Skip to content

chore: 🎸 add tx overrides to tsml #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: staging
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions javascript/engine-js/src/AbstractTokenScript.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ethers } from 'ethers';
import { ethers, Overrides } from 'ethers';
import { ITokenScriptEngine, ScriptSourceType } from './IEngine';
import { SecurityInfo } from './security/SecurityInfo';
import { TransactionValidator } from './security/TransactionValidator';
Expand Down Expand Up @@ -391,7 +391,7 @@ export abstract class AbstractTokenScript implements ITokenScript {

listener({ status: 'started' });

return await wallet.sendTransaction(contractAddr.chain, contractAddr.address, transInfo.function, ethParams, [], ethValue, waitForConfirmation, listener, errorAbi);
return await wallet.sendTransaction(contractAddr.chain, contractAddr.address, transInfo.function, ethParams, [], transInfo.overrides, ethValue, waitForConfirmation, listener, errorAbi);
}

public abstract getViewController(): any;
Expand Down
26 changes: 26 additions & 0 deletions javascript/engine-js/src/tokenScript/Transaction.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {Overrides} from "ethers";
import {EthUtils} from "../ethereum/EthUtils";
import {ITokenScript} from "../ITokenScript";
import {Attributes} from "./Attributes";
Expand All @@ -11,6 +12,7 @@ export interface ITransactionInfo {
contractName: string,
function: string
args: Argument[],
overrides: Overrides,
value?: Argument
}

Expand Down Expand Up @@ -47,6 +49,7 @@ export class Transaction {
contractName: contractName,
function: transInfo[0].getAttribute("function"),
args: new Arguments(this.tokenScript, transInfo[0], this.localAttrContext).getArguments(),
overrides: this.getOverridesArgs(transInfo[0]),
value: this.getValueArg(transInfo[0])
};
}
Expand All @@ -68,6 +71,29 @@ export class Transaction {
return new Argument(this.tokenScript, valueElem[0], "uint256", this.localAttrContext);
}

/**
* Fetches the override for the transaction
* e.g. gasLimit for execute a transaction, more details please refer to ethers.js Overrides
* @param transInfo
* @private
*/
private getOverridesArgs(transInfo: Element): Overrides {
const overridesElem = transInfo.getElementsByTagName('ethereum:overrides');

if (overridesElem.length === 0) return null;

const overrides: Overrides = {};
const elems = overridesElem[0].children;
for (let i in elems) {
const override = elems[i];
const type = override.tagName.split(':')[1];

overrides[override.getAttribute('name')] = EthUtils.encodeTransactionParameter(type, override.textContent);
}

return overrides;
}

public getTransactionInfo() {
return this.transaction;
};
Expand Down
8 changes: 4 additions & 4 deletions javascript/engine-js/src/wallet/EthersAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class EthersAdapter implements IWalletAdapter {
return (await contract.getFunction(method).staticCall(...(args.map((arg: any) => arg.value))));
}

async sendTransaction(chain: number, contractAddr: string, method: string, args: any[], outputTypes: string[], value?: bigint, waitForConfirmation: boolean = true, listener?: ITransactionListener, errorAbi: any[] = []){
async sendTransaction(chain: number, contractAddr: string, method: string, args: any[], outputTypes: string[], txOverrides?: Overrides, value?: bigint, waitForConfirmation: boolean = true, listener?: ITransactionListener, errorAbi: any[] = []){

console.log("Send ethereum transaction. chain " + chain + "; contract " + contractAddr + "; method " + method + "; value " + value + "; args", args);

Expand All @@ -74,10 +74,10 @@ export class EthersAdapter implements IWalletAdapter {

const contract = await this.getEthersContractInstance(chain, contractAddr, method, args, outputTypes, value ? "payable" : "nonpayable", errorAbi);

const overrides: Overrides = {
const overrides = {
...txOverrides,
chainId: chain
};

}
if (value)
overrides.value = value;

Expand Down
3 changes: 2 additions & 1 deletion javascript/engine-js/src/wallet/IWalletAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {EventLog, Log} from "ethers";
import {EventLog, Log, Overrides} from "ethers";
import {ITransactionListener} from "../ITokenScript";
import {IChainConfig} from "./EthersAdapter";

Expand Down Expand Up @@ -43,6 +43,7 @@ export interface IWalletAdapter {
method: string,
args: any[],
outputTypes: string[],
txOverrides?: Overrides,
value?: bigint,
waitForConfirmation?: boolean,
listener?: ITransactionListener,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export class TransferDialog {
args,
[],
null,
null,
true,
async (data: ITransactionStatus) => {

Expand Down