@atomiqlabs/chain-evm 1.0.0-dev.22

package/src/evm/contract/EVMContractBase.ts

@@ -0,0 +1,63 @@
+import {BaseContract, Contract, EventFragment, Log, TransactionDescription, EventLog} from "ethers";
+import {EVMChainInterface} from "../chain/EVMChainInterface";
+import {EVMContractEvents} from "./modules/EVMContractEvents";
+import {TypedContractMethod, TypedEventLog} from "../typechain/common";
+
+type __TypechainOutputObject<T> = T extends TypedContractMethod<
+        infer V
+    >
+    ? V
+    : never;
+
+type KeysOfType<T, ValueType> = keyof {
+    [K in keyof T]: T[K] extends ValueType ? K : never;
+};
+
+export interface TypedFunctionCall<TCMethod extends TypedContractMethod>
+    extends Omit<TransactionDescription, "args"> {
+    args: __TypechainOutputObject<TCMethod>;
+}
+
+/**
+ * Base class providing program specific utilities
+ */
+export class EVMContractBase<T extends BaseContract> {
+
+    contract: T;
+
+    public readonly Events: EVMContractEvents<T>;
+    public readonly Chain: EVMChainInterface<any>;
+
+    public readonly contractAddress: string;
+    public readonly contractDeploymentHeight: number;
+
+    constructor(
+        chainInterface: EVMChainInterface<any>,
+        contractAddress: string,
+        contractAbi: any,
+        contractDeploymentHeight?: number,
+    ) {
+        this.Chain = chainInterface;
+        this.contract = new Contract(contractAddress, contractAbi, chainInterface.provider) as unknown as T;
+        this.Events = new EVMContractEvents<T>(chainInterface, this);
+        this.contractAddress = contractAddress;
+        this.contractDeploymentHeight = contractDeploymentHeight;
+    }
+
+    toTypedEvent<TEventName extends keyof T["filters"] = keyof T["filters"]>(log: Log): TypedEventLog<T["filters"][TEventName]> {
+        let foundFragment: EventFragment;
+        try {
+            foundFragment = this.contract.interface.getEvent(log.topics[0]);
+        } catch (error) { }
+        if(!foundFragment) return null;
+
+        try {
+            return new EventLog(log, this.contract.interface, foundFragment) as unknown as TypedEventLog<T["filters"][TEventName]>;
+        } catch (error: any) { }
+    }
+
+    parseCalldata<TMethod extends TypedContractMethod>(calldata: string): TypedFunctionCall<TMethod> {
+        return this.contract.interface.parseTransaction({data: calldata}) as unknown as TypedFunctionCall<TMethod>;
+    }
+
+}

package/src/evm/contract/EVMContractModule.ts

@@ -0,0 +1,16 @@
+import {BaseContract} from "ethers";
+import {EVMModule} from "../chain/EVMModule";
+import {EVMChainInterface} from "../chain/EVMChainInterface";
+import {EVMContractBase} from "./EVMContractBase";
+
+
+export class EVMContractModule<T extends BaseContract> extends EVMModule<any> {
+
+    readonly contract: EVMContractBase<T>;
+
+    constructor(chainInterface: EVMChainInterface<any>, contract: EVMContractBase<T>) {
+        super(chainInterface)
+        this.contract = contract;
+    }
+
+}

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

@@ -0,0 +1,102 @@
+import {BaseContract, Log} from "ethers";
+import {EVMEvents} from "../../chain/modules/EVMEvents";
+import {EVMContractBase} from "../EVMContractBase";
+import {EVMChainInterface} from "../../chain/EVMChainInterface";
+import {TypedEventLog} from "../../typechain/common";
+
+export class EVMContractEvents<T extends BaseContract> extends EVMEvents {
+
+    readonly contract: EVMContractBase<T>;
+    readonly baseContract: T;
+
+    constructor(chainInterface: EVMChainInterface<any>, contract: EVMContractBase<T>) {
+        super(chainInterface);
+        this.contract = contract;
+        this.baseContract = contract.contract;
+    }
+
+    private toTypedEvents<TEventName extends keyof T["filters"]>(blockEvents: Log[]): TypedEventLog<T["filters"][TEventName]>[] {
+        return blockEvents.map(log => this.contract.toTypedEvent<TEventName>(log));
+    }
+
+    private toFilter<TEventName extends keyof T["filters"]>(
+        events: TEventName[],
+        keys: string[],
+    ): (string | string[])[] {
+        const filterArray: (string | string[])[] = [];
+        filterArray.push(events.map(name => {
+            return this.baseContract.getEvent(name as string).fragment.topicHash;
+        }));
+        if(keys!=null) keys.forEach(key => filterArray.push(key));
+        return filterArray;
+    }
+
+    /**
+     * Returns the events occuring in a range of EVM blocks as identified by the contract and keys,
+     *  returns pending events if no startHeight & endHeight is passed
+     *
+     * @param events
+     * @param keys
+     * @param startBlockHeight
+     * @param endBlockHeight
+     */
+    public async getContractBlockEvents<TEventName extends keyof T["filters"]>(
+        events: TEventName[],
+        keys: string[],
+        startBlockHeight?: number,
+        endBlockHeight: number = startBlockHeight
+    ): Promise<TypedEventLog<T["filters"][TEventName]>[]> {
+        const blockEvents = await super.getBlockEvents(await this.baseContract.getAddress(), this.toFilter(events, keys), startBlockHeight, endBlockHeight);
+        return this.toTypedEvents<TEventName>(blockEvents);
+    }
+
+    /**
+     * Runs a search backwards in time, processing the events for a specific topic public key
+     *
+     * @param events
+     * @param keys
+     * @param processor called for every event, should return a value if the correct event was found, or null
+     *  if the search should continue
+     * @param abortSignal
+     */
+    public async findInContractEvents<TResult, TEventName extends keyof T["filters"]>(
+        events: TEventName[],
+        keys: string[],
+        processor: (event: TypedEventLog<T["filters"][TEventName]>) => Promise<TResult>,
+        abortSignal?: AbortSignal
+    ): Promise<TResult> {
+        return this.findInEvents<TResult>(await this.baseContract.getAddress(), this.toFilter(events, keys), async (events: Log[]) => {
+            const parsedEvents = this.toTypedEvents<TEventName>(events);
+            for(let event of parsedEvents) {
+                const result: TResult = await processor(event);
+                if(result!=null) return result;
+            }
+        }, abortSignal, this.contract.contractDeploymentHeight);
+    }
+
+    /**
+     * Runs a search forwards in time, processing the events for a specific topic
+     *
+     * @param events
+     * @param keys
+     * @param processor called for every event, should return a value if the correct event was found, or null
+     *  if the search should continue
+     * @param abortSignal
+     */
+    public async findInContractEventsForward<TResult, TEventName extends keyof T["filters"]>(
+        events: TEventName[],
+        keys: string[],
+        processor: (event: TypedEventLog<T["filters"][TEventName]>) => Promise<TResult>,
+        abortSignal?: AbortSignal
+    ): Promise<TResult> {
+        return this.findInEventsForward<TResult>(await this.baseContract.getAddress(), this.toFilter(events, keys), async (events: Log[]) => {
+            const parsedEvents = this.toTypedEvents<TEventName>(events);
+            for(let event of parsedEvents) {
+                const result: TResult = await processor(event);
+                if(result!=null) return result;
+            }
+        }, abortSignal, this.contract.contractDeploymentHeight);
+    }
+
+}
+

package/src/evm/events/EVMChainEvents.ts

@@ -0,0 +1,81 @@
+//@ts-ignore
+import * as fs from "fs/promises";
+import {EVMChainEventsBrowser, EVMEventListenerState} from "./EVMChainEventsBrowser";
+import {EVMChainInterface} from "../chain/EVMChainInterface";
+import {EVMSwapContract} from "../swaps/EVMSwapContract";
+import {EVMSpvVaultContract} from "../spv_swap/EVMSpvVaultContract";
+
+
+export class EVMChainEvents extends EVMChainEventsBrowser {
+
+    private readonly directory: string;
+    private readonly BLOCKHEIGHT_FILENAME: string;
+
+    constructor(
+        directory: string,
+        chainInterface: EVMChainInterface,
+        evmSwapContract: EVMSwapContract,
+        evmSpvVaultContract: EVMSpvVaultContract<any>,
+        pollIntervalSeconds?: number
+    ) {
+        super(chainInterface, evmSwapContract, evmSpvVaultContract, pollIntervalSeconds);
+        this.BLOCKHEIGHT_FILENAME = "/"+chainInterface.chainId+"-blockheight.txt";
+        this.directory = directory;
+    }
+
+    /**
+     * Retrieves last signature & slot from filesystem
+     *
+     * @private
+     */
+    private async getLastEventData(): Promise<EVMEventListenerState[]> {
+        try {
+            const txt: string = (await fs.readFile(this.directory+this.BLOCKHEIGHT_FILENAME)).toString();
+            const arr = txt.split(";");
+            return arr.map(val => {
+                const stateResult = val.split(",");
+                if(stateResult.length>=3) {
+                    return {
+                        lastBlockNumber: parseInt(stateResult[0]),
+                        lastEvent: {
+                            blockHash: stateResult[1],
+                            logIndex: parseInt(stateResult[2])
+                        }
+                    };
+                } else if(stateResult.length>=1) {
+                    return {
+                        lastBlockNumber: parseInt(stateResult[0])
+                    }
+                } else {
+                    return null;
+                }
+            });
+        } catch (e) {
+            return null;
+        }
+    }
+
+    /**
+     * Saves last signature & slot to the filesystem
+     *
+     * @private
+     */
+    private saveLastEventData(newState: EVMEventListenerState[]): Promise<void> {
+        return fs.writeFile(this.directory+this.BLOCKHEIGHT_FILENAME, newState.map(val => {
+            if(val.lastEvent==null) {
+                return val.lastBlockNumber.toString(10);
+            } else {
+                return val.lastBlockNumber.toString(10)+","+val.lastEvent.blockHash+","+val.lastEvent.logIndex.toString(10);
+            }
+        }).join(";"));
+    }
+
+    async init(): Promise<void> {
+        const lastState = await this.getLastEventData();
+        await this.setupPoll(
+            lastState,
+            (newState: EVMEventListenerState[]) => this.saveLastEventData(newState)
+        );
+    }
+
+}

package/src/evm/events/EVMChainEventsBrowser.ts

@@ -0,0 +1,390 @@
+import {
+    ChainEvent,
+    ChainEvents,
+    ChainSwapType,
+    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, hexlify, JsonRpcApiProvider} from "ethers";
+import { EVMSwapContract } from "../swaps/EVMSwapContract";
+import {getLogger, onceAsync} from "../../utils/Utils";
+import {EVMSpvVaultContract, unpackOwnerAndVaultId} from "../spv_swap/EVMSpvVaultContract";
+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";
+
+const LOGS_SLIDING_WINDOW_LENGTH = 60;
+
+export type EVMEventListenerState = {lastBlockNumber: number, lastEvent?: {blockHash: string, logIndex: number}};
+
+/**
+ * EVM on-chain event handler for front-end systems without access to fs, uses WS or long-polling to subscribe, might lose
+ *  out on some events if the network is unreliable, front-end systems should take this into consideration and not
+ *  rely purely on events
+ */
+export class EVMChainEventsBrowser implements ChainEvents<EVMSwapData> {
+
+    protected readonly listeners: EventListener<EVMSwapData>[] = [];
+    protected readonly provider: JsonRpcApiProvider;
+    protected readonly chainInterface: EVMChainInterface;
+    protected readonly evmSwapContract: EVMSwapContract;
+    protected readonly evmSpvVaultContract: EVMSpvVaultContract<any>;
+    protected readonly logger = getLogger("EVMChainEventsBrowser: ");
+
+    protected stopped: boolean;
+    protected pollIntervalSeconds: number;
+
+    private timeout: number;
+
+    constructor(
+        chainInterface: EVMChainInterface,
+        evmSwapContract: EVMSwapContract,
+        evmSpvVaultContract: EVMSpvVaultContract<any>,
+        pollIntervalSeconds: number = 5
+    ) {
+        this.chainInterface = chainInterface;
+        this.provider = chainInterface.provider;
+        this.evmSwapContract = evmSwapContract;
+        this.evmSpvVaultContract = evmSpvVaultContract;
+        this.pollIntervalSeconds = pollIntervalSeconds;
+    }
+
+    findInitSwapData(call: EVMTxTrace, escrowHash: string, claimHandler: IClaimHandler<any, any>): EVMSwapData {
+        if(call.to.toLowerCase() === this.evmSwapContract.contractAddress.toLowerCase()) {
+            const result = this.evmSwapContract.parseCalldata<typeof this.evmSwapContract.contract.initialize>(call.input);
+            if(result!=null && result.name==="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
+     *
+     * @param event
+     * @param claimHandler
+     * @private
+     * @returns {() => Promise<EVMSwapData>} getter to be passed to InitializeEvent constructor
+     */
+    private getSwapDataGetter(
+        event: TypedEventLog<EscrowManager["filters"]["Initialize"]>,
+        claimHandler: IClaimHandler<any, any>
+    ): () => Promise<EVMSwapData> {
+        return async () => {
+            const trace = await this.chainInterface.Transactions.traceTransaction(event.transactionHash);
+            if(trace==null) return null;
+            return this.findInitSwapData(trace, event.args.escrowHash, claimHandler);
+        }
+    }
+
+    protected parseInitializeEvent(
+        event: TypedEventLog<EscrowManager["filters"]["Initialize"]>
+    ): InitializeEvent<EVMSwapData> {
+        const escrowHash = event.args.escrowHash.substring(2);
+        const claimHandlerHex = event.args.claimHandler;
+        const claimHandler = this.evmSwapContract.claimHandlersByAddress[claimHandlerHex.toLowerCase()];
+        if(claimHandler==null) {
+            this.logger.warn("parseInitializeEvent("+escrowHash+"): Unknown claim handler with claim: "+claimHandlerHex);
+            return null;
+        }
+        const swapType: ChainSwapType = claimHandler.getType();
+
+        this.logger.debug("InitializeEvent escrowHash: "+escrowHash);
+        return new InitializeEvent<EVMSwapData>(
+            escrowHash,
+            swapType,
+            onceAsync<EVMSwapData>(this.getSwapDataGetter(event, claimHandler))
+        );
+    }
+
+    protected parseRefundEvent(
+        event: TypedEventLog<EscrowManager["filters"]["Refund"]>
+    ): RefundEvent<EVMSwapData> {
+        const escrowHash = event.args.escrowHash.substring(2);
+        this.logger.debug("RefundEvent escrowHash: "+escrowHash);
+        return new RefundEvent<EVMSwapData>(escrowHash);
+    }
+
+    protected parseClaimEvent(
+        event: TypedEventLog<EscrowManager["filters"]["Claim"]>
+    ): ClaimEvent<EVMSwapData> {
+        const escrowHash = event.args.escrowHash.substring(2);
+        const claimHandlerHex = event.args.claimHandler;
+        const claimHandler = this.evmSwapContract.claimHandlersByAddress[claimHandlerHex.toLowerCase()];
+        if(claimHandler==null) {
+            this.logger.warn("parseClaimEvent("+escrowHash+"): Unknown claim handler with claim: "+claimHandlerHex);
+            return null;
+        }
+        const witnessResult = event.args.witnessResult.substring(2);
+        this.logger.debug("ClaimEvent witnessResult: "+witnessResult+" escrowHash: "+escrowHash);
+        return new ClaimEvent<EVMSwapData>(escrowHash, witnessResult);
+    }
+
+    protected parseSpvOpenEvent(
+        event: TypedEventLog<SpvVaultManager["filters"]["Opened"]>
+    ): SpvVaultOpenEvent {
+        const owner = event.args.owner;
+        const vaultId = event.args.vaultId;
+        const btcTxId = Buffer.from(event.args.btcTxHash.substring(2), "hex").reverse().toString("hex");
+        const vout = Number(event.args.vout);
+
+        this.logger.debug("SpvOpenEvent owner: "+owner+" vaultId: "+vaultId+" utxo: "+btcTxId+":"+vout);
+        return new SpvVaultOpenEvent(owner, vaultId, btcTxId, vout);
+    }
+
+    protected parseSpvDepositEvent(
+        event: TypedEventLog<SpvVaultManager["filters"]["Deposited"]>
+    ): SpvVaultDepositEvent {
+        const [owner, vaultId] = unpackOwnerAndVaultId(event.args.ownerAndVaultId);
+        const amounts = [event.args.amount0, event.args.amount1];
+        const depositCount = Number(event.args.depositCount);
+
+        this.logger.debug("SpvDepositEvent owner: "+owner+" vaultId: "+vaultId+" depositCount: "+depositCount+" amounts: ", amounts);
+        return new SpvVaultDepositEvent(owner, vaultId, amounts, depositCount);
+    }
+
+    protected parseSpvFrontEvent(
+        event: TypedEventLog<SpvVaultManager["filters"]["Fronted"]>
+    ): SpvVaultFrontEvent {
+        const [owner, vaultId] = unpackOwnerAndVaultId(event.args.ownerAndVaultId);
+        const btcTxId = Buffer.from(event.args.btcTxHash.substring(2), "hex").reverse().toString("hex");
+        const recipient = event.args.recipient;
+        const executionHash = event.args.executionHash;
+        const amounts = [event.args.amount0, event.args.amount1];
+        const frontingAddress = event.args.caller;
+
+        this.logger.debug("SpvFrontEvent owner: "+owner+" vaultId: "+vaultId+" btcTxId: "+btcTxId+
+            " recipient: "+recipient+" frontedBy: "+frontingAddress+" amounts: ", amounts);
+        return new SpvVaultFrontEvent(owner, vaultId, btcTxId, recipient, executionHash, amounts, frontingAddress);
+    }
+
+    protected parseSpvClaimEvent(
+        event: TypedEventLog<SpvVaultManager["filters"]["Claimed"]>
+    ): SpvVaultClaimEvent {
+        const [owner, vaultId] = unpackOwnerAndVaultId(event.args.ownerAndVaultId);
+        const btcTxId = Buffer.from(event.args.btcTxHash.substring(2), "hex").reverse().toString("hex");
+        const recipient = event.args.recipient;
+        const executionHash = event.args.executionHash;
+        const amounts = [event.args.amount0, event.args.amount1];
+        const caller = event.args.caller;
+        const frontingAddress = event.args.frontingAddress;
+        const withdrawCount = Number(event.args.withdrawCount);
+
+        this.logger.debug("SpvClaimEvent owner: "+owner+" vaultId: "+vaultId+" btcTxId: "+btcTxId+" withdrawCount: "+withdrawCount+
+            " recipient: "+recipient+" frontedBy: "+frontingAddress+" claimedBy: "+caller+" amounts: ", amounts);
+
+        return new SpvVaultClaimEvent(owner, vaultId, btcTxId, recipient, executionHash, amounts, caller, frontingAddress, withdrawCount);
+    }
+
+    protected parseSpvCloseEvent(
+        event: TypedEventLog<SpvVaultManager["filters"]["Closed"]>
+    ): SpvVaultCloseEvent {
+        const btcTxId = Buffer.from(event.args.btcTxHash.substring(2), "hex").reverse().toString("hex");
+
+        return new SpvVaultCloseEvent(event.args.owner, event.args.vaultId, btcTxId, event.args.error);
+    }
+
+    /**
+     * Processes event as received from the chain, parses it & calls event listeners
+     *
+     * @param events
+     * @param currentBlock
+     * @protected
+     */
+    protected async processEvents(
+        events : (
+            TypedEventLog<EscrowManager["filters"]["Initialize" | "Refund" | "Claim"]> |
+            TypedEventLog<SpvVaultManager["filters"]["Opened" | "Deposited" | "Fronted" | "Claimed" | "Closed"]>
+        )[],
+        currentBlock: Block
+    ) {
+        const parsedEvents: ChainEvent<EVMSwapData>[] = [];
+
+        for(let event of events) {
+            let parsedEvent: ChainEvent<EVMSwapData>;
+            switch(event.eventName) {
+                case "Claim":
+                    parsedEvent = this.parseClaimEvent(event as any);
+                    break;
+                case "Refund":
+                    parsedEvent = this.parseRefundEvent(event as any);
+                    break;
+                case "Initialize":
+                    parsedEvent = this.parseInitializeEvent(event as any);
+                    break;
+                case "Opened":
+                    parsedEvent = this.parseSpvOpenEvent(event as any);
+                    break;
+                case "Deposited":
+                    parsedEvent = this.parseSpvDepositEvent(event as any);
+                    break;
+                case "Fronted":
+                    parsedEvent = this.parseSpvFrontEvent(event as any);
+                    break;
+                case "Claimed":
+                    parsedEvent = this.parseSpvClaimEvent(event as any);
+                    break;
+                case "Closed":
+                    parsedEvent = this.parseSpvCloseEvent(event as any);
+                    break;
+            }
+            const timestamp = event.blockNumber===currentBlock.number ? currentBlock.timestamp : await this.chainInterface.Blocks.getBlockTime(event.blockNumber);
+            parsedEvent.meta = {
+                blockTime: timestamp,
+                txId: event.transactionHash,
+                timestamp //Maybe deprecated
+            } as any;
+            parsedEvents.push(parsedEvent);
+        }
+
+        for(let listener of this.listeners) {
+            await listener(parsedEvents);
+        }
+    }
+
+    protected async checkEventsEcrowManager(currentBlock: Block, lastProcessedEvent?: {blockHash: string, logIndex: number}, lastBlockNumber?: number): Promise<[{blockHash: string, logIndex: number}, number]> {
+        lastBlockNumber ??= currentBlock.number;
+        // this.logger.debug(`checkEvents(EscrowManager): Requesting logs: ${lastBlockNumber}...${currentBlock.number}`);
+        let events = await this.evmSwapContract.Events.getContractBlockEvents(
+            ["Initialize", "Claim", "Refund"],
+            [],
+            lastBlockNumber,
+            currentBlock.number
+        );
+        if(lastProcessedEvent!=null) {
+            const latestProcessedEventIndex = events.findIndex(val => val.blockHash===lastProcessedEvent.blockHash && val.index===lastProcessedEvent.logIndex);
+            if(latestProcessedEventIndex!==-1) {
+                events.splice(0, latestProcessedEventIndex+1);
+                this.logger.debug("checkEvents(EscrowManager): Splicing processed events, resulting size: "+events.length);
+            }
+        }
+        if(events.length>0) {
+            await this.processEvents(events, currentBlock);
+            const lastProcessed = events[events.length-1];
+            lastProcessedEvent = {
+                blockHash: lastProcessed.blockHash,
+                logIndex: lastProcessed.index
+            }
+            if(lastProcessed.blockNumber > lastBlockNumber) lastBlockNumber = lastProcessed.blockNumber;
+        } else if(currentBlock.number - lastBlockNumber > LOGS_SLIDING_WINDOW_LENGTH) {
+            lastProcessedEvent = null;
+            lastBlockNumber = currentBlock.number - LOGS_SLIDING_WINDOW_LENGTH;
+        }
+        return [lastProcessedEvent, lastBlockNumber];
+    }
+
+    protected async checkEventsSpvVaults(currentBlock: Block, lastProcessedEvent?: {blockHash: string, logIndex: number}, lastBlockNumber?: number): Promise<[{blockHash: string, logIndex: number}, number]> {
+        lastBlockNumber ??= currentBlock.number;
+        // this.logger.debug(`checkEvents(SpvVaults): Requesting logs: ${lastBlockNumber}...${currentBlock.number}`);
+        let events = await this.evmSpvVaultContract.Events.getContractBlockEvents(
+            ["Opened", "Deposited", "Closed", "Fronted", "Claimed"],
+            [],
+            lastBlockNumber,
+            currentBlock.number
+        );
+        if(lastProcessedEvent!=null) {
+            const latestProcessedEventIndex = events.findIndex(val => val.blockHash===lastProcessedEvent.blockHash && val.index===lastProcessedEvent.logIndex);
+            if(latestProcessedEventIndex!==-1) {
+                events.splice(0, latestProcessedEventIndex+1);
+                this.logger.debug("checkEvents(SpvVaults): Splicing processed events, resulting size: "+events.length);
+            }
+        }
+        if(events.length>0) {
+            await this.processEvents(events, currentBlock);
+            const lastProcessed = events[events.length-1];
+            lastProcessedEvent = {
+                blockHash: lastProcessed.blockHash,
+                logIndex: lastProcessed.index
+            }
+            if(lastProcessed.blockNumber > lastBlockNumber) lastBlockNumber = lastProcessed.blockNumber;
+        } else if(currentBlock.number - lastBlockNumber > LOGS_SLIDING_WINDOW_LENGTH) {
+            lastProcessedEvent = null;
+            lastBlockNumber = currentBlock.number - LOGS_SLIDING_WINDOW_LENGTH;
+        }
+        return [lastProcessedEvent, lastBlockNumber];
+    }
+
+    protected async checkEvents(lastState: EVMEventListenerState[]): Promise<EVMEventListenerState[]> {
+        lastState ??= [];
+
+        const currentBlock = await this.provider.getBlock(this.chainInterface.config.safeBlockTag, false);
+
+        const [lastEscrowEvent, lastEscrowHeight] = await this.checkEventsEcrowManager(currentBlock, lastState?.[0]?.lastEvent, lastState?.[0]?.lastBlockNumber);
+        const [lastSpvVaultEvent, lastSpvVaultHeight] = await this.checkEventsSpvVaults(currentBlock, lastState?.[1]?.lastEvent, lastState?.[1]?.lastBlockNumber);
+
+        lastState = [
+            {lastBlockNumber: lastEscrowHeight, lastEvent: lastEscrowEvent},
+            {lastBlockNumber: lastSpvVaultHeight, lastEvent: lastSpvVaultEvent}
+        ];
+
+        return lastState;
+    }
+
+    /**
+     * Sets up event handlers listening for swap events over websocket
+     *
+     * @protected
+     */
+    protected async setupPoll(
+        lastState?: EVMEventListenerState[],
+        saveLatestProcessedBlockNumber?: (newState: EVMEventListenerState[]) => Promise<void>
+    ) {
+        this.stopped = false;
+        let func;
+        func = async () => {
+            await this.checkEvents(lastState).then(newState => {
+                lastState = newState;
+                if(saveLatestProcessedBlockNumber!=null) return saveLatestProcessedBlockNumber(newState);
+            }).catch(e => {
+                this.logger.error("setupPoll(): Failed to fetch evm log: ", e);
+            });
+            if(this.stopped) return;
+            this.timeout = setTimeout(func, this.pollIntervalSeconds*1000) as any;
+        };
+        await func();
+    }
+
+    async init(): Promise<void> {
+        this.setupPoll();
+        this.stopped = false;
+        return Promise.resolve();
+    }
+
+    async stop(): Promise<void> {
+        this.stopped = true;
+        if(this.timeout!=null) clearTimeout(this.timeout);
+    }
+
+    registerListener(cbk: EventListener<EVMSwapData>): void {
+        this.listeners.push(cbk);
+    }
+
+    unregisterListener(cbk: EventListener<EVMSwapData>): boolean {
+        const index = this.listeners.indexOf(cbk);
+        if(index>=0) {
+            this.listeners.splice(index, 1);
+            return true;
+        }
+        return false;
+    }
+}