Merge pull request #465 from bluesign/master

Arguments parsing fix for Transactions with functions
onflow · Mar 7, 2022 · ff7a887 · ff7a887
2 parents 197585d + 883f79b
commit ff7a887
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/pkg/flowkit/arguments.go b/pkg/flowkit/arguments.go
@@ -132,20 +132,20 @@ func ParseArgumentsWithoutType(fileName string, code []byte, args []string) (scr
 
 	var parameterList []*ast.Parameter
 
-	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
 		}
 	}
 
+	transactionDeclaration := program.TransactionDeclarations()
+	if len(transactionDeclaration) == 1 {
+		if transactionDeclaration[0].ParameterList != nil {
+			parameterList = transactionDeclaration[0].ParameterList.Parameters
+		}
+	}
+
 	if parameterList == nil {
 		return resultArgs, nil
 	}