@atomiqlabs/chain-evm 1.0.0-dev.35 → 1.0.0-dev.37

package/src/chains/citrea/CitreaSpvVaultContract.ts

@@ -1,75 +1,75 @@
-import {EVMSpvVaultContract} from "../../evm/spv_swap/EVMSpvVaultContract";
-import {EVMSpvWithdrawalData} from "../../evm/spv_swap/EVMSpvWithdrawalData";
-import {EVMSpvVaultData} from "../../evm/spv_swap/EVMSpvVaultData";
-import {ZeroAddress, ZeroHash} from "ethers";
-import {CitreaFees} from "./CitreaFees";
-import {EVMAddresses} from "../../evm/chain/modules/EVMAddresses";
-
-
-export class CitreaSpvVaultContract extends EVMSpvVaultContract<"CITREA"> {
-
-    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();
-        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, vault?: EVMSpvVaultData, data?: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
-        vault ??= EVMSpvVaultData.randomVault();
-        feeRate ??= await this.Chain.Fees.getFeeRate();
-        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);
-    }
-
-}
+import {EVMSpvVaultContract} from "../../evm/spv_swap/EVMSpvVaultContract";
+import {EVMSpvWithdrawalData} from "../../evm/spv_swap/EVMSpvWithdrawalData";
+import {EVMSpvVaultData} from "../../evm/spv_swap/EVMSpvVaultData";
+import {ZeroAddress, ZeroHash} from "ethers";
+import {CitreaFees} from "./CitreaFees";
+import {EVMAddresses} from "../../evm/chain/modules/EVMAddresses";
+
+
+export class CitreaSpvVaultContract extends EVMSpvVaultContract<"CITREA"> {
+
+    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();
+        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, vault?: EVMSpvVaultData, data?: EVMSpvWithdrawalData, feeRate?: string): Promise<bigint> {
+        vault ??= EVMSpvVaultData.randomVault();
+        feeRate ??= await this.Chain.Fees.getFeeRate();
+        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

@@ -1,103 +1,103 @@
-import {EVMSwapContract} from "../../evm/swaps/EVMSwapContract";
-import {EVMSwapData} from "../../evm/swaps/EVMSwapData";
-import {CitreaFees} from "./CitreaFees";
-
-export class CitreaSwapContract extends EVMSwapContract<"CITREA"> {
-
-    public static readonly StateDiffSize = {
-        BASE_DIFF_SIZE: 35,
-        REPUTATION_UPDATE_DIFF_SIZE: 25,
-        LP_VAULT_UPDATE_DIFF_SIZE: 25,
-        ERC_20_TRANSFER_DIFF_SIZE: 50,
-        NATIVE_SELF_TRANSFER_DIFF_SIZE: 20,
-        NATIVE_TRANSFER_DIFF_SIZE: 30
-    };
-
-    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() ? CitreaSwapContract.StateDiffSize.NATIVE_SELF_TRANSFER_DIFF_SIZE : CitreaSwapContract.StateDiffSize.NATIVE_TRANSFER_DIFF_SIZE;
-            } else {
-                stateDiffSize += CitreaSwapContract.StateDiffSize.ERC_20_TRANSFER_DIFF_SIZE;
-            }
-        });
-        return stateDiffSize;
-    }
-
-    /**
-     * Get the estimated solana fee of the commit transaction
-     */
-    async getCommitFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
-        feeRate ??= await this.Chain.Fees.getFeeRate();
-
-        const tokenStateChanges: Set<string> = new Set();
-
-        let diffSize = CitreaSwapContract.StateDiffSize.BASE_DIFF_SIZE;
-        if(!swapData.isPayIn()) {
-            diffSize += CitreaSwapContract.StateDiffSize.LP_VAULT_UPDATE_DIFF_SIZE;
-        } else {
-            tokenStateChanges.add(swapData.getOfferer().toLowerCase()+":"+swapData.getToken().toLowerCase());
-        }
-        if(swapData.getTotalDeposit()>0n) {
-            tokenStateChanges.add(signer.toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
-        }
-        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
-
-        const gasFee = await this.Init.getInitFee(swapData, feeRate);
-        return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);
-    }
-
-    async getClaimFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
-        feeRate ??= await this.Chain.Fees.getFeeRate();
-
-        const tokenStateChanges: Set<string> = new Set();
-
-        let diffSize = CitreaSwapContract.StateDiffSize.BASE_DIFF_SIZE;
-        if(swapData.reputation) diffSize += CitreaSwapContract.StateDiffSize.REPUTATION_UPDATE_DIFF_SIZE;
-        if(!swapData.isPayOut()) {
-            diffSize += CitreaSwapContract.StateDiffSize.LP_VAULT_UPDATE_DIFF_SIZE;
-        } else {
-            tokenStateChanges.add(swapData.getClaimer().toLowerCase()+":"+swapData.getToken().toLowerCase());
-        }
-        if(swapData.getClaimerBounty() > 0) {
-            tokenStateChanges.add(signer.toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
-        }
-        if(swapData.getSecurityDeposit() > swapData.getClaimerBounty()) {
-            tokenStateChanges.add(swapData.getClaimer().toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
-        }
-        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
-
-        const gasFee = await this.Claim.getClaimFee(swapData, feeRate);
-        return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);
-    }
-
-    /**
-     * Get the estimated solana transaction fee of the refund transaction
-     */
-    async getRefundFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
-        feeRate ??= await this.Chain.Fees.getFeeRate();
-
-        const tokenStateChanges: Set<string> = new Set();
-
-        let diffSize = CitreaSwapContract.StateDiffSize.BASE_DIFF_SIZE;
-        if(swapData.reputation) diffSize += CitreaSwapContract.StateDiffSize.REPUTATION_UPDATE_DIFF_SIZE;
-        if(!swapData.isPayIn()) {
-            diffSize += CitreaSwapContract.StateDiffSize.LP_VAULT_UPDATE_DIFF_SIZE;
-        } else {
-            tokenStateChanges.add(swapData.getOfferer().toLowerCase()+":"+swapData.getToken().toLowerCase());
-        }
-        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(signer, tokenStateChanges);
-
-        const gasFee = await this.Refund.getRefundFee(swapData, feeRate);
-        return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);
-    }
-
+import {EVMSwapContract} from "../../evm/swaps/EVMSwapContract";
+import {EVMSwapData} from "../../evm/swaps/EVMSwapData";
+import {CitreaFees} from "./CitreaFees";
+
+export class CitreaSwapContract extends EVMSwapContract<"CITREA"> {
+
+    public static readonly StateDiffSize = {
+        BASE_DIFF_SIZE: 35,
+        REPUTATION_UPDATE_DIFF_SIZE: 25,
+        LP_VAULT_UPDATE_DIFF_SIZE: 25,
+        ERC_20_TRANSFER_DIFF_SIZE: 50,
+        NATIVE_SELF_TRANSFER_DIFF_SIZE: 20,
+        NATIVE_TRANSFER_DIFF_SIZE: 30
+    };
+
+    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() ? CitreaSwapContract.StateDiffSize.NATIVE_SELF_TRANSFER_DIFF_SIZE : CitreaSwapContract.StateDiffSize.NATIVE_TRANSFER_DIFF_SIZE;
+            } else {
+                stateDiffSize += CitreaSwapContract.StateDiffSize.ERC_20_TRANSFER_DIFF_SIZE;
+            }
+        });
+        return stateDiffSize;
+    }
+
+    /**
+     * Get the estimated solana fee of the commit transaction
+     */
+    async getCommitFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
+        feeRate ??= await this.Chain.Fees.getFeeRate();
+
+        const tokenStateChanges: Set<string> = new Set();
+
+        let diffSize = CitreaSwapContract.StateDiffSize.BASE_DIFF_SIZE;
+        if(!swapData.isPayIn()) {
+            diffSize += CitreaSwapContract.StateDiffSize.LP_VAULT_UPDATE_DIFF_SIZE;
+        } else {
+            tokenStateChanges.add(swapData.getOfferer().toLowerCase()+":"+swapData.getToken().toLowerCase());
+        }
+        if(swapData.getTotalDeposit()>0n) {
+            tokenStateChanges.add(signer.toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
+        }
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
+
+        const gasFee = await this.Init.getInitFee(swapData, feeRate);
+        return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);
+    }
+
+    async getClaimFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
+        feeRate ??= await this.Chain.Fees.getFeeRate();
+
+        const tokenStateChanges: Set<string> = new Set();
+
+        let diffSize = CitreaSwapContract.StateDiffSize.BASE_DIFF_SIZE;
+        if(swapData.reputation) diffSize += CitreaSwapContract.StateDiffSize.REPUTATION_UPDATE_DIFF_SIZE;
+        if(!swapData.isPayOut()) {
+            diffSize += CitreaSwapContract.StateDiffSize.LP_VAULT_UPDATE_DIFF_SIZE;
+        } else {
+            tokenStateChanges.add(swapData.getClaimer().toLowerCase()+":"+swapData.getToken().toLowerCase());
+        }
+        if(swapData.getClaimerBounty() > 0) {
+            tokenStateChanges.add(signer.toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
+        }
+        if(swapData.getSecurityDeposit() > swapData.getClaimerBounty()) {
+            tokenStateChanges.add(swapData.getClaimer().toLowerCase()+":"+swapData.getDepositToken().toLowerCase());
+        }
+        diffSize += this.calculateStateDiff(signer, tokenStateChanges);
+
+        const gasFee = await this.Claim.getClaimFee(swapData, feeRate);
+        return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);
+    }
+
+    /**
+     * Get the estimated solana transaction fee of the refund transaction
+     */
+    async getRefundFee(signer: string, swapData: EVMSwapData, feeRate?: string): Promise<bigint> {
+        feeRate ??= await this.Chain.Fees.getFeeRate();
+
+        const tokenStateChanges: Set<string> = new Set();
+
+        let diffSize = CitreaSwapContract.StateDiffSize.BASE_DIFF_SIZE;
+        if(swapData.reputation) diffSize += CitreaSwapContract.StateDiffSize.REPUTATION_UPDATE_DIFF_SIZE;
+        if(!swapData.isPayIn()) {
+            diffSize += CitreaSwapContract.StateDiffSize.LP_VAULT_UPDATE_DIFF_SIZE;
+        } else {
+            tokenStateChanges.add(swapData.getOfferer().toLowerCase()+":"+swapData.getToken().toLowerCase());
+        }
+        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(signer, tokenStateChanges);
+
+        const gasFee = await this.Refund.getRefundFee(swapData, feeRate);
+        return gasFee + CitreaFees.getGasFee(0, feeRate, diffSize);
+    }
+
 }

package/src/chains/citrea/CitreaTokens.ts

@@ -1,22 +1,22 @@
-import {EVMTokens} from "../../evm/chain/modules/EVMTokens";
-import {CitreaFees} from "./CitreaFees";
-
-
-export class CitreaTokens extends EVMTokens {
-
-    public static readonly StateDiffSize = {
-        APPROVE_DIFF_SIZE: 35,
-        TRANSFER_DIFF_SIZE: 55
-    };
-
-    async getApproveFee(feeRate?: string): Promise<bigint> {
-        feeRate ??= await this.root.Fees.getFeeRate();
-        return CitreaFees.getGasFee(EVMTokens.GasCosts.APPROVE, feeRate, CitreaTokens.StateDiffSize.APPROVE_DIFF_SIZE);
-    }
-
-    async getTransferFee(feeRate?: string): Promise<bigint> {
-        feeRate ??= await this.root.Fees.getFeeRate();
-        return CitreaFees.getGasFee(EVMTokens.GasCosts.APPROVE, feeRate, CitreaTokens.StateDiffSize.TRANSFER_DIFF_SIZE);
-    }
-
+import {EVMTokens} from "../../evm/chain/modules/EVMTokens";
+import {CitreaFees} from "./CitreaFees";
+
+
+export class CitreaTokens extends EVMTokens {
+
+    public static readonly StateDiffSize = {
+        APPROVE_DIFF_SIZE: 35,
+        TRANSFER_DIFF_SIZE: 55
+    };
+
+    async getApproveFee(feeRate?: string): Promise<bigint> {
+        feeRate ??= await this.root.Fees.getFeeRate();
+        return CitreaFees.getGasFee(EVMTokens.GasCosts.APPROVE, feeRate, CitreaTokens.StateDiffSize.APPROVE_DIFF_SIZE);
+    }
+
+    async getTransferFee(feeRate?: string): Promise<bigint> {
+        feeRate ??= await this.root.Fees.getFeeRate();
+        return CitreaFees.getGasFee(EVMTokens.GasCosts.APPROVE, feeRate, CitreaTokens.StateDiffSize.TRANSFER_DIFF_SIZE);
+    }
+
 }