@atomiqlabs/chain-evm 2.0.9 → 2.1.10

package/dist/chains/alpen/AlpenInitializer.d.ts

@@ -22,6 +22,7 @@ export type AlpenOptions = {
     retryPolicy?: EVMRetryPolicy;
     chainType?: "MAINNET" | "TESTNET" | "TESTNET4";
     swapContract?: string;
+    swapContractDeploymentHeight?: number;
     btcRelayContract?: string;
     btcRelayDeploymentHeight?: number;
     spvVaultContract?: string;
@@ -35,7 +36,7 @@ export type AlpenOptions = {
         };
     };
     fees?: EVMFees;
-    evmConfig?: Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag">;
+    evmConfig?: Partial<Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag" | "finalityCheckStrategy">>;
 };
 /**
  * Initialize Alpen chain integration

package/dist/chains/alpen/AlpenInitializer.js

@@ -21,6 +21,7 @@ const AlpenContractAddresses = {
     MAINNET: {
         executionContract: "",
         swapContract: "",
+        swapContractDeploymentHeight: 0,
         btcRelayContract: "",
         btcRelayDeploymentHeight: 0,
         spvVaultContract: "",
@@ -40,6 +41,7 @@ const AlpenContractAddresses = {
     TESTNET: {
         executionContract: "0x32EB4DbDdC31e19ba908fecc7cae03F0d04F01Fa",
         swapContract: "0x2920EE496693A5027249a027A6FD3F643E743745",
+        swapContractDeploymentHeight: 532614,
         btcRelayContract: "0x59A54378B6bA9C21ba66487C6A701D702baDEabE",
         btcRelayDeploymentHeight: 532610,
         spvVaultContract: "0xaB2D14745362B26a732dD8B7F95daAE3D2914bBF",
@@ -59,6 +61,7 @@ const AlpenContractAddresses = {
     TESTNET4: {
         executionContract: "0xa2698D2fBE3f7c74cCca428a5fd968411644C641",
         swapContract: "0xb0226bAC3BD30179fb66A43cEA212AbBC988e004",
+        swapContractDeploymentHeight: 843614,
         btcRelayContract: "0xfFA842529977a40A3fdb988cdDC9CB5c39bAcF26",
         btcRelayDeploymentHeight: 843611,
         spvVaultContract: "0x62a718348081F9CF9a8E3dF4B4EA6d6349991ad9",
@@ -128,7 +131,7 @@ function initializeAlpen(options, bitcoinRpc, network) {
             ...defaultContractAddresses.handlerContracts.claim,
             ...options?.handlerContracts?.claim
         }
-    });
+    }, options.swapContractDeploymentHeight ?? defaultContractAddresses.swapContractDeploymentHeight);
     const spvVaultContract = new EVMSpvVaultContract_1.EVMSpvVaultContract(chainInterface, btcRelay, bitcoinRpc, options.spvVaultContract ?? defaultContractAddresses.spvVaultContract, options.spvVaultDeploymentHeight ?? defaultContractAddresses.spvVaultDeploymentHeight);
     const chainEvents = new EVMChainEventsBrowser_1.EVMChainEventsBrowser(chainInterface, swapContract, spvVaultContract);
     return {

package/dist/chains/botanix/BotanixInitializer.d.ts

@@ -22,6 +22,7 @@ export type BotanixOptions = {
     retryPolicy?: EVMRetryPolicy;
     chainType?: "MAINNET" | "TESTNET";
     swapContract?: string;
+    swapContractDeploymentHeight?: number;
     btcRelayContract?: string;
     btcRelayDeploymentHeight?: number;
     spvVaultContract?: string;
@@ -35,7 +36,7 @@ export type BotanixOptions = {
         };
     };
     fees?: EVMFees;
-    evmConfig?: Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag">;
+    evmConfig?: Partial<Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag" | "finalityCheckStrategy">>;
 };
 /**
  * Initialize Botanix chain integration

package/dist/chains/botanix/BotanixInitializer.js

@@ -20,6 +20,7 @@ const BotanixContractAddresses = {
     MAINNET: {
         executionContract: "0x71Bc44F3F7203fC1279107D924e418F02b0d4029",
         swapContract: "0x9a027B5Bf43382Cc4A5134d9EFD389f61ece27B9",
+        swapContractDeploymentHeight: 2320403,
         btcRelayContract: "0xe8be24CF21341c9567664009a8a82C9Dc1eE90D6",
         btcRelayDeploymentHeight: 2320400,
         spvVaultContract: "0xe510D5781C6C849284Fb25Dc20b1684cEC445C8B",
@@ -39,6 +40,7 @@ const BotanixContractAddresses = {
     TESTNET: {
         executionContract: "0xe510D5781C6C849284Fb25Dc20b1684cEC445C8B",
         swapContract: "0xfFA842529977a40A3fdb988cdDC9CB5c39bAcF26",
+        swapContractDeploymentHeight: 4173454,
         btcRelayContract: "0xba7E78011909e3501027FBc226a04DCC837a555D",
         btcRelayDeploymentHeight: 3462466,
         spvVaultContract: "0x9a027B5Bf43382Cc4A5134d9EFD389f61ece27B9",
@@ -111,7 +113,7 @@ function initializeBotanix(options, bitcoinRpc, network) {
             ...defaultContractAddresses.handlerContracts.claim,
             ...options?.handlerContracts?.claim
         }
-    });
+    }, options.swapContractDeploymentHeight ?? defaultContractAddresses.swapContractDeploymentHeight);
     const spvVaultContract = new EVMSpvVaultContract_1.EVMSpvVaultContract(chainInterface, btcRelay, bitcoinRpc, options.spvVaultContract ?? defaultContractAddresses.spvVaultContract, options.spvVaultDeploymentHeight ?? defaultContractAddresses.spvVaultDeploymentHeight);
     const chainEvents = new EVMChainEventsBrowser_1.EVMChainEventsBrowser(chainInterface, swapContract, spvVaultContract);
     return {

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

@@ -22,6 +22,7 @@ export type CitreaOptions = {
     retryPolicy?: EVMRetryPolicy;
     chainType?: "MAINNET" | "TESTNET4";
     swapContract?: string;
+    swapContractDeploymentHeight?: number;
     btcRelayContract?: string;
     btcRelayDeploymentHeight?: number;
     spvVaultContract?: string;
@@ -35,7 +36,7 @@ export type CitreaOptions = {
         };
     };
     fees?: CitreaFees;
-    evmConfig?: Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag">;
+    evmConfig?: Partial<Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag" | "finalityCheckStrategy">>;
 };
 /**
  * Initialize Citrea chain integration

package/dist/chains/citrea/CitreaInitializer.js

@@ -21,6 +21,7 @@ const CitreaContractAddresses = {
     MAINNET: {
         executionContract: "0x6a373b6Adad83964727bA0fa15E22Be05173fc12",
         swapContract: "0xc98Ef084d3911C8447DBbE4dDa18bC2c9bB0584e",
+        swapContractDeploymentHeight: 2452632,
         btcRelayContract: "0x11ac854A68830d61af975063c91602f878C36fA6",
         btcRelayDeploymentHeight: 2452629,
         spvVaultContract: "0x5bb0C725939cB825d1322A99a3FeB570097628c3",
@@ -40,6 +41,7 @@ const CitreaContractAddresses = {
     TESTNET4: {
         executionContract: "0x9e289512965A0842b342A6BB3F3c41F22a555Cfe",
         swapContract: "0xBbf7755b674dD107d59F0650D1A3fA9C60bf6Fe6",
+        swapContractDeploymentHeight: 12346224,
         btcRelayContract: "0x00D122E9f9766cd81a38D2dd44f9AFfb94c67Af7",
         btcRelayDeploymentHeight: 12346223,
         spvVaultContract: "0x9Bf990C6088F716279797a602b05941c40591533",
@@ -121,7 +123,7 @@ function initializeCitrea(options, bitcoinRpc, network) {
             ...defaultContractAddresses.handlerContracts.claim,
             ...options?.handlerContracts?.claim
         }
-    });
+    }, options.swapContractDeploymentHeight ?? defaultContractAddresses.swapContractDeploymentHeight);
     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 {

package/dist/chains/goat/GoatInitializer.d.ts

@@ -22,6 +22,7 @@ export type GoatOptions = {
     retryPolicy?: EVMRetryPolicy;
     chainType?: "MAINNET" | "TESTNET" | "TESTNET4";
     swapContract?: string;
+    swapContractDeploymentHeight?: number;
     btcRelayContract?: string;
     btcRelayDeploymentHeight?: number;
     spvVaultContract?: string;
@@ -35,7 +36,7 @@ export type GoatOptions = {
         };
     };
     fees?: EVMFees;
-    evmConfig?: Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag">;
+    evmConfig?: Partial<Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag" | "finalityCheckStrategy">>;
 };
 /**
  * Initialize GOAT Network chain integration

package/dist/chains/goat/GoatInitializer.js

@@ -21,6 +21,7 @@ const GoatContractAddresses = {
     MAINNET: {
         executionContract: "",
         swapContract: "",
+        swapContractDeploymentHeight: 0,
         btcRelayContract: "",
         btcRelayDeploymentHeight: 0,
         spvVaultContract: "",
@@ -40,6 +41,7 @@ const GoatContractAddresses = {
     TESTNET: {
         executionContract: "0xe8be24CF21341c9567664009a8a82C9Dc1eE90D6",
         swapContract: "0xe510D5781C6C849284Fb25Dc20b1684cEC445C8B",
+        swapContractDeploymentHeight: 9368978,
         btcRelayContract: "0x3887B02217726bB36958Dd595e57293fB63D5082",
         btcRelayDeploymentHeight: 9368975,
         spvVaultContract: "0x71Bc44F3F7203fC1279107D924e418F02b0d4029",
@@ -59,6 +61,7 @@ const GoatContractAddresses = {
     TESTNET4: {
         executionContract: "0x4f7d86C870F28ac30C8fa864Ee04264D7dD03847",
         swapContract: "0x3FbbA0eb82cf1247cbf92B3D51641226310F0Ca5",
+        swapContractDeploymentHeight: 10240371,
         btcRelayContract: "0xEeD58871C24d24C49554aF8B65Dd86eD8ed778D3",
         btcRelayDeploymentHeight: 10240368,
         spvVaultContract: "0x8a80A68f8bA1732015A821b5260fEF8040a844b7",
@@ -138,7 +141,7 @@ function initializeGoat(options, bitcoinRpc, network) {
             ...defaultContractAddresses.handlerContracts.claim,
             ...options?.handlerContracts?.claim
         }
-    });
+    }, options.swapContractDeploymentHeight ?? defaultContractAddresses.swapContractDeploymentHeight);
     const spvVaultContract = new EVMSpvVaultContract_1.EVMSpvVaultContract(chainInterface, btcRelay, bitcoinRpc, options.spvVaultContract ?? defaultContractAddresses.spvVaultContract, options.spvVaultDeploymentHeight ?? defaultContractAddresses.spvVaultDeploymentHeight);
     const chainEvents = new EVMChainEventsBrowser_1.EVMChainEventsBrowser(chainInterface, swapContract, spvVaultContract);
     return {

package/dist/evm/contract/modules/EVMContractEvents.js

@@ -2,6 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EVMContractEvents = void 0;
 const EVMEvents_1 = require("../../chain/modules/EVMEvents");
+function normalizeTopic(topic) {
+    if (topic.length !== 66) {
+        return "0x" + topic.substring(2).padStart(64, "0");
+    }
+    return topic;
+}
 class EVMContractEvents extends EVMEvents_1.EVMEvents {
     constructor(chainInterface, contract) {
         super(chainInterface);
@@ -17,7 +23,7 @@ class EVMContractEvents extends EVMEvents_1.EVMEvents {
             return this.baseContract.getEvent(name).fragment.topicHash;
         }));
         if (keys != null)
-            keys.forEach(key => filterArray.push(key));
+            keys.forEach(key => filterArray.push(typeof (key) === "string" ? [normalizeTopic(key)] : Array.isArray(key) ? key.map(normalizeTopic) : key));
         return filterArray;
     }
     /**

package/dist/evm/events/EVMChainEventsBrowser.d.ts

@@ -1,5 +1,4 @@
 import { ChainEvents, ClaimEvent, EventListener, InitializeEvent, RefundEvent, SpvVaultClaimEvent, SpvVaultCloseEvent, SpvVaultDepositEvent, SpvVaultFrontEvent, SpvVaultOpenEvent } from "@atomiqlabs/base";
-import { IClaimHandler } from "../swaps/handlers/claim/ClaimHandlers";
 import { EVMSwapData } from "../swaps/EVMSwapData";
 import { Block, JsonRpcApiProvider, EventFilter, Log } from "ethers";
 import { EVMSwapContract } from "../swaps/EVMSwapContract";
@@ -8,7 +7,6 @@ import { EVMChainInterface } from "../chain/EVMChainInterface";
 import { TypedEventLog } from "../typechain/common";
 import { EscrowManager } from "../swaps/EscrowManagerTypechain";
 import { SpvVaultManager } from "../spv_swap/SpvVaultContractTypechain";
-import { EVMTxTrace } from "../chain/modules/EVMTransactions";
 export type EVMEventListenerState = {
     lastBlockNumber: number;
     lastEvent?: {
@@ -45,7 +43,6 @@ export declare class EVMChainEventsBrowser implements ChainEvents<EVMSwapData, E
     constructor(chainInterface: EVMChainInterface, evmSwapContract: EVMSwapContract, evmSpvVaultContract: EVMSpvVaultContract<any>, pollIntervalSeconds?: number);
     private addProcessedEvent;
     private isEventProcessed;
-    findInitSwapData(call: EVMTxTrace, escrowHash: string, claimHandler: IClaimHandler<any, any>): EVMSwapData | null;
     /**
      * Returns async getter for fetching on-demand initialize event swap data
      *

package/dist/evm/events/EVMChainEventsBrowser.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EVMChainEventsBrowser = void 0;
 const base_1 = require("@atomiqlabs/base");
-const EVMSwapData_1 = require("../swaps/EVMSwapData");
-const ethers_1 = require("ethers");
 const Utils_1 = require("../../utils/Utils");
 const EVMSpvVaultContract_1 = require("../spv_swap/EVMSpvVaultContract");
 const LOGS_SLIDING_WINDOW_LENGTH = 60;
@@ -45,30 +43,6 @@ class EVMChainEventsBrowser {
     isEventProcessed(event) {
         return this.processedEvents.includes(event.transactionHash + ":" + event.index);
     }
-    findInitSwapData(call, escrowHash, claimHandler) {
-        if (call.to.toLowerCase() === this.evmSwapContract.contractAddress.toLowerCase()) {
-            const _result = this.evmSwapContract.parseCalldata(call.input);
-            if (_result != null && _result.name === "initialize") {
-                const result = _result;
-                //Found, check correct escrow hash
-                const [escrowData, signature, timeout, extraData] = result.args;
-                const escrow = EVMSwapData_1.EVMSwapData.deserializeFromStruct(escrowData, claimHandler);
-                if ("0x" + escrow.getEscrowHash() === escrowHash) {
-                    const extraDataHex = (0, ethers_1.hexlify)(extraData);
-                    if (extraDataHex.length > 2) {
-                        escrow.setExtraData(extraDataHex.substring(2));
-                    }
-                    return escrow;
-                }
-            }
-        }
-        for (let _call of call.calls) {
-            const found = this.findInitSwapData(_call, escrowHash, claimHandler);
-            if (found != null)
-                return found;
-        }
-        return null;
-    }
     /**
      * Returns async getter for fetching on-demand initialize event swap data
      *
@@ -82,7 +56,7 @@ class EVMChainEventsBrowser {
             const trace = await this.chainInterface.Transactions.traceTransaction(event.transactionHash);
             if (trace == null)
                 return null;
-            return this.findInitSwapData(trace, event.args.escrowHash, claimHandler);
+            return this.evmSwapContract.findInitSwapData(trace, event.args.escrowHash, claimHandler);
         };
     }
     parseInitializeEvent(event) {

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { BitcoinRpc, BtcTx, RelaySynchronizer, SpvVaultContract, SpvVaultTokenData, SpvWithdrawalState, SpvWithdrawalTransactionData, TransactionConfirmationOptions } from "@atomiqlabs/base";
+import { BitcoinRpc, BtcTx, RelaySynchronizer, SpvVaultContract, SpvVaultTokenData, SpvWithdrawalClaimedState, SpvWithdrawalFrontedState, SpvWithdrawalState, SpvWithdrawalTransactionData, TransactionConfirmationOptions } from "@atomiqlabs/base";
 import { Buffer } from "buffer";
 import { EVMTx } from "../chain/modules/EVMTransactions";
 import { EVMContractBase } from "../contract/EVMContractBase";
@@ -112,6 +112,12 @@ export declare class EVMSpvVaultContract<ChainId extends string> extends EVMCont
     }[]): Promise<{
         [btcTxId: string]: SpvWithdrawalState;
     }>;
+    getHistoricalWithdrawalStates(recipient: string, startBlockheight?: number): Promise<{
+        withdrawals: {
+            [btcTxId: string]: SpvWithdrawalClaimedState | SpvWithdrawalFrontedState;
+        };
+        latestBlockheight?: number;
+    }>;
     /**
      * @inheritDoc
      */

package/dist/evm/spv_swap/EVMSpvVaultContract.js

@@ -264,32 +264,47 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
                 const [ownerFront, vaultIdFront] = unpackOwnerAndVaultId(frontedEvent.args.ownerAndVaultId);
                 return {
                     type: base_1.SpvWithdrawalStateType.FRONTED,
-                    txId: event.transactionHash,
+                    btcTxId: buffer_1.Buffer.from(frontedEvent.args.btcTxHash.substring(2), "hex").reverse().toString("hex"),
                     owner: ownerFront,
                     vaultId: vaultIdFront,
                     recipient: frontedEvent.args.recipient,
-                    fronter: frontedEvent.args.caller
+                    fronter: frontedEvent.args.caller,
+                    txId: event.transactionHash,
+                    getTxBlock: async () => ({
+                        blockHeight: event.blockNumber,
+                        blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                    })
                 };
             case "Claimed":
                 const claimedEvent = event;
                 const [ownerClaim, vaultIdClaim] = unpackOwnerAndVaultId(claimedEvent.args.ownerAndVaultId);
                 return {
                     type: base_1.SpvWithdrawalStateType.CLAIMED,
-                    txId: event.transactionHash,
+                    btcTxId: buffer_1.Buffer.from(claimedEvent.args.btcTxHash.substring(2), "hex").reverse().toString("hex"),
                     owner: ownerClaim,
                     vaultId: vaultIdClaim,
                     recipient: claimedEvent.args.recipient,
                     claimer: claimedEvent.args.caller,
-                    fronter: claimedEvent.args.frontingAddress
+                    fronter: claimedEvent.args.frontingAddress,
+                    txId: event.transactionHash,
+                    getTxBlock: async () => ({
+                        blockHeight: event.blockNumber,
+                        blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                    })
                 };
             case "Closed":
                 const closedEvent = event;
                 return {
                     type: base_1.SpvWithdrawalStateType.CLOSED,
-                    txId: event.transactionHash,
+                    btcTxId: buffer_1.Buffer.from(closedEvent.args.btcTxHash.substring(2), "hex").reverse().toString("hex"),
                     owner: closedEvent.args.owner,
                     vaultId: closedEvent.args.vaultId,
-                    error: closedEvent.args.error
+                    error: closedEvent.args.error,
+                    txId: event.transactionHash,
+                    getTxBlock: async () => ({
+                        blockHeight: event.blockNumber,
+                        blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                    })
                 };
             default:
                 return null;
@@ -398,6 +413,20 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
         }
         return result;
     }
+    async getHistoricalWithdrawalStates(recipient, startBlockheight) {
+        const { height: latestBlockheight } = await this.Chain.getFinalizedBlock();
+        const withdrawals = {};
+        await this.Events.findInContractEventsForward(["Claimed", "Fronted"], [null, recipient], async (_event) => {
+            const eventResult = this.parseWithdrawalEvent(_event);
+            if (eventResult == null || eventResult.type === base_1.SpvWithdrawalStateType.CLOSED)
+                return null;
+            withdrawals[eventResult.btcTxId] = eventResult;
+        }, startBlockheight);
+        return {
+            withdrawals,
+            latestBlockheight
+        };
+    }
     /**
      * @inheritDoc
      */

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

@@ -7,7 +7,7 @@ import { IHandler } from "./handlers/IHandler";
 import { EVMContractBase } from "../contract/EVMContractBase";
 import { EscrowManager } from "./EscrowManagerTypechain";
 import { EVMSwapData } from "./EVMSwapData";
-import { EVMTx } from "../chain/modules/EVMTransactions";
+import { EVMTx, EVMTxTrace } from "../chain/modules/EVMTransactions";
 import { EVMSigner } from "../wallet/EVMSigner";
 import { EVMChainInterface } from "../chain/EVMChainInterface";
 import { EVMBtcRelay } from "../btcrelay/EVMBtcRelay";
@@ -50,7 +50,7 @@ export declare class EVMSwapContract<ChainId extends string = string> extends EV
         claim: {
             [type in ChainSwapType]: string;
         };
-    });
+    }, contractDeploymentHeight?: number);
     /**
      * @inheritDoc
      */
@@ -136,10 +136,27 @@ export declare class EVMSwapContract<ChainId extends string = string> extends EV
     }[]): Promise<{
         [p: string]: SwapCommitState;
     }>;
+    getHistoricalSwaps(signer: string, startBlockheight?: number): Promise<{
+        swaps: {
+            [escrowHash: string]: {
+                init?: {
+                    data: EVMSwapData;
+                    getInitTxId: () => Promise<string>;
+                    getTxBlock: () => Promise<{
+                        blockTime: number;
+                        blockHeight: number;
+                    }>;
+                };
+                state: SwapCommitState;
+            };
+        };
+        latestBlockheight?: number;
+    }>;
     /**
      * @inheritDoc
      */
     createSwapData(type: ChainSwapType, offerer: string, claimer: string, token: string, amount: bigint, paymentHash: string, sequence: bigint, expiry: bigint, payIn: boolean, payOut: boolean, securityDeposit: bigint, claimerBounty: bigint, depositToken?: string): Promise<EVMSwapData>;
+    findInitSwapData(call: EVMTxTrace, escrowHash: string, claimHandler: IClaimHandler<any, any>): EVMSwapData | null;
     /**
      * @inheritDoc
      */

package/dist/evm/swaps/EVMSwapContract.js

@@ -14,15 +14,17 @@ const EVMLpVault_1 = require("./modules/EVMLpVault");
 const EVMSwapInit_1 = require("./modules/EVMSwapInit");
 const EVMSwapRefund_1 = require("./modules/EVMSwapRefund");
 const EVMSwapClaim_1 = require("./modules/EVMSwapClaim");
+const Utils_1 = require("../../utils/Utils");
 const ESCROW_STATE_COMMITTED = 1;
 const ESCROW_STATE_CLAIMED = 2;
 const ESCROW_STATE_REFUNDED = 3;
+const logger = (0, Utils_1.getLogger)("EVMSwapContract: ");
 /**
  * @category Swaps
  */
 class EVMSwapContract extends EVMContractBase_1.EVMContractBase {
-    constructor(chainInterface, btcRelay, contractAddress, handlerAddresses) {
-        super(chainInterface, contractAddress, EscrowManagerAbi_1.EscrowManagerAbi);
+    constructor(chainInterface, btcRelay, contractAddress, handlerAddresses, contractDeploymentHeight) {
+        super(chainInterface, contractAddress, EscrowManagerAbi_1.EscrowManagerAbi, contractDeploymentHeight);
         this.supportsInitWithoutClaimer = true;
         ////////////////////////
         //// Timeouts
@@ -299,6 +301,95 @@ class EVMSwapContract extends EVMContractBase_1.EVMContractBase {
         await Promise.all(promises);
         return result;
     }
+    async getHistoricalSwaps(signer, startBlockheight) {
+        const { height: latestBlockheight } = await this.Chain.getFinalizedBlock();
+        const swapsOpened = {};
+        const resultingSwaps = {};
+        const processor = async (_event) => {
+            const escrowHash = _event.args.escrowHash.substring(2);
+            if (_event.eventName === "Initialize") {
+                const event = _event;
+                const claimHandlerHex = event.args.claimHandler;
+                const claimHandler = this.claimHandlersByAddress[claimHandlerHex.toLowerCase()];
+                if (claimHandler == null) {
+                    logger.warn(`getHistoricalSwaps(): Unknown claim handler in tx ${event.transactionHash} with claim handler: ` + claimHandlerHex);
+                    return null;
+                }
+                const txTrace = await this.Chain.Transactions.traceTransaction(event.transactionHash);
+                const data = this.findInitSwapData(txTrace, event.args.escrowHash, claimHandler);
+                if (data == null) {
+                    logger.warn(`getHistoricalSwaps(): Cannot parse swap data from tx ${event.transactionHash} with escrow hash: ` + escrowHash);
+                    return null;
+                }
+                swapsOpened[escrowHash] = {
+                    data,
+                    getInitTxId: () => Promise.resolve(event.transactionHash),
+                    getTxBlock: async () => {
+                        return {
+                            blockHeight: event.blockNumber,
+                            blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                        };
+                    }
+                };
+            }
+            if (_event.eventName === "Claim") {
+                const event = _event;
+                const foundSwapData = swapsOpened[escrowHash];
+                delete swapsOpened[escrowHash];
+                resultingSwaps[escrowHash] = {
+                    init: foundSwapData,
+                    state: {
+                        type: base_1.SwapCommitStateType.PAID,
+                        getClaimTxId: () => Promise.resolve(event.transactionHash),
+                        getClaimResult: () => Promise.resolve(event.args.witnessResult.substring(2)),
+                        getTxBlock: async () => {
+                            return {
+                                blockHeight: event.blockNumber,
+                                blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                            };
+                        }
+                    }
+                };
+            }
+            if (_event.eventName === "Refund") {
+                const event = _event;
+                const foundSwapData = swapsOpened[escrowHash];
+                delete swapsOpened[escrowHash];
+                const isExpired = foundSwapData != null && await this.isExpired(signer, foundSwapData.data);
+                resultingSwaps[escrowHash] = {
+                    init: foundSwapData,
+                    state: {
+                        type: isExpired ? base_1.SwapCommitStateType.EXPIRED : base_1.SwapCommitStateType.NOT_COMMITED,
+                        getRefundTxId: () => Promise.resolve(event.transactionHash),
+                        getTxBlock: async () => {
+                            return {
+                                blockHeight: event.blockNumber,
+                                blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                            };
+                        }
+                    }
+                };
+            }
+        };
+        //We have to fetch separately the different directions
+        await this.Events.findInContractEventsForward(["Initialize", "Claim", "Refund"], [signer, null], processor, startBlockheight);
+        await this.Events.findInContractEventsForward(["Initialize", "Claim", "Refund"], [null, signer], processor, startBlockheight);
+        logger.debug(`getHistoricalSwaps(): Found ${Object.keys(resultingSwaps).length} settled swaps!`);
+        logger.debug(`getHistoricalSwaps(): Found ${Object.keys(swapsOpened).length} unsettled swaps!`);
+        for (let escrowHash in swapsOpened) {
+            const foundSwapData = swapsOpened[escrowHash];
+            resultingSwaps[escrowHash] = {
+                init: foundSwapData,
+                state: foundSwapData.data.isOfferer(signer) && await this.isExpired(signer, foundSwapData.data)
+                    ? { type: base_1.SwapCommitStateType.REFUNDABLE }
+                    : { type: base_1.SwapCommitStateType.COMMITED }
+            };
+        }
+        return {
+            swaps: resultingSwaps,
+            latestBlockheight: latestBlockheight ?? startBlockheight
+        };
+    }
     ////////////////////////////////////////////
     //// Swap data initializer
     /**
@@ -311,6 +402,30 @@ class EVMSwapContract extends EVMContractBase_1.EVMContractBase {
         return Promise.resolve(new EVMSwapData_1.EVMSwapData(offerer, claimer, token, this.timelockRefundHandler.address, claimHandler.address, payOut, payIn, payIn, //For now track reputation for all payIn swaps
         sequence, "0x" + paymentHash, (0, ethers_1.hexlify)(base_1.BigIntBufferUtils.toBuffer(expiry, "be", 32)), amount, depositToken, securityDeposit, claimerBounty, type));
     }
+    findInitSwapData(call, escrowHash, claimHandler) {
+        if (call.to.toLowerCase() === this.contractAddress.toLowerCase()) {
+            const _result = this.parseCalldata(call.input);
+            if (_result != null && _result.name === "initialize") {
+                const result = _result;
+                //Found, check correct escrow hash
+                const [escrowData, signature, timeout, extraData] = result.args;
+                const escrow = EVMSwapData_1.EVMSwapData.deserializeFromStruct(escrowData, claimHandler);
+                if ("0x" + escrow.getEscrowHash() === escrowHash) {
+                    const extraDataHex = (0, ethers_1.hexlify)(extraData);
+                    if (extraDataHex.length > 2) {
+                        escrow.setExtraData(extraDataHex.substring(2));
+                    }
+                    return escrow;
+                }
+            }
+        }
+        for (let _call of call.calls) {
+            const found = this.findInitSwapData(_call, escrowHash, claimHandler);
+            if (found != null)
+                return found;
+        }
+        return null;
+    }
     ////////////////////////////////////////////
     //// Utils
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "2.0.9",
+  "version": "2.1.10",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -25,7 +25,7 @@
   "author": "adambor",
   "license": "Apache-2.0",
   "dependencies": {
-    "@atomiqlabs/base": "^13.0.4",
+    "@atomiqlabs/base": "^13.1.9",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "^1.6.0",
     "buffer": "6.0.3",

package/src/chains/alpen/AlpenInitializer.ts

@@ -21,6 +21,7 @@ const AlpenContractAddresses = {
     MAINNET: {
         executionContract: "",
         swapContract: "",
+        swapContractDeploymentHeight: 0,
         btcRelayContract: "",
         btcRelayDeploymentHeight: 0,
         spvVaultContract: "",
@@ -40,6 +41,7 @@ const AlpenContractAddresses = {
     TESTNET: {
         executionContract: "0x32EB4DbDdC31e19ba908fecc7cae03F0d04F01Fa",
         swapContract: "0x2920EE496693A5027249a027A6FD3F643E743745",
+        swapContractDeploymentHeight: 532614,
         btcRelayContract: "0x59A54378B6bA9C21ba66487C6A701D702baDEabE",
         btcRelayDeploymentHeight: 532610,
         spvVaultContract: "0xaB2D14745362B26a732dD8B7F95daAE3D2914bBF",
@@ -59,6 +61,7 @@ const AlpenContractAddresses = {
     TESTNET4: {
         executionContract: "0xa2698D2fBE3f7c74cCca428a5fd968411644C641",
         swapContract: "0xb0226bAC3BD30179fb66A43cEA212AbBC988e004",
+        swapContractDeploymentHeight: 843614,
         btcRelayContract: "0xfFA842529977a40A3fdb988cdDC9CB5c39bAcF26",
         btcRelayDeploymentHeight: 843611,
         spvVaultContract: "0x62a718348081F9CF9a8E3dF4B4EA6d6349991ad9",
@@ -111,6 +114,7 @@ export type AlpenOptions = {
     chainType?: "MAINNET" | "TESTNET" | "TESTNET4",
 
     swapContract?: string,
+    swapContractDeploymentHeight?: number,
     btcRelayContract?: string,
     btcRelayDeploymentHeight?: number,
     spvVaultContract?: string,
@@ -126,7 +130,7 @@ export type AlpenOptions = {
 
     fees?: EVMFees,
 
-    evmConfig?: Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag">
+    evmConfig?: Partial<Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag" | "finalityCheckStrategy">>
 }
 
 /**
@@ -180,7 +184,8 @@ export function initializeAlpen(
                 ...defaultContractAddresses.handlerContracts.claim,
                 ...options?.handlerContracts?.claim
             }
-        }
+        },
+        options.swapContractDeploymentHeight ?? defaultContractAddresses.swapContractDeploymentHeight
     );
 
     const spvVaultContract = new EVMSpvVaultContract(

package/src/chains/botanix/BotanixInitializer.ts

@@ -20,6 +20,7 @@ const BotanixContractAddresses = {
     MAINNET: {
         executionContract: "0x71Bc44F3F7203fC1279107D924e418F02b0d4029",
         swapContract: "0x9a027B5Bf43382Cc4A5134d9EFD389f61ece27B9",
+        swapContractDeploymentHeight: 2320403,
         btcRelayContract: "0xe8be24CF21341c9567664009a8a82C9Dc1eE90D6",
         btcRelayDeploymentHeight: 2320400,
         spvVaultContract: "0xe510D5781C6C849284Fb25Dc20b1684cEC445C8B",
@@ -39,6 +40,7 @@ const BotanixContractAddresses = {
     TESTNET: {
         executionContract: "0xe510D5781C6C849284Fb25Dc20b1684cEC445C8B",
         swapContract: "0xfFA842529977a40A3fdb988cdDC9CB5c39bAcF26",
+        swapContractDeploymentHeight: 4173454,
         btcRelayContract: "0xba7E78011909e3501027FBc226a04DCC837a555D",
         btcRelayDeploymentHeight: 3462466,
         spvVaultContract: "0x9a027B5Bf43382Cc4A5134d9EFD389f61ece27B9",
@@ -90,6 +92,7 @@ export type BotanixOptions = {
     chainType?: "MAINNET" | "TESTNET",
 
     swapContract?: string,
+    swapContractDeploymentHeight?: number,
     btcRelayContract?: string,
     btcRelayDeploymentHeight?: number,
     spvVaultContract?: string,
@@ -105,7 +108,7 @@ export type BotanixOptions = {
 
     fees?: EVMFees,
 
-    evmConfig?: Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag">
+    evmConfig?: Partial<Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag" | "finalityCheckStrategy">>
 }
 
 /**
@@ -163,7 +166,8 @@ export function initializeBotanix(
                 ...defaultContractAddresses.handlerContracts.claim,
                 ...options?.handlerContracts?.claim
             }
-        }
+        },
+        options.swapContractDeploymentHeight ?? defaultContractAddresses.swapContractDeploymentHeight
     );
 
     const spvVaultContract = new EVMSpvVaultContract(

package/src/chains/citrea/CitreaInitializer.ts

@@ -21,6 +21,7 @@ const CitreaContractAddresses = {
     MAINNET: {
         executionContract: "0x6a373b6Adad83964727bA0fa15E22Be05173fc12",
         swapContract: "0xc98Ef084d3911C8447DBbE4dDa18bC2c9bB0584e",
+        swapContractDeploymentHeight: 2452632,
         btcRelayContract: "0x11ac854A68830d61af975063c91602f878C36fA6",
         btcRelayDeploymentHeight: 2452629,
         spvVaultContract: "0x5bb0C725939cB825d1322A99a3FeB570097628c3",
@@ -40,6 +41,7 @@ const CitreaContractAddresses = {
     TESTNET4: {
         executionContract: "0x9e289512965A0842b342A6BB3F3c41F22a555Cfe",
         swapContract: "0xBbf7755b674dD107d59F0650D1A3fA9C60bf6Fe6",
+        swapContractDeploymentHeight: 12346224,
         btcRelayContract: "0x00D122E9f9766cd81a38D2dd44f9AFfb94c67Af7",
         btcRelayDeploymentHeight: 12346223,
         spvVaultContract: "0x9Bf990C6088F716279797a602b05941c40591533",
@@ -101,6 +103,7 @@ export type CitreaOptions = {
     chainType?: "MAINNET" | "TESTNET4",
 
     swapContract?: string,
+    swapContractDeploymentHeight?: number,
     btcRelayContract?: string,
     btcRelayDeploymentHeight?: number,
     spvVaultContract?: string,
@@ -116,7 +119,7 @@ export type CitreaOptions = {
 
     fees?: CitreaFees,
 
-    evmConfig?: Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag">
+    evmConfig?: Partial<Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag" | "finalityCheckStrategy">>
 }
 
 /**
@@ -172,7 +175,8 @@ export function initializeCitrea(
                 ...defaultContractAddresses.handlerContracts.claim,
                 ...options?.handlerContracts?.claim
             }
-        }
+        },
+        options.swapContractDeploymentHeight ?? defaultContractAddresses.swapContractDeploymentHeight
     );
 
     const spvVaultContract = new CitreaSpvVaultContract(

package/src/chains/goat/GoatInitializer.ts

@@ -21,6 +21,7 @@ const GoatContractAddresses = {
     MAINNET: {
         executionContract: "",
         swapContract: "",
+        swapContractDeploymentHeight: 0,
         btcRelayContract: "",
         btcRelayDeploymentHeight: 0,
         spvVaultContract: "",
@@ -40,6 +41,7 @@ const GoatContractAddresses = {
     TESTNET: {
         executionContract: "0xe8be24CF21341c9567664009a8a82C9Dc1eE90D6",
         swapContract: "0xe510D5781C6C849284Fb25Dc20b1684cEC445C8B",
+        swapContractDeploymentHeight: 9368978,
         btcRelayContract: "0x3887B02217726bB36958Dd595e57293fB63D5082",
         btcRelayDeploymentHeight: 9368975,
         spvVaultContract: "0x71Bc44F3F7203fC1279107D924e418F02b0d4029",
@@ -59,6 +61,7 @@ const GoatContractAddresses = {
     TESTNET4: {
         executionContract: "0x4f7d86C870F28ac30C8fa864Ee04264D7dD03847",
         swapContract: "0x3FbbA0eb82cf1247cbf92B3D51641226310F0Ca5",
+        swapContractDeploymentHeight: 10240371,
         btcRelayContract: "0xEeD58871C24d24C49554aF8B65Dd86eD8ed778D3",
         btcRelayDeploymentHeight: 10240368,
         spvVaultContract: "0x8a80A68f8bA1732015A821b5260fEF8040a844b7",
@@ -121,6 +124,7 @@ export type GoatOptions = {
     chainType?: "MAINNET" | "TESTNET" | "TESTNET4",
 
     swapContract?: string,
+    swapContractDeploymentHeight?: number,
     btcRelayContract?: string,
     btcRelayDeploymentHeight?: number,
     spvVaultContract?: string,
@@ -136,7 +140,7 @@ export type GoatOptions = {
 
     fees?: EVMFees,
 
-    evmConfig?: Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag">
+    evmConfig?: Partial<Omit<EVMConfiguration, "safeBlockTag" | "finalizedBlockTag" | "finalityCheckStrategy">>
 }
 
 /**
@@ -190,7 +194,8 @@ export function initializeGoat(
                 ...defaultContractAddresses.handlerContracts.claim,
                 ...options?.handlerContracts?.claim
             }
-        }
+        },
+      options.swapContractDeploymentHeight?? defaultContractAddresses.swapContractDeploymentHeight
     );
 
     const spvVaultContract = new EVMSpvVaultContract(

package/src/evm/contract/modules/EVMContractEvents.ts

@@ -4,6 +4,14 @@ import {EVMContractBase} from "../EVMContractBase";
 import {EVMChainInterface} from "../../chain/EVMChainInterface";
 import {TypedEventLog} from "../../typechain/common";
 
+function normalizeTopic(topic: string) {
+    if(topic.length!==66) {
+        return "0x"+topic.substring(2).padStart(64, "0");
+    }
+    return topic;
+}
+
+
 export class EVMContractEvents<T extends BaseContract> extends EVMEvents {
 
     readonly contract: EVMContractBase<T>;
@@ -22,12 +30,12 @@ export class EVMContractEvents<T extends BaseContract> extends EVMEvents {
     private toFilter<TEventName extends keyof T["filters"]>(
         events: TEventName[],
         keys: null | (null | string | string[])[],
-    ): (null | string | string[])[] {
-        const filterArray: (null | string | string[])[] = [];
+    ): (null | string[])[] {
+        const filterArray: (null | string[])[] = [];
         filterArray.push(events.map(name => {
             return this.baseContract.getEvent(name as string).fragment.topicHash;
         }));
-        if(keys!=null) keys.forEach(key => filterArray.push(key));
+        if(keys!=null) keys.forEach(key => filterArray.push(typeof(key)==="string" ? [normalizeTopic(key)] : Array.isArray(key) ? key.map(normalizeTopic) : key));
         return filterArray;
     }
 

package/src/evm/events/EVMChainEventsBrowser.ts

@@ -93,33 +93,6 @@ export class EVMChainEventsBrowser implements ChainEvents<EVMSwapData, EVMEventL
         return this.processedEvents.includes(event.transactionHash+":"+event.index);
     }
 
-    findInitSwapData(call: EVMTxTrace, escrowHash: string, claimHandler: IClaimHandler<any, any>): EVMSwapData | null {
-        if(call.to.toLowerCase() === this.evmSwapContract.contractAddress.toLowerCase()) {
-            const _result = this.evmSwapContract.parseCalldata(call.input);
-            if(_result!=null && _result.name==="initialize") {
-                const result = _result as TypedFunctionCall<
-                    // @ts-ignore
-                    typeof this.evmSwapContract.contract.initialize
-                >;
-                //Found, check correct escrow hash
-                const [escrowData, signature, timeout, extraData] = result.args;
-                const escrow = EVMSwapData.deserializeFromStruct(escrowData, claimHandler);
-                if("0x"+escrow.getEscrowHash()===escrowHash) {
-                    const extraDataHex = hexlify(extraData);
-                    if(extraDataHex.length>2) {
-                        escrow.setExtraData(extraDataHex.substring(2));
-                    }
-                    return escrow;
-                }
-            }
-        }
-        for(let _call of call.calls) {
-            const found = this.findInitSwapData(_call, escrowHash, claimHandler);
-            if(found!=null) return found;
-        }
-        return null;
-    }
-
     /**
      * Returns async getter for fetching on-demand initialize event swap data
      *
@@ -135,7 +108,7 @@ export class EVMChainEventsBrowser implements ChainEvents<EVMSwapData, EVMEventL
         return async () => {
             const trace = await this.chainInterface.Transactions.traceTransaction(event.transactionHash);
             if(trace==null) return null;
-            return this.findInitSwapData(trace, event.args.escrowHash, claimHandler);
+            return this.evmSwapContract.findInitSwapData(trace, event.args.escrowHash, claimHandler);
         }
     }
 

package/src/evm/spv_swap/EVMSpvVaultContract.ts

@@ -5,6 +5,9 @@ import {
     RelaySynchronizer,
     SpvVaultContract,
     SpvVaultTokenData,
+    SpvWithdrawalClaimedState,
+    SpvWithdrawalClosedState,
+    SpvWithdrawalFrontedState,
     SpvWithdrawalState,
     SpvWithdrawalStateType,
     SpvWithdrawalTransactionData,
@@ -364,39 +367,56 @@ export class EVMSpvVaultContract<ChainId extends string>
         return vaults;
     }
 
-    private parseWithdrawalEvent(event: TypedEventLog<SpvVaultManager["filters"][keyof SpvVaultManager["filters"]]>): SpvWithdrawalState | null {
+    private parseWithdrawalEvent(
+        event: TypedEventLog<SpvVaultManager["filters"][keyof SpvVaultManager["filters"]]>
+    ): ((SpvWithdrawalFrontedState | SpvWithdrawalClaimedState | SpvWithdrawalClosedState) & {btcTxId: string}) | null {
         switch(event.eventName) {
             case "Fronted":
                 const frontedEvent = event as TypedEventLog<SpvVaultManager["filters"]["Fronted"]>;
                 const [ownerFront, vaultIdFront] = unpackOwnerAndVaultId(frontedEvent.args.ownerAndVaultId);
                 return {
                     type: SpvWithdrawalStateType.FRONTED,
-                    txId: event.transactionHash,
+                    btcTxId: Buffer.from(frontedEvent.args.btcTxHash.substring(2), "hex").reverse().toString("hex"),
                     owner: ownerFront,
                     vaultId: vaultIdFront,
                     recipient: frontedEvent.args.recipient,
-                    fronter: frontedEvent.args.caller
+                    fronter: frontedEvent.args.caller,
+                    txId: event.transactionHash,
+                    getTxBlock: async () => ({
+                        blockHeight: event.blockNumber,
+                        blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                    })
                 };
             case "Claimed":
                 const claimedEvent = event as TypedEventLog<SpvVaultManager["filters"]["Claimed"]>;
                 const [ownerClaim, vaultIdClaim] = unpackOwnerAndVaultId(claimedEvent.args.ownerAndVaultId);
                 return {
                     type: SpvWithdrawalStateType.CLAIMED,
-                    txId: event.transactionHash,
+                    btcTxId: Buffer.from(claimedEvent.args.btcTxHash.substring(2), "hex").reverse().toString("hex"),
                     owner: ownerClaim,
                     vaultId: vaultIdClaim,
                     recipient: claimedEvent.args.recipient,
                     claimer: claimedEvent.args.caller,
-                    fronter: claimedEvent.args.frontingAddress
+                    fronter: claimedEvent.args.frontingAddress,
+                    txId: event.transactionHash,
+                    getTxBlock: async () => ({
+                        blockHeight: event.blockNumber,
+                        blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                    })
                 };
             case "Closed":
                 const closedEvent = event as TypedEventLog<SpvVaultManager["filters"]["Closed"]>;
                 return {
                     type: SpvWithdrawalStateType.CLOSED,
-                    txId: event.transactionHash,
+                    btcTxId: Buffer.from(closedEvent.args.btcTxHash.substring(2), "hex").reverse().toString("hex"),
                     owner: closedEvent.args.owner,
                     vaultId: closedEvent.args.vaultId,
-                    error: closedEvent.args.error
+                    error: closedEvent.args.error,
+                    txId: event.transactionHash,
+                    getTxBlock: async () => ({
+                        blockHeight: event.blockNumber,
+                        blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                    })
                 };
             default:
                 return null;
@@ -523,6 +543,30 @@ export class EVMSpvVaultContract<ChainId extends string>
         return result;
     }
 
+    async getHistoricalWithdrawalStates(recipient: string, startBlockheight?: number): Promise<{
+        withdrawals: { [btcTxId: string]: SpvWithdrawalClaimedState | SpvWithdrawalFrontedState };
+        latestBlockheight?: number
+    }> {
+        const {height: latestBlockheight} = await this.Chain.getFinalizedBlock();
+        const withdrawals: { [btcTxId: string]: SpvWithdrawalClaimedState | SpvWithdrawalFrontedState } = {};
+
+        await this.Events.findInContractEventsForward(
+            ["Claimed", "Fronted"],
+            [null, recipient],
+            async (_event) => {
+                const eventResult = this.parseWithdrawalEvent(_event);
+                if(eventResult==null || eventResult.type===SpvWithdrawalStateType.CLOSED) return null;
+                withdrawals[eventResult.btcTxId] = eventResult;
+            },
+            startBlockheight
+        );
+
+        return {
+            withdrawals,
+            latestBlockheight
+        }
+    }
+
     /**
      * @inheritDoc
      */

package/src/evm/swaps/EVMSwapContract.ts

@@ -12,10 +12,10 @@ import {TimelockRefundHandler} from "./handlers/refund/TimelockRefundHandler";
 import {claimHandlersList, IClaimHandler} from "./handlers/claim/ClaimHandlers"
 import {IHandler} from "./handlers/IHandler";
 import {sha256} from "@noble/hashes/sha2";
-import { EVMContractBase } from "../contract/EVMContractBase";
+import {EVMContractBase, TypedFunctionCall} from "../contract/EVMContractBase";
 import {EscrowManager} from "./EscrowManagerTypechain";
 import { EVMSwapData } from "./EVMSwapData";
-import {EVMTx} from "../chain/modules/EVMTransactions";
+import {EVMTx, EVMTxTrace} from "../chain/modules/EVMTransactions";
 import { EVMSigner } from "../wallet/EVMSigner";
 import {EVMChainInterface} from "../chain/EVMChainInterface";
 import { EVMBtcRelay } from "../btcrelay/EVMBtcRelay";
@@ -26,11 +26,15 @@ import {EVMLpVault} from "./modules/EVMLpVault";
 import {EVMPreFetchVerification, EVMSwapInit} from "./modules/EVMSwapInit";
 import { EVMSwapRefund } from "./modules/EVMSwapRefund";
 import {EVMSwapClaim} from "./modules/EVMSwapClaim";
+import {TypedEventLog} from "../typechain/common";
+import {getLogger} from "../../utils/Utils";
 
 const ESCROW_STATE_COMMITTED = 1;
 const ESCROW_STATE_CLAIMED = 2;
 const ESCROW_STATE_REFUNDED = 3;
 
+const logger = getLogger("EVMSwapContract: ");
+
 /**
  * @category Swaps
  */
@@ -88,9 +92,10 @@ export class EVMSwapContract<ChainId extends string = string>
             claim: {
                 [type in ChainSwapType]: string
             }
-        }
+        },
+        contractDeploymentHeight?: number
     ) {
-        super(chainInterface, contractAddress, EscrowManagerAbi);
+        super(chainInterface, contractAddress, EscrowManagerAbi, contractDeploymentHeight);
         this.chainId = chainInterface.chainId;
         this.Init = new EVMSwapInit(chainInterface, this);
         this.Refund = new EVMSwapRefund(chainInterface, this);
@@ -378,6 +383,145 @@ export class EVMSwapContract<ChainId extends string = string>
         return result;
     }
 
+    async getHistoricalSwaps(signer: string, startBlockheight?: number): Promise<{
+        swaps: {
+            [escrowHash: string]: {
+                init?: {
+                    data: EVMSwapData;
+                    getInitTxId: () => Promise<string>;
+                    getTxBlock: () => Promise<{ blockTime: number; blockHeight: number }>
+                };
+                state: SwapCommitState
+            }
+        };
+        latestBlockheight?: number
+    }> {
+        const {height: latestBlockheight} = await this.Chain.getFinalizedBlock();
+
+        const swapsOpened: {
+            [escrowHash: string]: {
+                data: EVMSwapData,
+                getInitTxId: () => Promise<string>,
+                getTxBlock: () => Promise<{
+                    blockTime: number,
+                    blockHeight: number
+                }>
+            }
+        } = {};
+        const resultingSwaps: {
+            [escrowHash: string]: {
+                init?: {
+                    data: EVMSwapData;
+                    getInitTxId: () => Promise<string>;
+                    getTxBlock: () => Promise<{ blockTime: number; blockHeight: number }>
+                };
+                state: SwapCommitState
+            }
+        } = {};
+
+        const processor = async (_event: TypedEventLog<EscrowManager["filters"]["Initialize" | "Claim" | "Refund"]>) => {
+            const escrowHash = _event.args.escrowHash.substring(2);
+            if(_event.eventName==="Initialize") {
+                const event = _event as TypedEventLog<EscrowManager["filters"]["Initialize"]>;
+                const claimHandlerHex = event.args.claimHandler;
+
+                const claimHandler = this.claimHandlersByAddress[claimHandlerHex.toLowerCase()];
+                if(claimHandler==null) {
+                    logger.warn(`getHistoricalSwaps(): Unknown claim handler in tx ${event.transactionHash} with claim handler: `+claimHandlerHex);
+                    return null;
+                }
+
+                const txTrace = await this.Chain.Transactions.traceTransaction(event.transactionHash);
+                const data = this.findInitSwapData(txTrace, event.args.escrowHash, claimHandler);
+                if(data==null) {
+                    logger.warn(`getHistoricalSwaps(): Cannot parse swap data from tx ${event.transactionHash} with escrow hash: `+escrowHash);
+                    return null;
+                }
+
+                swapsOpened[escrowHash] = {
+                    data,
+                    getInitTxId: () => Promise.resolve(event.transactionHash),
+                    getTxBlock: async () => {
+                        return {
+                            blockHeight: event.blockNumber,
+                            blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                        }
+                    }
+                }
+            }
+            if(_event.eventName==="Claim") {
+                const event = _event as TypedEventLog<EscrowManager["filters"]["Claim"]>;
+                const foundSwapData = swapsOpened[escrowHash];
+                delete swapsOpened[escrowHash];
+                resultingSwaps[escrowHash] = {
+                    init: foundSwapData,
+                    state: {
+                        type: SwapCommitStateType.PAID,
+                        getClaimTxId: () => Promise.resolve(event.transactionHash),
+                        getClaimResult: () => Promise.resolve(event.args.witnessResult.substring(2)),
+                        getTxBlock: async () => {
+                            return {
+                                blockHeight: event.blockNumber,
+                                blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                            }
+                        }
+                    }
+                }
+            }
+            if(_event.eventName==="Refund") {
+                const event = _event as TypedEventLog<EscrowManager["filters"]["Refund"]>;
+                const foundSwapData = swapsOpened[escrowHash];
+                delete swapsOpened[escrowHash];
+                const isExpired = foundSwapData!=null && await this.isExpired(signer, foundSwapData.data);
+                resultingSwaps[escrowHash] = {
+                    init: foundSwapData,
+                    state: {
+                        type: isExpired ? SwapCommitStateType.EXPIRED : SwapCommitStateType.NOT_COMMITED,
+                        getRefundTxId: () => Promise.resolve(event.transactionHash),
+                        getTxBlock: async () => {
+                            return {
+                                blockHeight: event.blockNumber,
+                                blockTime: await this.Chain.Blocks.getBlockTime(event.blockNumber)
+                            }
+                        }
+                    }
+                }
+            }
+        };
+
+        //We have to fetch separately the different directions
+        await this.Events.findInContractEventsForward(
+            ["Initialize", "Claim", "Refund"],
+            [signer, null],
+            processor,
+            startBlockheight
+        );
+        await this.Events.findInContractEventsForward(
+            ["Initialize", "Claim", "Refund"],
+            [null, signer],
+            processor,
+            startBlockheight
+        );
+
+        logger.debug(`getHistoricalSwaps(): Found ${Object.keys(resultingSwaps).length} settled swaps!`);
+        logger.debug(`getHistoricalSwaps(): Found ${Object.keys(swapsOpened).length} unsettled swaps!`);
+
+        for(let escrowHash in swapsOpened) {
+            const foundSwapData = swapsOpened[escrowHash];
+            resultingSwaps[escrowHash] = {
+                init: foundSwapData,
+                state: foundSwapData.data.isOfferer(signer) && await this.isExpired(signer, foundSwapData.data)
+                    ? {type: SwapCommitStateType.REFUNDABLE}
+                    : {type: SwapCommitStateType.COMMITED}
+            }
+        }
+
+        return {
+            swaps: resultingSwaps,
+            latestBlockheight: latestBlockheight ?? startBlockheight
+        }
+    }
+
     ////////////////////////////////////////////
     //// Swap data initializer
     /**
@@ -421,6 +565,33 @@ export class EVMSwapContract<ChainId extends string = string>
         ));
     }
 
+    findInitSwapData(call: EVMTxTrace, escrowHash: string, claimHandler: IClaimHandler<any, any>): EVMSwapData | null {
+        if(call.to.toLowerCase() === this.contractAddress.toLowerCase()) {
+            const _result = this.parseCalldata(call.input);
+            if(_result!=null && _result.name==="initialize") {
+                const result = _result as TypedFunctionCall<
+                    // @ts-ignore
+                    typeof this.evmSwapContract.contract.initialize
+                >;
+                //Found, check correct escrow hash
+                const [escrowData, signature, timeout, extraData] = result.args;
+                const escrow = EVMSwapData.deserializeFromStruct(escrowData, claimHandler);
+                if("0x"+escrow.getEscrowHash()===escrowHash) {
+                    const extraDataHex = hexlify(extraData);
+                    if(extraDataHex.length>2) {
+                        escrow.setExtraData(extraDataHex.substring(2));
+                    }
+                    return escrow;
+                }
+            }
+        }
+        for(let _call of call.calls) {
+            const found = this.findInitSwapData(_call, escrowHash, claimHandler);
+            if(found!=null) return found;
+        }
+        return null;
+    }
+
     ////////////////////////////////////////////
     //// Utils
     /**