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

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

@@ -3,6 +3,7 @@ import {Contract, TransactionRequest} from "ethers";
 import {ERC20Abi} from "./ERC20Abi";
 import {EVMAddresses} from "./EVMAddresses";
 import {EVMFees} from "./EVMFees";
+import {EVMSwapData} from "../../swaps/EVMSwapData";
 
 
 export class EVMTokens extends EVMModule<any> {
@@ -10,8 +11,8 @@ export class EVMTokens extends EVMModule<any> {
     public static readonly ETH_ADDRESS = "0x0000000000000000000000000000000000000000";
 
     public static readonly GasCosts = {
-        TRANSFER: 80_000,
-        APPROVE: 80_000
+        TRANSFER: 80_000 + 21_000,
+        APPROVE: 80_000 + 21_000
     };
 
     private getContract(address: string) {
@@ -112,4 +113,14 @@ export class EVMTokens extends EVMModule<any> {
         return tx;
     }
 
+    async getApproveFee(feeRate?: string): Promise<bigint> {
+        feeRate ??= await this.root.Fees.getFeeRate();
+        return EVMFees.getGasFee(EVMTokens.GasCosts.APPROVE, feeRate);
+    }
+
+    async getTransferFee(feeRate?: string): Promise<bigint> {
+        feeRate ??= await this.root.Fees.getFeeRate();
+        return EVMFees.getGasFee(EVMTokens.GasCosts.APPROVE, feeRate);
+    }
+
 }

package/src/evm/spv_swap/EVMSpvVaultContract.ts

@@ -54,11 +54,21 @@ export class EVMSpvVaultContract<ChainId extends string>
         EVMSpvWithdrawalData
     >
 {
-    private static readonly GasCosts = {
-        DEPOSIT: 150_000,
-        OPEN: 100_000,
-        FRONT: 250_000,
-        CLAIM: 250_000
+    public static readonly GasCosts = {
+        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);
     }
 

package/src/evm/swaps/modules/EVMLpVault.ts

@@ -7,8 +7,8 @@ import {EVMTx} from "../../chain/modules/EVMTransactions";
 export class EVMLpVault extends EVMSwapModule {
 
     private static readonly GasCosts = {
-        WITHDRAW: 100_000,
-        DEPOSIT: 100_000
+        WITHDRAW: 100_000 + 21_000,
+        DEPOSIT: 100_000 + 21_000
     };
 
     /**

package/src/evm/swaps/modules/EVMSwapClaim.ts

@@ -13,8 +13,11 @@ import {EVMBtcStoredHeader} from "../../btcrelay/headers/EVMBtcStoredHeader";
 export class EVMSwapClaim extends EVMSwapModule {
 
     private static readonly GasCosts = {
-        CLAIM: 120_000,
-        CLAIM_WITH_SUCCESS_ACTION: 150_000
+        BASE: 30_000 + 21_000,
+        ERC20_TRANSFER: 40_000,
+        NATIVE_TRANSFER: 7500,
+        LP_VAULT_TRANSFER: 10_000,
+        REPUTATION: 25_000
     };
 
     /**
@@ -37,7 +40,7 @@ export class EVMSwapClaim extends EVMSwapModule {
         //TODO: Claim with success action not supported yet!
         const tx = await this.swapContract.claim.populateTransaction(swapData.toEscrowStruct(), witness);
         tx.from = signer;
-        EVMFees.applyFeeRate(tx, EVMSwapClaim.GasCosts.CLAIM + (claimHandlerGas ?? 0), feeRate);
+        EVMFees.applyFeeRate(tx, this.getClaimGas(swapData) + (claimHandlerGas ?? 0), feeRate);
         return tx;
     }
 
@@ -123,6 +126,35 @@ export class EVMSwapClaim extends EVMSwapModule {
         return [...initialTxns, claimTx];
     }
 
+    getClaimGas(swapData: EVMSwapData): number {
+        let totalGas = EVMSwapClaim.GasCosts.BASE;
+        if(swapData.reputation) totalGas += EVMSwapClaim.GasCosts.REPUTATION;
+        if(swapData.isPayOut()) {
+            if(swapData.isToken(this.root.getNativeCurrencyAddress())) {
+                totalGas += EVMSwapClaim.GasCosts.NATIVE_TRANSFER;
+            } else {
+                totalGas += EVMSwapClaim.GasCosts.ERC20_TRANSFER;
+            }
+        } else {
+            totalGas += EVMSwapClaim.GasCosts.LP_VAULT_TRANSFER;
+        }
+        if(swapData.getClaimerBounty() > 0n) {
+            if(swapData.isDepositToken(this.root.getNativeCurrencyAddress())) {
+                totalGas += EVMSwapClaim.GasCosts.NATIVE_TRANSFER;
+            } else {
+                totalGas += EVMSwapClaim.GasCosts.ERC20_TRANSFER;
+            }
+        }
+        if(swapData.getSecurityDeposit() > swapData.getClaimerBounty()) {
+            if(swapData.isDepositToken(this.root.getNativeCurrencyAddress())) {
+                totalGas += EVMSwapClaim.GasCosts.NATIVE_TRANSFER;
+            } else {
+                totalGas += EVMSwapClaim.GasCosts.ERC20_TRANSFER;
+            }
+        }
+        return totalGas;
+    }
+
     /**
      * Get the estimated starknet transaction fee of the claim transaction
      */
@@ -130,7 +162,7 @@ export class EVMSwapClaim extends EVMSwapModule {
         feeRate ??= await this.root.Fees.getFeeRate();
 
         //TODO: Claim with success action not supported yet!
-        let gasRequired = EVMSwapClaim.GasCosts.CLAIM;
+        let gasRequired = this.getClaimGas(swapData);
 
         const claimHandler: IClaimHandler<any, any> = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
         if(claimHandler!=null) gasRequired += claimHandler.getGas(swapData);

package/src/evm/swaps/modules/EVMSwapInit.ts

@@ -1,5 +1,4 @@
 import {SignatureVerificationError, SwapCommitStateType, SwapDataVerificationError} from "@atomiqlabs/base";
-import {Buffer} from "buffer";
 import { EVMSwapModule } from "../EVMSwapModule";
 import {EVMSwapData} from "../EVMSwapData";
 import {keccak256, TransactionRequest, ZeroHash} from "ethers";
@@ -36,8 +35,9 @@ const Initialize = [
 export class EVMSwapInit extends EVMSwapModule {
 
     private static readonly GasCosts = {
-        INIT: 100_000,
-        INIT_PAY_IN: 130_000,
+        BASE: 45_000 + 21_000,
+        ERC20_TRANSFER: 40_000,
+        LP_VAULT_TRANSFER: 10_000
     };
 
     /**
@@ -52,13 +52,15 @@ export class EVMSwapInit extends EVMSwapModule {
      */
     private async Init(sender: string, swapData: EVMSwapData, timeout: bigint, signature: string, feeRate: string): Promise<TransactionRequest> {
         let value = 0n;
-        if(swapData.isToken(this.root.getNativeCurrencyAddress())) value += swapData.getAmount();
+        if(swapData.isPayIn()) {
+            if(swapData.isOfferer(sender) && swapData.isToken(this.root.getNativeCurrencyAddress())) value += swapData.getAmount();
+        }
         if(swapData.isDepositToken(this.root.getNativeCurrencyAddress())) value += swapData.getTotalDeposit();
         const tx = await this.swapContract.initialize.populateTransaction(swapData.toEscrowStruct(), signature, timeout, "0x"+(swapData.extraData ?? ""), {
             value
         });
         tx.from = sender;
-        EVMFees.applyFeeRate(tx, swapData.isPayIn() ? EVMSwapInit.GasCosts.INIT_PAY_IN : EVMSwapInit.GasCosts.INIT, feeRate);
+        EVMFees.applyFeeRate(tx, this.getInitGas(swapData), feeRate);
         return tx;
     }
 
@@ -259,7 +261,7 @@ export class EVMSwapInit extends EVMSwapModule {
 
         const txs: EVMTx[] = [];
         const requiredApprovals: {[address: string]: bigint} = {};
-        if(swapData.payIn && swapData.isOfferer(sender)) {
+        if(swapData.isPayIn() && swapData.isOfferer(sender)) {
             if(!swapData.isToken(this.root.getNativeCurrencyAddress())) {
                 requiredApprovals[swapData.token.toLowerCase()] = swapData.amount;
             }
@@ -281,12 +283,44 @@ export class EVMSwapInit extends EVMSwapModule {
         return txs;
     }
 
+    private getInitGas(swapData: EVMSwapData): number {
+        let totalGas = EVMSwapInit.GasCosts.BASE;
+        if(swapData.isPayIn()) {
+            if(!swapData.isToken(this.root.getNativeCurrencyAddress())) {
+                totalGas += EVMSwapInit.GasCosts.ERC20_TRANSFER;
+            }
+        } else {
+            totalGas += EVMSwapInit.GasCosts.LP_VAULT_TRANSFER;
+        }
+        if(swapData.getTotalDeposit() > 0) {
+            if(!swapData.isPayIn() || !swapData.isDepositToken(swapData.token)) {
+                if(!swapData.isDepositToken(this.root.getNativeCurrencyAddress())) {
+                    totalGas += EVMSwapInit.GasCosts.ERC20_TRANSFER;
+                }
+            }
+        }
+        return totalGas;
+    }
+
     /**
-     * Get the estimated solana fee of the init transaction, this includes the required deposit for creating swap PDA
-     *  and also deposit for ATAs
+     * Get the estimated fee of the init transaction
      */
-    async getInitFee(swapData?: EVMSwapData, feeRate?: string): Promise<bigint> {
+    async getInitFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.root.Fees.getFeeRate();
-        return EVMFees.getGasFee(swapData.payIn ? EVMSwapInit.GasCosts.INIT_PAY_IN : EVMSwapInit.GasCosts.INIT, feeRate);
+        let totalFee = EVMFees.getGasFee(this.getInitGas(swapData), feeRate);
+        if(swapData.isPayIn()) {
+            if(!swapData.isToken(this.root.getNativeCurrencyAddress())) {
+                totalFee += await this.root.Tokens.getApproveFee(feeRate);
+            }
+        }
+        if(swapData.getTotalDeposit() > 0) {
+            if(!swapData.isPayIn() || !swapData.isDepositToken(swapData.token)) {
+                if(!swapData.isDepositToken(this.root.getNativeCurrencyAddress())) {
+                    totalFee += await this.root.Tokens.getApproveFee(feeRate);
+                }
+            }
+        }
+
+        return totalFee;
     }
 }

package/src/evm/swaps/modules/EVMSwapRefund.ts

@@ -17,8 +17,11 @@ const Refund = [
 export class EVMSwapRefund extends EVMSwapModule {
 
     private static readonly GasCosts = {
-        REFUND: 100_000,
-        REFUND_PAY_OUT: 130_000
+        BASE: 35_000 + 21_000,
+        ERC20_TRANSFER: 40_000,
+        NATIVE_TRANSFER: 7500,
+        LP_VAULT_TRANSFER: 10_000,
+        REPUTATION: 25_000
     };
 
     /**
@@ -40,7 +43,7 @@ export class EVMSwapRefund extends EVMSwapModule {
     ): Promise<TransactionRequest> {
         const tx = await this.swapContract.refund.populateTransaction(swapData.toEscrowStruct(), witness);
         tx.from = signer;
-        EVMFees.applyFeeRate(tx, (swapData.payIn ? EVMSwapRefund.GasCosts.REFUND_PAY_OUT : EVMSwapRefund.GasCosts.REFUND) + (handlerGas ?? 0), feeRate)
+        EVMFees.applyFeeRate(tx, this.getRefundGas(swapData) + (handlerGas ?? 0), feeRate)
         return tx;
     }
 
@@ -63,7 +66,7 @@ export class EVMSwapRefund extends EVMSwapModule {
     ): Promise<TransactionRequest> {
         const tx = await this.swapContract.cooperativeRefund.populateTransaction(swapData.toEscrowStruct(), signature, BigInt(timeout));
         tx.from = sender;
-        EVMFees.applyFeeRate(tx, swapData.payIn ? EVMSwapRefund.GasCosts.REFUND_PAY_OUT : EVMSwapRefund.GasCosts.REFUND, feeRate)
+        EVMFees.applyFeeRate(tx, this.getRefundGas(swapData), feeRate)
         return tx;
     }
 
@@ -186,13 +189,41 @@ export class EVMSwapRefund extends EVMSwapModule {
         return [tx];
     }
 
+    getRefundGas(swapData: EVMSwapData): number {
+        let totalGas = EVMSwapRefund.GasCosts.BASE;
+        if(swapData.reputation) totalGas += EVMSwapRefund.GasCosts.REPUTATION;
+        if(swapData.isPayIn()) {
+            if(swapData.isToken(this.root.getNativeCurrencyAddress())) {
+                totalGas += EVMSwapRefund.GasCosts.NATIVE_TRANSFER;
+            } else {
+                totalGas += EVMSwapRefund.GasCosts.ERC20_TRANSFER;
+            }
+        } else {
+            totalGas += EVMSwapRefund.GasCosts.LP_VAULT_TRANSFER;
+        }
+        if(swapData.getSecurityDeposit() > 0n) {
+            if(swapData.isDepositToken(this.root.getNativeCurrencyAddress())) {
+                totalGas += EVMSwapRefund.GasCosts.NATIVE_TRANSFER;
+            } else {
+                totalGas += EVMSwapRefund.GasCosts.ERC20_TRANSFER;
+            }
+        }
+        if(swapData.getClaimerBounty() > swapData.getSecurityDeposit()) {
+            if(swapData.isDepositToken(this.root.getNativeCurrencyAddress())) {
+                totalGas += EVMSwapRefund.GasCosts.NATIVE_TRANSFER;
+            } else {
+                totalGas += EVMSwapRefund.GasCosts.ERC20_TRANSFER;
+            }
+        }
+        return totalGas;
+    }
+
     /**
-     * Get the estimated solana transaction fee of the refund transaction, in the worst case scenario in case where the
-     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
+     * Get the estimated transaction fee of the refund transaction
      */
     async getRefundFee(swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.root.Fees.getFeeRate();
-        return EVMFees.getGasFee(swapData.payIn ? EVMSwapRefund.GasCosts.REFUND_PAY_OUT : EVMSwapRefund.GasCosts.REFUND, feeRate);
+        return EVMFees.getGasFee(this.getRefundGas(swapData), feeRate);
     }
 
 }

package/src/index.ts

@@ -42,3 +42,4 @@ export * from "./evm/wallet/EVMSigner";
 
 export * from "./chains/citrea/CitreaInitializer";
 export * from "./chains/citrea/CitreaChainType";
+export * from "./chains/citrea/CitreaFees";