Skip to content

Commit 98ef10e

Browse files
committed
executor helper abi update
1 parent f375196 commit 98ef10e

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

evm/ts/src/multiTokenNttWithExecutor.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const multiTokenNttWithExecutorAddresses: Partial<
2828
Record<Network, Partial<Record<EvmChains, string>>>
2929
> = {
3030
Testnet: {
31-
Sepolia: "0xc2EA39E0072b37C34c67C486C0B1526a96b0b77e",
32-
Monad: "0x780720817647E6C2532F821C4eC925840489942B",
31+
Sepolia: "0x63a193Fd7BE29632a6b32a2285807CEB2d9AC1B7",
32+
Monad: "0x38415a872F5A38187C8007c02DbD4Ce1782725d5",
3333
},
3434
};
3535

@@ -91,8 +91,8 @@ export class EvmMultiTokenNttWithExecutor<
9191
const isNativeToken = isNative(token.address);
9292

9393
const abi = [
94-
"function transfer(address multiTokenNtt, address token, uint256 amount, uint16 recipientChain, uint256 gasLimit, bytes32 recipient, bytes32 refundAddress, bytes transceiverInstructions, (uint256 value, address refundAddress, bytes signedQuote, bytes instructions) executorArgs, (uint16 dbps, address payee) feeArgs) external payable returns (uint64)",
95-
"function transferETH(address multiTokenNtt, uint256 amount, uint16 recipientChain, uint256 gasLimit, bytes32 recipient, bytes32 refundAddress, bytes transceiverInstructions, (uint256 value, address refundAddress, bytes signedQuote, bytes instructions) executorArgs, (uint16 dbps, address payee) feeArgs) external payable returns (uint64)",
94+
"function transfer(address multiTokenNtt, address token, uint256 amount, uint16 recipientChain, bytes32 recipient, bytes32 refundAddress, bytes transceiverInstructions, (uint256 value, address refundAddress, bytes signedQuote, bytes instructions) executorArgs, (uint16 dbps, address payee) feeArgs) external payable returns (uint64)",
95+
"function transferETH(address multiTokenNtt, uint256 amount, uint16 recipientChain, bytes32 recipient, bytes32 refundAddress, bytes transceiverInstructions, (uint256 value, address refundAddress, bytes signedQuote, bytes instructions) executorArgs, (uint16 dbps, address payee) feeArgs) external payable returns (uint64)",
9696
];
9797

9898
const iface = new Interface(abi);
@@ -101,6 +101,11 @@ export class EvmMultiTokenNttWithExecutor<
101101
const recipient = destination.address.toUniversalAddress().toUint8Array();
102102
const refundAddress = sender.toUniversalAddress().toUint8Array();
103103

104+
// TODO: We need to get the send transceivers and their indexes and types,
105+
// and fetch the quote for each transceiver.
106+
// We can use the axelarQueryApi to get the gas fee for the axelar transceiver.
107+
// Just use 0 as the gas fee for axelar if the fetch fails.
108+
104109
// Calculate core bridge fee (delivery price)
105110
// TODO: need to pass the axelar transceiver gas required here
106111
const deliveryPrice = await multiTokenNtt.quoteDeliveryPrice(
@@ -119,10 +124,6 @@ export class EvmMultiTokenNttWithExecutor<
119124
// TODO: add the axelar transceiver instruction
120125
]);
121126

122-
// This is the standard relayer gasLimit (not used in executor transfers),
123-
// but we still need to provide it
124-
const gasLimit = 0n;
125-
126127
// Executor args from quote
127128
const executorArgs = {
128129
value: quote.estimatedCost,
@@ -145,7 +146,6 @@ export class EvmMultiTokenNttWithExecutor<
145146
multiTokenNtt.managerAddress,
146147
amount,
147148
recipientChain,
148-
gasLimit,
149149
recipient,
150150
refundAddress,
151151
transceiverInstructions,
@@ -183,7 +183,6 @@ export class EvmMultiTokenNttWithExecutor<
183183
tokenAddress,
184184
amount,
185185
recipientChain,
186-
gasLimit,
187186
recipient,
188187
refundAddress,
189188
transceiverInstructions,

0 commit comments

Comments
 (0)