Patch go examples to v0.4.0 version

.github/workflows/test-go.yml

@@ -28,4 +28,4 @@ jobs:
           docker-compose up -d
           popd
       - name: Run tests
-        run: cd go && go test ./test/...
+        run: cd go && make run-tests

.github/workflows/test-js.yml

@@ -1,4 +1,4 @@
-name: Run tests
+name: Run tests JS
 on:
   workflow_dispatch:
   pull_request:

.github/workflows/validate.yml

@@ -19,18 +19,7 @@ jobs:
       - name: Install Go
         uses: actions/[email protected]
       - name: Run gofmt
-        run: |
-          cd go
-          fmt_output=$(gofmt -l .)
-
-          if [ -n "$fmt_output" ]; then
-            echo "Code not formatted correctly:"
-            echo "$fmt_output"
-            exit 1
-          else
-            echo "Code is formatted correctly"
-            exit 0
-          fi
+        run: cd go && make check-format
   lint-js:
     name: Check code format for JavaScript
     runs-on: ubuntu-latest

go/09_deploy_create.go → go/08_deploy_create.go

@@ -48,20 +48,12 @@ func main() {
 	fmt.Println("Transaction: ", hash)
 
 	// Wait unit transaction is finalized
-	_, err = client.WaitMined(context.Background(), hash)
+	receipt, err := client.WaitMined(context.Background(), hash)
 	if err != nil {
 		log.Panic(err)
 	}
 
-	receipt, err := client.TransactionReceipt(context.Background(), hash)
-	if err != nil {
-		log.Panic(err)
-	}
 	contractAddress := receipt.ContractAddress
-
-	if err != nil {
-		log.Panic(err)
-	}
 	fmt.Println("Smart contract address", contractAddress.String())
 
 	// INTERACT WITH SMART CONTRACT

go/10_deploy_create_with_constructor.go → go/09_deploy_create_with_constructor.go

@@ -61,20 +61,12 @@ func main() {
 	fmt.Println("Transaction: ", hash)
 
 	// Wait unit transaction is finalized
-	_, err = client.WaitMined(context.Background(), hash)
+	receipt, err := client.WaitMined(context.Background(), hash)
 	if err != nil {
 		log.Panic(err)
 	}
 
-	receipt, err := client.TransactionReceipt(context.Background(), hash)
-	if err != nil {
-		log.Panic(err)
-	}
 	contractAddress := receipt.ContractAddress
-
-	if err != nil {
-		panic(err)
-	}
 	fmt.Println("Smart contract address: ", contractAddress.String())
 
 	// INTERACT WITH SMART CONTRACT

go/11_deploy_create_with_deps.go → go/10_deploy_create_with_deps.go

@@ -63,10 +63,6 @@ func main() {
 		log.Panic(err)
 	}
 	contractAddress := receipt.ContractAddress
-
-	if err != nil {
-		log.Panic(err)
-	}
 	fmt.Println("Smart contract address: ", contractAddress.String())
 
 	// INTERACT WITH SMART CONTRACT

go/12_deploy_create2.go → go/11_deploy_create2.go

@@ -7,7 +7,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/zksync-sdk/zksync2-go/accounts"
 	"github.com/zksync-sdk/zksync2-go/clients"
-	"github.com/zksync-sdk/zksync2-go/utils"
 	"log"
 	"math/big"
 	"os"
@@ -42,26 +41,17 @@ func main() {
 	//Deploy smart contract
 	hash, err := wallet.Deploy(nil, accounts.Create2Transaction{Bytecode: bytecode})
 	if err != nil {
-		panic(err)
+		log.Panic(err)
 	}
 	fmt.Println("Transaction: ", hash)
 
 	// Wait unit transaction is finalized
-	_, err = client.WaitMined(context.Background(), hash)
+	receipt, err := client.WaitMined(context.Background(), hash)
 	if err != nil {
 		log.Panic(err)
 	}
 
-	// Get address of deployed smart contract
-	contractAddress, err := utils.Create2Address(
-		wallet.Address(),
-		bytecode,
-		nil,
-		nil,
-	)
-	if err != nil {
-		log.Panic(err)
-	}
+	contractAddress := receipt.ContractAddress
 	fmt.Println("Smart contract address", contractAddress.String())
 
 	// INTERACT WITH SMART CONTRACT

go/13_deploy_create2_with_constructor.go → go/12_deploy_create2_with_constructor.go

@@ -8,7 +8,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/zksync-sdk/zksync2-go/accounts"
 	"github.com/zksync-sdk/zksync2-go/clients"
-	"github.com/zksync-sdk/zksync2-go/utils"
 	"log"
 	"math/big"
 	"os"
@@ -73,21 +72,12 @@ func main() {
 	fmt.Println("Transaction: ", hash)
 
 	// Wait unit transaction is finalized
-	_, err = client.WaitMined(context.Background(), hash)
+	receipt, err := client.WaitMined(context.Background(), hash)
 	if err != nil {
 		log.Panic(err)
 	}
 
-	// Get address of deployed smart contract
-	contractAddress, err := utils.Create2Address(
-		wallet.Address(),
-		bytecode,
-		constructor,
-		salt,
-	)
-	if err != nil {
-		panic(err)
-	}
+	contractAddress := receipt.ContractAddress
 	fmt.Println("Smart contract address: ", contractAddress.String())
 
 	// INTERACT WITH SMART CONTRACT

go/14_deploy_create2_with_deps.go → go/13_deploy_create2_with_deps.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"crypto/rand"
 	"fmt"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/zksync-sdk/zksync2-go/accounts"
@@ -43,13 +44,21 @@ func main() {
 		log.Panic(err)
 	}
 
+	// Generate salt
+	salt := make([]byte, 32)
+	_, err = rand.Read(salt)
+	if err != nil {
+		log.Panicf("error while generating salt: %s", err)
+	}
+
 	// Deploy smart contract
 	hash, err := wallet.Deploy(nil, accounts.Create2Transaction{
 		Bytecode:     demoBytecode,
 		Dependencies: [][]byte{fooBytecode},
+		Salt:         salt,
 	})
 	if err != nil {
-		panic(err)
+		log.Panic(err)
 	}
 	fmt.Println("Transaction: ", hash)
 
@@ -59,12 +68,11 @@ func main() {
 		log.Panic(err)
 	}
 
-	// Get address of deployed smart contract
 	contractAddress, err := utils.Create2Address(
 		wallet.Address(),
 		demoBytecode,
 		nil,
-		nil,
+		salt,
 	)
 	if err != nil {
 		log.Panic(err)

go/15_deploy_token_create.go → go/14_deploy_token_create.go

@@ -6,10 +6,9 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/zksync-sdk/zksync2-go/accounts"
 	"github.com/zksync-sdk/zksync2-go/clients"
-	"github.com/zksync-sdk/zksync2-go/utils"
 	"log"
 	"os"
-	"zksync2-examples/contracts/crown"
+	"zksync2-examples/contracts/token"
 )
 
 func main() {
@@ -31,7 +30,7 @@ func main() {
 		log.Panic(err)
 	}
 
-	_, tokenAbi, bytecode, err := utils.ReadStandardJson("../solidity/custom_paymaster/token/build/Token.json")
+	tokenAbi, err := token.TokenMetaData.GetAbi()
 	if err != nil {
 		log.Panic(err)
 	}
@@ -42,35 +41,38 @@ func main() {
 	}
 
 	//Deploy smart contract
-	hash, err := wallet.DeployWithCreate(nil, accounts.CreateTransaction{Bytecode: bytecode, Calldata: constructor})
+	hash, err := wallet.DeployWithCreate(nil, accounts.CreateTransaction{
+		Bytecode: common.FromHex(token.TokenMetaData.Bin),
+		Calldata: constructor,
+	})
 	if err != nil {
 		log.Panic(err)
 	}
 	fmt.Println("Transaction: ", hash)
 
 	// Wait unit transaction is finalized
-	tx, err := client.WaitMined(context.Background(), hash)
+	receipt, err := client.WaitMined(context.Background(), hash)
 	if err != nil {
 		log.Panic(err)
 	}
 
 	// Get address of deployed smart contract
-	tokenAddress := tx.ContractAddress
+	tokenAddress := receipt.ContractAddress
 	fmt.Println("Token address", tokenAddress.String())
 
 	// Create instance of token contract
-	token, err := crown.NewCrown(tokenAddress, client)
+	tokenContract, err := token.NewToken(tokenAddress, client)
 	if err != nil {
 		log.Panic(err)
 	}
 
-	symbol, err := token.Symbol(nil)
+	symbol, err := tokenContract.Symbol(nil)
 	if err != nil {
 		log.Panic(err)
 	}
 	fmt.Println("Symbol: ", symbol)
 
-	decimals, err := token.Decimals(nil)
+	decimals, err := tokenContract.Decimals(nil)
 	if err != nil {
 		log.Panic(err)
 	}

go/16_deploy_token_create2.go → go/15_deploy_token_create2.go

@@ -7,11 +7,10 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/zksync-sdk/zksync2-go/accounts"
 	"github.com/zksync-sdk/zksync2-go/clients"
-	"github.com/zksync-sdk/zksync2-go/utils"
 	"log"
 	"math/big"
 	"os"
-	"zksync2-examples/contracts/crown"
+	"zksync2-examples/contracts/token"
 )
 
 func main() {
@@ -33,8 +32,7 @@ func main() {
 		log.Panic(err)
 	}
 
-	// Read token contract from standard json
-	_, tokenAbi, bytecode, err := utils.ReadStandardJson("../solidity/custom_paymaster/token/build/Token.json")
+	tokenAbi, err := token.TokenMetaData.GetAbi()
 	if err != nil {
 		log.Panic(err)
 	}
@@ -45,43 +43,36 @@ func main() {
 	}
 
 	//Deploy smart contract
-	hash, err := wallet.Deploy(nil, accounts.Create2Transaction{Bytecode: bytecode, Calldata: constructor})
+	hash, err := wallet.Deploy(nil, accounts.Create2Transaction{
+		Bytecode: common.FromHex(token.TokenMetaData.Bin),
+		Calldata: constructor})
 	if err != nil {
 		log.Panic(err)
 	}
 	fmt.Println("Transaction: ", hash)
 
 	// Wait unit transaction is finalized
-	_, err = client.WaitMined(context.Background(), hash)
+	receipt, err := client.WaitMined(context.Background(), hash)
 	if err != nil {
 		log.Panic(err)
 	}
 
-	// Get address of deployed smart contract
-	tokenAddress, err := utils.Create2Address(
-		wallet.Address(),
-		bytecode,
-		constructor,
-		nil,
-	)
-	if err != nil {
-		log.Panic(err)
-	}
+	tokenAddress := receipt.ContractAddress
 	fmt.Println("Token address", tokenAddress.String())
 
 	// Create instance of token contract
-	token, err := crown.NewCrown(tokenAddress, client)
+	tokenContract, err := token.NewToken(tokenAddress, client)
 	if err != nil {
 		log.Panic(err)
 	}
 
-	symbol, err := token.Symbol(nil)
+	symbol, err := tokenContract.Symbol(nil)
 	if err != nil {
 		log.Panic(err)
 	}
 	fmt.Println("Symbol: ", symbol)
 
-	decimals, err := token.Decimals(nil)
+	decimals, err := tokenContract.Decimals(nil)
 	if err != nil {
 		log.Panic(err)
 	}
@@ -91,7 +82,7 @@ func main() {
 	if err != nil {
 		log.Panic(err)
 	}
-	mint, err := token.Mint(opts, wallet.Address(), big.NewInt(5))
+	mint, err := tokenContract.Mint(opts, wallet.Address(), big.NewInt(5))
 	if err != nil {
 		log.Panic(err)
 	}