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

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

@@ -38,6 +38,7 @@ export declare class EVMChainInterface<ChainId extends string = string> implemen
     getNativeCurrencyAddress(): string;
     isValidToken(tokenIdentifier: string): boolean;
     isValidAddress(address: string): boolean;
+    normalizeAddress(address: string): string;
     offBeforeTxReplace(callback: (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => Promise<void>): boolean;
     onBeforeTxReplace(callback: (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => Promise<void>): void;
     onBeforeTxSigned(callback: (tx: TransactionRequest) => Promise<void>): void;

package/dist/evm/chain/EVMChainInterface.js

@@ -42,6 +42,9 @@ class EVMChainInterface {
     isValidAddress(address) {
         return EVMAddresses_1.EVMAddresses.isValidAddress(address);
     }
+    normalizeAddress(address) {
+        return (0, ethers_1.getAddress)(address);
+    }
     ///////////////////////////////////
     //// Callbacks & handlers
     offBeforeTxReplace(callback) {

package/dist/evm/wallet/EVMSigner.js

@@ -10,7 +10,7 @@ class EVMSigner {
         this.isManagingNoncesInternally = isManagingNoncesInternally;
     }
     getAddress() {
-        return this.address;
+        return (0, ethers_1.getAddress)(this.address);
     }
     async signTransaction(transaction) {
         return this.account.signTransaction(transaction);
@@ -18,7 +18,10 @@ class EVMSigner {
     async sendTransaction(transaction, onBeforePublish) {
         const txResponse = await this.account.sendTransaction(transaction);
         if (onBeforePublish != null)
-            await onBeforePublish(txResponse.hash, ethers_1.Transaction.from(txResponse).serialized);
+            await onBeforePublish(txResponse.hash, ethers_1.Transaction.from({
+                ...txResponse,
+                chainId: transaction.chainId
+            }).serialized);
         return txResponse;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.97",
+  "version": "1.0.0-dev.99",
   "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.16",
+    "@atomiqlabs/base": "^10.0.0-dev.18",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "^1.6.0",
     "buffer": "6.0.3",

package/src/evm/chain/EVMChainInterface.ts

@@ -7,7 +7,8 @@ import {
     Signer,
     Transaction,
     TransactionRequest,
-    Wallet
+    Wallet,
+    getAddress
 } from "ethers";
 import {EVMBlocks, EVMBlockTag} from "./modules/EVMBlocks";
 import {EVMEvents} from "./modules/EVMEvents";
@@ -18,7 +19,6 @@ 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,
@@ -97,6 +97,10 @@ export class EVMChainInterface<ChainId extends string = string> implements Chain
         return EVMAddresses.isValidAddress(address);
     }
 
+    normalizeAddress(address: string): string {
+        return getAddress(address);
+    }
+
     ///////////////////////////////////
     //// Callbacks & handlers
     offBeforeTxReplace(callback: (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => Promise<void>): boolean {

package/src/evm/wallet/EVMSigner.ts

@@ -1,5 +1,5 @@
 import {AbstractSigner} from "@atomiqlabs/base";
-import {Signer, Transaction, TransactionRequest, TransactionResponse} from "ethers";
+import {getAddress, Signer, Transaction, TransactionRequest, TransactionResponse} from "ethers";
 
 
 export class EVMSigner implements AbstractSigner {
@@ -16,7 +16,7 @@ export class EVMSigner implements AbstractSigner {
     }
 
     getAddress(): string {
-        return this.address;
+        return getAddress(this.address);
     }
 
     async signTransaction?(transaction: TransactionRequest): Promise<string> {
@@ -25,7 +25,10 @@ export class EVMSigner implements AbstractSigner {
 
     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);
+        if(onBeforePublish!=null) await onBeforePublish(txResponse.hash, Transaction.from({
+            ...txResponse,
+            chainId: transaction.chainId
+        }).serialized);
         return txResponse;
     }