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

Secure Cadence

Author: devbugging

go.mod

@@ -9,15 +9,15 @@ 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.23.3
-	github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831
+	github.com/onflow/cadence v0.21.3-0.20220601002855-8b113c539a2c
+	github.com/onflow/cadence/languageserver v0.23.5-0.20220520080030-2a9ba4e0aae7
 	github.com/onflow/fcl-dev-wallet v0.4.2
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.11.0
-	github.com/onflow/flow-emulator v0.31.1
-	github.com/onflow/flow-go v0.25.6
-	github.com/onflow/flow-go-sdk v0.24.0
+	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/psiemens/sconfig v0.1.0
-	github.com/sirupsen/logrus v1.6.0 // indirect
+	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/afero v1.8.2
 	github.com/spf13/cobra v1.4.0
 	github.com/stretchr/testify v1.7.1

go.sum

@@ -30,7 +30,7 @@ var Cmd = &cobra.Command{
 	Short: "Execute Cadence code",
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 0 {
-			execute.Execute(args)
+			execute.Execute(args, nil)
 		} else {
 			execute.RunREPL()
 		}

internal/cadence/cadence.go

@@ -42,7 +42,7 @@ func (v CadenceArgument) MarshalJSON() ([]byte, error) {
 }
 
 func (v *CadenceArgument) UnmarshalJSON(b []byte) (err error) {
-	v.Value, err = jsoncdc.Decode(b)
+	v.Value, err = jsoncdc.Decode(nil, b)
 	if err != nil {
 		return err
 	}
@@ -173,7 +173,7 @@ func ParseArgumentsWithoutType(fileName string, code []byte, args []string) (scr
 
 		}
 
-		var value, err = runtime.ParseLiteral(argumentString, semaType)
+		var value, err = runtime.ParseLiteral(argumentString, semaType, nil)
 		if err != nil {
 			return nil, fmt.Errorf("argument `%s` is not expected type `%s`", parameterList[index].Identifier, semaType)
 		}

pkg/flowkit/arguments.go

@@ -62,7 +62,7 @@ func (j jsonDeployments) transformToConfig() (config.Deployments, error) {
 							return nil, err
 						}
 
-						cadenceArg, err := jsoncdc.Decode(b)
+						cadenceArg, err := jsoncdc.Decode(nil, b)
 						if err != nil {
 							return nil, err
 						}

pkg/flowkit/config/json/deploy.go

@@ -56,7 +56,7 @@ func newContract(
 	accountName string,
 	args []cadence.Value,
 ) (*Contract, error) {
-	program, err := parser2.ParseProgram(contractCode)
+	program, err := parser2.ParseProgram(contractCode, nil)
 	if err != nil {
 		return nil, err
 	}

pkg/flowkit/contracts/contracts.go

@@ -39,7 +39,7 @@ type Resolver struct {
 
 // NewResolver creates a new resolver.
 func NewResolver(code []byte) (*Resolver, error) {
-	program, err := parser2.ParseProgram(string(code))
+	program, err := parser2.ParseProgram(string(code), nil)
 	if err != nil {
 		return nil, err
 	}

pkg/flowkit/contracts/resolver.go

@@ -121,8 +121,7 @@ func TestAccounts(t *testing.T) {
 			tx := args.Get(0).(*flowkit.Transaction)
 			assert.Equal(t, tx.FlowTransaction().Authorizers[0], serviceAddress)
 			assert.Equal(t, tx.Signer().Address(), serviceAddress)
-			assert.True(t, strings.Contains(string(tx.FlowTransaction().Script), "acct.contracts.add"))
-
+			assert.True(t, strings.Contains(string(tx.FlowTransaction().Script), "account.contracts.add"))
 			gw.SendSignedTransaction.Return(tests.NewTransaction(), nil)
 		})
 

pkg/flowkit/services/accounts_test.go

@@ -104,7 +104,7 @@ func TestBlocksGet_Integration(t *testing.T) {
 		assert.Nil(t, blockEvents)
 		assert.Equal(t, collection, []*flow.Collection{})
 		assert.Equal(t, block.Height, uint64(0))
-		assert.Equal(t, block.ID.String(), "7bc42fe85d32ca513769a74f97f7e1a7bad6c9407f0d934c2aa645ef9cf613c7")
+		assert.Equal(t, block.ID.String(), "13c7ff23bb65feb5757cc65fdd75cd243506518c126385fae530ddebdad10b17")
 
 		// create an event
 		_, _ = s.Accounts.Create(srvAcc, tests.PubKeys(), nil, tests.SigAlgos(), tests.HashAlgos(), nil)

pkg/flowkit/services/blocks_test.go

@@ -145,11 +145,12 @@ func NewCreateAccountTransaction(
 	keys []*flow.AccountKey,
 	contracts []templates.Contract,
 ) (*Transaction, error) {
+	template, err := templates.CreateAccount(keys, contracts, signer.Address())
+	if err != nil {
+		return nil, err
+	}
 
-	return newTransactionFromTemplate(
-		templates.CreateAccount(keys, contracts, signer.Address()),
-		signer,
-	)
+	return newTransactionFromTemplate(template, signer)
 }
 
 func newTransactionFromTemplate(templateTx *flow.Transaction, signer *Account) (*Transaction, error) {