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

package/src/evm/typechain/common.ts

@@ -1,131 +1,131 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-    FunctionFragment,
-    Typed,
-    EventFragment,
-    ContractTransaction,
-    ContractTransactionResponse,
-    DeferredTopicFilter,
-    EventLog,
-    TransactionRequest,
-    LogDescription,
-} from "ethers";
-
-export interface TypedDeferredTopicFilter<_TCEvent extends TypedContractEvent>
-    extends DeferredTopicFilter {}
-
-export interface TypedContractEvent<
-    InputTuple extends Array<any> = any,
-    OutputTuple extends Array<any> = any,
-    OutputObject = any
-> {
-    (...args: Partial<InputTuple>): TypedDeferredTopicFilter<
-        TypedContractEvent<InputTuple, OutputTuple, OutputObject>
-    >;
-    name: string;
-    fragment: EventFragment;
-    getFragment(...args: Partial<InputTuple>): EventFragment;
-}
-
-type __TypechainAOutputTuple<T> = T extends TypedContractEvent<
-        infer _U,
-        infer W
-    >
-    ? W
-    : never;
-type __TypechainOutputObject<T> = T extends TypedContractEvent<
-        infer _U,
-        infer _W,
-        infer V
-    >
-    ? V
-    : never;
-
-export interface TypedEventLog<TCEvent extends TypedContractEvent>
-    extends Omit<EventLog, "args"> {
-    args: __TypechainAOutputTuple<TCEvent> & __TypechainOutputObject<TCEvent>;
-}
-
-export interface TypedLogDescription<TCEvent extends TypedContractEvent>
-    extends Omit<LogDescription, "args"> {
-    args: __TypechainAOutputTuple<TCEvent> & __TypechainOutputObject<TCEvent>;
-}
-
-export type TypedListener<TCEvent extends TypedContractEvent> = (
-    ...listenerArg: [
-        ...__TypechainAOutputTuple<TCEvent>,
-        TypedEventLog<TCEvent>,
-        ...undefined[]
-    ]
-) => void;
-
-export type MinEthersFactory<C, ARGS> = {
-    deploy(...a: ARGS[]): Promise<C>;
-};
-
-export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<
-        infer C,
-        any
-    >
-    ? C
-    : never;
-export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any>
-    ? Parameters<F["deploy"]>
-    : never;
-
-export type StateMutability = "nonpayable" | "payable" | "view";
-
-export type BaseOverrides = Omit<TransactionRequest, "to" | "data">;
-export type NonPayableOverrides = Omit<
-    BaseOverrides,
-    "value" | "blockTag" | "enableCcipRead"
->;
-export type PayableOverrides = Omit<
-    BaseOverrides,
-    "blockTag" | "enableCcipRead"
->;
-export type ViewOverrides = Omit<TransactionRequest, "to" | "data">;
-export type Overrides<S extends StateMutability> = S extends "nonpayable"
-    ? NonPayableOverrides
-    : S extends "payable"
-        ? PayableOverrides
-        : ViewOverrides;
-
-export type PostfixOverrides<A extends Array<any>, S extends StateMutability> =
-    | A
-    | [...A, Overrides<S>];
-export type ContractMethodArgs<
-    A extends Array<any>,
-    S extends StateMutability
-> = PostfixOverrides<{ [I in keyof A]-?: A[I] | Typed }, S>;
-
-export type DefaultReturnType<R> = R extends Array<any> ? R[0] : R;
-
-// export interface ContractMethod<A extends Array<any> = Array<any>, R = any, D extends R | ContractTransactionResponse = R | ContractTransactionResponse> {
-export interface TypedContractMethod<
-    A extends Array<any> = Array<any>,
-    R = any,
-    S extends StateMutability = "payable"
-> {
-    (...args: ContractMethodArgs<A, S>): S extends "view"
-        ? Promise<DefaultReturnType<R>>
-        : Promise<ContractTransactionResponse>;
-
-    name: string;
-
-    fragment: FunctionFragment;
-
-    getFragment(...args: ContractMethodArgs<A, S>): FunctionFragment;
-
-    populateTransaction(
-        ...args: ContractMethodArgs<A, S>
-    ): Promise<ContractTransaction>;
-    staticCall(
-        ...args: ContractMethodArgs<A, "view">
-    ): Promise<DefaultReturnType<R>>;
-    send(...args: ContractMethodArgs<A, S>): Promise<ContractTransactionResponse>;
-    estimateGas(...args: ContractMethodArgs<A, S>): Promise<bigint>;
-    staticCallResult(...args: ContractMethodArgs<A, "view">): Promise<R>;
-}
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+    FunctionFragment,
+    Typed,
+    EventFragment,
+    ContractTransaction,
+    ContractTransactionResponse,
+    DeferredTopicFilter,
+    EventLog,
+    TransactionRequest,
+    LogDescription,
+} from "ethers";
+
+export interface TypedDeferredTopicFilter<_TCEvent extends TypedContractEvent>
+    extends DeferredTopicFilter {}
+
+export interface TypedContractEvent<
+    InputTuple extends Array<any> = any,
+    OutputTuple extends Array<any> = any,
+    OutputObject = any
+> {
+    (...args: Partial<InputTuple>): TypedDeferredTopicFilter<
+        TypedContractEvent<InputTuple, OutputTuple, OutputObject>
+    >;
+    name: string;
+    fragment: EventFragment;
+    getFragment(...args: Partial<InputTuple>): EventFragment;
+}
+
+type __TypechainAOutputTuple<T> = T extends TypedContractEvent<
+        infer _U,
+        infer W
+    >
+    ? W
+    : never;
+type __TypechainOutputObject<T> = T extends TypedContractEvent<
+        infer _U,
+        infer _W,
+        infer V
+    >
+    ? V
+    : never;
+
+export interface TypedEventLog<TCEvent extends TypedContractEvent>
+    extends Omit<EventLog, "args"> {
+    args: __TypechainAOutputTuple<TCEvent> & __TypechainOutputObject<TCEvent>;
+}
+
+export interface TypedLogDescription<TCEvent extends TypedContractEvent>
+    extends Omit<LogDescription, "args"> {
+    args: __TypechainAOutputTuple<TCEvent> & __TypechainOutputObject<TCEvent>;
+}
+
+export type TypedListener<TCEvent extends TypedContractEvent> = (
+    ...listenerArg: [
+        ...__TypechainAOutputTuple<TCEvent>,
+        TypedEventLog<TCEvent>,
+        ...undefined[]
+    ]
+) => void;
+
+export type MinEthersFactory<C, ARGS> = {
+    deploy(...a: ARGS[]): Promise<C>;
+};
+
+export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<
+        infer C,
+        any
+    >
+    ? C
+    : never;
+export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any>
+    ? Parameters<F["deploy"]>
+    : never;
+
+export type StateMutability = "nonpayable" | "payable" | "view";
+
+export type BaseOverrides = Omit<TransactionRequest, "to" | "data">;
+export type NonPayableOverrides = Omit<
+    BaseOverrides,
+    "value" | "blockTag" | "enableCcipRead"
+>;
+export type PayableOverrides = Omit<
+    BaseOverrides,
+    "blockTag" | "enableCcipRead"
+>;
+export type ViewOverrides = Omit<TransactionRequest, "to" | "data">;
+export type Overrides<S extends StateMutability> = S extends "nonpayable"
+    ? NonPayableOverrides
+    : S extends "payable"
+        ? PayableOverrides
+        : ViewOverrides;
+
+export type PostfixOverrides<A extends Array<any>, S extends StateMutability> =
+    | A
+    | [...A, Overrides<S>];
+export type ContractMethodArgs<
+    A extends Array<any>,
+    S extends StateMutability
+> = PostfixOverrides<{ [I in keyof A]-?: A[I] | Typed }, S>;
+
+export type DefaultReturnType<R> = R extends Array<any> ? R[0] : R;
+
+// export interface ContractMethod<A extends Array<any> = Array<any>, R = any, D extends R | ContractTransactionResponse = R | ContractTransactionResponse> {
+export interface TypedContractMethod<
+    A extends Array<any> = Array<any>,
+    R = any,
+    S extends StateMutability = "payable"
+> {
+    (...args: ContractMethodArgs<A, S>): S extends "view"
+        ? Promise<DefaultReturnType<R>>
+        : Promise<ContractTransactionResponse>;
+
+    name: string;
+
+    fragment: FunctionFragment;
+
+    getFragment(...args: ContractMethodArgs<A, S>): FunctionFragment;
+
+    populateTransaction(
+        ...args: ContractMethodArgs<A, S>
+    ): Promise<ContractTransaction>;
+    staticCall(
+        ...args: ContractMethodArgs<A, "view">
+    ): Promise<DefaultReturnType<R>>;
+    send(...args: ContractMethodArgs<A, S>): Promise<ContractTransactionResponse>;
+    estimateGas(...args: ContractMethodArgs<A, S>): Promise<bigint>;
+    staticCallResult(...args: ContractMethodArgs<A, "view">): Promise<R>;
+}

package/src/evm/wallet/EVMSigner.ts

@@ -1,23 +1,25 @@
-import {AbstractSigner} from "@atomiqlabs/base";
-import {Signer} from "ethers";
-
-
-export class EVMSigner implements AbstractSigner {
-
-    account: Signer;
-    public readonly address: string;
-
-    constructor(account: Signer, address: string) {
-        this.account = account;
-        this.address = address;
-    }
-
-    getNonce(): Promise<number> {
-        return Promise.resolve(null);
-    }
-
-    getAddress(): string {
-        return this.address;
-    }
-
-}
+import {AbstractSigner} from "@atomiqlabs/base";
+import {Signer} from "ethers";
+
+
+export class EVMSigner implements AbstractSigner {
+
+    account: Signer;
+    public readonly address: string;
+    public readonly isBrowserWallet: boolean;
+
+    constructor(account: Signer, address: string, isBrowserWallet: boolean = false) {
+        this.account = account;
+        this.address = address;
+        this.isBrowserWallet = isBrowserWallet;
+    }
+
+    getNonce(): Promise<number> {
+        return Promise.resolve(null);
+    }
+
+    getAddress(): string {
+        return this.address;
+    }
+
+}

package/src/index.ts

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

package/src/utils/Utils.ts

@@ -1,81 +1,81 @@
-
-
-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 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));
+}