@lifi/sdk 3.5.1-beta.0 → 3.6.0-beta.0

package/src/_esm/core/EVM/EVMStepExecutor.js

@@ -1,19 +1,24 @@
-import { getAddresses, sendTransaction } from 'viem/actions';
+import { estimateGas, getAddresses, sendTransaction } from 'viem/actions';
+import { getCapabilities, sendCalls } from 'viem/experimental';
 import { getAction } from 'viem/utils';
 import { config } from '../../config.js';
 import { LiFiErrorCode } from '../../errors/constants.js';
-import { TransactionError, ValidationError } from '../../errors/errors.js';
-import { getStepTransaction } from '../../services/api.js';
+import { TransactionError } from '../../errors/errors.js';
+import { getRelayerQuote, getStepTransaction, relayTransaction, } from '../../services/api.js';
 import { isZeroAddress } from '../../utils/isZeroAddress.js';
 import { BaseStepExecutor } from '../BaseStepExecutor.js';
 import { checkBalance } from '../checkBalance.js';
 import { stepComparison } from '../stepComparison.js';
 import { waitForDestinationChainTransaction } from '../waitForDestinationChainTransaction.js';
 import { checkAllowance } from './checkAllowance.js';
-import { updateMultisigRouteProcess } from './multisig.js';
+import { getNativePermit } from './getNativePermit.js';
 import { parseEVMErrors } from './parseEVMErrors.js';
+import { signPermitMessage } from './signPermitMessage.js';
 import { switchChain } from './switchChain.js';
+import { isEVMPermitStep } from './typeguards.js';
 import { getMaxPriorityFeePerGas } from './utils.js';
+import { waitForBatchTransactionReceipt, } from './waitForBatchTransactionReceipt.js';
+import { waitForRelayedTransactionReceipt } from './waitForRelayedTransactionReceipt.js';
 import { waitForTransactionReceipt } from './waitForTransactionReceipt.js';
 export class EVMStepExecutor extends BaseStepExecutor {
     constructor(options) {
@@ -24,12 +29,6 @@ export class EVMStepExecutor extends BaseStepExecutor {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "multisig", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         // Ensure that we are using the right chain and wallet when executing transactions.
         Object.defineProperty(this, "checkClient", {
             enumerable: true,
@@ -86,29 +85,68 @@ export class EVMStepExecutor extends BaseStepExecutor {
                         return step;
                     }
                 }
-                const isMultisigClient = !!this.multisig?.isMultisigWalletClient;
-                const multisigBatchTransactions = [];
-                const shouldBatchTransactions = this.multisig?.shouldBatchTransactions &&
-                    !!this.multisig.sendBatchTransaction;
                 const fromChain = await config.getChainById(step.action.fromChainId);
                 const toChain = await config.getChainById(step.action.toChainId);
+                let atomicBatchSupported = false;
+                try {
+                    const capabilities = (await getAction(this.client, getCapabilities, 'getCapabilities')(undefined));
+                    atomicBatchSupported = capabilities[fromChain.id]?.atomicBatch?.supported;
+                }
+                catch {
+                    // If the wallet does not support getCapabilities, we assume that atomic batch is not supported
+                }
+                const calls = [];
                 const isBridgeExecution = fromChain.id !== toChain.id;
                 const currentProcessType = isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP';
-                // Check allowance
+                // Find existing swap/bridge process
                 const existingProcess = step.execution.process.find((p) => p.type === currentProcessType);
-                // Check token approval only if fromToken is not the native token => no approval needed in that case
-                const checkForAllowance = !existingProcess?.txHash &&
+                // Check if step requires permit signature and will be used with relayer service
+                const isPermitStep = isEVMPermitStep(step);
+                // Check if token requires approval
+                // Native tokens (like ETH) don't need approval since they're not ERC20 tokens
+                // We should support different permit types:
+                // 1. Native permits (EIP-2612)
+                // 2. Permit2 - Universal permit implementation by Uniswap (limited to certain chains)
+                // 3. Standard ERC20 approval
+                const nativePermit = await getNativePermit(this.client, fromChain, step.action.fromToken.address);
+                // Check if proxy contract is available and token supports native permits, not available for atomic batch
+                const nativePermitSupported = !!fromChain.permit2Proxy &&
+                    nativePermit.supported &&
+                    !atomicBatchSupported &&
+                    !isPermitStep;
+                // Check if chain has Permit2 contract deployed. Permit2 should not be available for atomic batch.
+                const permit2Supported = !!fromChain.permit2 && !!fromChain.permit2Proxy && !atomicBatchSupported;
+                // Token supports either native permits or Permit2
+                const permitSupported = permit2Supported || nativePermitSupported;
+                const checkForAllowance = 
+                // No existing swap/bridgetransaction is pending
+                !existingProcess?.txHash &&
+                    // Token is not native (address is not zero)
                     !isZeroAddress(step.action.fromToken.address) &&
-                    (shouldBatchTransactions || !isMultisigClient);
+                    // Token doesn't support native permits
+                    !nativePermitSupported;
                 if (checkForAllowance) {
-                    const data = await checkAllowance(this.client, fromChain, step, this.statusManager, this.executionOptions, this.allowUserInteraction, shouldBatchTransactions);
+                    // Check if token needs approval and get approval transaction or message data when available
+                    const data = await checkAllowance({
+                        client: this.client,
+                        chain: fromChain,
+                        step,
+                        statusManager: this.statusManager,
+                        executionOptions: this.executionOptions,
+                        allowUserInteraction: this.allowUserInteraction,
+                        atomicBatchSupported,
+                        permit2Supported,
+                    });
                     if (data) {
-                        // allowance doesn't need value
-                        const baseTransaction = {
-                            to: step.action.fromToken.address,
-                            data,
-                        };
-                        multisigBatchTransactions.push(baseTransaction);
+                        // Create approval transaction call
+                        // No value needed since we're only approving ERC20 tokens
+                        if (atomicBatchSupported) {
+                            calls.push({
+                                chainId: step.action.fromToken.chainId,
+                                to: step.action.fromToken.address,
+                                data,
+                            });
+                        }
                     }
                 }
                 let process = this.statusManager.findOrCreateProcess({
@@ -117,15 +155,7 @@ export class EVMStepExecutor extends BaseStepExecutor {
                     chainId: fromChain.id,
                 });
                 if (process.status !== 'DONE') {
-                    const multisigProcess = step.execution.process.find((p) => !!p.multisigTxHash);
                     try {
-                        if (isMultisigClient && multisigProcess) {
-                            const multisigTxHash = multisigProcess.multisigTxHash;
-                            if (!multisigTxHash) {
-                                throw new ValidationError('Multisig internal transaction hash is undefined.');
-                            }
-                            await updateMultisigRouteProcess(multisigTxHash, step, process.type, fromChain, this.statusManager, this.multisig);
-                        }
                         let txHash;
                         if (process.txHash) {
                             // Make sure that the chain is still correct
@@ -140,10 +170,31 @@ export class EVMStepExecutor extends BaseStepExecutor {
                             process = this.statusManager.updateProcess(step, process.type, 'STARTED');
                             // Check balance
                             await checkBalance(this.client.account.address, step);
-                            // Create new transaction
+                            // Create new transaction request
                             if (!step.transactionRequest) {
                                 const { execution, ...stepBase } = step;
-                                const updatedStep = await getStepTransaction(stepBase);
+                                let updatedStep;
+                                if (isPermitStep) {
+                                    const updatedRelayedStep = await getRelayerQuote({
+                                        fromChain: stepBase.action.fromChainId,
+                                        fromToken: stepBase.action.fromToken.address,
+                                        fromAddress: stepBase.action.fromAddress,
+                                        fromAmount: stepBase.action.fromAmount,
+                                        toChain: stepBase.action.toChainId,
+                                        toToken: stepBase.action.toToken.address,
+                                        slippage: stepBase.action.slippage,
+                                        toAddress: stepBase.action.toAddress,
+                                        allowBridges: [stepBase.tool],
+                                    });
+                                    updatedStep = {
+                                        ...updatedRelayedStep.data.quote.step,
+                                        ...updatedRelayedStep.data.quote,
+                                        id: stepBase.id,
+                                    };
+                                }
+                                else {
+                                    updatedStep = await getStepTransaction(stepBase);
+                                }
                                 const comparedStep = await stepComparison(this.statusManager, step, updatedStep, this.allowUserInteraction, this.executionOptions);
                                 Object.assign(step, {
                                     ...comparedStep,
@@ -153,15 +204,6 @@ export class EVMStepExecutor extends BaseStepExecutor {
                             if (!step.transactionRequest) {
                                 throw new TransactionError(LiFiErrorCode.TransactionUnprepared, 'Unable to prepare transaction.');
                             }
-                            // Make sure that the chain is still correct
-                            const updatedClient = await this.checkClient(step, process);
-                            if (!updatedClient) {
-                                return step;
-                            }
-                            process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
-                            if (!this.allowUserInteraction) {
-                                return step;
-                            }
                             let transactionRequest = {
                                 to: step.transactionRequest.to,
                                 from: step.transactionRequest.from,
@@ -194,65 +236,118 @@ export class EVMStepExecutor extends BaseStepExecutor {
                                     ...customizedTransactionRequest,
                                 };
                             }
-                            if (shouldBatchTransactions && this.multisig?.sendBatchTransaction) {
-                                if (transactionRequest.to && transactionRequest.data) {
-                                    const populatedTransaction = {
-                                        value: transactionRequest.value,
-                                        to: transactionRequest.to,
-                                        data: transactionRequest.data,
-                                    };
-                                    multisigBatchTransactions.push(populatedTransaction);
-                                    txHash = await this.multisig?.sendBatchTransaction(multisigBatchTransactions);
-                                }
-                                else {
-                                    throw new TransactionError(LiFiErrorCode.TransactionUnprepared, 'Unable to prepare transaction.');
-                                }
+                            // Make sure that the chain is still correct
+                            const updatedClient = await this.checkClient(step, process);
+                            if (!updatedClient) {
+                                return step;
                             }
-                            else {
-                                txHash = await getAction(this.client, sendTransaction, 'sendTransaction')({
-                                    to: transactionRequest.to,
-                                    account: this.client.account,
+                            process = this.statusManager.updateProcess(step, process.type, permitSupported ? 'PERMIT_REQUIRED' : 'ACTION_REQUIRED');
+                            if (!this.allowUserInteraction) {
+                                return step;
+                            }
+                            if (atomicBatchSupported) {
+                                const transferCall = {
+                                    chainId: fromChain.id,
                                     data: transactionRequest.data,
+                                    to: transactionRequest.to,
                                     value: transactionRequest.value,
-                                    gas: transactionRequest.gas,
-                                    gasPrice: transactionRequest.gasPrice,
-                                    maxFeePerGas: transactionRequest.maxFeePerGas,
-                                    maxPriorityFeePerGas: transactionRequest.maxPriorityFeePerGas,
-                                    chain: null,
-                                });
-                            }
-                            if (isMultisigClient) {
-                                process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED', {
-                                    multisigTxHash: txHash,
-                                });
+                                };
+                                calls.push(transferCall);
+                                txHash = (await getAction(this.client, sendCalls, 'sendCalls')({
+                                    account: this.client.account,
+                                    calls,
+                                }));
                             }
                             else {
-                                process = this.statusManager.updateProcess(step, process.type, 'PENDING', {
+                                let permitSignature;
+                                if (permitSupported) {
+                                    permitSignature = await signPermitMessage(this.client, {
+                                        transactionRequest,
+                                        chain: fromChain,
+                                        tokenAddress: step.action.fromToken.address,
+                                        amount: BigInt(step.action.fromAmount),
+                                        nativePermit,
+                                        permitData: isPermitStep ? step.permitData : undefined,
+                                        useWitness: isPermitStep,
+                                    });
+                                    transactionRequest.to = fromChain.permit2Proxy;
+                                    // If it's a permit step, we already have everything encoded in the data field
+                                    transactionRequest.data = isPermitStep
+                                        ? transactionRequest.data
+                                        : permitSignature.data;
+                                    try {
+                                        // Try to re-estimate the gas due to additional Permit data
+                                        transactionRequest.gas = await estimateGas(this.client, {
+                                            account: this.client.account,
+                                            to: transactionRequest.to,
+                                            data: transactionRequest.data,
+                                            value: transactionRequest.value,
+                                        });
+                                    }
+                                    catch {
+                                        // Let the wallet estimate the gas in case of failure
+                                        transactionRequest.gas = undefined;
+                                    }
+                                    process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
+                                }
+                                if (isPermitStep && permitSignature) {
+                                    const relayedTransaction = await relayTransaction({
+                                        tokenOwner: this.client.account.address,
+                                        chainId: fromChain.id,
+                                        permit: step.permit,
+                                        witness: step.witness,
+                                        signedPermitData: permitSignature.signature,
+                                        callData: transactionRequest.data,
+                                    });
+                                    txHash = relayedTransaction.data.taskId;
+                                }
+                                else {
+                                    txHash = await getAction(this.client, sendTransaction, 'sendTransaction')({
+                                        to: transactionRequest.to,
+                                        account: this.client.account,
+                                        data: transactionRequest.data,
+                                        value: transactionRequest.value,
+                                        gas: transactionRequest.gas,
+                                        gasPrice: transactionRequest.gasPrice,
+                                        maxFeePerGas: transactionRequest.maxFeePerGas,
+                                        maxPriorityFeePerGas: transactionRequest.maxPriorityFeePerGas,
+                                    });
+                                }
+                            }
+                            process = this.statusManager.updateProcess(step, process.type, 'PENDING', 
+                            // When atomic batch is supported, txHash represents the batch hash rather than an individual transaction hash at this point
+                            atomicBatchSupported
+                                ? {
+                                    atomicBatchSupported,
+                                }
+                                : {
                                     txHash: txHash,
                                     txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${txHash}`,
                                 });
-                            }
                         }
-                        const transactionReceipt = await waitForTransactionReceipt({
-                            client: this.client,
-                            chainId: fromChain.id,
-                            txHash,
-                            onReplaced: (response) => {
-                                this.statusManager.updateProcess(step, process.type, 'PENDING', {
-                                    txHash: response.transaction.hash,
-                                    txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
-                                });
-                            },
-                        });
-                        // if it's multisig wallet client and the process is in ACTION_REQUIRED
-                        // then signatures are still needed
-                        if (isMultisigClient && process.status === 'ACTION_REQUIRED') {
-                            await updateMultisigRouteProcess(transactionReceipt?.transactionHash || txHash, step, process.type, fromChain, this.statusManager, this.multisig);
+                        let transactionReceipt;
+                        if (atomicBatchSupported) {
+                            transactionReceipt = await waitForBatchTransactionReceipt(this.client, txHash);
+                        }
+                        else if (isPermitStep) {
+                            transactionReceipt = await waitForRelayedTransactionReceipt(txHash);
+                        }
+                        else {
+                            transactionReceipt = await waitForTransactionReceipt({
+                                client: this.client,
+                                chainId: fromChain.id,
+                                txHash,
+                                onReplaced: (response) => {
+                                    this.statusManager.updateProcess(step, process.type, 'PENDING', {
+                                        txHash: response.transaction.hash,
+                                        txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
+                                    });
+                                },
+                            });
                         }
                         // Update pending process if the transaction hash from the receipt is different.
                         // This might happen if the transaction was replaced.
-                        if (!isMultisigClient &&
-                            transactionReceipt?.transactionHash &&
+                        if (transactionReceipt?.transactionHash &&
                             transactionReceipt.transactionHash !== txHash) {
                             process = this.statusManager.updateProcess(step, process.type, 'PENDING', {
                                 txHash: transactionReceipt.transactionHash,
@@ -290,7 +385,6 @@ export class EVMStepExecutor extends BaseStepExecutor {
             }
         });
         this.client = options.client;
-        this.multisig = options.multisig;
     }
 }
 //# sourceMappingURL=EVMStepExecutor.js.map

package/src/_esm/core/EVM/EVMStepExecutor.js.map

@@ -1 +1 @@
-{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAEzE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAMrD,OAAO,EAAE,kCAAkC,EAAE,MAAM,0CAA0C,CAAA;AAC7F,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAwB,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,EAEL,8BAA8B,GAC/B,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAA;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAa1E,MAAM,OAAO,eAAgB,SAAQ,gBAAgB;IAGnD,YAAY,OAA+B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAA;QAHR;;;;;WAAc;QAOtB,mFAAmF;QACnF;;;;mBAAc,KAAK,EAAE,IAAsB,EAAE,OAAiB,EAAE,EAAE;gBAChE,MAAM,aAAa,GAAG,MAAM,WAAW,CACrC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,aAAa,EAClB,IAAI,EACJ,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,gBAAgB,EAAE,eAAe,CACvC,CAAA;gBACD,IAAI,aAAa,EAAE,CAAC;oBAClB,IAAI,CAAC,MAAM,GAAG,aAAa,CAAA;gBAC7B,CAAC;gBAED,4FAA4F;gBAC5F,IAAI,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAA;gBACjD,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,MAAM,gBAAgB,GAAG,CAAC,MAAM,SAAS,CACvC,IAAI,CAAC,MAAM,EACX,YAAY,EACZ,cAAc,CACf,CAAC,SAAS,CAAC,CAA2B,CAAA;oBACvC,cAAc,GAAG,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAA;gBACxC,CAAC;gBACD,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;oBAC/C,IAAI,eAAe,GAAG,OAAO,CAAA;oBAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;wBACrB,+EAA+E;wBAC/E,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;4BACvD,IAAI;4BACJ,IAAI,EAAE,aAAa;yBACpB,CAAC,CAAA;oBACJ,CAAC;oBACD,MAAM,YAAY,GAChB,mHAAmH,CAAA;oBACrH,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE;wBACrE,KAAK,EAAE;4BACL,IAAI,EAAE,aAAa,CAAC,4BAA4B;4BAChD,OAAO,EAAE,YAAY;yBACtB;qBACF,CAAC,CAAA;oBACF,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;oBAClD,MAAM,MAAM,cAAc,CACxB,IAAI,gBAAgB,CAClB,aAAa,CAAC,4BAA4B,EAC1C,YAAY,CACb,EACD,IAAI,EACJ,OAAO,CACR,CAAA;gBACH,CAAC;gBACD,OAAO,aAAa,CAAA;YACtB,CAAC;WAAA;QAED;;;;mBAAc,KAAK,EAAE,IAAsB,EAA6B,EAAE;gBACxE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAA;gBAE7D,2FAA2F;gBAC3F,MAAM,uBAAuB,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAC1D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,iBAAiB,CAChD,CAAA;gBAED,4CAA4C;gBAC5C,gGAAgG;gBAChG,qDAAqD;gBACrD,kBAAkB;gBAClB,IAAI,uBAAuB,EAAE,SAAS,KAAK,8BAA8B,EAAE,CAAC;oBAC1E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;oBAClD,IAAI,CAAC,aAAa,EAAE,CAAC;wBACnB,OAAO,IAAI,CAAA;oBACb,CAAC;gBACH,CAAC;gBAED,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;gBACpE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;gBAEhE,IAAI,oBAAoB,GAAG,KAAK,CAAA;gBAChC,IAAI,CAAC;oBACH,MAAM,YAAY,GAAG,CAAC,MAAM,SAAS,CACnC,IAAI,CAAC,MAAM,EACX,eAAe,EACf,iBAAiB,CAClB,CAAC,SAAS,CAAC,CAA8B,CAAA;oBAC1C,oBAAoB,GAAG,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,SAAS,CAAA;gBAC3E,CAAC;gBAAC,MAAM,CAAC;oBACP,+FAA+F;gBACjG,CAAC;gBAED,MAAM,KAAK,GAAW,EAAE,CAAA;gBAExB,MAAM,iBAAiB,GAAG,SAAS,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAA;gBACrD,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAA;gBAErE,oCAAoC;gBACpC,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CACrC,CAAA;gBAED,gFAAgF;gBAChF,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;gBAE1C,mCAAmC;gBACnC,8EAA8E;gBAC9E,4CAA4C;gBAC5C,+BAA+B;gBAC/B,sFAAsF;gBACtF,6BAA6B;gBAC7B,MAAM,YAAY,GAAG,MAAM,eAAe,CACxC,IAAI,CAAC,MAAM,EACX,SAAS,EACT,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB,CACzC,CAAA;gBACD,yGAAyG;gBACzG,MAAM,qBAAqB,GACzB,CAAC,CAAC,SAAS,CAAC,YAAY;oBACxB,YAAY,CAAC,SAAS;oBACtB,CAAC,oBAAoB;oBACrB,CAAC,YAAY,CAAA;gBACf,kGAAkG;gBAClG,MAAM,gBAAgB,GACpB,CAAC,CAAC,SAAS,CAAC,OAAO,IAAI,CAAC,CAAC,SAAS,CAAC,YAAY,IAAI,CAAC,oBAAoB,CAAA;gBAC1E,kDAAkD;gBAClD,MAAM,eAAe,GAAG,gBAAgB,IAAI,qBAAqB,CAAA;gBAEjE,MAAM,iBAAiB;gBACrB,gDAAgD;gBAChD,CAAC,eAAe,EAAE,MAAM;oBACxB,4CAA4C;oBAC5C,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC7C,uCAAuC;oBACvC,CAAC,qBAAqB,CAAA;gBAExB,IAAI,iBAAiB,EAAE,CAAC;oBACtB,4FAA4F;oBAC5F,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC;wBAChC,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,KAAK,EAAE,SAAS;wBAChB,IAAI;wBACJ,aAAa,EAAE,IAAI,CAAC,aAAa;wBACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;wBACvC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;wBAC/C,oBAAoB;wBACpB,gBAAgB;qBACjB,CAAC,CAAA;oBAEF,IAAI,IAAI,EAAE,CAAC;wBACT,mCAAmC;wBACnC,0DAA0D;wBAC1D,IAAI,oBAAoB,EAAE,CAAC;4BACzB,KAAK,CAAC,IAAI,CAAC;gCACT,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO;gCACtC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB;gCAC5C,IAAI;6BACL,CAAC,CAAA;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,IAAI,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;oBACnD,IAAI;oBACJ,IAAI,EAAE,kBAAkB;oBACxB,OAAO,EAAE,SAAS,CAAC,EAAE;iBACtB,CAAC,CAAA;gBAEF,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBAC9B,IAAI,CAAC;wBACH,IAAI,MAAY,CAAA;wBAChB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;4BACnB,4CAA4C;4BAC5C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;4BAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;gCACnB,OAAO,IAAI,CAAA;4BACb,CAAC;4BAED,+BAA+B;4BAC/B,MAAM,GAAG,OAAO,CAAC,MAAc,CAAA;wBACjC,CAAC;6BAAM,CAAC;4BACN,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,CACV,CAAA;4BAED,gBAAgB;4BAChB,MAAM,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;4BAEtD,iCAAiC;4BACjC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gCAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAA;gCACvC,IAAI,WAAqB,CAAA;gCACzB,IAAI,YAAY,EAAE,CAAC;oCACjB,MAAM,kBAAkB,GAAG,MAAM,eAAe,CAAC;wCAC/C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW;wCACtC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO;wCAC5C,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAY;wCACzC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU;wCACtC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;wCAClC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO;wCACxC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;wCAClC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;wCACpC,YAAY,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;qCAC9B,CAAC,CAAA;oCACF,WAAW,GAAG;wCACZ,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;wCACrC,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK;wCAChC,EAAE,EAAE,QAAQ,CAAC,EAAE;qCAChB,CAAA;gCACH,CAAC;qCAAM,CAAC;oCACN,WAAW,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAA;gCAClD,CAAC;gCACD,MAAM,YAAY,GAAG,MAAM,cAAc,CACvC,IAAI,CAAC,aAAa,EAClB,IAAI,EACJ,WAAW,EACX,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,gBAAgB,CACtB,CAAA;gCACD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;oCAClB,GAAG,YAAY;oCACf,SAAS,EAAE,IAAI,CAAC,SAAS;iCAC1B,CAAC,CAAA;4BACJ,CAAC;4BAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gCAC7B,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,qBAAqB,EACnC,gCAAgC,CACjC,CAAA;4BACH,CAAC;4BAED,IAAI,kBAAkB,GAA0B;gCAC9C,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAE;gCAC9B,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;gCAClC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;gCAClC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK;oCAClC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;oCACvC,CAAC,CAAC,SAAS;gCACb,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ;oCACnC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;oCAC1C,CAAC,CAAC,SAAS;gCACb,6CAA6C;gCAC7C,yDAAyD;gCACzD,iBAAiB;gCACjB,qDAAqD;gCACrD,6DAA6D;gCAC7D,iBAAiB;gCACjB,oBAAoB,EAClB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,OAAO;oCACnC,CAAC,CAAC,MAAM,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC;oCAC5C,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB;wCAC5C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC;wCACtD,CAAC,CAAC,SAAS;6BAClB,CAAA;4BAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,4BAA4B,EAAE,CAAC;gCACxD,MAAM,4BAA4B,GAChC,MAAM,IAAI,CAAC,gBAAgB,CAAC,4BAA4B,CAAC;oCACvD,WAAW,EAAE,aAAa;oCAC1B,GAAG,kBAAkB;iCACtB,CAAC,CAAA;gCAEJ,kBAAkB,GAAG;oCACnB,GAAG,kBAAkB;oCACrB,GAAG,4BAA4B;iCAChC,CAAA;4BACH,CAAC;4BAED,4CAA4C;4BAC5C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;4BAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;gCACnB,OAAO,IAAI,CAAA;4BACb,CAAC;4BAED,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CACxD,CAAA;4BAED,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gCAC/B,OAAO,IAAI,CAAA;4BACb,CAAC;4BAED,IAAI,oBAAoB,EAAE,CAAC;gCACzB,MAAM,YAAY,GAAS;oCACzB,OAAO,EAAE,SAAS,CAAC,EAAE;oCACrB,IAAI,EAAE,kBAAkB,CAAC,IAAW;oCACpC,EAAE,EAAE,kBAAkB,CAAC,EAAa;oCACpC,KAAK,EAAE,kBAAkB,CAAC,KAAK;iCAChC,CAAA;gCAED,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gCAExB,MAAM,GAAG,CAAC,MAAM,SAAS,CACvB,IAAI,CAAC,MAAM,EACX,SAAS,EACT,WAAW,CACZ,CAAC;oCACA,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;oCAC7B,KAAK;iCACN,CAAC,CAAY,CAAA;4BAChB,CAAC;iCAAM,CAAC;gCACN,IAAI,eAA4C,CAAA;gCAChD,IAAI,eAAe,EAAE,CAAC;oCACpB,eAAe,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE;wCACrD,kBAAkB;wCAClB,KAAK,EAAE,SAAS;wCAChB,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB;wCACtD,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;wCACtC,YAAY;wCACZ,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;wCACtD,UAAU,EAAE,YAAY;qCACzB,CAAC,CAAA;oCAEF,kBAAkB,CAAC,EAAE,GAAG,SAAS,CAAC,YAAY,CAAA;oCAC9C,8EAA8E;oCAC9E,kBAAkB,CAAC,IAAI,GAAG,YAAY;wCACpC,CAAC,CAAC,kBAAkB,CAAC,IAAI;wCACzB,CAAC,CAAC,eAAe,CAAC,IAAI,CAAA;oCAExB,IAAI,CAAC;wCACH,2DAA2D;wCAC3D,kBAAkB,CAAC,GAAG,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE;4CACtD,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;4CAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAa;4CACpC,IAAI,EAAE,kBAAkB,CAAC,IAAW;4CACpC,KAAK,EAAE,kBAAkB,CAAC,KAAK;yCAChC,CAAC,CAAA;oCACJ,CAAC;oCAAC,MAAM,CAAC;wCACP,qDAAqD;wCACrD,kBAAkB,CAAC,GAAG,GAAG,SAAS,CAAA;oCACpC,CAAC;oCAED,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,iBAAiB,CAClB,CAAA;gCACH,CAAC;gCACD,IAAI,YAAY,IAAI,eAAe,EAAE,CAAC;oCACpC,MAAM,kBAAkB,GAAG,MAAM,gBAAgB,CAAC;wCAChD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ,CAAC,OAAO;wCACxC,OAAO,EAAE,SAAS,CAAC,EAAE;wCACrB,MAAM,EAAE,IAAI,CAAC,MAAM;wCACnB,OAAO,EAAE,IAAI,CAAC,OAAO;wCACrB,gBAAgB,EAAE,eAAe,CAAC,SAAS;wCAC3C,QAAQ,EAAE,kBAAkB,CAAC,IAAK;qCACnC,CAAC,CAAA;oCACF,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAA;gCACzC,CAAC;qCAAM,CAAC;oCACN,MAAM,GAAG,MAAM,SAAS,CACtB,IAAI,CAAC,MAAM,EACX,eAAe,EACf,iBAAiB,CAClB,CAAC;wCACA,EAAE,EAAE,kBAAkB,CAAC,EAAE;wCACzB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;wCAC7B,IAAI,EAAE,kBAAkB,CAAC,IAAI;wCAC7B,KAAK,EAAE,kBAAkB,CAAC,KAAK;wCAC/B,GAAG,EAAE,kBAAkB,CAAC,GAAG;wCAC3B,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;wCACrC,YAAY,EAAE,kBAAkB,CAAC,YAAY;wCAC7C,oBAAoB,EAAE,kBAAkB,CAAC,oBAAoB;qCACjC,CAAC,CAAA;gCACjC,CAAC;4BACH,CAAC;4BAED,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS;4BACT,4HAA4H;4BAC5H,oBAAoB;gCAClB,CAAC,CAAC;oCACE,oBAAoB;iCACrB;gCACH,CAAC,CAAC;oCACE,MAAM,EAAE,MAAM;oCACd,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,MAAM,EAAE;iCACjE,CACN,CAAA;wBACH,CAAC;wBAED,IAAI,kBAGS,CAAA;wBAEb,IAAI,oBAAoB,EAAE,CAAC;4BACzB,kBAAkB,GAAG,MAAM,8BAA8B,CACvD,IAAI,CAAC,MAAM,EACX,MAAM,CACP,CAAA;wBACH,CAAC;6BAAM,IAAI,YAAY,EAAE,CAAC;4BACxB,kBAAkB,GAAG,MAAM,gCAAgC,CAAC,MAAM,CAAC,CAAA;wBACrE,CAAC;6BAAM,CAAC;4BACN,kBAAkB,GAAG,MAAM,yBAAyB,CAAC;gCACnD,MAAM,EAAE,IAAI,CAAC,MAAM;gCACnB,OAAO,EAAE,SAAS,CAAC,EAAE;gCACrB,MAAM;gCACN,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;oCACvB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE;wCAC9D,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI;wCACjC,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE;qCACpF,CAAC,CAAA;gCACJ,CAAC;6BACF,CAAC,CAAA;wBACJ,CAAC;wBAED,gFAAgF;wBAChF,qDAAqD;wBACrD,IACE,kBAAkB,EAAE,eAAe;4BACnC,kBAAkB,CAAC,eAAe,KAAK,MAAM,EAC7C,CAAC;4BACD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,EACT;gCACE,MAAM,EAAE,kBAAkB,CAAC,eAAe;gCAC1C,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,kBAAkB,CAAC,eAAe,EAAE;6BAC7F,CACF,CAAA;wBACH,CAAC;wBAED,IAAI,iBAAiB,EAAE,CAAC;4BACtB,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;wBACxE,CAAC;oBACH,CAAC;oBAAC,OAAO,CAAM,EAAE,CAAC;wBAChB,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;wBACpD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,QAAQ,EACR;4BACE,KAAK,EAAE;gCACL,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO;gCAC5B,IAAI,EAAE,KAAK,CAAC,IAAI;6BACjB;yBACF,CACF,CAAA;wBACD,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;wBAElD,MAAM,KAAK,CAAA;oBACb,CAAC;gBACH,CAAC;gBAED,2DAA2D;gBAC3D,IAAI,iBAAiB,EAAE,CAAC;oBACtB,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;wBAC/C,IAAI;wBACJ,IAAI,EAAE,iBAAiB;wBACvB,MAAM,EAAE,SAAS;wBACjB,OAAO,EAAE,OAAO,CAAC,EAAE;qBACpB,CAAC,CAAA;gBACJ,CAAC;gBAED,MAAM,kCAAkC,CACtC,IAAI,EACJ,OAAO,EACP,IAAI,CAAC,aAAa,EAClB,OAAO,CACR,CAAA;gBAED,OAAO;gBACP,OAAO,IAAI,CAAA;YACb,CAAC;WAAA;QArdC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC9B,CAAC;CAqdF"}

package/src/_esm/core/EVM/abi.js

@@ -1,43 +1,38 @@
-export const approveAbi = [
-    {
-        name: 'approve',
-        inputs: [
-            { internalType: 'address', name: 'spender', type: 'address' },
-            { internalType: 'uint256', name: 'amount', type: 'uint256' },
-        ],
-        outputs: [{ internalType: 'bool', name: 'approved', type: 'bool' }],
-        stateMutability: 'nonpayable',
-        type: 'function',
-    },
-];
-export const allowanceAbi = [
-    {
-        name: 'allowance',
-        inputs: [
-            { internalType: 'address', name: 'owner', type: 'address' },
-            { internalType: 'address', name: 'spender', type: 'address' },
-        ],
-        outputs: [{ internalType: 'uint256', name: 'allowance', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function',
-    },
-];
-export const getEthBalanceAbi = [
-    {
-        inputs: [{ name: '_owner', type: 'address' }],
-        name: 'getEthBalance',
-        outputs: [{ name: 'balance', type: 'uint256' }],
-        type: 'function',
-        stateMutability: 'view',
-    },
-];
-export const balanceOfAbi = [
-    {
-        inputs: [{ name: '_owner', type: 'address' }],
-        name: 'balanceOf',
-        outputs: [{ name: 'balance', type: 'uint256' }],
-        type: 'function',
-        stateMutability: 'view',
-    },
-];
+import { parseAbi } from 'viem';
+export const permit2ProxyAbi = parseAbi([
+    'function callDiamondWithPermit2(bytes, ((address, uint256), uint256, uint256), bytes) external',
+    'function callDiamondWithEIP2612Signature(address, uint256, uint256, uint8, bytes32, bytes32, bytes) external payable',
+    'function nextNonce(address) external view returns (uint256)',
+    'function callDiamondWithPermit2Witness(bytes, address, ((address, uint256), uint256, uint256), bytes) external payable',
+]);
+export const eip2612Abi = parseAbi([
+    'function permit(address, address, uint256, uint256, uint8, bytes32, bytes32) external',
+    'function DOMAIN_SEPARATOR() external view returns (bytes32)',
+    'function nonces(address) external view returns (uint256)',
+    'function name() external view returns (string)',
+    'function version() external view returns (string)',
+]);
+export const approveAbi = parseAbi([
+    'function approve(address, uint256) external returns (bool)',
+]);
+export const allowanceAbi = parseAbi([
+    'function allowance(address, address) external view returns (uint256)',
+]);
+export const getEthBalanceAbi = parseAbi([
+    'function getEthBalance(address) external view returns (uint256)',
+]);
+export const balanceOfAbi = parseAbi([
+    'function balanceOf(address) external view returns (uint256)',
+]);
+// EIP-2612 types
+// https://eips.ethereum.org/EIPS/eip-2612
+export const eip2612Types = {
+    Permit: [
+        { name: 'owner', type: 'address' },
+        { name: 'spender', type: 'address' },
+        { name: 'value', type: 'uint256' },
+        { name: 'nonce', type: 'uint256' },
+        { name: 'deadline', type: 'uint256' },
+    ],
+};
 //# sourceMappingURL=abi.js.map

package/src/_esm/core/EVM/abi.js.map

@@ -1 +1 @@
-{"version":3,"file":"abi.js","sourceRoot":"","sources":["../../../core/EVM/abi.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GAAQ;IAC7B;QACE,IAAI,EAAE,SAAS;QACf,MAAM,EAAE;YACN,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;YAC7D,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;SAC7D;QACD,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QACnE,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACjB;CACF,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAQ;IAC/B;QACE,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE;YACN,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;YAC3D,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;SAC9D;QACD,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC1E,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACF,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAQ;IACnC;QACE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC/C,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;KACxB;CACF,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAQ;IAC/B;QACE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC/C,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;KACxB;CACF,CAAA"}
+{"version":3,"file":"abi.js","sourceRoot":"","sources":["../../../core/EVM/abi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAE/B,MAAM,CAAC,MAAM,eAAe,GAAG,QAAQ,CAAC;IACtC,gGAAgG;IAChG,sHAAsH;IACtH,6DAA6D;IAC7D,wHAAwH;CACzH,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC;IACjC,uFAAuF;IACvF,6DAA6D;IAC7D,0DAA0D;IAC1D,gDAAgD;IAChD,mDAAmD;CACpD,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC;IACjC,4DAA4D;CAC7D,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC;IACnC,sEAAsE;CACvE,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACvC,iEAAiE;CAClE,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC;IACnC,6DAA6D;CAC9D,CAAC,CAAA;AAEF,iBAAiB;AACjB,0CAA0C;AAC1C,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM,EAAE;QACN,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;QACpC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;KACtC;CACO,CAAA"}

package/src/_esm/core/EVM/checkAllowance.js

@@ -1,43 +1,49 @@
+import { MaxUint256 } from '../../constants.js';
 import { getAllowance } from './getAllowance.js';
 import { parseEVMErrors } from './parseEVMErrors.js';
 import { setAllowance } from './setAllowance.js';
 import { waitForTransactionReceipt } from './waitForTransactionReceipt.js';
-export const checkAllowance = async (client, chain, step, statusManager, settings, allowUserInteraction = false, shouldBatchTransactions = false) => {
-    // Ask the user to set an allowance
-    let allowanceProcess = statusManager.findOrCreateProcess({
+export const checkAllowance = async ({ client, chain, step, statusManager, executionOptions, allowUserInteraction = false, atomicBatchSupported = false, permit2Supported = false, }) => {
+    // Find existing or create new allowance process
+    const allowanceProcess = statusManager.findOrCreateProcess({
         step,
         type: 'TOKEN_ALLOWANCE',
         chainId: step.action.fromChainId,
     });
-    // Check allowance
     try {
+        // Handle existing pending transaction
         if (allowanceProcess.txHash && allowanceProcess.status !== 'DONE') {
             await waitForApprovalTransaction(client, allowanceProcess.txHash, allowanceProcess.type, step, chain, statusManager);
+            return;
         }
-        else {
-            allowanceProcess = statusManager.updateProcess(step, allowanceProcess.type, 'STARTED');
-            const approved = await getAllowance(chain.id, step.action.fromToken.address, client.account.address, step.estimate.approvalAddress);
-            const fromAmount = BigInt(step.action.fromAmount);
-            if (fromAmount > approved) {
-                if (!allowUserInteraction) {
-                    return;
-                }
-                if (shouldBatchTransactions) {
-                    const approveTxHash = await setAllowance(client, step.action.fromToken.address, step.estimate.approvalAddress, fromAmount, settings, true);
-                    allowanceProcess = statusManager.updateProcess(step, allowanceProcess.type, 'DONE');
-                    return approveTxHash;
-                }
-                const approveTxHash = await setAllowance(client, step.action.fromToken.address, step.estimate.approvalAddress, fromAmount);
-                await waitForApprovalTransaction(client, approveTxHash, allowanceProcess.type, step, chain, statusManager);
-            }
-            else {
-                allowanceProcess = statusManager.updateProcess(step, allowanceProcess.type, 'DONE');
-            }
+        // Start new allowance check
+        statusManager.updateProcess(step, allowanceProcess.type, 'STARTED');
+        const spenderAddress = permit2Supported
+            ? chain.permit2
+            : step.estimate.approvalAddress;
+        const fromAmount = BigInt(step.action.fromAmount);
+        const approved = await getAllowance(chain.id, step.action.fromToken.address, client.account.address, spenderAddress);
+        // Return early if already approved
+        if (fromAmount <= approved) {
+            statusManager.updateProcess(step, allowanceProcess.type, 'DONE');
+            return;
         }
+        if (!allowUserInteraction) {
+            return;
+        }
+        statusManager.updateProcess(step, allowanceProcess.type, 'ACTION_REQUIRED');
+        // Set new allowance
+        const approveAmount = permit2Supported ? MaxUint256 : fromAmount;
+        const approveTxHash = await setAllowance(client, step.action.fromToken.address, spenderAddress, approveAmount, executionOptions, atomicBatchSupported);
+        if (atomicBatchSupported) {
+            statusManager.updateProcess(step, allowanceProcess.type, 'DONE');
+            return approveTxHash;
+        }
+        await waitForApprovalTransaction(client, approveTxHash, allowanceProcess.type, step, chain, statusManager);
     }
     catch (e) {
         const error = await parseEVMErrors(e, step, allowanceProcess);
-        allowanceProcess = statusManager.updateProcess(step, allowanceProcess.type, 'FAILED', {
+        statusManager.updateProcess(step, allowanceProcess.type, 'FAILED', {
             error: {
                 message: error.cause.message,
                 code: error.code,
@@ -48,25 +54,28 @@ export const checkAllowance = async (client, chain, step, statusManager, setting
     }
 };
 const waitForApprovalTransaction = async (client, txHash, processType, step, chain, statusManager) => {
+    const baseExplorerUrl = chain.metamask.blockExplorerUrls[0];
+    const getTxLink = (hash) => `${baseExplorerUrl}tx/${hash}`;
     statusManager.updateProcess(step, processType, 'PENDING', {
         txHash,
-        txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${txHash}`,
+        txLink: getTxLink(txHash),
     });
     const transactionReceipt = await waitForTransactionReceipt({
-        client: client,
+        client,
         chainId: chain.id,
-        txHash: txHash,
+        txHash,
         onReplaced(response) {
+            const newHash = response.transaction.hash;
             statusManager.updateProcess(step, processType, 'PENDING', {
-                txHash: response.transaction.hash,
-                txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
+                txHash: newHash,
+                txLink: getTxLink(newHash),
             });
         },
     });
-    const transactionHash = transactionReceipt?.transactionHash || txHash;
+    const finalHash = transactionReceipt?.transactionHash || txHash;
     statusManager.updateProcess(step, processType, 'DONE', {
-        txHash: transactionHash,
-        txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${transactionHash}`,
+        txHash: finalHash,
+        txLink: getTxLink(finalHash),
     });
 };
 //# sourceMappingURL=checkAllowance.js.map