Merge pull request #162 from aeternity/dependabot/go_modules/golang.o…

…rg/x/crypto-0.1.0 chore(deps): bump golang.org/x/crypto from 0.0.0-20210513164829-c07d793c2f9a to 0.1.0
aeternity · Jul 3, 2023 · eb7ae33 · eb7ae33
2 parents 28c5e63 + ad8dda9
commit eb7ae33
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 473 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
-TAG=v6.0.0
-COMPILER_TAG=v6.0.0
+TAG=v6.10.0
+COMPILER_TAG=v7.3.0
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -4,15 +4,15 @@ jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v4
       with:
-        go-version: 1.16
+        go-version: '1.20'
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Lint
       run: |
-        go get honnef.co/go/tools/cmd/staticcheck@v0.2.0
+        go install honnef.co/go/tools/cmd/staticcheck@v0.4.3
         make lint
 
     - run: make test-unit
@@ -24,12 +24,7 @@ jobs:
         done
     - run: make test-integration
 
-    - name: Build
-      if: true != startsWith(github.ref, 'refs/tags/')
-      run: make build-release
-
     - name: Build release
-      if: startsWith(github.ref, 'refs/tags/')
       run: make build-release
 
     - name: Publish release

diff --git a/aeternity/helpers.go b/aeternity/helpers.go
@@ -135,18 +135,21 @@ func (t *TxReceipt) Watch(mined chan bool, waitBlocks uint64, node transactionWa
 	if err != nil {
 		t.Error = err
 		mined <- false
+		return
 	}
 	endHeight := nodeHeight + waitBlocks
 	for nodeHeight <= endHeight {
 		nodeHeight, err = node.GetHeight()
 		if err != nil {
 			t.Error = err
 			mined <- false
+			return
 		}
 		tx, err := node.GetTransactionByHash(t.Hash)
 		if err != nil {
 			t.Error = err
 			mined <- false
+			return
 		}
 
 		if tx.BlockHeight.LargerThanZero() {

diff --git a/api/compiler.json b/api/compiler.json
@@ -850,43 +850,6 @@
         }
       }
     },
-    "/decode-data": {
-      "post": {
-        "consumes": [
-          "application/json"
-        ],
-        "description": "Decode data as retuned by a contract call. - Legacy decoding",
-        "operationId": "DecodeData",
-        "parameters": [
-          {
-            "description": "Binary data in Sophia ABI format",
-            "in": "body",
-            "name": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/SophiaBinaryData"
-            }
-          }
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "responses": {
-          "200": {
-            "description": "Json encoded data",
-            "schema": {
-              "$ref": "#/definitions/SophiaJsonData"
-            }
-          },
-          "400": {
-            "description": "Invalid data",
-            "schema": {
-              "$ref": "#/definitions/CompilerErrors"
-            }
-          }
-        }
-      }
-    },
     "/encode-calldata": {
       "post": {
         "consumes": [

diff --git a/go.mod b/go.mod
@@ -3,44 +3,31 @@ module github.com/aeternity/aepp-sdk-go/v9
 go 1.16
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.2.12 // indirect
 	github.com/aeternity/rlp-go v0.0.0-20190813143754-207301e28aeb
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/btcsuite/btcutil v1.0.2
-	github.com/fatih/color v1.12.0 // indirect
-	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
-	github.com/git-chglog/git-chglog v0.14.2 // indirect
 	github.com/go-openapi/analysis v0.20.1 // indirect
 	github.com/go-openapi/errors v0.20.0
 	github.com/go-openapi/jsonreference v0.19.6 // indirect
 	github.com/go-openapi/runtime v0.19.29
 	github.com/go-openapi/strfmt v0.20.1
 	github.com/go-openapi/swag v0.19.15
 	github.com/go-openapi/validate v0.20.2
-	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.2.0 // indirect
-	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-isatty v0.0.13 // indirect
-	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
-	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/pelletier/go-toml v1.9.2 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/viper v1.7.1
-	github.com/trivago/tgo v1.0.7 // indirect
 	github.com/tyler-smith/go-bip39 v1.1.0
 	go.mongodb.org/mongo-driver v1.5.3 // indirect
-	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
-	golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
-	golang.org/x/term v0.0.0-20210503060354-a79de5458b56
+	golang.org/x/crypto v0.1.0
+	golang.org/x/term v0.1.0
 	gopkg.in/ini.v1 v1.62.0 // indirect
 	gotest.tools v2.2.0+incompatible
 )