@atomiqlabs/chain-evm 2.1.14 → 2.2.1

package/README.md

@@ -67,7 +67,7 @@ const Factory = new SwapperFactory<SupportedChains>(chains); //Create swapper fa
 const swapper: TypedSwapper<SupportedChains> = Factory.newSwapper({
   chains: {
     CITREA: {
-      rpcUrl: citreaRpc, //You can also pass JsonApiProvider object here
+      rpcUrl: citreaRpc, //You can also pass JsonRpcApiProvider object here
     }
   },
   bitcoinNetwork: BitcoinNetwork.MAINNET //or BitcoinNetwork.TESTNET3, BitcoinNetwork.TESTNET4 - this also sets the deployment to use for EVM chains

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

@@ -160,6 +160,10 @@ export declare class EVMChainInterface<ChainId extends string = string> implemen
      * @inheritDoc
      */
     sendSignedAndConfirm(signedTxs: Transaction[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]>;
+    /**
+     * @inheritDoc
+     */
+    prepareTxs(txs: EVMTx[]): Promise<EVMTx[]>;
     /**
      * @inheritDoc
      */

package/dist/evm/chain/EVMChainInterface.js

@@ -118,6 +118,13 @@ class EVMChainInterface {
     sendSignedAndConfirm(signedTxs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
         return this.Transactions.sendSignedAndConfirm(signedTxs, waitForConfirmation, abortSignal, parallel, onBeforePublish);
     }
+    /**
+     * @inheritDoc
+     */
+    async prepareTxs(txs) {
+        await this.Transactions.prepareTransactions(txs);
+        return txs;
+    }
     /**
      * @inheritDoc
      */

package/dist/evm/chain/modules/EVMTransactions.d.ts

@@ -56,12 +56,11 @@ export declare class EVMTransactions extends EVMModule<any> {
      * Prepares EVM transactions, assigns nonces when needed, and optionally applies access lists
      * before signing.
      *
-     * @param signer
      * @param txs
+     * @param signer
      * @param useAccessList Whether to use access lists for sending txns
-     * @private
      */
-    private prepareTransactions;
+    prepareTransactions(txs: TransactionRequest[], signer?: EVMSigner, useAccessList?: boolean): Promise<void>;
     /**
      * Sends out a signed transaction to the RPC
      *

package/dist/evm/chain/modules/EVMTransactions.js

@@ -117,19 +117,24 @@ class EVMTransactions extends EVMModule_1.EVMModule {
      * Prepares EVM transactions, assigns nonces when needed, and optionally applies access lists
      * before signing.
      *
-     * @param signer
      * @param txs
+     * @param signer
      * @param useAccessList Whether to use access lists for sending txns
-     * @private
      */
-    async prepareTransactions(signer, txs, useAccessList) {
+    async prepareTransactions(txs, signer, useAccessList) {
+        if (txs.length === 0)
+            return;
+        const signerAddress = signer?.getAddress()
+            ?? (txs[0].from == null ? null : await (0, ethers_1.resolveAddress)(txs[0].from, this.provider));
+        if (signerAddress == null)
+            throw new Error("Cannot get tx sender address!");
         for (let tx of txs) {
             tx.chainId = this.root.evmChainId;
-            tx.from = signer.getAddress();
+            tx.from = signerAddress;
         }
-        if (!signer.isManagingNoncesInternally) {
-            let nonce = await this.root.provider.getTransactionCount(signer.getAddress(), "pending");
-            const latestKnownNonce = this.latestPendingNonces[signer.getAddress()];
+        if (signer == null || !signer.isManagingNoncesInternally) {
+            let nonce = await this.root.provider.getTransactionCount(signerAddress, "pending");
+            const latestKnownNonce = this.latestPendingNonces[signerAddress];
             if (latestKnownNonce != null && latestKnownNonce > nonce) {
                 this.logger.debug("prepareTransactions(): Using nonce from local cache!");
                 nonce = latestKnownNonce;
@@ -139,20 +144,21 @@ class EVMTransactions extends EVMModule_1.EVMModule {
                 if (tx.nonce != null)
                     nonce = tx.nonce; //Take the nonce from last tx
                 if (nonce == null)
-                    nonce = await this.root.provider.getTransactionCount(signer.getAddress(), "pending"); //Fetch the nonce
+                    nonce = await this.root.provider.getTransactionCount(signerAddress, "pending"); //Fetch the nonce
                 if (tx.nonce == null)
                     tx.nonce = nonce;
                 this.logger.debug("sendAndConfirm(): transaction prepared (" + (i + 1) + "/" + txs.length + "), nonce: " + tx.nonce);
                 nonce++;
             }
         }
-        for (let tx of txs) {
-            if (useAccessList)
-                await this.applyAccessList(tx);
-            for (let callback of this.cbksBeforeTxSigned) {
-                await callback(tx);
+        if (signer != null)
+            for (let tx of txs) {
+                if (useAccessList)
+                    await this.applyAccessList(tx);
+                for (let callback of this.cbksBeforeTxSigned) {
+                    await callback(tx);
+                }
             }
-        }
     }
     /**
      * Sends out a signed transaction to the RPC
@@ -191,7 +197,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
      * @param useAccessLists
      */
     async sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish, useAccessLists) {
-        await this.prepareTransactions(signer, txs, useAccessLists ?? this.root._config.useAccessLists);
+        await this.prepareTransactions(txs, signer, useAccessLists ?? this.root._config.useAccessLists);
         const signedTxs = [];
         //Don't separate the signing process from the sending when using browser-based wallet
         if (signer.signTransaction != null)
@@ -329,7 +335,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
         const tx = ethers_1.Transaction.from({
             ...unsignedTx,
             to: unsignedTx.to == null ? null : await (0, ethers_1.resolveAddress)(unsignedTx.to),
-            from: unsignedTx.from == null ? null : await (0, ethers_1.resolveAddress)(unsignedTx.from),
+            from: null,
             authorizationList: unsignedTx.authorizationList == null ? null : unsignedTx.authorizationList.map(val => ({
                 ...val,
                 nonce: BigInt(val.nonce),
@@ -337,7 +343,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
                 signature: ethers_1.Signature.from(val.signature)
             }))
         });
-        return this.serializeSignedTx(tx);
+        return tx.unsignedSerialized;
     }
     /**
      * Serializes the signed EVM transaction

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "2.1.14",
+  "version": "2.2.1",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
   "scripts": {
+    "build": "npx -y -p typescript@4.9 tsc",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build:ts4": "npx -p typescript@4.9 tsc --noEmit",
     "build:ts5": "npx -p typescript@5.3 tsc --noEmit"
@@ -26,7 +27,7 @@
   "author": "adambor",
   "license": "Apache-2.0",
   "dependencies": {
-    "@atomiqlabs/base": "^13.1.14",
+    "@atomiqlabs/base": "^13.2.0",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "^1.6.0",
     "buffer": "6.0.3",

package/src/evm/chain/EVMChainInterface.ts

@@ -264,6 +264,14 @@ export class EVMChainInterface<ChainId extends string = string> implements Chain
         return this.Transactions.sendSignedAndConfirm(signedTxs, waitForConfirmation, abortSignal, parallel, onBeforePublish);
     }
 
+    /**
+     * @inheritDoc
+     */
+    async prepareTxs(txs: EVMTx[]): Promise<EVMTx[]> {
+        await this.Transactions.prepareTransactions(txs);
+        return txs;
+    }
+
     /**
      * @inheritDoc
      */

package/src/evm/chain/modules/EVMTransactions.ts

@@ -161,20 +161,24 @@ export class EVMTransactions extends EVMModule<any> {
      * Prepares EVM transactions, assigns nonces when needed, and optionally applies access lists
      * before signing.
      *
-     * @param signer
      * @param txs
+     * @param signer
      * @param useAccessList Whether to use access lists for sending txns
-     * @private
      */
-    private async prepareTransactions(signer: EVMSigner, txs: TransactionRequest[], useAccessList?: boolean): Promise<void> {
+    public async prepareTransactions(txs: TransactionRequest[], signer?: EVMSigner, useAccessList?: boolean): Promise<void> {
+        if(txs.length===0) return;
+        const signerAddress = signer?.getAddress()
+            ?? (txs[0].from==null ? null : await resolveAddress(txs[0].from, this.provider));
+        if(signerAddress==null) throw new Error("Cannot get tx sender address!");
+
         for(let tx of txs) {
             tx.chainId = this.root.evmChainId;
-            tx.from = signer.getAddress();
+            tx.from = signerAddress;
         }
 
-        if(!signer.isManagingNoncesInternally) {
-            let nonce: number = await this.root.provider.getTransactionCount(signer.getAddress(), "pending");
-            const latestKnownNonce = this.latestPendingNonces[signer.getAddress()];
+        if(signer==null || !signer.isManagingNoncesInternally) {
+            let nonce: number = await this.root.provider.getTransactionCount(signerAddress, "pending");
+            const latestKnownNonce = this.latestPendingNonces[signerAddress];
             if(latestKnownNonce!=null && latestKnownNonce > nonce) {
                 this.logger.debug("prepareTransactions(): Using nonce from local cache!");
                 nonce = latestKnownNonce;
@@ -183,7 +187,7 @@ export class EVMTransactions extends EVMModule<any> {
             for(let i=0;i<txs.length;i++) {
                 const tx = txs[i];
                 if(tx.nonce!=null) nonce = tx.nonce; //Take the nonce from last tx
-                if(nonce==null) nonce = await this.root.provider.getTransactionCount(signer.getAddress(), "pending"); //Fetch the nonce
+                if(nonce==null) nonce = await this.root.provider.getTransactionCount(signerAddress, "pending"); //Fetch the nonce
                 if(tx.nonce==null) tx.nonce = nonce;
 
                 this.logger.debug("sendAndConfirm(): transaction prepared ("+(i+1)+"/"+txs.length+"), nonce: "+tx.nonce);
@@ -192,7 +196,7 @@ export class EVMTransactions extends EVMModule<any> {
             }
         }
 
-        for(let tx of txs) {
+        if(signer!=null) for(let tx of txs) {
             if(useAccessList) await this.applyAccessList(tx);
             for(let callback of this.cbksBeforeTxSigned) {
                 await callback(tx);
@@ -246,7 +250,7 @@ export class EVMTransactions extends EVMModule<any> {
         abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>,
         useAccessLists?: boolean
     ): Promise<string[]> {
-        await this.prepareTransactions(signer, txs, useAccessLists ?? this.root._config.useAccessLists);
+        await this.prepareTransactions(txs, signer, useAccessLists ?? this.root._config.useAccessLists);
         const signedTxs: Transaction[] = [];
 
         //Don't separate the signing process from the sending when using browser-based wallet
@@ -395,7 +399,7 @@ export class EVMTransactions extends EVMModule<any> {
         const tx = Transaction.from({
             ...unsignedTx,
             to: unsignedTx.to==null ? null : await resolveAddress(unsignedTx.to),
-            from: unsignedTx.from==null ? null : await resolveAddress(unsignedTx.from),
+            from: null, // Unsigned transaction cannot have its `from` field populated
             authorizationList: unsignedTx.authorizationList==null ? null : unsignedTx.authorizationList.map(val => ({
                 ...val,
                 nonce: BigInt(val.nonce),
@@ -403,7 +407,7 @@ export class EVMTransactions extends EVMModule<any> {
                 signature: Signature.from(val.signature)
             }))
         });
-        return this.serializeSignedTx(tx);
+        return tx.unsignedSerialized;
     }
 
     /**