Merge pull request #371 from bluesign/master

Arguments fix ( checker rollback)

Author: devbugging

internal/scripts/execute.go

@@ -68,7 +68,7 @@ func execute(
 	if scriptFlags.ArgsJSON != "" || len(scriptFlags.Arg) != 0 {
 		scriptArgs, err = flowkit.ParseArguments(scriptFlags.Arg, scriptFlags.ArgsJSON)
 	} else {
-		scriptArgs, err = flowkit.ParseArgumentsWithoutType(code, args[1:])
+		scriptArgs, err = flowkit.ParseArgumentsWithoutType(filename, code, args[1:])
 	}
 
 	if err != nil {

internal/transactions/build.go

@@ -21,6 +21,7 @@ package transactions
 import (
 	"fmt"
 
+	"github.com/onflow/cadence"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/spf13/cobra"
 
@@ -32,7 +33,7 @@ import (
 
 type flagsBuild struct {
 	ArgsJSON         string   `default:"" flag:"args-json" info:"arguments in JSON-Cadence format"`
-	Args             []string `default:"" flag:"arg" info:"argument in Type:Value format"`
+	Args             []string `default:"" flag:"arg" info:"⚠️  Deprecated: use command arguments"`
 	Proposer         string   `default:"emulator-account" flag:"proposer" info:"transaction proposer"`
 	ProposerKeyIndex int      `default:"0" flag:"proposer-key-index" info:"proposer key index"`
 	Payer            string   `default:"emulator-account" flag:"payer" info:"transaction payer"`
@@ -44,10 +45,10 @@ var buildFlags = flagsBuild{}
 
 var BuildCommand = &command.Command{
 	Cmd: &cobra.Command{
-		Use:     "build <code filename>",
+		Use:     "build <code filename>  [<argument> <argument> ...]",
 		Short:   "Build an unsigned transaction",
-		Example: "flow transactions build ./transaction.cdc --proposer alice --authorizer alice --payer bob",
-		Args:    cobra.ExactArgs(1),
+		Example: `flow transactions build ./transaction.cdc "Hello" --proposer alice --authorizer alice --payer bob`,
+		Args:    cobra.MinimumNArgs(1),
 	},
 	Flags: &buildFlags,
 	RunS:  build,
@@ -86,9 +87,19 @@ func build(
 		return nil, fmt.Errorf("error loading transaction file: %w", err)
 	}
 
-	txArgs, err := flowkit.ParseArguments(buildFlags.Args, buildFlags.ArgsJSON)
+	if len(buildFlags.Args) != 0 {
+		fmt.Println("⚠️  DEPRECATION WARNING: use transaction arguments as command arguments: send <code filename> [<argument> <argument> ...]")
+	}
+
+	var transactionArgs []cadence.Value
+	if buildFlags.ArgsJSON != "" || len(buildFlags.Args) != 0 {
+		transactionArgs, err = flowkit.ParseArguments(buildFlags.Args, buildFlags.ArgsJSON)
+	} else {
+		transactionArgs, err = flowkit.ParseArgumentsWithoutType(filename, code, args[1:])
+	}
+
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error parsing transaction arguments: %w", err)
 	}
 
 	build, err := services.Transactions.Build(
@@ -99,7 +110,7 @@ func build(
 		code,
 		filename,
 		buildFlags.GasLimit,
-		txArgs,
+		transactionArgs,
 		globalFlags.Network,
 	)
 	if err != nil {

internal/transactions/send.go

@@ -79,7 +79,7 @@ func send(
 	if sendFlags.ArgsJSON != "" || len(sendFlags.Arg) != 0 {
 		transactionArgs, err = flowkit.ParseArguments(sendFlags.Arg, sendFlags.ArgsJSON)
 	} else {
-		transactionArgs, err = flowkit.ParseArgumentsWithoutType(code, args[1:])
+		transactionArgs, err = flowkit.ParseArgumentsWithoutType(codeFilename, code, args[1:])
 	}
 
 	if err != nil {

pkg/flowkit/arguments.go

@@ -27,6 +27,7 @@ import (
 	"github.com/onflow/cadence"
 	jsoncdc "github.com/onflow/cadence/encoding/json"
 	"github.com/onflow/cadence/runtime"
+	"github.com/onflow/cadence/runtime/ast"
 	"github.com/onflow/cadence/runtime/cmd"
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/sema"
@@ -120,20 +121,32 @@ func ParseArguments(args []string, argsJSON string) (scriptArgs []cadence.Value,
 	return
 }
 
-func ParseArgumentsWithoutType(code []byte, args []string) (scriptArgs []cadence.Value, err error) {
+func ParseArgumentsWithoutType(fileName string, code []byte, args []string) (scriptArgs []cadence.Value, err error) {
 
 	var resultArgs []cadence.Value = make([]cadence.Value, 0)
 
 	codes := map[common.LocationID]string{}
-	location := common.StringLocation("")
+	location := common.StringLocation(fileName)
 	program, must := cmd.PrepareProgram(string(code), location, codes)
 	checker, _ := cmd.PrepareChecker(program, location, codes, nil, must)
 
-	err = checker.Check()
-	var parameterList []*sema.Parameter = checker.EntryPointParameters()
+	var parameterList []*ast.Parameter
 
-	//return on checker error or no entry
-	if err != nil || parameterList == nil {
+	transactionDeclaration := program.SoleTransactionDeclaration()
+	if transactionDeclaration != nil {
+		if transactionDeclaration.ParameterList != nil {
+			parameterList = transactionDeclaration.ParameterList.Parameters
+		}
+	}
+
+	functionDeclaration := sema.FunctionEntryPointDeclaration(program)
+	if functionDeclaration != nil {
+		if functionDeclaration.ParameterList != nil {
+			parameterList = functionDeclaration.ParameterList.Parameters
+		}
+	}
+
+	if parameterList == nil {
 		return resultArgs, nil
 	}
 
@@ -142,7 +155,8 @@ func ParseArgumentsWithoutType(code []byte, args []string) (scriptArgs []cadence
 	}
 
 	for index, argumentString := range args {
-		semaType := parameterList[index].TypeAnnotation.Type
+		astType := parameterList[index].TypeAnnotation.Type
+		semaType := checker.ConvertType(astType)
 
 		switch semaType {
 		case sema.StringType:

pkg/flowkit/arguments_test.go

@@ -50,6 +50,7 @@ func TestArguments(t *testing.T) {
 		var sampleType string = sample.Type().ID()
 
 		args, err := flowkit.ParseArgumentsWithoutType(
+			"",
 			[]byte(fmt.Sprintf(`
 			pub fun main(test: %s): Void {
 			}`, sampleType)),