feat: Allow complex input types for ethereum:transaction and ethereum:call args

This commit allows complex input types for function inputs, such as arrays or structs.
When ts:struct is used as an argument input, it's local-ref is used to get
the correct input type from the ABI supplied within the contract definition.

Complex arguments can then be set using setProps() within the JS card.

Author: micwallace

javascript/engine-js/src/TokenScript.ts

@@ -765,9 +765,9 @@ export class TokenScript {
 				}], ["bool"]
 			);
 		} catch (e) {
-			
+
 		}
-		
+
 		return isAuthorised;
 	}
 
@@ -784,24 +784,24 @@ export class TokenScript {
 
 		// TODO: confirm with James exact use cases of having multiple address in a contract element
 		const chain = this.getCurrentTokenContext()?.chainId ?? await wallet.getChain();
-		const contract = transInfo.contract.getAddressByChain(chain, true);
+		const contractAddr = transInfo.contract.getAddressByChain(chain, true);
 
 		// If validation callback returns false we abort silently
-		if (!await this.transactionValidator.validateContract(chain, contract.address, transInfo.contract, transInfo.function))
+		if (!await this.transactionValidator.validateContract(chain, contractAddr.address, transInfo.contract, transInfo.function))
 			return false;
 
 		const errorAbi = transInfo.contract.getAbi("error");
 
 		const ethParams = [];
 
 		for (let i in transInfo.args){
-			ethParams.push(await transInfo.args[i].getEthersArgument(this.getCurrentTokenContext()))
+			ethParams.push(await transInfo.args[i].getEthersArgument(this.getCurrentTokenContext(), transInfo.function, transInfo.contract))
 		}
 
 		const ethValue = transInfo.value ? await transInfo?.value?.getValue(this.getCurrentTokenContext()) : null;
 
 		listener({status: 'started'});
 
-		return await wallet.sendTransaction(contract.chain, contract.address, transInfo.function, ethParams, [], ethValue, waitForConfirmation, listener, errorAbi);
+		return await wallet.sendTransaction(contractAddr.chain, contractAddr.address, transInfo.function, ethParams, [], ethValue, waitForConfirmation, listener, errorAbi);
 	}
 }

javascript/engine-js/src/tokenScript/Attribute.ts

@@ -223,7 +223,7 @@ export class Attribute {
 					const ethParams = [];
 
 					for (let i in args) {
-						ethParams.push(await args[i].getEthersArgument(tokenContext))
+						ethParams.push(await args[i].getEthersArgument(tokenContext, func, contract))
 					}
 
 					resultValue = await wallet.call(contractAddr.chain, contractAddr.address, func, ethParams, outputTypes);

javascript/engine-js/src/tokenScript/Transaction.ts

@@ -5,7 +5,7 @@ import {Argument} from "./data/function/Argument";
 import {Attributes} from "./Attributes";
 import {EthUtils} from "../ethereum/EthUtils";
 
-interface ITransactionInfo {
+export interface ITransactionInfo {
 	as: string,
 	contract: Contract,
 	contractName: string,

javascript/engine-js/src/tokenScript/data/function/Argument.ts

@@ -3,6 +3,7 @@ import {Attributes} from "../../Attributes";
 import {EthUtils, IEthersArgument} from "../../../ethereum/EthUtils";
 import {AbstractDependencyBranch} from "../AbstractDependencyBranch";
 import {ITokenContextData} from "../../../tokens/ITokenContextData";
+import {Contract} from "../../Contract";
 
 export interface IArgument {
 	type: string;
@@ -30,10 +31,14 @@ export class Argument extends AbstractDependencyBranch implements IArgument {
 		this.localRef = argDef.getAttribute("local-ref");
 	}
 
+	public getName(){
+		return this.localRef ?? this.ref;
+	}
+
 	/**
 	 * Get the ethers argument data for this argument
 	 */
-	public async getEthersArgument(tokenContext: ITokenIdContext, name: string = ""){
+	public async getEthersArgument(tokenContext: ITokenIdContext, functionName: string, contract: Contract){
 
 		let overrideValue;
 
@@ -43,7 +48,7 @@ export class Argument extends AbstractDependencyBranch implements IArgument {
 		}
 
 		let arg: Partial<IEthersArgument> = {
-			name,
+			name: this.getName(),
 			value: overrideValue ?? await this.getValue(tokenContext)
 		};
 
@@ -66,7 +71,25 @@ export class Argument extends AbstractDependencyBranch implements IArgument {
 					break;
 
 				default:
-					throw new Error("Struct encoding is not defined for " + this.ref + " attribute.");
+
+					const abi = contract.getAbi("function", functionName);
+
+					console.log("ABI: ", abi);
+
+					if (abi.length){
+						const abiArg = abi[0].inputs.find((arg: any) => {
+							return arg.name == this.localRef || arg.name == this.ref;
+						});
+
+						if (abiArg){
+							arg.type = abiArg.type;
+							arg.internalType = abiArg.internalType;
+							arg.components = abiArg.components;
+							break;
+						}
+					}
+
+					throw new Error(`Struct or ABI encoding is not defined for ${this.localRef ?? this.ref} arg in contract ${contract.getName()} method ${functionName}`);
 			}
 		} else {
 			arg.type = this.type;