@atomiqlabs/chain-evm 1.0.0-dev.27 → 1.0.0-dev.28

package/dist/chains/citrea/CitreaInitializer.js

@@ -4,7 +4,6 @@ exports.CitreaInitializer = exports.initializeCitrea = exports.CitreaAssets = vo
 const base_1 = require("@atomiqlabs/base");
 const ethers_1 = require("ethers");
 const EVMChainInterface_1 = require("../../evm/chain/EVMChainInterface");
-const EVMSpvVaultContract_1 = require("../../evm/spv_swap/EVMSpvVaultContract");
 const EVMChainEventsBrowser_1 = require("../../evm/events/EVMChainEventsBrowser");
 const EVMSwapData_1 = require("../../evm/swaps/EVMSwapData");
 const EVMSpvVaultData_1 = require("../../evm/spv_swap/EVMSpvVaultData");
@@ -13,6 +12,7 @@ const CitreaFees_1 = require("./CitreaFees");
 const CitreaBtcRelay_1 = require("./CitreaBtcRelay");
 const CitreaSwapContract_1 = require("./CitreaSwapContract");
 const CitreaTokens_1 = require("./CitreaTokens");
+const CitreaSpvVaultContract_1 = require("./CitreaSpvVaultContract");
 const CitreaChainIds = {
     MAINNET: null,
     TESTNET4: 5115
@@ -102,7 +102,7 @@ function initializeCitrea(options, bitcoinRpc, network) {
             ...options?.handlerContracts?.claim
         }
     });
-    const spvVaultContract = new EVMSpvVaultContract_1.EVMSpvVaultContract(chainInterface, btcRelay, bitcoinRpc, options.spvVaultContract ?? defaultContractAddresses.spvVaultContract, options.spvVaultDeploymentHeight ?? defaultContractAddresses.spvVaultDeploymentHeight);
+    const spvVaultContract = new CitreaSpvVaultContract_1.CitreaSpvVaultContract(chainInterface, btcRelay, bitcoinRpc, options.spvVaultContract ?? defaultContractAddresses.spvVaultContract, options.spvVaultDeploymentHeight ?? defaultContractAddresses.spvVaultDeploymentHeight);
     const chainEvents = new EVMChainEventsBrowser_1.EVMChainEventsBrowser(chainInterface, swapContract, spvVaultContract);
     return {
         chainId: "CITREA",

package/dist/chains/citrea/CitreaSpvVaultContract.d.ts

@@ -1,6 +1,15 @@
 import { EVMSpvVaultContract } from "../../evm/spv_swap/EVMSpvVaultContract";
 import { EVMSpvWithdrawalData } from "../../evm/spv_swap/EVMSpvWithdrawalData";
+import { EVMSpvVaultData } from "../../evm/spv_swap/EVMSpvVaultData";
 export declare class CitreaSpvVaultContract extends EVMSpvVaultContract<"CITREA"> {
-    getClaimFee(signer: string, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint>;
-    getFrontFee(signer: string, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint>;
+    static readonly StateDiffSize: {
+        BASE_DIFF_SIZE: number;
+        ERC_20_TRANSFER_DIFF_SIZE: number;
+        NATIVE_SELF_TRANSFER_DIFF_SIZE: number;
+        NATIVE_TRANSFER_DIFF_SIZE: number;
+        EXECUTION_SCHEDULE_DIFF_SIZE: number;
+    };
+    private calculateStateDiff;
+    getClaimFee(signer: string, vault?: EVMSpvVaultData, data?: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint>;
+    getFrontFee(signer: string, vault?: EVMSpvVaultData, data?: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint>;
 }

package/dist/chains/citrea/CitreaSpvVaultContract.js

@@ -2,15 +2,74 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CitreaSpvVaultContract = void 0;
 const EVMSpvVaultContract_1 = require("../../evm/spv_swap/EVMSpvVaultContract");
-const EVMFees_1 = require("../../evm/chain/modules/EVMFees");
+const EVMSpvVaultData_1 = require("../../evm/spv_swap/EVMSpvVaultData");
+const lib_esm_1 = require("ethers/lib.esm");
+const ethers_1 = require("ethers");
+const CitreaFees_1 = require("./CitreaFees");
+const EVMAddresses_1 = require("../../evm/chain/modules/EVMAddresses");
 class CitreaSpvVaultContract extends EVMSpvVaultContract_1.EVMSpvVaultContract {
-    async getClaimFee(signer, withdrawalData, feeRate) {
+    calculateStateDiff(signer, tokenStateChanges) {
+        let stateDiffSize = 0;
+        tokenStateChanges.forEach(val => {
+            const [address, token] = val.split(":");
+            if (token.toLowerCase() === this.Chain.getNativeCurrencyAddress().toLowerCase()) {
+                stateDiffSize += address.toLowerCase() === signer?.toLowerCase() ? CitreaSpvVaultContract.StateDiffSize.NATIVE_SELF_TRANSFER_DIFF_SIZE : CitreaSpvVaultContract.StateDiffSize.NATIVE_TRANSFER_DIFF_SIZE;
+            }
+            else {
+                stateDiffSize += CitreaSpvVaultContract.StateDiffSize.ERC_20_TRANSFER_DIFF_SIZE;
+            }
+        });
+        return stateDiffSize;
+    }
+    async getClaimFee(signer, vault, data, feeRate) {
+        vault ?? (vault = EVMSpvVaultData_1.EVMSpvVaultData.randomVault());
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
-        return EVMFees_1.EVMFees.getGasFee(EVMSpvVaultContract_1.EVMSpvVaultContract.GasCosts.CLAIM, feeRate);
+        const tokenStateChanges = new Set();
+        let diffSize = CitreaSpvVaultContract.StateDiffSize.BASE_DIFF_SIZE;
+        const recipient = data != null ? data.recipient : EVMAddresses_1.EVMAddresses.randomAddress();
+        if (data == null || (data.rawAmounts[0] != null && data.rawAmounts[0] > 0n)) {
+            tokenStateChanges.add(recipient.toLowerCase() + ":" + vault.token0.token.toLowerCase());
+            if (data == null || data.frontingFeeRate > 0n)
+                tokenStateChanges.add(ethers_1.ZeroAddress + ":" + vault.token0.token.toLowerCase()); //Also needs to pay out to fronter
+            if (data == null || data.callerFeeRate > 0n)
+                tokenStateChanges.add(signer + ":" + vault.token0.token.toLowerCase()); //Also needs to pay out to caller
+        }
+        if (data == null || (data.rawAmounts[1] != null && data.rawAmounts[1] > 0n)) {
+            tokenStateChanges.add(recipient.toLowerCase() + ":" + vault.token1.token.toLowerCase());
+            if (data == null || data.frontingFeeRate > 0n)
+                tokenStateChanges.add(ethers_1.ZeroAddress + ":" + vault.token1.token.toLowerCase()); //Also needs to pay out to fronter
+            if (data == null || data.callerFeeRate > 0n)
+                tokenStateChanges.add(signer + ":" + vault.token1.token.toLowerCase()); //Also needs to pay out to caller
+        }
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
+        if (data == null || (data.executionHash != null && data.executionHash !== lib_esm_1.ZeroHash))
+            diffSize += CitreaSpvVaultContract.StateDiffSize.EXECUTION_SCHEDULE_DIFF_SIZE;
+        const gasFee = await super.getClaimFee(signer, vault, data, feeRate);
+        return gasFee + CitreaFees_1.CitreaFees.getGasFee(0, feeRate, diffSize);
     }
-    async getFrontFee(signer, withdrawalData, feeRate) {
+    async getFrontFee(signer, vault, data, feeRate) {
+        vault ?? (vault = EVMSpvVaultData_1.EVMSpvVaultData.randomVault());
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
-        return EVMFees_1.EVMFees.getGasFee(EVMSpvVaultContract_1.EVMSpvVaultContract.GasCosts.FRONT, feeRate);
+        const tokenStateChanges = new Set();
+        let diffSize = CitreaSpvVaultContract.StateDiffSize.BASE_DIFF_SIZE;
+        if (data == null || (data.rawAmounts[0] != null && data.rawAmounts[0] > 0n)) {
+            tokenStateChanges.add(signer + ":" + vault.token0.token.toLowerCase());
+        }
+        if (data == null || (data.rawAmounts[1] != null && data.rawAmounts[1] > 0n)) {
+            tokenStateChanges.add(signer + ":" + vault.token1.token.toLowerCase());
+        }
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
+        if (data == null || (data.executionHash != null && data.executionHash !== lib_esm_1.ZeroHash))
+            diffSize += CitreaSpvVaultContract.StateDiffSize.EXECUTION_SCHEDULE_DIFF_SIZE;
+        const gasFee = await super.getFrontFee(signer, vault, data, feeRate);
+        return gasFee + CitreaFees_1.CitreaFees.getGasFee(0, feeRate, diffSize);
     }
 }
 exports.CitreaSpvVaultContract = CitreaSpvVaultContract;
+CitreaSpvVaultContract.StateDiffSize = {
+    BASE_DIFF_SIZE: 50,
+    ERC_20_TRANSFER_DIFF_SIZE: 50,
+    NATIVE_SELF_TRANSFER_DIFF_SIZE: 20,
+    NATIVE_TRANSFER_DIFF_SIZE: 30,
+    EXECUTION_SCHEDULE_DIFF_SIZE: 40
+};

package/dist/chains/citrea/CitreaSwapContract.d.ts

@@ -13,10 +13,10 @@ export declare class CitreaSwapContract extends EVMSwapContract<"CITREA"> {
     /**
      * Get the estimated solana fee of the commit transaction
      */
-    getCommitFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
+    getCommitFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
     getClaimFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    getRefundFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
+    getRefundFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
 }

package/dist/chains/citrea/CitreaSwapContract.js

@@ -20,7 +20,7 @@ class CitreaSwapContract extends EVMSwapContract_1.EVMSwapContract {
     /**
      * Get the estimated solana fee of the commit transaction
      */
-    async getCommitFee(swapData, feeRate) {
+    async getCommitFee(signer, swapData, feeRate) {
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
         const tokenStateChanges = new Set();
         let diffSize = CitreaSwapContract.StateDiffSize.BASE_DIFF_SIZE;
@@ -30,11 +30,10 @@ class CitreaSwapContract extends EVMSwapContract_1.EVMSwapContract {
         else {
             tokenStateChanges.add(swapData.getOfferer().toLowerCase() + ":" + swapData.getToken().toLowerCase());
         }
-        //TODO: Since we don't know who is sending the transaction, we calculate with the worst case
         if (swapData.getTotalDeposit() > 0n) {
-            tokenStateChanges.add(swapData.getClaimer().toLowerCase() + ":" + swapData.getDepositToken().toLowerCase());
+            tokenStateChanges.add(signer.toLowerCase() + ":" + swapData.getDepositToken().toLowerCase());
         }
-        diffSize += this.calculateStateDiff(null, tokenStateChanges);
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
         const gasFee = await this.Init.getInitFee(swapData, feeRate);
         return gasFee + CitreaFees_1.CitreaFees.getGasFee(0, feeRate, diffSize);
     }
@@ -63,7 +62,7 @@ class CitreaSwapContract extends EVMSwapContract_1.EVMSwapContract {
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    async getRefundFee(swapData, feeRate) {
+    async getRefundFee(signer, swapData, feeRate) {
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
         const tokenStateChanges = new Set();
         let diffSize = CitreaSwapContract.StateDiffSize.BASE_DIFF_SIZE;
@@ -75,14 +74,13 @@ class CitreaSwapContract extends EVMSwapContract_1.EVMSwapContract {
         else {
             tokenStateChanges.add(swapData.getOfferer().toLowerCase() + ":" + swapData.getToken().toLowerCase());
         }
-        //TODO: Since we don't know if the refund is cooperative or not and also not the signer, we calculate with the worst case
         if (swapData.getSecurityDeposit() > 0) {
             tokenStateChanges.add(swapData.getOfferer().toLowerCase() + ":" + swapData.getDepositToken().toLowerCase());
         }
         if (swapData.getClaimerBounty() > swapData.getSecurityDeposit()) {
             tokenStateChanges.add(swapData.getClaimer().toLowerCase() + ":" + swapData.getDepositToken().toLowerCase());
         }
-        diffSize += this.calculateStateDiff(null, tokenStateChanges);
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
         const gasFee = await this.Refund.getRefundFee(swapData, feeRate);
         return gasFee + CitreaFees_1.CitreaFees.getGasFee(0, feeRate, diffSize);
     }

package/dist/evm/chain/EVMChainInterface.js

@@ -54,8 +54,7 @@ class EVMChainInterface {
         return this.Transactions.offBeforeTxSigned(callback);
     }
     randomAddress() {
-        const wallet = ethers_1.Wallet.createRandom();
-        return wallet.address;
+        return EVMAddresses_1.EVMAddresses.randomAddress();
     }
     randomSigner() {
         const wallet = ethers_1.Wallet.createRandom();

package/dist/evm/chain/modules/EVMAddresses.d.ts

@@ -6,4 +6,5 @@ export declare class EVMAddresses extends EVMModule<any> {
      * @param value
      */
     static isValidAddress(value: string): boolean;
+    static randomAddress(): string;
 }

package/dist/evm/chain/modules/EVMAddresses.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EVMAddresses = void 0;
 const EVMModule_1 = require("../EVMModule");
 const ethers_1 = require("ethers");
+const lib_esm_1 = require("ethers/lib.esm");
 class EVMAddresses extends EVMModule_1.EVMModule {
     ///////////////////
     //// Address utils
@@ -22,5 +23,9 @@ class EVMAddresses extends EVMModule_1.EVMModule {
             return false;
         }
     }
+    static randomAddress() {
+        const wallet = lib_esm_1.Wallet.createRandom();
+        return wallet.address;
+    }
 }
 exports.EVMAddresses = EVMAddresses;

package/dist/evm/spv_swap/EVMSpvVaultContract.d.ts

@@ -16,10 +16,17 @@ export declare function packOwnerAndVaultId(owner: string, vaultId: bigint): str
 export declare function unpackOwnerAndVaultId(data: string): [string, bigint];
 export declare class EVMSpvVaultContract<ChainId extends string> extends EVMContractBase<SpvVaultManager> implements SpvVaultContract<EVMTx, EVMSigner, ChainId, EVMSpvVaultData, EVMSpvWithdrawalData> {
     static readonly GasCosts: {
-        DEPOSIT: number;
+        DEPOSIT_BASE: number;
+        DEPOSIT_ERC20: number;
         OPEN: number;
-        FRONT: number;
-        CLAIM: number;
+        CLAIM_BASE: number;
+        CLAIM_NATIVE_TRANSFER: number;
+        CLAIM_ERC20_TRANSFER: number;
+        CLAIM_EXECUTION_SCHEDULE: number;
+        FRONT_BASE: number;
+        FRONT_NATIVE_TRANSFER: number;
+        FRONT_ERC20_TRANSFER: number;
+        FRONT_EXECUTION_SCHEDULE: number;
     };
     readonly chainId: ChainId;
     readonly btcRelay: EVMBtcRelay<any>;
@@ -64,6 +71,8 @@ export declare class EVMSpvVaultContract<ChainId extends string> extends EVMCont
     txsDeposit(signer: string, vault: EVMSpvVaultData, rawAmounts: bigint[], feeRate?: string): Promise<EVMTx[]>;
     txsFrontLiquidity(signer: string, vault: EVMSpvVaultData, realWithdrawalTx: EVMSpvWithdrawalData, withdrawSequence: number, feeRate?: string): Promise<EVMTx[]>;
     txsOpen(signer: string, vault: EVMSpvVaultData, feeRate?: string): Promise<EVMTx[]>;
-    getClaimFee(signer: string, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint>;
-    getFrontFee(signer: string, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint>;
+    getClaimGas(signer: string, vault: EVMSpvVaultData, data?: EVMSpvWithdrawalData): number;
+    getFrontGas(signer: string, vault: EVMSpvVaultData, data?: EVMSpvWithdrawalData): number;
+    getClaimFee(signer: string, vault: EVMSpvVaultData, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint>;
+    getFrontFee(signer: string, vault?: EVMSpvVaultData, withdrawalData?: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint>;
 }

package/dist/evm/spv_swap/EVMSpvVaultContract.js

@@ -49,14 +49,25 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
         return tx;
     }
     async Deposit(signer, vault, rawAmounts, feeRate) {
+        let totalGas = EVMSpvVaultContract.GasCosts.DEPOSIT_BASE;
         let value = 0n;
-        if (vault.token0.token.toLowerCase() === this.Chain.getNativeCurrencyAddress().toLowerCase())
+        if (vault.token0.token.toLowerCase() === this.Chain.getNativeCurrencyAddress().toLowerCase()) {
             value += rawAmounts[0] * vault.token0.multiplier;
-        if (vault.token1.token.toLowerCase() === this.Chain.getNativeCurrencyAddress().toLowerCase())
+        }
+        else {
+            if (rawAmounts[0] > 0n)
+                totalGas += EVMSpvVaultContract.GasCosts.DEPOSIT_ERC20;
+        }
+        if (vault.token1.token.toLowerCase() === this.Chain.getNativeCurrencyAddress().toLowerCase()) {
             value += (rawAmounts[1] ?? 0n) * vault.token1.multiplier;
+        }
+        else {
+            if (rawAmounts[1] != null && rawAmounts[1] > 0n && vault.token0.token.toLowerCase() !== vault.token1.token.toLowerCase())
+                totalGas += EVMSpvVaultContract.GasCosts.DEPOSIT_ERC20;
+        }
         const tx = await this.contract.deposit.populateTransaction(vault.owner, vault.vaultId, vault.getVaultParamsStruct(), rawAmounts[0], rawAmounts[1] ?? 0n, { value });
         tx.from = signer;
-        EVMFees_1.EVMFees.applyFeeRate(tx, EVMSpvVaultContract.GasCosts.DEPOSIT, feeRate);
+        EVMFees_1.EVMFees.applyFeeRate(tx, totalGas, feeRate);
         return tx;
     }
     async Front(signer, vault, data, withdrawalSequence, feeRate) {
@@ -68,13 +79,13 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
             value += (frontingAmount[1] ?? 0n) * vault.token1.multiplier;
         const tx = await this.contract.front.populateTransaction(vault.owner, vault.vaultId, vault.getVaultParamsStruct(), withdrawalSequence, data.getTxHash(), data.serializeToStruct(), { value });
         tx.from = signer;
-        EVMFees_1.EVMFees.applyFeeRate(tx, EVMSpvVaultContract.GasCosts.FRONT, feeRate);
+        EVMFees_1.EVMFees.applyFeeRate(tx, this.getFrontGas(signer, vault, data), feeRate);
         return tx;
     }
     async Claim(signer, vault, data, blockheader, merkle, position, feeRate) {
         const tx = await this.contract.claim.populateTransaction(vault.owner, vault.vaultId, vault.getVaultParamsStruct(), "0x" + data.btcTx.hex, blockheader.serializeToStruct(), merkle, position);
         tx.from = signer;
-        EVMFees_1.EVMFees.applyFeeRate(tx, EVMSpvVaultContract.GasCosts.CLAIM, feeRate);
+        EVMFees_1.EVMFees.applyFeeRate(tx, this.getClaimGas(signer, vault, data), feeRate);
         return tx;
     }
     async checkWithdrawalTx(tx) {
@@ -392,19 +403,78 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
             " vaultId: " + vault.getVaultId().toString(10));
         return [tx];
     }
-    async getClaimFee(signer, withdrawalData, feeRate) {
+    getClaimGas(signer, vault, data) {
+        let totalGas = EVMSpvVaultContract.GasCosts.CLAIM_BASE;
+        if (data == null || (data.rawAmounts[0] != null && data.rawAmounts[0] > 0n)) {
+            const transferFee = vault.token0.token.toLowerCase() === this.Chain.getNativeCurrencyAddress() ?
+                EVMSpvVaultContract.GasCosts.CLAIM_NATIVE_TRANSFER : EVMSpvVaultContract.GasCosts.CLAIM_ERC20_TRANSFER;
+            totalGas += transferFee;
+            if (data == null || data.frontingFeeRate > 0n)
+                totalGas += transferFee; //Also needs to pay out to fronter
+            if (data == null || (data.callerFeeRate > 0n && !data.isRecipient(signer)))
+                totalGas += transferFee; //Also needs to pay out to caller
+        }
+        if (data == null || (data.rawAmounts[1] != null && data.rawAmounts[1] > 0n)) {
+            const transferFee = vault.token1.token.toLowerCase() === this.Chain.getNativeCurrencyAddress() ?
+                EVMSpvVaultContract.GasCosts.CLAIM_NATIVE_TRANSFER : EVMSpvVaultContract.GasCosts.CLAIM_ERC20_TRANSFER;
+            totalGas += transferFee;
+            if (data == null || data.frontingFeeRate > 0n)
+                totalGas += transferFee; //Also needs to pay out to fronter
+            if (data == null || (data.callerFeeRate > 0n && !data.isRecipient(signer)))
+                totalGas += transferFee; //Also needs to pay out to caller
+        }
+        if (data == null || (data.executionHash != null && data.executionHash !== ethers_1.ZeroHash))
+            totalGas += EVMSpvVaultContract.GasCosts.CLAIM_EXECUTION_SCHEDULE;
+        return totalGas;
+    }
+    getFrontGas(signer, vault, data) {
+        let totalGas = EVMSpvVaultContract.GasCosts.FRONT_BASE;
+        if (data == null || (data.rawAmounts[0] != null && data.rawAmounts[0] > 0n)) {
+            totalGas += vault.token0.token.toLowerCase() === this.Chain.getNativeCurrencyAddress() ?
+                EVMSpvVaultContract.GasCosts.FRONT_NATIVE_TRANSFER : EVMSpvVaultContract.GasCosts.FRONT_ERC20_TRANSFER;
+        }
+        if (data == null || (data.rawAmounts[1] != null && data.rawAmounts[1] > 0n)) {
+            totalGas += vault.token1.token.toLowerCase() === this.Chain.getNativeCurrencyAddress() ?
+                EVMSpvVaultContract.GasCosts.FRONT_NATIVE_TRANSFER : EVMSpvVaultContract.GasCosts.FRONT_ERC20_TRANSFER;
+        }
+        if (data == null || (data.executionHash != null && data.executionHash !== ethers_1.ZeroHash))
+            totalGas += EVMSpvVaultContract.GasCosts.FRONT_EXECUTION_SCHEDULE;
+        return totalGas;
+    }
+    async getClaimFee(signer, vault, withdrawalData, feeRate) {
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
-        return EVMFees_1.EVMFees.getGasFee(EVMSpvVaultContract.GasCosts.CLAIM, feeRate);
+        return EVMFees_1.EVMFees.getGasFee(this.getClaimGas(signer, vault, withdrawalData), feeRate);
     }
-    async getFrontFee(signer, withdrawalData, feeRate) {
+    async getFrontFee(signer, vault, withdrawalData, feeRate) {
+        vault ?? (vault = EVMSpvVaultData_1.EVMSpvVaultData.randomVault());
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
-        return EVMFees_1.EVMFees.getGasFee(EVMSpvVaultContract.GasCosts.FRONT, feeRate);
+        let totalFee = EVMFees_1.EVMFees.getGasFee(this.getFrontGas(signer, vault, withdrawalData), feeRate);
+        if (withdrawalData == null || (withdrawalData.rawAmounts[0] != null && withdrawalData.rawAmounts[0] > 0n)) {
+            if (vault.token0.token.toLowerCase() !== this.Chain.getNativeCurrencyAddress().toLowerCase()) {
+                totalFee += await this.Chain.Tokens.getApproveFee(feeRate);
+            }
+        }
+        if (withdrawalData == null || (withdrawalData.rawAmounts[1] != null && withdrawalData.rawAmounts[1] > 0n)) {
+            if (vault.token1.token.toLowerCase() !== this.Chain.getNativeCurrencyAddress().toLowerCase()) {
+                if (vault.token1.token.toLowerCase() !== vault.token0.token.toLowerCase() || withdrawalData == null || withdrawalData.rawAmounts[0] == null || withdrawalData.rawAmounts[0] === 0n) {
+                    totalFee += await this.Chain.Tokens.getApproveFee(feeRate);
+                }
+            }
+        }
+        return totalFee;
     }
 }
 exports.EVMSpvVaultContract = EVMSpvVaultContract;
 EVMSpvVaultContract.GasCosts = {
-    DEPOSIT: 150000 + 21000,
-    OPEN: 100000 + 21000,
-    FRONT: 250000 + 21000,
-    CLAIM: 250000 + 21000
+    DEPOSIT_BASE: 15000 + 21000,
+    DEPOSIT_ERC20: 40000,
+    OPEN: 80000 + 21000,
+    CLAIM_BASE: 85000 + 21000,
+    CLAIM_NATIVE_TRANSFER: 7500,
+    CLAIM_ERC20_TRANSFER: 40000,
+    CLAIM_EXECUTION_SCHEDULE: 30000,
+    FRONT_BASE: 75000 + 21000,
+    FRONT_NATIVE_TRANSFER: 7500,
+    FRONT_ERC20_TRANSFER: 40000,
+    FRONT_EXECUTION_SCHEDULE: 30000
 };

package/dist/evm/spv_swap/EVMSpvVaultData.d.ts

@@ -35,4 +35,5 @@ export declare class EVMSpvVaultData extends SpvVaultData<EVMSpvWithdrawalData>
     updateState(withdrawalTxOrEvent: SpvVaultClaimEvent | SpvVaultCloseEvent | SpvVaultOpenEvent | SpvVaultDepositEvent | EVMSpvWithdrawalData): void;
     getDepositCount(): number;
     getVaultParamsStruct(): SpvVaultParametersStruct;
+    static randomVault(): EVMSpvVaultData;
 }

package/dist/evm/spv_swap/EVMSpvVaultData.js

@@ -6,6 +6,7 @@ const buffer_1 = require("buffer");
 const EVMSpvWithdrawalData_1 = require("./EVMSpvWithdrawalData");
 const ethers_1 = require("ethers");
 const ethers_2 = require("ethers");
+const EVMAddresses_1 = require("../chain/modules/EVMAddresses");
 function getVaultParamsCommitment(vaultParams) {
     return (0, ethers_2.keccak256)(ethers_2.AbiCoder.defaultAbiCoder().encode(["address", "address", "address", "uint192", "uint192", "uint256"], [vaultParams.btcRelayContract, vaultParams.token0, vaultParams.token1, vaultParams.token0Multiplier, vaultParams.token1Multiplier, vaultParams.confirmations]));
 }
@@ -154,6 +155,26 @@ class EVMSpvVaultData extends base_1.SpvVaultData {
             confirmations: this.confirmations
         };
     }
+    static randomVault() {
+        const spvVaultParams = {
+            btcRelayContract: EVMAddresses_1.EVMAddresses.randomAddress(),
+            token0: EVMAddresses_1.EVMAddresses.randomAddress(),
+            token1: EVMAddresses_1.EVMAddresses.randomAddress(),
+            token0Multiplier: 1n,
+            token1Multiplier: 1n,
+            confirmations: 3n,
+        };
+        return new EVMSpvVaultData(EVMAddresses_1.EVMAddresses.randomAddress(), 0n, {
+            spvVaultParametersCommitment: getVaultParamsCommitment(spvVaultParams),
+            utxoTxHash: (0, ethers_1.randomBytes)(32),
+            utxoVout: 0n,
+            openBlockheight: 0n,
+            withdrawCount: 0n,
+            depositCount: 0n,
+            token0Amount: 0n,
+            token1Amount: 0n
+        }, spvVaultParams);
+    }
 }
 exports.EVMSpvVaultData = EVMSpvVaultData;
 base_1.SpvVaultData.deserializers["EVM"] = EVMSpvVaultData;

package/dist/evm/swaps/EVMSwapContract.d.ts

@@ -182,11 +182,11 @@ export declare class EVMSwapContract<ChainId extends string = string> extends EV
     getClaimFeeRate(signer: string, swapData: EVMSwapData): Promise<string>;
     getClaimFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
     /**
-     * Get the estimated solana fee of the commit transaction
+     * Get the estimated fee of the commit transaction
      */
-    getCommitFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
+    getCommitFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
     /**
-     * Get the estimated solana transaction fee of the refund transaction
+     * Get the estimated transaction fee of the refund transaction
      */
-    getRefundFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
+    getRefundFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint>;
 }

package/dist/evm/swaps/EVMSwapContract.js

@@ -358,15 +358,15 @@ class EVMSwapContract extends EVMContractBase_1.EVMContractBase {
         return this.Claim.getClaimFee(swapData, feeRate);
     }
     /**
-     * Get the estimated solana fee of the commit transaction
+     * Get the estimated fee of the commit transaction
      */
-    getCommitFee(swapData, feeRate) {
+    getCommitFee(signer, swapData, feeRate) {
         return this.Init.getInitFee(swapData, feeRate);
     }
     /**
-     * Get the estimated solana transaction fee of the refund transaction
+     * Get the estimated transaction fee of the refund transaction
      */
-    getRefundFee(swapData, feeRate) {
+    getRefundFee(signer, swapData, feeRate) {
         return this.Refund.getRefundFee(swapData, feeRate);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.27",
+  "version": "1.0.0-dev.28",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -23,7 +23,7 @@
   "author": "adambor",
   "license": "Apache-2.0",
   "dependencies": {
-    "@atomiqlabs/base": "^10.0.0-dev.1",
+    "@atomiqlabs/base": "^10.0.0-dev.2",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "1.6.0",
     "buffer": "6.0.3"

package/src/chains/citrea/CitreaInitializer.ts

@@ -14,6 +14,7 @@ import {CitreaFees} from "./CitreaFees";
 import {CitreaBtcRelay} from "./CitreaBtcRelay";
 import {CitreaSwapContract} from "./CitreaSwapContract";
 import {CitreaTokens} from "./CitreaTokens";
+import {CitreaSpvVaultContract} from "./CitreaSpvVaultContract";
 
 const CitreaChainIds = {
     MAINNET: null,
@@ -147,7 +148,7 @@ export function initializeCitrea(
         }
     );
 
-    const spvVaultContract = new EVMSpvVaultContract(
+    const spvVaultContract = new CitreaSpvVaultContract(
         chainInterface, btcRelay, bitcoinRpc, options.spvVaultContract ?? defaultContractAddresses.spvVaultContract,
         options.spvVaultDeploymentHeight ?? defaultContractAddresses.spvVaultDeploymentHeight
     )

package/src/chains/citrea/CitreaSpvVaultContract.ts

@@ -1,18 +1,76 @@
 import {EVMSpvVaultContract} from "../../evm/spv_swap/EVMSpvVaultContract";
 import {EVMSpvWithdrawalData} from "../../evm/spv_swap/EVMSpvWithdrawalData";
-import {EVMFees} from "../../evm/chain/modules/EVMFees";
+import {EVMSpvVaultData} from "../../evm/spv_swap/EVMSpvVaultData";
+import {ZeroHash} from "ethers/lib.esm";
+import {ZeroAddress} from "ethers";
+import {CitreaFees} from "./CitreaFees";
+import {EVMAddresses} from "../../evm/chain/modules/EVMAddresses";
 
 
 export class CitreaSpvVaultContract extends EVMSpvVaultContract<"CITREA"> {
 
-    async getClaimFee(signer: string, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
+    public static readonly StateDiffSize = {
+        BASE_DIFF_SIZE: 50,
+        ERC_20_TRANSFER_DIFF_SIZE: 50,
+        NATIVE_SELF_TRANSFER_DIFF_SIZE: 20,
+        NATIVE_TRANSFER_DIFF_SIZE: 30,
+        EXECUTION_SCHEDULE_DIFF_SIZE: 40
+    };
+
+    private calculateStateDiff(signer: string, tokenStateChanges: Set<string>): number {
+        let stateDiffSize = 0;
+        tokenStateChanges.forEach(val => {
+            const [address, token] = val.split(":");
+            if(token.toLowerCase()===this.Chain.getNativeCurrencyAddress().toLowerCase()) {
+                stateDiffSize += address.toLowerCase()===signer?.toLowerCase() ? CitreaSpvVaultContract.StateDiffSize.NATIVE_SELF_TRANSFER_DIFF_SIZE : CitreaSpvVaultContract.StateDiffSize.NATIVE_TRANSFER_DIFF_SIZE;
+            } else {
+                stateDiffSize += CitreaSpvVaultContract.StateDiffSize.ERC_20_TRANSFER_DIFF_SIZE;
+            }
+        });
+        return stateDiffSize;
+    }
+
+    async getClaimFee(signer: string, vault?: EVMSpvVaultData, data?: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
+        vault ??= EVMSpvVaultData.randomVault();
         feeRate ??= await this.Chain.Fees.getFeeRate();
-        return EVMFees.getGasFee(EVMSpvVaultContract.GasCosts.CLAIM, feeRate);
+        const tokenStateChanges: Set<string> = new Set();
+
+        let diffSize = CitreaSpvVaultContract.StateDiffSize.BASE_DIFF_SIZE;
+        const recipient = data!=null ? data.recipient : EVMAddresses.randomAddress();
+        if (data==null || (data.rawAmounts[0] != null && data.rawAmounts[0] > 0n)) {
+            tokenStateChanges.add(recipient.toLowerCase()+":"+vault.token0.token.toLowerCase());
+            if (data==null || data.frontingFeeRate > 0n) tokenStateChanges.add(ZeroAddress+":"+vault.token0.token.toLowerCase()); //Also needs to pay out to fronter
+            if (data==null || data.callerFeeRate > 0n) tokenStateChanges.add(signer+":"+vault.token0.token.toLowerCase()); //Also needs to pay out to caller
+        }
+        if (data==null || (data.rawAmounts[1] != null && data.rawAmounts[1] > 0n)) {
+            tokenStateChanges.add(recipient.toLowerCase()+":"+vault.token1.token.toLowerCase());
+            if (data==null || data.frontingFeeRate > 0n) tokenStateChanges.add(ZeroAddress+":"+vault.token1.token.toLowerCase()); //Also needs to pay out to fronter
+            if (data==null || data.callerFeeRate > 0n) tokenStateChanges.add(signer+":"+vault.token1.token.toLowerCase()); //Also needs to pay out to caller
+        }
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
+        if (data==null || (data.executionHash != null && data.executionHash !== ZeroHash)) diffSize += CitreaSpvVaultContract.StateDiffSize.EXECUTION_SCHEDULE_DIFF_SIZE;
+
+        const gasFee = await super.getClaimFee(signer, vault, data, feeRate);
+        return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);
     }
 
-    async getFrontFee(signer: string, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
+    async getFrontFee(signer: string, vault?: EVMSpvVaultData, data?: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
+        vault ??= EVMSpvVaultData.randomVault();
         feeRate ??= await this.Chain.Fees.getFeeRate();
-        return EVMFees.getGasFee(EVMSpvVaultContract.GasCosts.FRONT, feeRate);
+        const tokenStateChanges: Set<string> = new Set();
+
+        let diffSize = CitreaSpvVaultContract.StateDiffSize.BASE_DIFF_SIZE;
+        if (data==null || (data.rawAmounts[0] != null && data.rawAmounts[0] > 0n)) {
+            tokenStateChanges.add(signer+":"+vault.token0.token.toLowerCase());
+        }
+        if (data==null || (data.rawAmounts[1] != null && data.rawAmounts[1] > 0n)) {
+            tokenStateChanges.add(signer+":"+vault.token1.token.toLowerCase());
+        }
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
+        if (data==null || (data.executionHash != null && data.executionHash !== ZeroHash)) diffSize += CitreaSpvVaultContract.StateDiffSize.EXECUTION_SCHEDULE_DIFF_SIZE;
+
+        const gasFee = await super.getFrontFee(signer, vault, data, feeRate);
+        return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);
     }
 
 }

package/src/chains/citrea/CitreaSwapContract.ts

@@ -29,7 +29,7 @@ export class CitreaSwapContract extends EVMSwapContract<"CITREA"> {
     /**
      * Get the estimated solana fee of the commit transaction
      */
-    async getCommitFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
+    async getCommitFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.Chain.Fees.getFeeRate();
 
         const tokenStateChanges: Set<string> = new Set();
@@ -40,11 +40,10 @@ export class CitreaSwapContract extends EVMSwapContract<"CITREA"> {
         } else {
             tokenStateChanges.add(swapData.getOfferer().toLowerCase()+":"+swapData.getToken().toLowerCase());
         }
-        //TODO: Since we don't know who is sending the transaction, we calculate with the worst case
         if(swapData.getTotalDeposit()>0n) {
-            tokenStateChanges.add(swapData.getClaimer().toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
+            tokenStateChanges.add(signer.toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
         }
-        diffSize += this.calculateStateDiff(null, tokenStateChanges);
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
 
         const gasFee = await this.Init.getInitFee(swapData, feeRate);
         return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);
@@ -77,7 +76,7 @@ export class CitreaSwapContract extends EVMSwapContract<"CITREA"> {
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    async getRefundFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
+    async getRefundFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.Chain.Fees.getFeeRate();
 
         const tokenStateChanges: Set<string> = new Set();
@@ -89,14 +88,13 @@ export class CitreaSwapContract extends EVMSwapContract<"CITREA"> {
         } else {
             tokenStateChanges.add(swapData.getOfferer().toLowerCase()+":"+swapData.getToken().toLowerCase());
         }
-        //TODO: Since we don't know if the refund is cooperative or not and also not the signer, we calculate with the worst case
         if(swapData.getSecurityDeposit() > 0) {
             tokenStateChanges.add(swapData.getOfferer().toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
         }
         if(swapData.getClaimerBounty() > swapData.getSecurityDeposit()) {
             tokenStateChanges.add(swapData.getClaimer().toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
         }
-        diffSize += this.calculateStateDiff(null, tokenStateChanges);
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
 
         const gasFee = await this.Refund.getRefundFee(swapData, feeRate);
         return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);

package/src/evm/chain/EVMChainInterface.ts

@@ -100,8 +100,7 @@ export class EVMChainInterface<ChainId extends string = string, EVMChainId exten
     }
 
     randomAddress(): string {
-        const wallet = Wallet.createRandom();
-        return wallet.address;
+        return EVMAddresses.randomAddress();
     }
 
     randomSigner(): EVMSigner {

package/src/evm/chain/modules/EVMAddresses.ts

@@ -1,5 +1,6 @@
 import {EVMModule} from "../EVMModule";
 import {isAddress} from "ethers";
+import {Wallet} from "ethers/lib.esm";
 
 
 export class EVMAddresses extends EVMModule<any> {
@@ -21,4 +22,9 @@ export class EVMAddresses extends EVMModule<any> {
         }
     }
 
+    static randomAddress(): string {
+        const wallet = Wallet.createRandom();
+        return wallet.address;
+    }
+
 }

package/src/evm/spv_swap/EVMSpvVaultContract.ts

@@ -55,10 +55,20 @@ export class EVMSpvVaultContract<ChainId extends string>
     >
 {
     public static readonly GasCosts = {
-        DEPOSIT: 150_000 + 21_000,
-        OPEN: 100_000 + 21_000,
-        FRONT: 250_000 + 21_000,
-        CLAIM: 250_000 + 21_000
+        DEPOSIT_BASE: 15_000 + 21_000,
+        DEPOSIT_ERC20: 40_000,
+
+        OPEN: 80_000 + 21_000,
+
+        CLAIM_BASE: 85_000 + 21_000,
+        CLAIM_NATIVE_TRANSFER: 7_500,
+        CLAIM_ERC20_TRANSFER: 40_000,
+        CLAIM_EXECUTION_SCHEDULE: 30_000,
+
+        FRONT_BASE: 75_000 + 21_000,
+        FRONT_NATIVE_TRANSFER: 7_500,
+        FRONT_ERC20_TRANSFER: 40_000,
+        FRONT_EXECUTION_SCHEDULE: 30_000
     };
 
     readonly chainId: ChainId;
@@ -96,18 +106,26 @@ export class EVMSpvVaultContract<ChainId extends string>
     }
 
     protected async Deposit(signer: string, vault: EVMSpvVaultData, rawAmounts: bigint[], feeRate: string): Promise<TransactionRequest> {
+        let totalGas = EVMSpvVaultContract.GasCosts.DEPOSIT_BASE;
         let value = 0n;
-        if(vault.token0.token.toLowerCase()===this.Chain.getNativeCurrencyAddress().toLowerCase())
+        if(vault.token0.token.toLowerCase()===this.Chain.getNativeCurrencyAddress().toLowerCase()) {
             value += rawAmounts[0] * vault.token0.multiplier;
-        if(vault.token1.token.toLowerCase()===this.Chain.getNativeCurrencyAddress().toLowerCase())
+        } else {
+            if(rawAmounts[0] > 0n) totalGas += EVMSpvVaultContract.GasCosts.DEPOSIT_ERC20;
+        }
+        if(vault.token1.token.toLowerCase()===this.Chain.getNativeCurrencyAddress().toLowerCase()) {
             value += (rawAmounts[1] ?? 0n) * vault.token1.multiplier;
+        } else {
+            if(rawAmounts[1]!=null && rawAmounts[1] > 0n && vault.token0.token.toLowerCase()!==vault.token1.token.toLowerCase())
+                totalGas += EVMSpvVaultContract.GasCosts.DEPOSIT_ERC20;
+        }
 
         const tx = await this.contract.deposit.populateTransaction(
             vault.owner, vault.vaultId, vault.getVaultParamsStruct(),
             rawAmounts[0], rawAmounts[1] ?? 0n, { value }
         );
         tx.from = signer;
-        EVMFees.applyFeeRate(tx, EVMSpvVaultContract.GasCosts.DEPOSIT, feeRate);
+        EVMFees.applyFeeRate(tx, totalGas, feeRate);
 
         return tx;
     }
@@ -128,7 +146,7 @@ export class EVMSpvVaultContract<ChainId extends string>
             { value }
         );
         tx.from = signer;
-        EVMFees.applyFeeRate(tx, EVMSpvVaultContract.GasCosts.FRONT, feeRate);
+        EVMFees.applyFeeRate(tx, this.getFrontGas(signer, vault, data), feeRate);
 
         return tx;
     }
@@ -143,7 +161,7 @@ export class EVMSpvVaultContract<ChainId extends string>
         )
 
         tx.from = signer;
-        EVMFees.applyFeeRate(tx, EVMSpvVaultContract.GasCosts.CLAIM, feeRate);
+        EVMFees.applyFeeRate(tx, this.getClaimGas(signer, vault, data), feeRate);
 
         return tx;
     }
@@ -520,14 +538,66 @@ export class EVMSpvVaultContract<ChainId extends string>
         return [tx];
     }
 
-    async getClaimFee(signer: string, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
+    getClaimGas(signer: string, vault: EVMSpvVaultData, data?: EVMSpvWithdrawalData): number {
+        let totalGas = EVMSpvVaultContract.GasCosts.CLAIM_BASE;
+
+        if (data==null || (data.rawAmounts[0] != null && data.rawAmounts[0] > 0n)) {
+            const transferFee = vault.token0.token.toLowerCase() === this.Chain.getNativeCurrencyAddress() ?
+                EVMSpvVaultContract.GasCosts.CLAIM_NATIVE_TRANSFER : EVMSpvVaultContract.GasCosts.CLAIM_ERC20_TRANSFER;
+            totalGas += transferFee;
+            if (data==null || data.frontingFeeRate > 0n) totalGas += transferFee; //Also needs to pay out to fronter
+            if (data==null || (data.callerFeeRate > 0n && !data.isRecipient(signer))) totalGas += transferFee; //Also needs to pay out to caller
+        }
+        if (data==null || (data.rawAmounts[1] != null && data.rawAmounts[1] > 0n)) {
+            const transferFee = vault.token1.token.toLowerCase() === this.Chain.getNativeCurrencyAddress() ?
+                EVMSpvVaultContract.GasCosts.CLAIM_NATIVE_TRANSFER : EVMSpvVaultContract.GasCosts.CLAIM_ERC20_TRANSFER;
+            totalGas += transferFee;
+            if (data==null || data.frontingFeeRate > 0n) totalGas += transferFee; //Also needs to pay out to fronter
+            if (data==null || (data.callerFeeRate > 0n && !data.isRecipient(signer))) totalGas += transferFee; //Also needs to pay out to caller
+        }
+        if (data==null || (data.executionHash != null && data.executionHash !== ZeroHash)) totalGas += EVMSpvVaultContract.GasCosts.CLAIM_EXECUTION_SCHEDULE;
+
+        return totalGas;
+    }
+
+    getFrontGas(signer: string, vault: EVMSpvVaultData, data?: EVMSpvWithdrawalData): number {
+        let totalGas = EVMSpvVaultContract.GasCosts.FRONT_BASE;
+
+        if (data==null || (data.rawAmounts[0] != null && data.rawAmounts[0] > 0n)) {
+            totalGas += vault.token0.token.toLowerCase() === this.Chain.getNativeCurrencyAddress() ?
+                EVMSpvVaultContract.GasCosts.FRONT_NATIVE_TRANSFER : EVMSpvVaultContract.GasCosts.FRONT_ERC20_TRANSFER;
+        }
+        if (data==null || (data.rawAmounts[1] != null && data.rawAmounts[1] > 0n)) {
+            totalGas += vault.token1.token.toLowerCase() === this.Chain.getNativeCurrencyAddress() ?
+                EVMSpvVaultContract.GasCosts.FRONT_NATIVE_TRANSFER : EVMSpvVaultContract.GasCosts.FRONT_ERC20_TRANSFER;
+        }
+        if (data==null || (data.executionHash != null && data.executionHash !== ZeroHash)) totalGas += EVMSpvVaultContract.GasCosts.FRONT_EXECUTION_SCHEDULE;
+
+        return totalGas;
+    }
+
+    async getClaimFee(signer: string, vault: EVMSpvVaultData, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.Chain.Fees.getFeeRate();
-        return EVMFees.getGasFee(EVMSpvVaultContract.GasCosts.CLAIM, feeRate);
+        return EVMFees.getGasFee(this.getClaimGas(signer, vault, withdrawalData), feeRate);
     }
 
-    async getFrontFee(signer: string, withdrawalData: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
+    async getFrontFee(signer: string, vault?: EVMSpvVaultData, withdrawalData?: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
+        vault ??= EVMSpvVaultData.randomVault();
         feeRate ??= await this.Chain.Fees.getFeeRate();
-        return EVMFees.getGasFee(EVMSpvVaultContract.GasCosts.FRONT, feeRate);
+        let totalFee = EVMFees.getGasFee(this.getFrontGas(signer, vault, withdrawalData), feeRate);
+        if(withdrawalData==null || (withdrawalData.rawAmounts[0]!=null && withdrawalData.rawAmounts[0]>0n)) {
+            if(vault.token0.token.toLowerCase()!==this.Chain.getNativeCurrencyAddress().toLowerCase()) {
+                totalFee += await this.Chain.Tokens.getApproveFee(feeRate);
+            }
+        }
+        if(withdrawalData==null || (withdrawalData.rawAmounts[1]!=null && withdrawalData.rawAmounts[1]>0n)) {
+            if(vault.token1.token.toLowerCase()!==this.Chain.getNativeCurrencyAddress().toLowerCase()) {
+                if(vault.token1.token.toLowerCase()!==vault.token0.token.toLowerCase() || withdrawalData==null || withdrawalData.rawAmounts[0]==null || withdrawalData.rawAmounts[0]===0n) {
+                    totalFee += await this.Chain.Tokens.getApproveFee(feeRate);
+                }
+            }
+        }
+        return totalFee;
     }
 
 }

package/src/evm/spv_swap/EVMSpvVaultData.ts

@@ -11,8 +11,10 @@ import {
     SpvVaultParametersStruct,
     SpvVaultStateStruct
 } from "./SpvVaultContractTypechain";
-import {hexlify} from "ethers";
+import {hexlify, randomBytes} from "ethers";
 import {AbiCoder, keccak256} from "ethers";
+import {EVMAddresses} from "../chain/modules/EVMAddresses";
+import type {AddressLike, BigNumberish, BytesLike} from "ethers/lib.esm";
 
 export function getVaultParamsCommitment(vaultParams: SpvVaultParametersStruct) {
     return keccak256(AbiCoder.defaultAbiCoder().encode(
@@ -196,6 +198,27 @@ export class EVMSpvVaultData extends SpvVaultData<EVMSpvWithdrawalData> {
         }
     }
 
+    static randomVault(): EVMSpvVaultData {
+        const spvVaultParams = {
+            btcRelayContract: EVMAddresses.randomAddress(),
+            token0: EVMAddresses.randomAddress(),
+            token1: EVMAddresses.randomAddress(),
+            token0Multiplier: 1n,
+            token1Multiplier: 1n,
+            confirmations: 3n,
+        }
+        return new EVMSpvVaultData(EVMAddresses.randomAddress(), 0n, {
+            spvVaultParametersCommitment: getVaultParamsCommitment(spvVaultParams),
+            utxoTxHash: randomBytes(32),
+            utxoVout: 0n,
+            openBlockheight: 0n,
+            withdrawCount: 0n,
+            depositCount: 0n,
+            token0Amount: 0n,
+            token1Amount: 0n
+        }, spvVaultParams);
+    }
+
 }
 
 SpvVaultData.deserializers["EVM"] = EVMSpvVaultData;

package/src/evm/swaps/EVMSwapContract.ts

@@ -574,16 +574,16 @@ export class EVMSwapContract<ChainId extends string = string>
     }
 
     /**
-     * Get the estimated solana fee of the commit transaction
+     * Get the estimated fee of the commit transaction
      */
-    getCommitFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
+    getCommitFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
         return this.Init.getInitFee(swapData, feeRate);
     }
 
     /**
-     * Get the estimated solana transaction fee of the refund transaction
+     * Get the estimated transaction fee of the refund transaction
      */
-    getRefundFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
+    getRefundFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
         return this.Refund.getRefundFee(swapData, feeRate);
     }