Parse contract deployment arg type from source file (#104)

Author: jribbink

flowkit_test.go

@@ -630,7 +630,7 @@ func TestAccountsAddContractWithArgs(t *testing.T) {
 		UpdateExistingContract(false),
 	)
 	assert.Error(t, err)
-	assert.True(t, strings.Contains(err.Error(), "invalid argument count, too few arguments: expected 1, got 0"))
+	assert.ErrorContains(t, err, "provided arguments length mismatch, required arguments 1, but provided 0")
 
 	c := resourceToContract(tests.ContractSimpleWithArgs)
 	c.Args = []cadence.Value{cadence.UInt64(4)}
@@ -1082,7 +1082,7 @@ func TestProject(t *testing.T) {
 			Network: config.EmulatorNetwork.Name,
 			Account: a.Name,
 			Contracts: []config.ContractDeployment{
-				{Name: c1.Name}, {Name: c3.Name},
+				{Name: c1.Name}, {Name: c3.Name, Args: []cadence.Value{cadence.String("foo")}},
 			},
 		}
 		state.Deployments().AddOrUpdate(d)
@@ -1159,7 +1159,7 @@ func TestProject(t *testing.T) {
 			Network: config.EmulatorNetwork.Name,
 			Account: a.Name,
 			Contracts: []config.ContractDeployment{
-				{Name: c1.Name}, {Name: c3.Name},
+				{Name: c1.Name}, {Name: c3.Name, Args: []cadence.Value{cadence.String("foo")}},
 			},
 		}
 		state.Deployments().AddOrUpdate(d)

transactions/transaction.go

@@ -118,15 +118,51 @@ func addAccountContractWithArgs(
 		AddAuthorizer(signer.Address)
 
 	for _, arg := range args {
-		arg.Type().ID()
 		tx.AddRawArgument(jsoncdc.MustEncode(arg))
 	}
 
+	// Determine the argument types for the contract init function
+	program, err := parser.ParseProgram(nil, []byte(contract.Source), parser.Config{})
+	if err != nil {
+		return nil, err
+	}
+
+	// get contract init function
+	contractAst := program.SoleContractDeclaration()
+	if contractAst == nil {
+		return nil, fmt.Errorf("failed to find contract declaration")
+	}
+
+	// get contract init function
+	specialFunctions := contractAst.Members.SpecialFunctions()
+	var initFunction *ast.SpecialFunctionDeclaration
+	for _, specialFunction := range specialFunctions {
+		if specialFunction.FunctionDeclaration.Identifier.Identifier == "init" {
+			initFunction = specialFunction
+			break
+		}
+	}
+
+	// if init function is not found, return error
+	contractInitArgs := make([]*ast.Parameter, 0)
+	if initFunction != nil {
+		contractInitArgs = initFunction.FunctionDeclaration.ParameterList.Parameters
+	}
+
+	// get contract init function arguments
+	if len(contractInitArgs) != len(args) {
+		return nil, fmt.Errorf(
+			"provided arguments length mismatch, required arguments %d, but provided %d",
+			len(contractInitArgs),
+			len(args),
+		)
+	}
+
 	// here we itterate over all arguments and possibly extend the transaction input argument
 	// in the above template to include them
 	txArgs, addArgs := "", ""
-	for i, arg := range args {
-		txArgs += fmt.Sprintf(",arg%d:%s", i, arg.Type().ID())
+	for i, arg := range contractInitArgs {
+		txArgs += fmt.Sprintf(",arg%d:%s", i, arg.TypeAnnotation.Type.String())
 		addArgs += fmt.Sprintf(",arg%d", i)
 	}
 
@@ -135,7 +171,7 @@ func addAccountContractWithArgs(
 	tx.SetComputeLimit(flow.DefaultTransactionGasLimit)
 
 	t := &Transaction{tx: tx}
-	err := t.SetSigner(signer)
+	err = t.SetSigner(signer)
 	if err != nil {
 		return nil, err
 	}