@atomiqlabs/chain-evm 1.0.0-dev.95 → 1.0.0-dev.97

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

@@ -10,4 +10,5 @@ import { EVMSpvWithdrawalData } from "../../evm/spv_swap/EVMSpvWithdrawalData";
 import { EVMSwapContract } from "../../evm/swaps/EVMSwapContract";
 import { EVMBtcRelay } from "../../evm/btcrelay/EVMBtcRelay";
 import { EVMSpvVaultContract } from "../../evm/spv_swap/EVMSpvVaultContract";
-export type BotanixChainType = ChainType<"BOTANIX", never, EVMPreFetchVerification, EVMTx, EVMSigner, EVMSwapData, EVMSwapContract<"BOTANIX">, EVMChainInterface<"BOTANIX">, EVMChainEventsBrowser, EVMBtcRelay<any>, EVMSpvVaultData, EVMSpvWithdrawalData, EVMSpvVaultContract<"BOTANIX">>;
+import { Signer } from "ethers";
+export type BotanixChainType = ChainType<"BOTANIX", never, EVMPreFetchVerification, EVMTx, EVMSigner, Signer, EVMSwapData, EVMSwapContract<"BOTANIX">, EVMChainInterface<"BOTANIX">, EVMChainEventsBrowser, EVMBtcRelay<any>, EVMSpvVaultData, EVMSpvWithdrawalData, EVMSpvVaultContract<"BOTANIX">>;

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

@@ -10,4 +10,5 @@ import { EVMSpvWithdrawalData } from "../../evm/spv_swap/EVMSpvWithdrawalData";
 import { CitreaSwapContract } from "./CitreaSwapContract";
 import { CitreaBtcRelay } from "./CitreaBtcRelay";
 import { CitreaSpvVaultContract } from "./CitreaSpvVaultContract";
-export type CitreaChainType = ChainType<"CITREA", never, EVMPreFetchVerification, EVMTx, EVMSigner, EVMSwapData, CitreaSwapContract, EVMChainInterface<"CITREA">, EVMChainEventsBrowser, CitreaBtcRelay<any>, EVMSpvVaultData, EVMSpvWithdrawalData, CitreaSpvVaultContract>;
+import { Signer } from "ethers";
+export type CitreaChainType = ChainType<"CITREA", never, EVMPreFetchVerification, EVMTx, EVMSigner, Signer, EVMSwapData, CitreaSwapContract, EVMChainInterface<"CITREA">, EVMChainEventsBrowser, CitreaBtcRelay<any>, EVMSpvVaultData, EVMSpvWithdrawalData, CitreaSpvVaultContract>;

package/dist/evm/chain/EVMChainInterface.d.ts

@@ -1,11 +1,11 @@
 import { ChainInterface, TransactionConfirmationOptions } from "@atomiqlabs/base";
 import { LoggerType } from "../../utils/Utils";
-import { JsonRpcApiProvider, Transaction, TransactionRequest } from "ethers";
+import { JsonRpcApiProvider, Signer, Transaction, TransactionRequest } from "ethers";
 import { EVMBlocks, EVMBlockTag } from "./modules/EVMBlocks";
 import { EVMEvents } from "./modules/EVMEvents";
 import { EVMFees } from "./modules/EVMFees";
 import { EVMTokens } from "./modules/EVMTokens";
-import { EVMTransactions } from "./modules/EVMTransactions";
+import { EVMTransactions, EVMTx } from "./modules/EVMTransactions";
 import { EVMSignatures } from "./modules/EVMSignatures";
 import { EVMSigner } from "../wallet/EVMSigner";
 export type EVMRetryPolicy = {
@@ -20,7 +20,7 @@ export type EVMConfiguration = {
     maxParallelCalls: number;
     maxLogTopics: number;
 };
-export declare class EVMChainInterface<ChainId extends string = string> implements ChainInterface {
+export declare class EVMChainInterface<ChainId extends string = string> implements ChainInterface<EVMTx, EVMSigner, ChainId, Signer> {
     readonly chainId: ChainId;
     readonly provider: JsonRpcApiProvider;
     readonly retryPolicy: EVMRetryPolicy;
@@ -51,4 +51,5 @@ export declare class EVMChainInterface<ChainId extends string = string> implemen
     getTxStatus(tx: string): Promise<"not_found" | "pending" | "success" | "reverted">;
     txsTransfer(signer: string, token: string, amount: bigint, dstAddress: string, feeRate?: string): Promise<TransactionRequest[]>;
     transfer(signer: EVMSigner, token: string, amount: bigint, dstAddress: string, txOptions?: TransactionConfirmationOptions): Promise<string>;
+    wrapSigner(signer: Signer): Promise<EVMSigner>;
 }

package/dist/evm/chain/EVMChainInterface.js

@@ -11,6 +11,7 @@ const EVMTransactions_1 = require("./modules/EVMTransactions");
 const EVMSignatures_1 = require("./modules/EVMSignatures");
 const EVMAddresses_1 = require("./modules/EVMAddresses");
 const EVMSigner_1 = require("../wallet/EVMSigner");
+const EVMBrowserSigner_1 = require("../wallet/EVMBrowserSigner");
 class EVMChainInterface {
     constructor(chainId, evmChainId, provider, config, retryPolicy, evmFeeEstimator = new EVMFees_1.EVMFees(provider)) {
         var _a;
@@ -85,5 +86,12 @@ class EVMChainInterface {
         const [txId] = await this.Transactions.sendAndConfirm(signer, [tx], txOptions?.waitForConfirmation, txOptions?.abortSignal, false);
         return txId;
     }
+    async wrapSigner(signer) {
+        const address = await signer.getAddress();
+        if (signer instanceof ethers_1.JsonRpcSigner || signer.provider instanceof ethers_1.BrowserProvider) {
+            return new EVMBrowserSigner_1.EVMBrowserSigner(signer, address);
+        }
+        return new EVMSigner_1.EVMSigner(signer, address);
+    }
 }
 exports.EVMChainInterface = EVMChainInterface;

package/dist/evm/wallet/EVMSigner.d.ts

@@ -1,6 +1,7 @@
 import { AbstractSigner } from "@atomiqlabs/base";
 import { Signer, TransactionRequest, TransactionResponse } from "ethers";
 export declare class EVMSigner implements AbstractSigner {
+    type: "AtomiqAbstractSigner";
     account: Signer;
     readonly address: string;
     readonly isManagingNoncesInternally: boolean;

package/dist/evm/wallet/EVMSigner.js

@@ -4,6 +4,7 @@ exports.EVMSigner = void 0;
 const ethers_1 = require("ethers");
 class EVMSigner {
     constructor(account, address, isManagingNoncesInternally = false) {
+        this.type = "AtomiqAbstractSigner";
         this.account = account;
         this.address = address;
         this.isManagingNoncesInternally = isManagingNoncesInternally;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.95",
+  "version": "1.0.0-dev.97",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -23,7 +23,7 @@
   "author": "adambor",
   "license": "Apache-2.0",
   "dependencies": {
-    "@atomiqlabs/base": "^10.0.0-dev.13",
+    "@atomiqlabs/base": "^10.0.0-dev.16",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "^1.6.0",
     "buffer": "6.0.3",

package/src/chains/botanix/BotanixChainType.ts

@@ -10,6 +10,7 @@ import { EVMSpvWithdrawalData } from "../../evm/spv_swap/EVMSpvWithdrawalData";
 import {EVMSwapContract} from "../../evm/swaps/EVMSwapContract";
 import {EVMBtcRelay} from "../../evm/btcrelay/EVMBtcRelay";
 import {EVMSpvVaultContract} from "../../evm/spv_swap/EVMSpvVaultContract";
+import {Signer} from "ethers";
 
 export type BotanixChainType = ChainType<
     "BOTANIX",
@@ -17,6 +18,7 @@ export type BotanixChainType = ChainType<
     EVMPreFetchVerification,
     EVMTx,
     EVMSigner,
+    Signer,
     EVMSwapData,
     EVMSwapContract<"BOTANIX">,
     EVMChainInterface<"BOTANIX">,

package/src/chains/citrea/CitreaChainType.ts

@@ -10,6 +10,7 @@ import { EVMSpvWithdrawalData } from "../../evm/spv_swap/EVMSpvWithdrawalData";
 import {CitreaSwapContract} from "./CitreaSwapContract";
 import {CitreaBtcRelay} from "./CitreaBtcRelay";
 import {CitreaSpvVaultContract} from "./CitreaSpvVaultContract";
+import {Signer} from "ethers";
 
 export type CitreaChainType = ChainType<
     "CITREA",
@@ -17,6 +18,7 @@ export type CitreaChainType = ChainType<
     EVMPreFetchVerification,
     EVMTx,
     EVMSigner,
+    Signer,
     EVMSwapData,
     CitreaSwapContract,
     EVMChainInterface<"CITREA">,

package/src/evm/chain/EVMChainInterface.ts

@@ -1,14 +1,24 @@
 import {ChainInterface, TransactionConfirmationOptions} from "@atomiqlabs/base";
 import {getLogger, LoggerType} from "../../utils/Utils";
-import {JsonRpcApiProvider, Transaction, TransactionRequest, Wallet} from "ethers";
+import {
+    BrowserProvider,
+    JsonRpcApiProvider,
+    JsonRpcSigner,
+    Signer,
+    Transaction,
+    TransactionRequest,
+    Wallet
+} from "ethers";
 import {EVMBlocks, EVMBlockTag} from "./modules/EVMBlocks";
 import {EVMEvents} from "./modules/EVMEvents";
 import {EVMFees} from "./modules/EVMFees";
 import {EVMTokens} from "./modules/EVMTokens";
-import { EVMTransactions } from "./modules/EVMTransactions";
+import {EVMTransactions, EVMTx} from "./modules/EVMTransactions";
 import { EVMSignatures } from "./modules/EVMSignatures";
 import {EVMAddresses} from "./modules/EVMAddresses";
 import {EVMSigner} from "../wallet/EVMSigner";
+import {EVMBrowserSigner} from "../wallet/EVMBrowserSigner";
+import {add} from "@noble/hashes/_u64";
 
 export type EVMRetryPolicy = {
     maxRetries?: number,
@@ -24,7 +34,7 @@ export type EVMConfiguration = {
     maxLogTopics: number
 };
 
-export class EVMChainInterface<ChainId extends string = string> implements ChainInterface {
+export class EVMChainInterface<ChainId extends string = string> implements ChainInterface<EVMTx, EVMSigner, ChainId, Signer> {
 
     readonly chainId: ChainId;
 
@@ -156,4 +166,12 @@ export class EVMChainInterface<ChainId extends string = string> implements Chain
         return txId;
     }
 
+    async wrapSigner(signer: Signer): Promise<EVMSigner> {
+        const address = await signer.getAddress();
+        if(signer instanceof JsonRpcSigner || signer.provider instanceof BrowserProvider) {
+            return new EVMBrowserSigner(signer, address);
+        }
+        return new EVMSigner(signer, address);
+    }
+
 }

package/src/evm/wallet/EVMSigner.ts

@@ -3,6 +3,7 @@ import {Signer, Transaction, TransactionRequest, TransactionResponse} from "ethe
 
 
 export class EVMSigner implements AbstractSigner {
+    type = "AtomiqAbstractSigner" as const;
 
     account: Signer;
     public readonly address: string;