@atomiqlabs/chain-evm 1.0.0-dev.89 → 1.0.0-dev.93

package/dist/evm/contract/EVMContractBase.js

@@ -1,34 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVMContractBase = void 0;
-const ethers_1 = require("ethers");
-const EVMContractEvents_1 = require("./modules/EVMContractEvents");
-/**
- * Base class providing program specific utilities
- */
-class EVMContractBase {
-    constructor(chainInterface, contractAddress, contractAbi, contractDeploymentHeight) {
-        this.Chain = chainInterface;
-        this.contract = new ethers_1.Contract(contractAddress, contractAbi, chainInterface.provider);
-        this.Events = new EVMContractEvents_1.EVMContractEvents(chainInterface, this);
-        this.contractAddress = contractAddress;
-        this.contractDeploymentHeight = contractDeploymentHeight;
-    }
-    toTypedEvent(log) {
-        let foundFragment;
-        try {
-            foundFragment = this.contract.interface.getEvent(log.topics[0]);
-        }
-        catch (error) { }
-        if (!foundFragment)
-            return null;
-        try {
-            return new ethers_1.EventLog(log, this.contract.interface, foundFragment);
-        }
-        catch (error) { }
-    }
-    parseCalldata(calldata) {
-        return this.contract.interface.parseTransaction({ data: calldata });
-    }
-}
-exports.EVMContractBase = EVMContractBase;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EVMContractBase = void 0;
+const ethers_1 = require("ethers");
+const EVMContractEvents_1 = require("./modules/EVMContractEvents");
+/**
+ * Base class providing program specific utilities
+ */
+class EVMContractBase {
+    constructor(chainInterface, contractAddress, contractAbi, contractDeploymentHeight) {
+        this.Chain = chainInterface;
+        this.contract = new ethers_1.Contract(contractAddress, contractAbi, chainInterface.provider);
+        this.Events = new EVMContractEvents_1.EVMContractEvents(chainInterface, this);
+        this.contractAddress = contractAddress;
+        this.contractDeploymentHeight = contractDeploymentHeight;
+    }
+    toTypedEvent(log) {
+        let foundFragment;
+        try {
+            foundFragment = this.contract.interface.getEvent(log.topics[0]);
+        }
+        catch (error) { }
+        if (!foundFragment)
+            return null;
+        try {
+            return new ethers_1.EventLog(log, this.contract.interface, foundFragment);
+        }
+        catch (error) { }
+    }
+    parseCalldata(calldata) {
+        return this.contract.interface.parseTransaction({ data: calldata });
+    }
+}
+exports.EVMContractBase = EVMContractBase;

package/dist/evm/contract/EVMContractModule.d.ts

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

package/dist/evm/contract/EVMContractModule.js

@@ -1,11 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVMContractModule = void 0;
-const EVMModule_1 = require("../chain/EVMModule");
-class EVMContractModule extends EVMModule_1.EVMModule {
-    constructor(chainInterface, contract) {
-        super(chainInterface);
-        this.contract = contract;
-    }
-}
-exports.EVMContractModule = EVMContractModule;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EVMContractModule = void 0;
+const EVMModule_1 = require("../chain/EVMModule");
+class EVMContractModule extends EVMModule_1.EVMModule {
+    constructor(chainInterface, contract) {
+        super(chainInterface);
+        this.contract = contract;
+    }
+}
+exports.EVMContractModule = EVMContractModule;

package/dist/evm/contract/modules/EVMContractEvents.d.ts

@@ -1,42 +1,42 @@
-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 declare class EVMContractEvents<T extends BaseContract> extends EVMEvents {
-    readonly contract: EVMContractBase<T>;
-    readonly baseContract: T;
-    constructor(chainInterface: EVMChainInterface<any>, contract: EVMContractBase<T>);
-    toTypedEvents<TEventName extends keyof T["filters"]>(blockEvents: Log[]): TypedEventLog<T["filters"][TEventName]>[];
-    private toFilter;
-    /**
-     * 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
-     */
-    getContractBlockEvents<TEventName extends keyof T["filters"]>(events: TEventName[], keys: string[], startBlockHeight?: number, endBlockHeight?: number): Promise<TypedEventLog<T["filters"][TEventName]>[]>;
-    /**
-     * 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
-     */
-    findInContractEvents<TResult, TEventName extends keyof T["filters"]>(events: TEventName[], keys: string[], processor: (event: TypedEventLog<T["filters"][TEventName]>) => Promise<TResult>, abortSignal?: AbortSignal): Promise<TResult>;
-    /**
-     * 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
-     */
-    findInContractEventsForward<TResult, TEventName extends keyof T["filters"]>(events: TEventName[], keys: string[], processor: (event: TypedEventLog<T["filters"][TEventName]>) => Promise<TResult>, abortSignal?: AbortSignal): Promise<TResult>;
-}
+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 declare class EVMContractEvents<T extends BaseContract> extends EVMEvents {
+    readonly contract: EVMContractBase<T>;
+    readonly baseContract: T;
+    constructor(chainInterface: EVMChainInterface<any>, contract: EVMContractBase<T>);
+    toTypedEvents<TEventName extends keyof T["filters"]>(blockEvents: Log[]): TypedEventLog<T["filters"][TEventName]>[];
+    private toFilter;
+    /**
+     * 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
+     */
+    getContractBlockEvents<TEventName extends keyof T["filters"]>(events: TEventName[], keys: string[], startBlockHeight?: number, endBlockHeight?: number): Promise<TypedEventLog<T["filters"][TEventName]>[]>;
+    /**
+     * 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
+     */
+    findInContractEvents<TResult, TEventName extends keyof T["filters"]>(events: TEventName[], keys: (string | string[])[], processor: (event: TypedEventLog<T["filters"][TEventName]>) => Promise<TResult>, abortSignal?: AbortSignal): Promise<TResult>;
+    /**
+     * 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
+     */
+    findInContractEventsForward<TResult, TEventName extends keyof T["filters"]>(events: TEventName[], keys: (string | string[])[], processor: (event: TypedEventLog<T["filters"][TEventName]>) => Promise<TResult>, abortSignal?: AbortSignal): Promise<TResult>;
+}

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

@@ -1,75 +1,75 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVMContractEvents = void 0;
-const EVMEvents_1 = require("../../chain/modules/EVMEvents");
-class EVMContractEvents extends EVMEvents_1.EVMEvents {
-    constructor(chainInterface, contract) {
-        super(chainInterface);
-        this.contract = contract;
-        this.baseContract = contract.contract;
-    }
-    toTypedEvents(blockEvents) {
-        return blockEvents.map(log => this.contract.toTypedEvent(log));
-    }
-    toFilter(events, keys) {
-        const filterArray = [];
-        filterArray.push(events.map(name => {
-            return this.baseContract.getEvent(name).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
-     */
-    async getContractBlockEvents(events, keys, startBlockHeight, endBlockHeight = startBlockHeight) {
-        const blockEvents = await super.getBlockEvents(await this.baseContract.getAddress(), this.toFilter(events, keys), startBlockHeight, endBlockHeight);
-        return this.toTypedEvents(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
-     */
-    async findInContractEvents(events, keys, processor, abortSignal) {
-        return this.findInEvents(await this.baseContract.getAddress(), this.toFilter(events, keys), async (events) => {
-            const parsedEvents = this.toTypedEvents(events);
-            for (let event of parsedEvents) {
-                const result = 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
-     */
-    async findInContractEventsForward(events, keys, processor, abortSignal) {
-        return this.findInEventsForward(await this.baseContract.getAddress(), this.toFilter(events, keys), async (events) => {
-            const parsedEvents = this.toTypedEvents(events);
-            for (let event of parsedEvents) {
-                const result = await processor(event);
-                if (result != null)
-                    return result;
-            }
-        }, abortSignal, this.contract.contractDeploymentHeight);
-    }
-}
-exports.EVMContractEvents = EVMContractEvents;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EVMContractEvents = void 0;
+const EVMEvents_1 = require("../../chain/modules/EVMEvents");
+class EVMContractEvents extends EVMEvents_1.EVMEvents {
+    constructor(chainInterface, contract) {
+        super(chainInterface);
+        this.contract = contract;
+        this.baseContract = contract.contract;
+    }
+    toTypedEvents(blockEvents) {
+        return blockEvents.map(log => this.contract.toTypedEvent(log));
+    }
+    toFilter(events, keys) {
+        const filterArray = [];
+        filterArray.push(events.map(name => {
+            return this.baseContract.getEvent(name).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
+     */
+    async getContractBlockEvents(events, keys, startBlockHeight, endBlockHeight = startBlockHeight) {
+        const blockEvents = await super.getBlockEvents(await this.baseContract.getAddress(), this.toFilter(events, keys), startBlockHeight, endBlockHeight);
+        return this.toTypedEvents(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
+     */
+    async findInContractEvents(events, keys, processor, abortSignal) {
+        return this.findInEvents(await this.baseContract.getAddress(), this.toFilter(events, keys), async (events) => {
+            const parsedEvents = this.toTypedEvents(events);
+            for (let event of parsedEvents) {
+                const result = 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
+     */
+    async findInContractEventsForward(events, keys, processor, abortSignal) {
+        return this.findInEventsForward(await this.baseContract.getAddress(), this.toFilter(events, keys), async (events) => {
+            const parsedEvents = this.toTypedEvents(events);
+            for (let event of parsedEvents) {
+                const result = await processor(event);
+                if (result != null)
+                    return result;
+            }
+        }, abortSignal, this.contract.contractDeploymentHeight);
+    }
+}
+exports.EVMContractEvents = EVMContractEvents;

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

@@ -1,22 +1,22 @@
-import { EVMChainEventsBrowser } from "./EVMChainEventsBrowser";
-import { EVMChainInterface } from "../chain/EVMChainInterface";
-import { EVMSwapContract } from "../swaps/EVMSwapContract";
-import { EVMSpvVaultContract } from "../spv_swap/EVMSpvVaultContract";
-export declare class EVMChainEvents extends EVMChainEventsBrowser {
-    private readonly directory;
-    private readonly BLOCKHEIGHT_FILENAME;
-    constructor(directory: string, chainInterface: EVMChainInterface, evmSwapContract: EVMSwapContract, evmSpvVaultContract: EVMSpvVaultContract<any>, pollIntervalSeconds?: number);
-    /**
-     * Retrieves last signature & slot from filesystem
-     *
-     * @private
-     */
-    private getLastEventData;
-    /**
-     * Saves last signature & slot to the filesystem
-     *
-     * @private
-     */
-    private saveLastEventData;
-    init(): Promise<void>;
-}
+import { EVMChainEventsBrowser } from "./EVMChainEventsBrowser";
+import { EVMChainInterface } from "../chain/EVMChainInterface";
+import { EVMSwapContract } from "../swaps/EVMSwapContract";
+import { EVMSpvVaultContract } from "../spv_swap/EVMSpvVaultContract";
+export declare class EVMChainEvents extends EVMChainEventsBrowser {
+    private readonly directory;
+    private readonly BLOCKHEIGHT_FILENAME;
+    constructor(directory: string, chainInterface: EVMChainInterface, evmSwapContract: EVMSwapContract, evmSpvVaultContract: EVMSpvVaultContract<any>, pollIntervalSeconds?: number);
+    /**
+     * Retrieves last signature & slot from filesystem
+     *
+     * @private
+     */
+    private getLastEventData;
+    /**
+     * Saves last signature & slot to the filesystem
+     *
+     * @private
+     */
+    private saveLastEventData;
+    init(): Promise<void>;
+}

package/dist/evm/events/EVMChainEvents.js

@@ -1,69 +1,69 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVMChainEvents = void 0;
-//@ts-ignore
-const fs = require("fs/promises");
-const EVMChainEventsBrowser_1 = require("./EVMChainEventsBrowser");
-class EVMChainEvents extends EVMChainEventsBrowser_1.EVMChainEventsBrowser {
-    constructor(directory, chainInterface, evmSwapContract, evmSpvVaultContract, pollIntervalSeconds) {
-        super(chainInterface, evmSwapContract, evmSpvVaultContract, pollIntervalSeconds);
-        this.BLOCKHEIGHT_FILENAME = "/" + chainInterface.chainId + "-blockheight.txt";
-        this.directory = directory;
-    }
-    /**
-     * Retrieves last signature & slot from filesystem
-     *
-     * @private
-     */
-    async getLastEventData() {
-        try {
-            const txt = (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
-     */
-    saveLastEventData(newState) {
-        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() {
-        const lastState = await this.getLastEventData();
-        if (this.provider.websocket != null)
-            await this.setupWebsocket();
-        await this.setupPoll(lastState, (newState) => this.saveLastEventData(newState));
-    }
-}
-exports.EVMChainEvents = EVMChainEvents;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EVMChainEvents = void 0;
+//@ts-ignore
+const fs = require("fs/promises");
+const EVMChainEventsBrowser_1 = require("./EVMChainEventsBrowser");
+class EVMChainEvents extends EVMChainEventsBrowser_1.EVMChainEventsBrowser {
+    constructor(directory, chainInterface, evmSwapContract, evmSpvVaultContract, pollIntervalSeconds) {
+        super(chainInterface, evmSwapContract, evmSpvVaultContract, pollIntervalSeconds);
+        this.BLOCKHEIGHT_FILENAME = "/" + chainInterface.chainId + "-blockheight.txt";
+        this.directory = directory;
+    }
+    /**
+     * Retrieves last signature & slot from filesystem
+     *
+     * @private
+     */
+    async getLastEventData() {
+        try {
+            const txt = (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
+     */
+    saveLastEventData(newState) {
+        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() {
+        const lastState = await this.getLastEventData();
+        if (this.provider.websocket != null)
+            await this.setupWebsocket();
+        await this.setupPoll(lastState, (newState) => this.saveLastEventData(newState));
+    }
+}
+exports.EVMChainEvents = EVMChainEvents;