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

package/dist/index.d.ts

@@ -1,38 +1,38 @@
-export * from "./evm/btcrelay/headers/EVMBtcHeader";
-export * from "./evm/btcrelay/headers/EVMBtcStoredHeader";
-export * from "./evm/btcrelay/EVMBtcRelay";
-export * from "./evm/chain/EVMChainInterface";
-export * from "./evm/chain/EVMModule";
-export * from "./evm/chain/modules/EVMAddresses";
-export * from "./evm/chain/modules/EVMBlocks";
-export * from "./evm/chain/modules/EVMEvents";
-export * from "./evm/chain/modules/EVMFees";
-export * from "./evm/chain/modules/EVMSignatures";
-export * from "./evm/chain/modules/EVMTokens";
-export * from "./evm/chain/modules/EVMTransactions";
-export * from "./evm/contract/modules/EVMContractEvents";
-export * from "./evm/contract/EVMContractBase";
-export * from "./evm/contract/EVMContractModule";
-export * from "./evm/events/EVMChainEventsBrowser";
-export * from "./evm/spv_swap/EVMSpvVaultContract";
-export * from "./evm/spv_swap/EVMSpvWithdrawalData";
-export * from "./evm/spv_swap/EVMSpvVaultData";
-export * from "./evm/swaps/EVMSwapContract";
-export * from "./evm/swaps/EVMSwapData";
-export * from "./evm/swaps/EVMSwapModule";
-export * from "./evm/swaps/modules/EVMLpVault";
-export * from "./evm/swaps/modules/EVMSwapInit";
-export * from "./evm/swaps/modules/EVMSwapClaim";
-export * from "./evm/swaps/modules/EVMSwapRefund";
-export * from "./evm/swaps/handlers/IHandler";
-export * from "./evm/swaps/handlers/refund/TimelockRefundHandler";
-export * from "./evm/swaps/handlers/claim/ClaimHandlers";
-export * from "./evm/swaps/handlers/claim/HashlockClaimHandler";
-export * from "./evm/swaps/handlers/claim/btc/IBitcoinClaimHandler";
-export * from "./evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler";
-export * from "./evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler";
-export * from "./evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler";
-export * from "./evm/wallet/EVMSigner";
-export * from "./chains/citrea/CitreaInitializer";
-export * from "./chains/citrea/CitreaChainType";
-export * from "./chains/citrea/CitreaFees";
+export * from "./evm/btcrelay/headers/EVMBtcHeader";
+export * from "./evm/btcrelay/headers/EVMBtcStoredHeader";
+export * from "./evm/btcrelay/EVMBtcRelay";
+export * from "./evm/chain/EVMChainInterface";
+export * from "./evm/chain/EVMModule";
+export * from "./evm/chain/modules/EVMAddresses";
+export * from "./evm/chain/modules/EVMBlocks";
+export * from "./evm/chain/modules/EVMEvents";
+export * from "./evm/chain/modules/EVMFees";
+export * from "./evm/chain/modules/EVMSignatures";
+export * from "./evm/chain/modules/EVMTokens";
+export * from "./evm/chain/modules/EVMTransactions";
+export * from "./evm/contract/modules/EVMContractEvents";
+export * from "./evm/contract/EVMContractBase";
+export * from "./evm/contract/EVMContractModule";
+export * from "./evm/events/EVMChainEventsBrowser";
+export * from "./evm/spv_swap/EVMSpvVaultContract";
+export * from "./evm/spv_swap/EVMSpvWithdrawalData";
+export * from "./evm/spv_swap/EVMSpvVaultData";
+export * from "./evm/swaps/EVMSwapContract";
+export * from "./evm/swaps/EVMSwapData";
+export * from "./evm/swaps/EVMSwapModule";
+export * from "./evm/swaps/modules/EVMLpVault";
+export * from "./evm/swaps/modules/EVMSwapInit";
+export * from "./evm/swaps/modules/EVMSwapClaim";
+export * from "./evm/swaps/modules/EVMSwapRefund";
+export * from "./evm/swaps/handlers/IHandler";
+export * from "./evm/swaps/handlers/refund/TimelockRefundHandler";
+export * from "./evm/swaps/handlers/claim/ClaimHandlers";
+export * from "./evm/swaps/handlers/claim/HashlockClaimHandler";
+export * from "./evm/swaps/handlers/claim/btc/IBitcoinClaimHandler";
+export * from "./evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler";
+export * from "./evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler";
+export * from "./evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler";
+export * from "./evm/wallet/EVMSigner";
+export * from "./chains/citrea/CitreaInitializer";
+export * from "./chains/citrea/CitreaChainType";
+export * from "./chains/citrea/CitreaFees";

package/dist/index.js

@@ -1,54 +1,54 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./evm/btcrelay/headers/EVMBtcHeader"), exports);
-__exportStar(require("./evm/btcrelay/headers/EVMBtcStoredHeader"), exports);
-__exportStar(require("./evm/btcrelay/EVMBtcRelay"), exports);
-__exportStar(require("./evm/chain/EVMChainInterface"), exports);
-__exportStar(require("./evm/chain/EVMModule"), exports);
-__exportStar(require("./evm/chain/modules/EVMAddresses"), exports);
-__exportStar(require("./evm/chain/modules/EVMBlocks"), exports);
-__exportStar(require("./evm/chain/modules/EVMEvents"), exports);
-__exportStar(require("./evm/chain/modules/EVMFees"), exports);
-__exportStar(require("./evm/chain/modules/EVMSignatures"), exports);
-__exportStar(require("./evm/chain/modules/EVMTokens"), exports);
-__exportStar(require("./evm/chain/modules/EVMTransactions"), exports);
-__exportStar(require("./evm/contract/modules/EVMContractEvents"), exports);
-__exportStar(require("./evm/contract/EVMContractBase"), exports);
-__exportStar(require("./evm/contract/EVMContractModule"), exports);
-__exportStar(require("./evm/events/EVMChainEventsBrowser"), exports);
-__exportStar(require("./evm/spv_swap/EVMSpvVaultContract"), exports);
-__exportStar(require("./evm/spv_swap/EVMSpvWithdrawalData"), exports);
-__exportStar(require("./evm/spv_swap/EVMSpvVaultData"), exports);
-__exportStar(require("./evm/swaps/EVMSwapContract"), exports);
-__exportStar(require("./evm/swaps/EVMSwapData"), exports);
-__exportStar(require("./evm/swaps/EVMSwapModule"), exports);
-__exportStar(require("./evm/swaps/modules/EVMLpVault"), exports);
-__exportStar(require("./evm/swaps/modules/EVMSwapInit"), exports);
-__exportStar(require("./evm/swaps/modules/EVMSwapClaim"), exports);
-__exportStar(require("./evm/swaps/modules/EVMSwapRefund"), exports);
-__exportStar(require("./evm/swaps/handlers/IHandler"), exports);
-__exportStar(require("./evm/swaps/handlers/refund/TimelockRefundHandler"), exports);
-__exportStar(require("./evm/swaps/handlers/claim/ClaimHandlers"), exports);
-__exportStar(require("./evm/swaps/handlers/claim/HashlockClaimHandler"), exports);
-__exportStar(require("./evm/swaps/handlers/claim/btc/IBitcoinClaimHandler"), exports);
-__exportStar(require("./evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler"), exports);
-__exportStar(require("./evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler"), exports);
-__exportStar(require("./evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler"), exports);
-__exportStar(require("./evm/wallet/EVMSigner"), exports);
-__exportStar(require("./chains/citrea/CitreaInitializer"), exports);
-__exportStar(require("./chains/citrea/CitreaChainType"), exports);
-__exportStar(require("./chains/citrea/CitreaFees"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./evm/btcrelay/headers/EVMBtcHeader"), exports);
+__exportStar(require("./evm/btcrelay/headers/EVMBtcStoredHeader"), exports);
+__exportStar(require("./evm/btcrelay/EVMBtcRelay"), exports);
+__exportStar(require("./evm/chain/EVMChainInterface"), exports);
+__exportStar(require("./evm/chain/EVMModule"), exports);
+__exportStar(require("./evm/chain/modules/EVMAddresses"), exports);
+__exportStar(require("./evm/chain/modules/EVMBlocks"), exports);
+__exportStar(require("./evm/chain/modules/EVMEvents"), exports);
+__exportStar(require("./evm/chain/modules/EVMFees"), exports);
+__exportStar(require("./evm/chain/modules/EVMSignatures"), exports);
+__exportStar(require("./evm/chain/modules/EVMTokens"), exports);
+__exportStar(require("./evm/chain/modules/EVMTransactions"), exports);
+__exportStar(require("./evm/contract/modules/EVMContractEvents"), exports);
+__exportStar(require("./evm/contract/EVMContractBase"), exports);
+__exportStar(require("./evm/contract/EVMContractModule"), exports);
+__exportStar(require("./evm/events/EVMChainEventsBrowser"), exports);
+__exportStar(require("./evm/spv_swap/EVMSpvVaultContract"), exports);
+__exportStar(require("./evm/spv_swap/EVMSpvWithdrawalData"), exports);
+__exportStar(require("./evm/spv_swap/EVMSpvVaultData"), exports);
+__exportStar(require("./evm/swaps/EVMSwapContract"), exports);
+__exportStar(require("./evm/swaps/EVMSwapData"), exports);
+__exportStar(require("./evm/swaps/EVMSwapModule"), exports);
+__exportStar(require("./evm/swaps/modules/EVMLpVault"), exports);
+__exportStar(require("./evm/swaps/modules/EVMSwapInit"), exports);
+__exportStar(require("./evm/swaps/modules/EVMSwapClaim"), exports);
+__exportStar(require("./evm/swaps/modules/EVMSwapRefund"), exports);
+__exportStar(require("./evm/swaps/handlers/IHandler"), exports);
+__exportStar(require("./evm/swaps/handlers/refund/TimelockRefundHandler"), exports);
+__exportStar(require("./evm/swaps/handlers/claim/ClaimHandlers"), exports);
+__exportStar(require("./evm/swaps/handlers/claim/HashlockClaimHandler"), exports);
+__exportStar(require("./evm/swaps/handlers/claim/btc/IBitcoinClaimHandler"), exports);
+__exportStar(require("./evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler"), exports);
+__exportStar(require("./evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler"), exports);
+__exportStar(require("./evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler"), exports);
+__exportStar(require("./evm/wallet/EVMSigner"), exports);
+__exportStar(require("./chains/citrea/CitreaInitializer"), exports);
+__exportStar(require("./chains/citrea/CitreaChainType"), exports);
+__exportStar(require("./chains/citrea/CitreaFees"), exports);

package/dist/utils/Utils.d.ts

@@ -1,15 +1,15 @@
-export type LoggerType = {
-    debug: (msg: string, ...args: any[]) => void;
-    info: (msg: string, ...args: any[]) => void;
-    warn: (msg: string, ...args: any[]) => void;
-    error: (msg: string, ...args: any[]) => void;
-};
-export declare function timeoutPromise(timeoutMillis: number, abortSignal?: AbortSignal): Promise<void>;
-export declare function onceAsync<T>(executor: () => Promise<T>): () => Promise<T>;
-export declare function getLogger(prefix: string): LoggerType;
-export declare function tryWithRetries<T>(func: () => Promise<T>, retryPolicy?: {
-    maxRetries?: number;
-    delay?: number;
-    exponential?: boolean;
-}, errorAllowed?: (e: any) => boolean, abortSignal?: AbortSignal): Promise<T>;
-export declare function uint32ReverseEndianness(value: number): number;
+export type LoggerType = {
+    debug: (msg: string, ...args: any[]) => void;
+    info: (msg: string, ...args: any[]) => void;
+    warn: (msg: string, ...args: any[]) => void;
+    error: (msg: string, ...args: any[]) => void;
+};
+export declare function timeoutPromise(timeoutMillis: number, abortSignal?: AbortSignal): Promise<void>;
+export declare function onceAsync<T>(executor: () => Promise<T>): () => Promise<T>;
+export declare function getLogger(prefix: string): LoggerType;
+export declare function tryWithRetries<T>(func: () => Promise<T>, retryPolicy?: {
+    maxRetries?: number;
+    delay?: number;
+    exponential?: boolean;
+}, errorAllowed?: (e: any) => boolean, abortSignal?: AbortSignal): Promise<T>;
+export declare function uint32ReverseEndianness(value: number): number;

package/dist/utils/Utils.js

@@ -1,71 +1,71 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uint32ReverseEndianness = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = void 0;
-function timeoutPromise(timeoutMillis, abortSignal) {
-    return new Promise((resolve, reject) => {
-        const timeout = setTimeout(resolve, timeoutMillis);
-        if (abortSignal != null)
-            abortSignal.addEventListener("abort", () => {
-                clearTimeout(timeout);
-                reject(new Error("Aborted"));
-            });
-    });
-}
-exports.timeoutPromise = timeoutPromise;
-function onceAsync(executor) {
-    let promise;
-    return () => {
-        if (promise == null) {
-            promise = executor();
-            return promise;
-        }
-        else {
-            return promise.catch(() => promise = executor());
-        }
-    };
-}
-exports.onceAsync = onceAsync;
-function getLogger(prefix) {
-    return {
-        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug(prefix + msg, ...args),
-        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info(prefix + msg, ...args),
-        warn: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 1) && console.warn(prefix + msg, ...args),
-        error: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 0) && console.error(prefix + msg, ...args)
-    };
-}
-exports.getLogger = getLogger;
-const logger = getLogger("Utils: ");
-async function tryWithRetries(func, retryPolicy, errorAllowed, abortSignal) {
-    retryPolicy = retryPolicy || {};
-    retryPolicy.maxRetries = retryPolicy.maxRetries || 5;
-    retryPolicy.delay = retryPolicy.delay || 500;
-    retryPolicy.exponential = retryPolicy.exponential == null ? true : retryPolicy.exponential;
-    let err = null;
-    for (let i = 0; i < retryPolicy.maxRetries; i++) {
-        try {
-            const resp = await func();
-            return resp;
-        }
-        catch (e) {
-            if (errorAllowed != null && errorAllowed(e))
-                throw e;
-            err = e;
-            logger.error("tryWithRetries(): error on try number: " + i, e);
-        }
-        if (abortSignal != null && abortSignal.aborted)
-            throw new Error("Aborted");
-        if (i !== retryPolicy.maxRetries - 1) {
-            await timeoutPromise(retryPolicy.exponential ? retryPolicy.delay * Math.pow(2, i) : retryPolicy.delay, abortSignal);
-        }
-    }
-    throw err;
-}
-exports.tryWithRetries = tryWithRetries;
-function uint32ReverseEndianness(value) {
-    const valueBN = BigInt(value);
-    return Number(((valueBN & 0xffn) << 24n) |
-        ((valueBN & 0xff00n) << 8n) |
-        ((valueBN >> 8n) & 0xff00n) |
-        ((valueBN >> 24n) & 0xffn));
-}
-exports.uint32ReverseEndianness = uint32ReverseEndianness;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uint32ReverseEndianness = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = void 0;
+function timeoutPromise(timeoutMillis, abortSignal) {
+    return new Promise((resolve, reject) => {
+        const timeout = setTimeout(resolve, timeoutMillis);
+        if (abortSignal != null)
+            abortSignal.addEventListener("abort", () => {
+                clearTimeout(timeout);
+                reject(new Error("Aborted"));
+            });
+    });
+}
+exports.timeoutPromise = timeoutPromise;
+function onceAsync(executor) {
+    let promise;
+    return () => {
+        if (promise == null) {
+            promise = executor();
+            return promise;
+        }
+        else {
+            return promise.catch(() => promise = executor());
+        }
+    };
+}
+exports.onceAsync = onceAsync;
+function getLogger(prefix) {
+    return {
+        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug(prefix + msg, ...args),
+        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info(prefix + msg, ...args),
+        warn: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 1) && console.warn(prefix + msg, ...args),
+        error: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 0) && console.error(prefix + msg, ...args)
+    };
+}
+exports.getLogger = getLogger;
+const logger = getLogger("Utils: ");
+async function tryWithRetries(func, retryPolicy, errorAllowed, abortSignal) {
+    retryPolicy = retryPolicy || {};
+    retryPolicy.maxRetries = retryPolicy.maxRetries || 5;
+    retryPolicy.delay = retryPolicy.delay || 500;
+    retryPolicy.exponential = retryPolicy.exponential == null ? true : retryPolicy.exponential;
+    let err = null;
+    for (let i = 0; i < retryPolicy.maxRetries; i++) {
+        try {
+            const resp = await func();
+            return resp;
+        }
+        catch (e) {
+            if (errorAllowed != null && errorAllowed(e))
+                throw e;
+            err = e;
+            logger.error("tryWithRetries(): error on try number: " + i, e);
+        }
+        if (abortSignal != null && abortSignal.aborted)
+            throw new Error("Aborted");
+        if (i !== retryPolicy.maxRetries - 1) {
+            await timeoutPromise(retryPolicy.exponential ? retryPolicy.delay * Math.pow(2, i) : retryPolicy.delay, abortSignal);
+        }
+    }
+    throw err;
+}
+exports.tryWithRetries = tryWithRetries;
+function uint32ReverseEndianness(value) {
+    const valueBN = BigInt(value);
+    return Number(((valueBN & 0xffn) << 24n) |
+        ((valueBN & 0xff00n) << 8n) |
+        ((valueBN >> 8n) & 0xff00n) |
+        ((valueBN >> 24n) & 0xffn));
+}
+exports.uint32ReverseEndianness = uint32ReverseEndianness;

package/package.json

@@ -1,37 +1,37 @@
-{
-  "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.35",
-  "description": "EVM specific base implementation",
-  "main": "./dist/index.js",
-  "types:": "./dist/index.d.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "files": [
-    "/dist",
-    "/src"
-  ],
-  "keywords": [
-    "EVM",
-    "Ethereum",
-    "Bitcoin",
-    "Cross-chain",
-    "Cryptocurrency",
-    "Bridge",
-    "Trustless"
-  ],
-  "author": "adambor",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "@atomiqlabs/base": "^10.0.0-dev.8",
-    "@noble/hashes": "^1.8.0",
-    "@scure/btc-signer": "1.6.0",
-    "buffer": "6.0.3"
-  },
-  "peerDependencies": {
-    "ethers": "^6.15.0"
-  },
-  "devDependencies": {
-    "typescript": "^5.8.3"
-  }
-}
+{
+  "name": "@atomiqlabs/chain-evm",
+  "version": "1.0.0-dev.37",
+  "description": "EVM specific base implementation",
+  "main": "./dist/index.js",
+  "types:": "./dist/index.d.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "files": [
+    "/dist",
+    "/src"
+  ],
+  "keywords": [
+    "EVM",
+    "Ethereum",
+    "Bitcoin",
+    "Cross-chain",
+    "Cryptocurrency",
+    "Bridge",
+    "Trustless"
+  ],
+  "author": "adambor",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@atomiqlabs/base": "^10.0.0-dev.8",
+    "@noble/hashes": "^1.8.0",
+    "@scure/btc-signer": "1.6.0",
+    "buffer": "6.0.3"
+  },
+  "peerDependencies": {
+    "ethers": "^6.15.0"
+  },
+  "devDependencies": {
+    "typescript": "^5.8.3"
+  }
+}

package/src/chains/citrea/CitreaBtcRelay.ts

@@ -1,58 +1,58 @@
-import {EVMBtcRelay} from "../../evm/btcrelay/EVMBtcRelay";
-import {BtcBlock} from "@atomiqlabs/base";
-import {getLogger} from "../../utils/Utils";
-import {CitreaFees} from "./CitreaFees";
-
-const logger = getLogger("CitreaBtcRelay: ");
-
-export class CitreaBtcRelay<B extends BtcBlock> extends EVMBtcRelay<B> {
-
-    public static StateDiffSize = {
-        STATE_DIFF_PER_BLOCKHEADER: 22,
-        STATE_DIFF_BASE: 30
-    }
-
-    /**
-     * Estimate required synchronization fee (worst case) to synchronize btc relay to the required blockheight
-     *
-     * @param requiredBlockheight
-     * @param feeRate
-     */
-    public async estimateSynchronizeFee(requiredBlockheight: number, feeRate?: string): Promise<bigint> {
-        feeRate ??= await this.Chain.Fees.getFeeRate();
-        const tipData = await this.getTipData();
-        const currBlockheight = tipData.blockheight;
-
-        const blockheightDelta = requiredBlockheight-currBlockheight;
-
-        if(blockheightDelta<=0) return 0n;
-
-        const numTxs = Math.ceil(blockheightDelta / this.maxHeadersPerTx);
-
-        const synchronizationFee = (BigInt(blockheightDelta) * await this.getFeePerBlock(feeRate))
-            + CitreaFees.getGasFee(
-                EVMBtcRelay.GasCosts.GAS_BASE_MAIN * numTxs,
-                feeRate,
-                CitreaBtcRelay.StateDiffSize.STATE_DIFF_BASE * numTxs
-            );
-        logger.debug("estimateSynchronizeFee(): required blockheight: "+requiredBlockheight+
-            " blockheight delta: "+blockheightDelta+" fee: "+synchronizationFee.toString(10));
-
-        return synchronizationFee;
-    }
-
-    /**
-     * Returns fee required (in native token) to synchronize a single block to btc relay
-     *
-     * @param feeRate
-     */
-    public async getFeePerBlock(feeRate?: string): Promise<bigint> {
-        feeRate ??= await this.Chain.Fees.getFeeRate();
-        return CitreaFees.getGasFee(
-            EVMBtcRelay.GasCosts.GAS_PER_BLOCKHEADER,
-            feeRate,
-            CitreaBtcRelay.StateDiffSize.STATE_DIFF_PER_BLOCKHEADER
-        );
-    }
-
+import {EVMBtcRelay} from "../../evm/btcrelay/EVMBtcRelay";
+import {BtcBlock} from "@atomiqlabs/base";
+import {getLogger} from "../../utils/Utils";
+import {CitreaFees} from "./CitreaFees";
+
+const logger = getLogger("CitreaBtcRelay: ");
+
+export class CitreaBtcRelay<B extends BtcBlock> extends EVMBtcRelay<B> {
+
+    public static StateDiffSize = {
+        STATE_DIFF_PER_BLOCKHEADER: 22,
+        STATE_DIFF_BASE: 30
+    }
+
+    /**
+     * Estimate required synchronization fee (worst case) to synchronize btc relay to the required blockheight
+     *
+     * @param requiredBlockheight
+     * @param feeRate
+     */
+    public async estimateSynchronizeFee(requiredBlockheight: number, feeRate?: string): Promise<bigint> {
+        feeRate ??= await this.Chain.Fees.getFeeRate();
+        const tipData = await this.getTipData();
+        const currBlockheight = tipData.blockheight;
+
+        const blockheightDelta = requiredBlockheight-currBlockheight;
+
+        if(blockheightDelta<=0) return 0n;
+
+        const numTxs = Math.ceil(blockheightDelta / this.maxHeadersPerTx);
+
+        const synchronizationFee = (BigInt(blockheightDelta) * await this.getFeePerBlock(feeRate))
+            + CitreaFees.getGasFee(
+                EVMBtcRelay.GasCosts.GAS_BASE_MAIN * numTxs,
+                feeRate,
+                CitreaBtcRelay.StateDiffSize.STATE_DIFF_BASE * numTxs
+            );
+        logger.debug("estimateSynchronizeFee(): required blockheight: "+requiredBlockheight+
+            " blockheight delta: "+blockheightDelta+" fee: "+synchronizationFee.toString(10));
+
+        return synchronizationFee;
+    }
+
+    /**
+     * Returns fee required (in native token) to synchronize a single block to btc relay
+     *
+     * @param feeRate
+     */
+    public async getFeePerBlock(feeRate?: string): Promise<bigint> {
+        feeRate ??= await this.Chain.Fees.getFeeRate();
+        return CitreaFees.getGasFee(
+            EVMBtcRelay.GasCosts.GAS_PER_BLOCKHEADER,
+            feeRate,
+            CitreaBtcRelay.StateDiffSize.STATE_DIFF_PER_BLOCKHEADER
+        );
+    }
+
 }

package/src/chains/citrea/CitreaChainType.ts

@@ -1,28 +1,28 @@
-import {ChainType} from "@atomiqlabs/base";
-import {EVMPreFetchVerification} from "../../evm/swaps/modules/EVMSwapInit";
-import {EVMTx} from "../../evm/chain/modules/EVMTransactions";
-import {EVMSigner} from "../../evm/wallet/EVMSigner";
-import {EVMSwapData} from "../../evm/swaps/EVMSwapData";
-import {EVMChainInterface} from "../../evm/chain/EVMChainInterface";
-import {EVMChainEventsBrowser} from "../../evm/events/EVMChainEventsBrowser";
-import { EVMSpvVaultData } from "../../evm/spv_swap/EVMSpvVaultData";
-import { EVMSpvWithdrawalData } from "../../evm/spv_swap/EVMSpvWithdrawalData";
-import {CitreaSwapContract} from "./CitreaSwapContract";
-import {CitreaBtcRelay} from "./CitreaBtcRelay";
-import {CitreaSpvVaultContract} from "./CitreaSpvVaultContract";
-
-export type CitreaChainType = ChainType<
-    "CITREA",
-    never,
-    EVMPreFetchVerification,
-    EVMTx,
-    EVMSigner,
-    EVMSwapData,
-    CitreaSwapContract,
-    EVMChainInterface<"CITREA", 5115>,
-    EVMChainEventsBrowser,
-    CitreaBtcRelay<any>,
-    EVMSpvVaultData,
-    EVMSpvWithdrawalData,
-    CitreaSpvVaultContract
->;
+import {ChainType} from "@atomiqlabs/base";
+import {EVMPreFetchVerification} from "../../evm/swaps/modules/EVMSwapInit";
+import {EVMTx} from "../../evm/chain/modules/EVMTransactions";
+import {EVMSigner} from "../../evm/wallet/EVMSigner";
+import {EVMSwapData} from "../../evm/swaps/EVMSwapData";
+import {EVMChainInterface} from "../../evm/chain/EVMChainInterface";
+import {EVMChainEventsBrowser} from "../../evm/events/EVMChainEventsBrowser";
+import { EVMSpvVaultData } from "../../evm/spv_swap/EVMSpvVaultData";
+import { EVMSpvWithdrawalData } from "../../evm/spv_swap/EVMSpvWithdrawalData";
+import {CitreaSwapContract} from "./CitreaSwapContract";
+import {CitreaBtcRelay} from "./CitreaBtcRelay";
+import {CitreaSpvVaultContract} from "./CitreaSpvVaultContract";
+
+export type CitreaChainType = ChainType<
+    "CITREA",
+    never,
+    EVMPreFetchVerification,
+    EVMTx,
+    EVMSigner,
+    EVMSwapData,
+    CitreaSwapContract,
+    EVMChainInterface<"CITREA", 5115>,
+    EVMChainEventsBrowser,
+    CitreaBtcRelay<any>,
+    EVMSpvVaultData,
+    EVMSpvWithdrawalData,
+    CitreaSpvVaultContract
+>;