feat: update go/tinygo versiont

hunjixin · hunjixin · commit 8f9ddbd0c8ec · 2023-04-23T17:39:49.000+08:00
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -17,9 +17,9 @@ jobs:
         run: sudo apt-get -o Acquire::Retries=3 update && sudo apt-get -o Acquire::Retries=3 install make git mesa-opencl-icd ocl-icd-opencl-dev wget -y && sudo apt upgrade -y
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.20.3
 
       - name: setup rust
         uses: actions-rs/toolchain@v1
@@ -42,9 +42,9 @@ jobs:
 
       - name: install tinygo
         run: |
-          wget https://github.com/tinygo-org/tinygo/releases/download/v0.25.0/tinygo_0.25.0_amd64.deb
-          sudo dpkg -i tinygo_0.25.0_amd64.deb
-          rm tinygo_0.25.0_amd64.deb
+          wget https://github.com/tinygo-org/tinygo/releases/download/v0.27.0/tinygo_0.27.0_amd64.deb
+          sudo dpkg -i tinygo_0.27.0_amd64.deb
+          rm tinygo_0.27.0_amd64.deb
 
       - name: Build
         run: |
diff --git a/.golangci.yml b/.golangci.yml
@@ -30,6 +30,7 @@ issues:
   exclude-use-default: false
   exclude:
     - "\\w+Id should be \\w+ID"
+    - "main redeclared in this block"
 
 linters-settings:
   goconst:
diff --git a/Makefile b/Makefile
@@ -20,6 +20,10 @@ code-gen:
 	cd ./examples/erc20 && fvm_go_sdk build
 	cd ./examples/frc46token/gen && go run main.go
 	cd ./examples/frc46token && fvm_go_sdk build
+	cd ./examples/wallet/gen && go run main.go
+	cd ./examples/wallet && fvm_go_sdk build
+	cd ./examples/queuecall/gen && go run main.go
+	cd ./examples/queuecall && fvm_go_sdk build
 
 clean:
 	rm -rf ./bin/*
@@ -36,6 +40,7 @@ test: build code-gen
 	cd ./examples/frc46token && fvm_go_sdk test
 	cd ./examples/frc46token/contract && go test --tags simulate
 	cd ./examples/hellocontract/contract && go test --tags simulate
-
+	cd ./examples/queuecall/contract && go test --tags simulate
+	cd ./examples/wallet/contract && go test --tags simulate
 
 check: code-gen lint build-client-example test
diff --git a/README.MD b/README.MD
@@ -16,7 +16,7 @@ Key features of `go-fvm-sdk` are...
 
 ## Install
 
-Install [Go](https://go.dev/doc/install)v1.17 or above and [TinyGo](https://tinygo.org/getting-started/install/)v0.25 or above.
+Install [Go](https://go.dev/doc/install)v1.20.x or above and [TinyGo](https://tinygo.org/getting-started/install/)v0.27 or above.
 
 *Note: latest Go or TinyGo versions may not be tested.*
 
diff --git a/examples/erc20/client_example/go.mod b/examples/erc20/client_example/go.mod
@@ -1,6 +1,6 @@
 module client_example
 
-go 1.18
+go 1.20
 
 replace (
 	erc20 => ../
diff --git a/examples/erc20/gen/go.mod b/examples/erc20/gen/go.mod
@@ -1,6 +1,6 @@
 module gen
 
-go 1.18
+go 1.20
 
 require (
 	erc20 v0.0.0-00010101000000-000000000000
diff --git a/examples/erc20/go.mod b/examples/erc20/go.mod
@@ -1,6 +1,6 @@
 module erc20
 
-go 1.18
+go 1.20
 
 replace (
 	erc20 => ./
diff --git a/examples/frc46token/client_example/go.mod b/examples/frc46token/client_example/go.mod
@@ -1,6 +1,6 @@
 module client_example
 
-go 1.18
+go 1.20
 
 replace (
 	frc46token => ../
diff --git a/examples/frc46token/gen/go.mod b/examples/frc46token/gen/go.mod
@@ -1,6 +1,6 @@
 module gen
 
-go 1.18
+go 1.20
 
 require (
 	frc46token v0.0.0-00010101000000-000000000000
diff --git a/examples/frc46token/go.mod b/examples/frc46token/go.mod
@@ -1,6 +1,6 @@
 module frc46token
 
-go 1.18
+go 1.20
 
 replace (
 	erc20 => ./
diff --git a/examples/hellocontract/client_example/go.mod b/examples/hellocontract/client_example/go.mod
@@ -1,6 +1,6 @@
 module client_example
 
-go 1.18
+go 1.20
 
 replace (
 	github.com/ipfs-force-community/go-fvm-sdk => ../../../
diff --git a/examples/hellocontract/gen/go.mod b/examples/hellocontract/gen/go.mod
@@ -1,6 +1,6 @@
 module gen
 
-go 1.18
+go 1.20
 
 require (
 	github.com/ipfs-force-community/go-fvm-sdk/gen v0.0.0-00010101000000-000000000000
diff --git a/examples/hellocontract/go.mod b/examples/hellocontract/go.mod
@@ -1,9 +1,8 @@
 module hellocontract
 
-go 1.18
+go 1.20
 
 replace (
-	hellocontract => ./
 	github.com/davecgh/go-spew => github.com/ipfs-force-community/go-spew v1.1.2-0.20220524052205-0034150c051a
 	github.com/filecoin-project/go-address => github.com/ipfs-force-community/go-address v0.0.7-0.20230207015848-7a27d889c267
 	github.com/ipfs-force-community/go-fvm-sdk => ../..
@@ -16,6 +15,7 @@ replace (
 	github.com/stretchr/testify => github.com/ipfs-force-community/testify v1.7.1-0.20220616060316-ea4f53121ac3
 	github.com/whyrusleeping/cbor-gen => github.com/ipfs-force-community/cbor-gen v0.0.0-20220421100448-dc345220256c
 	golang.org/x/crypto => github.com/ipfs-force-community/crypto v0.0.0-20220523090957-2aff239c26f7
+	hellocontract => ./
 	lukechampine.com/blake3 => github.com/ipfs-force-community/blake3 v1.1.8-0.20220609024944-51450f2b2fc0
 )
 
diff --git a/examples/queuecall/client/client_gen.go b/examples/queuecall/client/client_gen.go
diff --git a/examples/queuecall/contract/queuecall.go b/examples/queuecall/contract/queuecall.go
@@ -160,7 +160,7 @@ func (e *State) Execute(ctx context.Context, id *types.CborString) (*types.Recei
 		return nil, err
 	}
 	if !found {
-		return nil, fmt.Errorf("call %s not found", id)
+		return nil, fmt.Errorf("call %v not found", id)
 	}
 
 	timestamp, err := sdk.TipsetTimestamp(ctx)
diff --git a/examples/queuecall/entry_gen.go b/examples/queuecall/entry_gen.go
diff --git a/examples/queuecall/gen/go.mod b/examples/queuecall/gen/go.mod
@@ -1,16 +1,16 @@
 module gen
 
-go 1.18
+go 1.20
 
 require (
-	queuecall v0.0.0-00010101000000-000000000000
 	github.com/ipfs-force-community/go-fvm-sdk/gen v0.0.0-00010101000000-000000000000
+	queuecall v0.0.0-00010101000000-000000000000
 )
 
 replace (
-	queuecall => ../
 	github.com/ipfs-force-community/go-fvm-sdk => ../../..
 	github.com/ipfs-force-community/go-fvm-sdk/gen => ../../../gen
+	queuecall => ../
 )
 
 require (
diff --git a/examples/queuecall/go.mod b/examples/queuecall/go.mod
@@ -1,6 +1,6 @@
 module queuecall
 
-go 1.18
+go 1.20
 
 replace (
 	github.com/davecgh/go-spew => github.com/ipfs-force-community/go-spew v1.1.2-0.20220524052205-0034150c051a
@@ -32,6 +32,7 @@ require (
 	github.com/ipfs-force-community/go-fvm-sdk v0.0.0-00010101000000-000000000000
 	github.com/ipfs/go-block-format v0.0.3
 	github.com/ipfs/go-ipld-cbor v0.0.6
+	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
 	github.com/stretchr/testify v1.8.0
 )
 
@@ -99,7 +100,6 @@ require (
 	github.com/libp2p/go-openssl v0.1.0 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-pointer v0.0.1 // indirect
-	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.0.4 // indirect
diff --git a/examples/wallet/gen/go.mod b/examples/wallet/gen/go.mod
@@ -1,16 +1,16 @@
 module gen
 
-go 1.18
+go 1.20
 
 require (
-	wallet v0.0.0-00010101000000-000000000000
 	github.com/ipfs-force-community/go-fvm-sdk/gen v0.0.0-00010101000000-000000000000
+	wallet v0.0.0-00010101000000-000000000000
 )
 
 replace (
-	wallet => ../
 	github.com/ipfs-force-community/go-fvm-sdk => ../../..
 	github.com/ipfs-force-community/go-fvm-sdk/gen => ../../../gen
+	wallet => ../
 )
 
 require (
diff --git a/examples/wallet/go.mod b/examples/wallet/go.mod
@@ -1,6 +1,6 @@
 module wallet
 
-go 1.18
+go 1.20
 
 replace (
 	github.com/davecgh/go-spew => github.com/ipfs-force-community/go-spew v1.1.2-0.20220524052205-0034150c051a
diff --git a/gen/go.mod b/gen/go.mod
diff --git a/go.mod b/go.mod
diff --git a/sdk/gen/go.mod b/sdk/gen/go.mod
diff --git a/tools/sdk_tool/src/patch.rs b/tools/sdk_tool/src/patch.rs
diff --git a/tools/sdk_tool/src/utils.rs b/tools/sdk_tool/src/utils.rs

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ func (e State) Execute(ctx context.Context, id types.CborString) (*types.Recei`
`160`	`160`	`return nil, err`
`161`	`161`	`}`
`162`	`162`	`if !found {`
`163`		`- return nil, fmt.Errorf("call %s not found", id)`
	`163`	`+ return nil, fmt.Errorf("call %v not found", id)`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`timestamp, err := sdk.TipsetTimestamp(ctx)`