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

package/src/evm/wallet/EVMSigner.ts

@@ -1,31 +1,31 @@
-import {AbstractSigner} from "@atomiqlabs/base";
-import {Signer, Transaction, TransactionRequest, TransactionResponse} from "ethers";
-
-
-export class EVMSigner implements AbstractSigner {
-
-    account: Signer;
-    public readonly address: string;
-    public readonly isManagingNoncesInternally: boolean;
-
-    constructor(account: Signer, address: string, isManagingNoncesInternally: boolean = false) {
-        this.account = account;
-        this.address = address;
-        this.isManagingNoncesInternally = isManagingNoncesInternally;
-    }
-
-    getAddress(): string {
-        return this.address;
-    }
-
-    async signTransaction?(transaction: TransactionRequest): Promise<string> {
-        return this.account.signTransaction(transaction);
-    }
-
-    async sendTransaction(transaction: TransactionRequest, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<TransactionResponse> {
-        const txResponse = await this.account.sendTransaction(transaction);
-        if(onBeforePublish!=null) await onBeforePublish(txResponse.hash, Transaction.from(txResponse).serialized);
-        return txResponse;
-    }
-
-}
+import {AbstractSigner} from "@atomiqlabs/base";
+import {Signer, Transaction, TransactionRequest, TransactionResponse} from "ethers";
+
+
+export class EVMSigner implements AbstractSigner {
+
+    account: Signer;
+    public readonly address: string;
+    public readonly isManagingNoncesInternally: boolean;
+
+    constructor(account: Signer, address: string, isManagingNoncesInternally: boolean = false) {
+        this.account = account;
+        this.address = address;
+        this.isManagingNoncesInternally = isManagingNoncesInternally;
+    }
+
+    getAddress(): string {
+        return this.address;
+    }
+
+    async signTransaction?(transaction: TransactionRequest): Promise<string> {
+        return this.account.signTransaction(transaction);
+    }
+
+    async sendTransaction(transaction: TransactionRequest, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<TransactionResponse> {
+        const txResponse = await this.account.sendTransaction(transaction);
+        if(onBeforePublish!=null) await onBeforePublish(txResponse.hash, Transaction.from(txResponse).serialized);
+        return txResponse;
+    }
+
+}

package/src/index.ts

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

package/src/utils/Utils.ts

@@ -1,111 +1,111 @@
-
-
-export type LoggerType = {
-    debug: (msg: string, ...args: any[]) => void,
-    info: (msg: string, ...args: any[]) => void,
-    warn: (msg: string, ...args: any[]) => void,
-    error: (msg: string, ...args: any[]) => void,
-}
-
-export function timeoutPromise(timeoutMillis: number, abortSignal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        const timeout = setTimeout(resolve, timeoutMillis)
-        if(abortSignal!=null) abortSignal.addEventListener("abort", () => {
-            clearTimeout(timeout);
-            reject(new Error("Aborted"));
-        })
-    });
-}
-
-export function onceAsync<T>(executor: () => Promise<T>): () => Promise<T> {
-    let promise: Promise<T>;
-
-    return () => {
-        if(promise==null) {
-            promise = executor();
-            return promise;
-        } else {
-            return promise.catch(() => promise = executor());
-        }
-    }
-}
-
-export function getLogger(prefix: string): LoggerType {
-    return {
-        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug(prefix+msg, ...args),
-        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info(prefix+msg, ...args),
-        warn: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 1) && console.warn(prefix+msg, ...args),
-        error: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 0) && console.error(prefix+msg, ...args)
-    };
-}
-
-const logger = getLogger("Utils: ");
-
-export async function tryWithRetries<T>(func: () => Promise<T>, retryPolicy?: {
-    maxRetries?: number, delay?: number, exponential?: boolean
-}, errorAllowed?: (e: any) => boolean, abortSignal?: AbortSignal): Promise<T> {
-    retryPolicy = retryPolicy || {};
-    retryPolicy.maxRetries = retryPolicy.maxRetries || 5;
-    retryPolicy.delay = retryPolicy.delay || 500;
-    retryPolicy.exponential =  retryPolicy.exponential==null ? true : retryPolicy.exponential;
-
-    let err = null;
-
-    for(let i=0;i<retryPolicy.maxRetries;i++) {
-        try {
-            const resp: T = await func();
-            return resp;
-        } catch (e) {
-            if(errorAllowed!=null && errorAllowed(e)) throw e;
-            err = e;
-            logger.error("tryWithRetries(): error on try number: "+i, e);
-        }
-        if(abortSignal!=null && abortSignal.aborted) throw new Error("Aborted");
-        if(i!==retryPolicy.maxRetries-1) {
-            await timeoutPromise(
-                retryPolicy.exponential ? retryPolicy.delay*Math.pow(2, i) : retryPolicy.delay,
-                abortSignal
-            );
-        }
-    }
-
-    throw err;
-}
-
-export function uint32ReverseEndianness(value: number): number {
-    const valueBN = BigInt(value);
-    return Number(((valueBN & 0xFFn) << 24n) |
-        ((valueBN & 0xFF00n) << 8n) |
-        ((valueBN >> 8n) & 0xFF00n) |
-        ((valueBN >> 24n) & 0xFFn));
-}
-
-export function bigIntMax(a: bigint, b: bigint) {
-    return a>b ? a : b;
-}
-
-export const allowedEthersErrorCodes: Set<string> = new Set([
-    "NOT_IMPLEMENTED", "UNSUPPORTED_OPERATION", "BAD_DATA",
-    "NUMERIC_FAULT",
-    "INVALID_ARGUMENT", "MISSING_ARGUMENT", "UNEXPECTED_ARGUMENT", "VALUE_MISMATCH",
-    "CALL_EXCEPTION", "NONCE_EXPIRED", "REPLACEMENT_UNDERPRICED", "TRANSACTION_REPLACED", "UNCONFIGURED_NAME", "OFFCHAIN_FAULT", "ACTION_REJECTED"
-]);
-
-export const allowedEthersErrorNumbers: Set<number> = new Set([
-    -32700, //Invalid JSON
-    -32600, //Invalid request
-    -32601, //Method not found
-    // -32602, //Invalid params
-    // -32603, //Internal error
-    -32000, //Invalid input
-    // -32001, //Resource not found
-    // -32002, //Resource unavailable
-    // -32003, //Transaction rejected
-    -32004, //Method not supported
-    // -32005, //Limit exceeded
-    -32006 //JSON-RPC version not supported
-]);
-
-export const allowedEthersErrorMessages: Set<string> = new Set([
-    "already known"
-]);
+
+
+export type LoggerType = {
+    debug: (msg: string, ...args: any[]) => void,
+    info: (msg: string, ...args: any[]) => void,
+    warn: (msg: string, ...args: any[]) => void,
+    error: (msg: string, ...args: any[]) => void,
+}
+
+export function timeoutPromise(timeoutMillis: number, abortSignal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        const timeout = setTimeout(resolve, timeoutMillis)
+        if(abortSignal!=null) abortSignal.addEventListener("abort", () => {
+            clearTimeout(timeout);
+            reject(new Error("Aborted"));
+        })
+    });
+}
+
+export function onceAsync<T>(executor: () => Promise<T>): () => Promise<T> {
+    let promise: Promise<T>;
+
+    return () => {
+        if(promise==null) {
+            promise = executor();
+            return promise;
+        } else {
+            return promise.catch(() => promise = executor());
+        }
+    }
+}
+
+export function getLogger(prefix: string): LoggerType {
+    return {
+        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug(prefix+msg, ...args),
+        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info(prefix+msg, ...args),
+        warn: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 1) && console.warn(prefix+msg, ...args),
+        error: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 0) && console.error(prefix+msg, ...args)
+    };
+}
+
+const logger = getLogger("Utils: ");
+
+export async function tryWithRetries<T>(func: () => Promise<T>, retryPolicy?: {
+    maxRetries?: number, delay?: number, exponential?: boolean
+}, errorAllowed?: (e: any) => boolean, abortSignal?: AbortSignal): Promise<T> {
+    retryPolicy = retryPolicy || {};
+    retryPolicy.maxRetries = retryPolicy.maxRetries || 5;
+    retryPolicy.delay = retryPolicy.delay || 500;
+    retryPolicy.exponential =  retryPolicy.exponential==null ? true : retryPolicy.exponential;
+
+    let err = null;
+
+    for(let i=0;i<retryPolicy.maxRetries;i++) {
+        try {
+            const resp: T = await func();
+            return resp;
+        } catch (e) {
+            if(errorAllowed!=null && errorAllowed(e)) throw e;
+            err = e;
+            logger.error("tryWithRetries(): error on try number: "+i, e);
+        }
+        if(abortSignal!=null && abortSignal.aborted) throw new Error("Aborted");
+        if(i!==retryPolicy.maxRetries-1) {
+            await timeoutPromise(
+                retryPolicy.exponential ? retryPolicy.delay*Math.pow(2, i) : retryPolicy.delay,
+                abortSignal
+            );
+        }
+    }
+
+    throw err;
+}
+
+export function uint32ReverseEndianness(value: number): number {
+    const valueBN = BigInt(value);
+    return Number(((valueBN & 0xFFn) << 24n) |
+        ((valueBN & 0xFF00n) << 8n) |
+        ((valueBN >> 8n) & 0xFF00n) |
+        ((valueBN >> 24n) & 0xFFn));
+}
+
+export function bigIntMax(a: bigint, b: bigint) {
+    return a>b ? a : b;
+}
+
+export const allowedEthersErrorCodes: Set<string> = new Set([
+    "NOT_IMPLEMENTED", "UNSUPPORTED_OPERATION", "BAD_DATA",
+    "NUMERIC_FAULT",
+    "INVALID_ARGUMENT", "MISSING_ARGUMENT", "UNEXPECTED_ARGUMENT", "VALUE_MISMATCH",
+    "CALL_EXCEPTION", "NONCE_EXPIRED", "REPLACEMENT_UNDERPRICED", "TRANSACTION_REPLACED", "UNCONFIGURED_NAME", "OFFCHAIN_FAULT", "ACTION_REJECTED"
+]);
+
+export const allowedEthersErrorNumbers: Set<number> = new Set([
+    -32700, //Invalid JSON
+    -32600, //Invalid request
+    -32601, //Method not found
+    -32602, //Invalid params
+    // -32603, //Internal error
+    -32000, //Invalid input
+    // -32001, //Resource not found
+    // -32002, //Resource unavailable
+    // -32003, //Transaction rejected
+    -32004, //Method not supported
+    // -32005, //Limit exceeded
+    -32006 //JSON-RPC version not supported
+]);
+
+export const allowedEthersErrorMessages: Set<string> = new Set([
+    "already known"
+]);