Merge pull request #516 from onflow/improvement/secure-cadence

Author: turbolent

go.mod

@@ -9,13 +9,13 @@ require (
 	github.com/gosuri/uilive v0.0.4
 	github.com/joho/godotenv v1.4.0
 	github.com/manifoldco/promptui v0.9.0
-	github.com/onflow/cadence v0.21.3-0.20220601002855-8b113c539a2c
-	github.com/onflow/cadence/languageserver v0.23.5-0.20220520080030-2a9ba4e0aae7
+	github.com/onflow/cadence v0.24.1
+	github.com/onflow/cadence/languageserver v0.24.0
 	github.com/onflow/fcl-dev-wallet v0.4.2
 	github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220513155751-c4c1f8d59f83
-	github.com/onflow/flow-emulator v0.32.0
-	github.com/onflow/flow-go v0.26.2
-	github.com/onflow/flow-go-sdk v0.24.1-0.20220513205729-d1f58d47c4e3
+	github.com/onflow/flow-emulator v0.33.1
+	github.com/onflow/flow-go v0.26.3
+	github.com/onflow/flow-go-sdk v0.26.1
 	github.com/psiemens/sconfig v0.1.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/afero v1.8.2

go.sum

@@ -25,7 +25,6 @@ import (
 	"github.com/onflow/flow-cli/internal/command"
 
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/client"
 	"github.com/spf13/cobra"
 
 	"github.com/onflow/flow-cli/internal/events"
@@ -44,7 +43,7 @@ func init() {
 
 type BlockResult struct {
 	block       *flow.Block
-	events      []client.BlockEvents
+	events      []flow.BlockEvents
 	collections []*flow.Collection
 	included    []string
 }

internal/blocks/blocks.go

@@ -25,7 +25,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/onflow/flow-go-sdk/client"
+	"github.com/onflow/flow-go-sdk/access/grpc"
 	"github.com/spf13/afero"
 
 	"github.com/onflow/flow-cli/pkg/flowkit/config"
@@ -137,7 +137,7 @@ func handleError(description string, err error) {
 	// TODO(sideninja): refactor this to better handle errors not by string matching
 	// handle rpc error
 	switch t := err.(type) {
-	case *client.RPCError:
+	case *grpc.RPCError:
 		_, _ = fmt.Fprintf(os.Stderr, "%s Grpc Error: %s \n", output.ErrorEmoji(), t.GRPCStatus().Err().Error())
 	default:
 		if errors.Is(err, config.ErrOutdatedFormat) {

internal/command/result.go

@@ -29,7 +29,6 @@ import (
 	"github.com/onflow/cadence"
 	jsoncdc "github.com/onflow/cadence/encoding/json"
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/client"
 	"github.com/spf13/cobra"
 )
 
@@ -44,7 +43,7 @@ func init() {
 }
 
 type EventResult struct {
-	BlockEvents []client.BlockEvents
+	BlockEvents []flow.BlockEvents
 	Events      []flow.Event
 }
 

internal/events/events.go

@@ -57,7 +57,7 @@ func TestArguments(t *testing.T) {
 			[]string{sample.String()},
 		)
 		assert.NoError(t, err)
-		assert.Equal(t, 1, len(args))
+		assert.Len(t, args, 1)
 		assert.Equal(t, []cadence.Value{sample}, args)
 	}
 }

pkg/flowkit/arguments_test.go

@@ -145,55 +145,58 @@ func Test_GetContractsForNetworkComplex(t *testing.T) {
 	market, err := conf.Contracts.ByName("KittyItemsMarket")
 	assert.NoError(t, err)
 
-	assert.Equal(t, kitty.Name, "KittyItems")
-	assert.Equal(t, market.Source, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc")
+	assert.Equal(t, "KittyItems", kitty.Name)
+	assert.Equal(t, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc", market.Source)
 }
 
 func Test_GetContractsByNameAndNetworkComplex(t *testing.T) {
 	conf := generateComplexConfig()
 	market, err := conf.Contracts.ByNameAndNetwork("KittyItemsMarket", "testnet")
 	assert.NoError(t, err)
 
-	assert.Equal(t, market.Source, "0x123123123")
+	assert.Equal(t, "0x123123123", market.Source)
 }
 
 func Test_GetContractsByNetworkComplex(t *testing.T) {
 	conf := generateComplexConfig()
 	contracts := conf.Contracts.ByNetwork("emulator")
 
-	assert.Equal(t, 5, len(contracts))
-	assert.Equal(t, contracts[0].Name, "NonFungibleToken")
-	assert.Equal(t, contracts[1].Name, "FungibleToken")
-	assert.Equal(t, contracts[2].Name, "Kibble")
-	assert.Equal(t, contracts[3].Name, "KittyItems")
-	assert.Equal(t, contracts[4].Name, "KittyItemsMarket")
+	assert.Len(t, contracts, 5)
+	assert.Equal(t, "NonFungibleToken", contracts[0].Name)
+	assert.Equal(t, "FungibleToken", contracts[1].Name)
+	assert.Equal(t, "Kibble", contracts[2].Name)
+	assert.Equal(t, "KittyItems", contracts[3].Name)
+	assert.Equal(t, "KittyItemsMarket", contracts[4].Name)
 }
 
 func Test_GetAccountByNameComplex(t *testing.T) {
 	conf := generateComplexConfig()
 	acc, err := conf.Accounts.ByName("account-4")
 	assert.NoError(t, err)
 
-	assert.Equal(t, acc.Address.String(), "f8d6e0586b0a20c1")
+	assert.Equal(t, "f8d6e0586b0a20c1", acc.Address.String())
 }
 
 func Test_GetDeploymentsByNetworkComplex(t *testing.T) {
 	conf := generateComplexConfig()
 	deployments := conf.Deployments.ByAccountAndNetwork("account-2", "testnet")
 
-	assert.Equal(t, deployments[0].Contracts, []config.ContractDeployment{
-		{Name: "FungibleToken", Args: []cadence.Value{}},
-		{Name: "NonFungibleToken", Args: []cadence.Value{}},
-		{Name: "Kibble", Args: []cadence.Value{}},
-		{Name: "KittyItems", Args: []cadence.Value{}},
-	})
+	assert.Equal(t,
+		[]config.ContractDeployment{
+			{Name: "FungibleToken", Args: []cadence.Value{}},
+			{Name: "NonFungibleToken", Args: []cadence.Value{}},
+			{Name: "Kibble", Args: []cadence.Value{}},
+			{Name: "KittyItems", Args: []cadence.Value{}},
+		},
+		deployments[0].Contracts,
+	)
 }
 
 func Test_GetNetworkByNameComplex(t *testing.T) {
 	conf := generateComplexConfig()
 	network, err := conf.Networks.ByName("emulator")
 	assert.NoError(t, err)
-	assert.Equal(t, network.Host, "127.0.0.1.3569")
+	assert.Equal(t, "127.0.0.1.3569", network.Host)
 
 	network, err = conf.Networks.ByName("testnet")
 	assert.NoError(t, err)

pkg/flowkit/config/config_test.go

@@ -43,11 +43,11 @@ func Test_ConfigAccountKeysSimple(t *testing.T) {
 	assert.NoError(t, err)
 	key := account.Key
 
-	assert.Equal(t, account.Address.String(), "f8d6e0586b0a20c7")
-	assert.Equal(t, key.HashAlgo.String(), "SHA3_256")
-	assert.Equal(t, key.Index, 0)
-	assert.Equal(t, key.SigAlgo.String(), "ECDSA_P256")
-	assert.Equal(t, key.PrivateKey.String(), "0x1fae488ce86422698f1c13468b137d62de488e7e978d7090396f7883a60abdcf")
+	assert.Equal(t, "f8d6e0586b0a20c7", account.Address.String())
+	assert.Equal(t, "SHA3_256", key.HashAlgo.String())
+	assert.Equal(t, 0, key.Index)
+	assert.Equal(t, "ECDSA_P256", key.SigAlgo.String())
+	assert.Equal(t, "0x1fae488ce86422698f1c13468b137d62de488e7e978d7090396f7883a60abdcf", key.PrivateKey.String())
 }
 
 func Test_ConfigAccountKeysAdvancedHex(t *testing.T) {
@@ -75,12 +75,12 @@ func Test_ConfigAccountKeysAdvancedHex(t *testing.T) {
 	assert.NoError(t, err)
 	key := account.Key
 
-	assert.Equal(t, account.Address.String(), "f8d6e0586b0a20c7")
-	assert.Equal(t, key.HashAlgo.String(), "SHA2_256")
-	assert.Equal(t, key.Index, 1)
-	assert.Equal(t, key.SigAlgo.String(), "ECDSA_P256")
-	assert.Equal(t, key.PrivateKey.String(), "0x271cec6bb5221d12713759188166bdfa00079db5789c36b54dcf1d794d8d8cdf")
-	assert.Equal(t, key.ResourceID, "")
+	assert.Equal(t, "f8d6e0586b0a20c7", account.Address.String())
+	assert.Equal(t, "SHA2_256", key.HashAlgo.String())
+	assert.Equal(t, 1, key.Index)
+	assert.Equal(t, "ECDSA_P256", key.SigAlgo.String())
+	assert.Equal(t, "0x271cec6bb5221d12713759188166bdfa00079db5789c36b54dcf1d794d8d8cdf", key.PrivateKey.String())
+	assert.Equal(t, "", key.ResourceID)
 }
 
 func Test_ConfigAccountKeysAdvancedKMS(t *testing.T) {
@@ -108,11 +108,11 @@ func Test_ConfigAccountKeysAdvancedKMS(t *testing.T) {
 	assert.NoError(t, err)
 	key := account.Key
 
-	assert.Equal(t, account.Address.String(), "f8d6e0586b0a20c7")
-	assert.Equal(t, key.HashAlgo.String(), "SHA3_256")
-	assert.Equal(t, key.Index, 1)
-	assert.Equal(t, key.SigAlgo.String(), "ECDSA_P256")
-	assert.Equal(t, key.ResourceID, "projects/flow/locations/us/keyRings/foo/bar/cryptoKeyVersions/1")
+	assert.Equal(t, "f8d6e0586b0a20c7", account.Address.String())
+	assert.Equal(t, "SHA3_256", key.HashAlgo.String())
+	assert.Equal(t, 1, key.Index)
+	assert.Equal(t, "ECDSA_P256", key.SigAlgo.String())
+	assert.Equal(t, "projects/flow/locations/us/keyRings/foo/bar/cryptoKeyVersions/1", key.ResourceID)
 	assert.Nil(t, key.PrivateKey)
 }
 

pkg/flowkit/config/json/account_test.go

@@ -48,7 +48,7 @@ func Test_SimpleJSONConfig(t *testing.T) {
 	conf, err := parser.Deserialize(b)
 
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(conf.Accounts))
+	assert.Len(t, conf.Accounts, 1)
 	assert.Equal(t, "emulator-account", conf.Accounts[0].Name)
 	assert.Equal(t, "0x11c5dfdeb0ff03a7a73ef39788563b62c89adea67bbb21ab95e5f710bd1d40b7", conf.Accounts[0].Key.PrivateKey.String())
 	network, err := conf.Networks.ByName("emulator")
@@ -80,7 +80,7 @@ func Test_NonExistingContractForDeployment(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = config.Validate()
-	assert.Equal(t, err.Error(), "deployment contains nonexisting contract FungibleToken")
+	assert.Equal(t, "deployment contains nonexisting contract FungibleToken", err.Error())
 }
 
 func Test_NonExistingAccountForDeployment(t *testing.T) {
@@ -109,7 +109,7 @@ func Test_NonExistingAccountForDeployment(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = conf.Validate()
-	assert.Equal(t, err.Error(), "deployment contains nonexisting account test-1")
+	assert.Equal(t, "deployment contains nonexisting account test-1", err.Error())
 }
 
 func Test_NonExistingNetworkForDeployment(t *testing.T) {
@@ -136,7 +136,7 @@ func Test_NonExistingNetworkForDeployment(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = conf.Validate()
-	assert.Equal(t, err.Error(), "deployment contains nonexisting network foo")
+	assert.Equal(t, "deployment contains nonexisting network foo", err.Error())
 }
 
 func Test_NonExistingAccountForEmulator(t *testing.T) {
@@ -154,5 +154,5 @@ func Test_NonExistingAccountForEmulator(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = conf.Validate()
-	assert.Equal(t, err.Error(), "emulator default contains nonexisting service account emulator-account")
+	assert.Equal(t, "emulator default contains nonexisting service account emulator-account", err.Error())
 }

pkg/flowkit/config/json/config_test.go

@@ -65,7 +65,7 @@ func Test_ConfigContractsComplex(t *testing.T) {
 	contracts, err := jsonContracts.transformToConfig()
 	assert.NoError(t, err)
 
-	assert.Equal(t, len(contracts), 2)
+	assert.Len(t, contracts, 2)
 
 	contract, err := contracts.ByName("KittyItems")
 	assert.NoError(t, err)
@@ -75,21 +75,21 @@ func Test_ConfigContractsComplex(t *testing.T) {
 	kittyItemsMarketTestnet, err := contracts.ByNameAndNetwork("KittyItemsMarket", "testnet")
 	assert.NoError(t, err)
 
-	assert.Equal(t, contract.Source, "./cadence/kittyItems/contracts/KittyItems.cdc")
-	assert.Equal(t, kittyItemsMarketEmulator.Source, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc")
-	assert.Equal(t, kittyItemsMarketTestnet.Source, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc")
+	assert.Equal(t, "./cadence/kittyItems/contracts/KittyItems.cdc", contract.Source)
+	assert.Equal(t, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc", kittyItemsMarketEmulator.Source)
+	assert.Equal(t, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc", kittyItemsMarketTestnet.Source)
 
 	kittyItemsEmulator, err := contracts.ByNameAndNetwork("KittyItems", "emulator")
 	assert.NoError(t, err)
 
 	kittyItemsTestnet, err := contracts.ByNameAndNetwork("KittyItems", "testnet")
 	assert.NoError(t, err)
 
-	assert.Equal(t, kittyItemsEmulator.Alias, "")
-	assert.Equal(t, kittyItemsTestnet.Alias, "")
+	assert.Equal(t, "", kittyItemsEmulator.Alias)
+	assert.Equal(t, "", kittyItemsTestnet.Alias)
 
-	assert.Equal(t, kittyItemsMarketTestnet.Alias, "f8d6e0586b0a20c7")
-	assert.Equal(t, kittyItemsMarketEmulator.Alias, "")
+	assert.Equal(t, "f8d6e0586b0a20c7", kittyItemsMarketTestnet.Alias)
+	assert.Equal(t, "", kittyItemsMarketEmulator.Alias)
 }
 
 func Test_ConfigContractsAliases(t *testing.T) {
@@ -125,14 +125,14 @@ func Test_ConfigContractsAliases(t *testing.T) {
 	fungibleTokenTestnet, err := contracts.ByNameAndNetwork("FungibleToken", "testnet")
 	assert.NoError(t, err)
 
-	assert.Equal(t, fungibleToken.Network, "emulator")
-	assert.Equal(t, fungibleToken.Alias, "e5a8b7f23e8b548f")
-	assert.Equal(t, fungibleToken.Source, "../hungry-kitties/cadence/contracts/FungibleToken.cdc")
-	assert.Equal(t, fungibleTokenEmulator.Alias, "e5a8b7f23e8b548f")
-	assert.Equal(t, fungibleTokenTestnet.Alias, "")
-	assert.Equal(t, fungibleTokenTestnet.Network, "testnet")
-	assert.Equal(t, fungibleTokenTestnet.Source, "../hungry-kitties/cadence/contracts/FungibleToken.cdc")
-	assert.Equal(t, fungibleTokenEmulator.Source, "../hungry-kitties/cadence/contracts/FungibleToken.cdc")
+	assert.Equal(t, "emulator", fungibleToken.Network)
+	assert.Equal(t, "e5a8b7f23e8b548f", fungibleToken.Alias)
+	assert.Equal(t, "../hungry-kitties/cadence/contracts/FungibleToken.cdc", fungibleToken.Source)
+	assert.Equal(t, "e5a8b7f23e8b548f", fungibleTokenEmulator.Alias)
+	assert.Equal(t, "", fungibleTokenTestnet.Alias)
+	assert.Equal(t, "testnet", fungibleTokenTestnet.Network)
+	assert.Equal(t, "../hungry-kitties/cadence/contracts/FungibleToken.cdc", fungibleTokenTestnet.Source)
+	assert.Equal(t, "../hungry-kitties/cadence/contracts/FungibleToken.cdc", fungibleTokenEmulator.Source)
 
 	kibbleTestnet, err := contracts.ByNameAndNetwork("Kibble", "testnet")
 	assert.NoError(t, err)