@atomiqlabs/chain-evm 2.4.2 → 2.4.3

package/dist/evm/btcrelay/EVMBtcRelay.d.ts

@@ -13,6 +13,8 @@ import { EVMChainInterface } from "../chain/EVMChainInterface";
  * @category BTC Relay
  */
 export declare class EVMBtcRelay<B extends BtcBlock> extends EVMContractBase<BtcRelayTypechain> implements BtcRelay<EVMBtcStoredHeader, EVMTx, B, EVMSigner> {
+    private readonly logger;
+    readonly chainId: string;
     /**
      * @internal
      */

package/dist/evm/btcrelay/EVMBtcRelay.js

@@ -21,7 +21,6 @@ function serializeBlockHeader(e) {
         hash: Buffer.from(e.getHash(), "hex").reverse()
     });
 }
-const logger = (0, Utils_1.getLogger)("EVMBtcRelay: ");
 /**
  * EVM BTC Relay bitcoin light client contract representation.
  *
@@ -90,6 +89,8 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
         this.commitHashCache = new promise_cache_ts_1.PromiseLruCache(1000);
         this.blockHashCache = new promise_cache_ts_1.PromiseLruCache(1000);
         this._bitcoinRpc = bitcoinRpc;
+        this.logger = (0, Utils_1.getLogger)("EVMBtcRelay(" + chainInterface.chainId + "): ");
+        this.chainId = chainInterface.chainId;
     }
     /**
      * Computes subsequent committed headers as they will appear on-chain once transactions
@@ -238,7 +239,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
         const chainCommitment = await this.contract.getCommitHash(storedBlockHeader.getBlockheight());
         if (chainCommitment !== commitHash)
             return null;
-        logger.debug("retrieveLogAndBlockheight(): block found," +
+        this.logger.debug("retrieveLogAndBlockheight(): block found," +
             " commit hash: " + commitHash + " blockhash: " + blockData.blockhash + " current btc relay height: " + blockHeight);
         return { header: storedBlockHeader, height: blockHeight };
     }
@@ -254,7 +255,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
         const chainCommitment = await this.contract.getCommitHash(storedBlockHeader.getBlockheight());
         if (chainCommitment !== commitHash)
             return null;
-        logger.debug("retrieveLogByCommitHash(): block found," +
+        this.logger.debug("retrieveLogByCommitHash(): block found," +
             " commit hash: " + commitmentHashStr + " blockhash: " + blockData.blockhash + " height: " + storedBlockHeader.getBlockheight());
         return storedBlockHeader;
     }
@@ -284,7 +285,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
             };
         });
         if (data != null)
-            logger.debug("retrieveLatestKnownBlockLog(): block found," +
+            this.logger.debug("retrieveLatestKnownBlockLog(): block found," +
                 " commit hash: " + data.commitHash + " blockhash: " + data.resultBitcoinHeader.getHash() +
                 " height: " + data.resultStoredHeader.getBlockheight());
         return data;
@@ -294,7 +295,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
      */
     async saveMainHeaders(signer, mainHeaders, storedHeader, feeRate) {
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
-        logger.debug("saveMainHeaders(): submitting main blockheaders, count: " + mainHeaders.length);
+        this.logger.debug("saveMainHeaders(): submitting main blockheaders, count: " + mainHeaders.length);
         return this._saveHeaders(signer, mainHeaders, storedHeader, 0, feeRate, 0);
     }
     /**
@@ -303,7 +304,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
     async saveNewForkHeaders(signer, forkHeaders, storedHeader, tipWork, feeRate) {
         let forkId = Math.floor(Math.random() * 0xFFFFFFFFFFFF);
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
-        logger.debug("saveNewForkHeaders(): submitting new fork & blockheaders," +
+        this.logger.debug("saveNewForkHeaders(): submitting new fork & blockheaders," +
             " count: " + forkHeaders.length + " forkId: 0x" + forkId.toString(16));
         const result = await this._saveHeaders(signer, forkHeaders, storedHeader, forkId, feeRate, 100);
         if (result.forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(result.lastStoredHeader.getChainWork(), tipWork)) {
@@ -317,7 +318,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
      */
     async saveForkHeaders(signer, forkHeaders, storedHeader, forkId, tipWork, feeRate) {
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
-        logger.debug("saveForkHeaders(): submitting blockheaders to existing fork," +
+        this.logger.debug("saveForkHeaders(): submitting blockheaders to existing fork," +
             " count: " + forkHeaders.length + " forkId: 0x" + forkId.toString(16));
         const result = await this._saveHeaders(signer, forkHeaders, storedHeader, forkId, feeRate, 100);
         if (result.forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(result.lastStoredHeader.getChainWork(), tipWork)) {
@@ -331,7 +332,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
      */
     async saveShortForkHeaders(signer, forkHeaders, storedHeader, tipWork, feeRate) {
         feeRate ?? (feeRate = await this.Chain.Fees.getFeeRate());
-        logger.debug("saveShortForkHeaders(): submitting short fork blockheaders," +
+        this.logger.debug("saveShortForkHeaders(): submitting short fork blockheaders," +
             " count: " + forkHeaders.length);
         const result = await this._saveHeaders(signer, forkHeaders, storedHeader, -1, feeRate, 0);
         if (result.forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(result.lastStoredHeader.getChainWork(), tipWork)) {
@@ -354,7 +355,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
             return 0n;
         const synchronizationFee = (BigInt(blockheightDelta) * await this.getFeePerBlock(feeRate))
             + EVMFees_1.EVMFees.getGasFee(EVMBtcRelay._GasCosts.GAS_BASE_MAIN * Math.ceil(blockheightDelta / this.maxHeadersPerTx), feeRate);
-        logger.debug("estimateSynchronizeFee(): required blockheight: " + requiredBlockheight +
+        this.logger.debug("estimateSynchronizeFee(): required blockheight: " + requiredBlockheight +
             " blockheight delta: " + blockheightDelta + " fee: " + synchronizationFee.toString(10));
         return synchronizationFee;
     }
@@ -421,6 +422,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
             return null;
         //TODO: We don't have to synchronize to tip, only to our required blockheight
         const resp = await synchronizer.syncToLatestTxs(signer.toString(), feeRate);
+        const logger = (0, Utils_1.getLogger)("EVMBtcRelay(" + btcRelay.Chain.chainId + "): ");
         logger.debug("getCommitedHeaderAndSynchronize(): BTC Relay not synchronized to required blockheight, " +
             "synchronizing ourselves in " + resp.txs.length + " txs");
         logger.debug("getCommitedHeaderAndSynchronize(): BTC Relay computed header map: ", resp.computedHeaderMap);

package/dist/evm/chain/EVMChainInterface.js

@@ -30,7 +30,7 @@ class EVMChainInterface {
         (_c = this._config).finalityCheckStrategy ?? (_c.finalityCheckStrategy = { type: "timer" });
         (_d = this._config.finalityCheckStrategy).delayMs ?? (_d.delayMs = 1000);
         this.bitcoinNetwork = bitcoinNetwork;
-        this.logger = (0, Utils_1.getLogger)("EVMChainInterface(" + this.evmChainId + "): ");
+        this.logger = (0, Utils_1.getLogger)("EVMChainInterface(" + this.chainId + "): ");
         this.Fees = evmFeeEstimator;
         this.Tokens = new EVMTokens_1.EVMTokens(this);
         this.Transactions = new EVMTransactions_1.EVMTransactions(this);

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

@@ -1,3 +1,4 @@
+import { LoggerType } from "../../utils/Utils";
 import { JsonRpcApiProvider } from "ethers";
 import { EVMChainInterface, EVMRetryPolicy } from "./EVMChainInterface";
 /**
@@ -9,6 +10,6 @@ export declare class EVMModule<ChainId extends string = string> {
     protected readonly provider: JsonRpcApiProvider;
     protected readonly retryPolicy?: EVMRetryPolicy;
     protected readonly root: EVMChainInterface<ChainId>;
-    protected readonly logger: import("../../utils/Utils").LoggerType;
+    protected readonly logger: LoggerType;
     constructor(root: EVMChainInterface<ChainId>);
 }

package/dist/evm/chain/EVMModule.js

@@ -9,10 +9,10 @@ const Utils_1 = require("../../utils/Utils");
  */
 class EVMModule {
     constructor(root) {
-        this.logger = (0, Utils_1.getLogger)(this.constructor.name + ": ");
         this.provider = root.provider;
         this.retryPolicy = root._retryPolicy;
         this.root = root;
+        this.logger = (0, Utils_1.getLogger)(this.constructor.name + "(" + root.chainId + "): ");
     }
 }
 exports.EVMModule = EVMModule;

package/dist/evm/events/EVMChainEventsBrowser.d.ts

@@ -2,6 +2,7 @@ import { ChainEvents, EventListener } from "@atomiqlabs/base";
 import { EVMSwapData } from "../swaps/EVMSwapData";
 import { Block, JsonRpcApiProvider, EventFilter, Log } from "ethers";
 import { EVMSwapContract } from "../swaps/EVMSwapContract";
+import { LoggerType } from "../../utils/Utils";
 import { EVMSpvVaultContract } from "../spv_swap/EVMSpvVaultContract";
 import { EVMChainInterface } from "../chain/EVMChainInterface";
 import { TypedEventLog } from "../typechain/common";
@@ -55,7 +56,7 @@ export declare class EVMChainEventsBrowser implements ChainEvents<EVMSwapData, E
     /**
      * @internal
      */
-    protected readonly logger: import("../../utils/Utils").LoggerType;
+    protected readonly logger: LoggerType;
     /**
      * @internal
      */

package/dist/evm/events/EVMChainEventsBrowser.js

@@ -22,10 +22,6 @@ class EVMChainEventsBrowser {
          * @internal
          */
         this.listeners = [];
-        /**
-         * @internal
-         */
-        this.logger = (0, Utils_1.getLogger)("EVMChainEventsBrowser: ");
         /**
          * @internal
          */
@@ -47,6 +43,7 @@ class EVMChainEventsBrowser {
         this.evmSwapContract = evmSwapContract;
         this.evmSpvVaultContract = evmSpvVaultContract;
         this.pollIntervalSeconds = pollIntervalSeconds;
+        this.logger = (0, Utils_1.getLogger)("EVMChainEventsBrowser(" + evmSwapContract.chainId + "): ");
         this.spvVaultContractLogFilter = {
             address: this.evmSpvVaultContract._contractAddress
         };

package/dist/evm/providers/ReconnectingWebSocketProvider.d.ts

@@ -1,6 +1,7 @@
 import { JsonRpcApiProviderOptions } from "ethers";
 import type { Networkish, WebSocketLike } from "ethers";
 import { SocketProvider } from "./SocketProvider";
+import { LoggerType } from "../../utils/Utils";
 /**
  * WebSocket RPC provider with automatic reconnect, heartbeat ping and connection timeout handling.
  *
@@ -19,6 +20,7 @@ export declare class ReconnectingWebSocketProvider extends SocketProvider {
         onclose?: (...args: any[]) => void;
         ping?: () => void;
     });
+    readonly logger: LoggerType;
     constructor(url: string | (() => WebSocketLike), network?: Networkish, options?: JsonRpcApiProviderOptions);
     private connect;
     private disconnectedAndScheduleReconnect;

package/dist/evm/providers/ReconnectingWebSocketProvider.js

@@ -1,9 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReconnectingWebSocketProvider = void 0;
+const ethers_1 = require("ethers");
 const SocketProvider_1 = require("./SocketProvider");
 const Utils_1 = require("../../utils/Utils");
-const logger = (0, Utils_1.getLogger)("ReconnectingWebSocketProvider: ");
+function getChainIdentifier(network) {
+    if (network == null)
+        return "UNKNOWN";
+    if (typeof (network) === "bigint")
+        return network.toString(10);
+    if (typeof (network) === "number")
+        return network.toString(10);
+    if (typeof (network) === "string")
+        return network;
+    if (network instanceof ethers_1.Network)
+        return network.name ?? network.chainId.toString(10);
+    return network.name ?? network.chainId?.toString(10) ?? "UNKNOWN";
+}
 /**
  * WebSocket RPC provider with automatic reconnect, heartbeat ping and connection timeout handling.
  *
@@ -17,6 +30,7 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
         this.pingIntervalSeconds = 30;
         this.connectionTimeout = 10;
         this.websocket = null;
+        this.logger = (0, Utils_1.getLogger)("ReconnectingWebSocketProvider(" + getChainIdentifier(network) + "): ");
         this.wsCtor = typeof (url) === "string" ? () => new WebSocket(url) : url;
         this.connect();
     }
@@ -31,7 +45,7 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
                 this._send({ method: "eth_chainId", params: [], id: 1000000000, jsonrpc: "2.0" }).catch(e => {
                     //Error
                     if (e.code === "NETWORK_ERROR") {
-                        logger.error("connect(): pingInterval: Websocket ping error: ", e);
+                        this.logger.error("connect(): pingInterval: Websocket ping error: ", e);
                         if (this.websocket != null) {
                             this.websocket.close();
                             this.disconnectedAndScheduleReconnect();
@@ -39,21 +53,21 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
                     }
                 });
             }, this.pingIntervalSeconds * 1000);
-            logger.info("connect(): Websocket connected!");
+            this.logger.info("connect(): Websocket connected!");
         };
         this.websocket.onerror = (err) => {
-            logger.error(`connect(): onerror: Websocket connection error: `, err.error ?? err);
+            this.logger.error(`connect(): onerror: Websocket connection error: `, err.error ?? err);
             this.disconnectedAndScheduleReconnect();
         };
         this.websocket.onmessage = (message) => {
             this._processMessage(message.data);
         };
         this.websocket.onclose = (event) => {
-            logger.error(`connect(): onclose: Websocket connection closed: `, event);
+            this.logger.error(`connect(): onclose: Websocket connection closed: `, event);
             this.disconnectedAndScheduleReconnect();
         };
         this.connectTimer = setTimeout(() => {
-            logger.warn("connect(): Websocket connection taking too long, (above " + this.connectionTimeout + " seconds!), closing and re-attempting connection");
+            this.logger.warn("connect(): Websocket connection taking too long, (above " + this.connectionTimeout + " seconds!), closing and re-attempting connection");
             this.websocket.close();
             this.disconnectedAndScheduleReconnect();
         }, this.connectionTimeout * 1000);
@@ -65,7 +79,7 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
             return;
         this.websocket.onclose = undefined;
         //Register dummy handler, otherwise we get unhandled `error` event which crashes the whole thing
-        this.websocket.onerror = (err) => logger.error("disconnectedAndScheduleReconnect(): Post-close onerror: ", err.error ?? err);
+        this.websocket.onerror = (err) => this.logger.error("disconnectedAndScheduleReconnect(): Post-close onerror: ", err.error ?? err);
         this.websocket.onmessage = null;
         this.websocket.onopen = null;
         this.websocket = null;
@@ -74,7 +88,7 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
         if (this.connectTimer != null)
             clearInterval(this.connectTimer);
         this._disconnected();
-        logger.info(`disconnectedAndScheduleReconnect(): Retrying in ${this.reconnectSeconds} seconds...`);
+        this.logger.info(`disconnectedAndScheduleReconnect(): Retrying in ${this.reconnectSeconds} seconds...`);
         this.reconnectTimer = setTimeout(() => this.connect(), this.reconnectSeconds * 1000);
     }
     async _write(message) {

package/dist/evm/spv_swap/EVMSpvVaultContract.js

@@ -49,8 +49,8 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
     constructor(chainInterface, btcRelay, bitcoinRpc, contractAddress, contractDeploymentHeight) {
         super(chainInterface, contractAddress, SpvVaultContractAbi_1.SpvVaultContractAbi, contractDeploymentHeight);
         this.claimTimeout = 180;
-        this.logger = (0, Utils_1.getLogger)("EVMSpvVaultContract: ");
         this.vaultParamsCache = new promise_cache_ts_1.PromiseLruCache(5000);
+        this.logger = (0, Utils_1.getLogger)("EVMSpvVaultContract(" + chainInterface.chainId + "): ");
         this.chainId = chainInterface.chainId;
         this.btcRelay = btcRelay;
         this.bitcoinRpc = bitcoinRpc;

package/dist/evm/swaps/EVMSwapContract.d.ts

@@ -23,6 +23,7 @@ import { EVMSwapClaim } from "./modules/EVMSwapClaim";
  * @category Swaps
  */
 export declare class EVMSwapContract<ChainId extends string = string> extends EVMContractBase<EscrowManager> implements SwapContract<EVMSwapData, EVMTx, never, EVMPreFetchVerification, EVMSigner, ChainId> {
+    private readonly logger;
     readonly supportsInitWithoutClaimer = true;
     readonly chainId: ChainId;
     readonly claimWithSecretTimeout: number;

package/dist/evm/swaps/EVMSwapContract.js

@@ -18,7 +18,6 @@ const Utils_1 = require("../../utils/Utils");
 const ESCROW_STATE_COMMITTED = 1;
 const ESCROW_STATE_CLAIMED = 2;
 const ESCROW_STATE_REFUNDED = 3;
-const logger = (0, Utils_1.getLogger)("EVMSwapContract: ");
 /**
  * EVM swap contract (escrow manager) representation handling PrTLC (on-chain) and HTLC (lightning)
  *  based swaps.
@@ -67,6 +66,7 @@ class EVMSwapContract extends EVMContractBase_1.EVMContractBase {
         });
         this._timelockRefundHandler = new TimelockRefundHandler_1.TimelockRefundHandler(handlerAddresses.refund.timelock);
         this._refundHandlersByAddress[this._timelockRefundHandler.address.toLowerCase()] = this._timelockRefundHandler;
+        this.logger = (0, Utils_1.getLogger)("EVMSwapContract(" + this.chainId + "): ");
     }
     /**
      * @inheritDoc
@@ -346,13 +346,13 @@ class EVMSwapContract extends EVMContractBase_1.EVMContractBase {
                 const claimHandlerHex = event.args.claimHandler;
                 const claimHandler = this._claimHandlersByAddress[claimHandlerHex.toLowerCase()];
                 if (claimHandler == null) {
-                    logger.warn(`getHistoricalSwaps(): Unknown claim handler in tx ${event.transactionHash} with claim handler: ` + claimHandlerHex);
+                    this.logger.warn(`getHistoricalSwaps(): Unknown claim handler in tx ${event.transactionHash} with claim handler: ` + claimHandlerHex);
                     return null;
                 }
                 const txTrace = await this.Chain.Transactions.traceTransaction(event.transactionHash);
                 const data = this.findInitSwapData(txTrace, event.args.escrowHash, claimHandler);
                 if (data == null) {
-                    logger.warn(`getHistoricalSwaps(): Cannot parse swap data from tx ${event.transactionHash} with escrow hash: ` + escrowHash);
+                    this.logger.warn(`getHistoricalSwaps(): Cannot parse swap data from tx ${event.transactionHash} with escrow hash: ` + escrowHash);
                     return null;
                 }
                 swapsOpened[escrowHash] = {
@@ -410,8 +410,8 @@ class EVMSwapContract extends EVMContractBase_1.EVMContractBase {
         //We have to fetch separately the different directions
         await this._Events.findInContractEventsForward(["Initialize", "Claim", "Refund"], [signer, null], processor, startBlockheight);
         await this._Events.findInContractEventsForward(["Initialize", "Claim", "Refund"], [null, signer], processor, startBlockheight);
-        logger.debug(`getHistoricalSwaps(): Found ${Object.keys(resultingSwaps).length} settled swaps!`);
-        logger.debug(`getHistoricalSwaps(): Found ${Object.keys(swapsOpened).length} unsettled swaps!`);
+        this.logger.debug(`getHistoricalSwaps(): Found ${Object.keys(resultingSwaps).length} settled swaps!`);
+        this.logger.debug(`getHistoricalSwaps(): Found ${Object.keys(swapsOpened).length} unsettled swaps!`);
         for (let escrowHash in swapsOpened) {
             const foundSwapData = swapsOpened[escrowHash];
             resultingSwaps[escrowHash] = {

package/dist/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.js

@@ -6,7 +6,7 @@ const EVMBtcRelay_1 = require("../../../../btcrelay/EVMBtcRelay");
 const Utils_1 = require("../../../../../utils/Utils");
 const ethers_1 = require("ethers");
 const buffer_1 = require("buffer");
-const logger = (0, Utils_1.getLogger)("IBitcoinClaimHandler: ");
+const logger = (0, Utils_1.getLogger)("IBitcoinClaimHandler");
 /**
  * Shared base implementation for bitcoin-backed claim handlers.
  *
@@ -37,7 +37,7 @@ class IBitcoinClaimHandler {
         const merkleProof = await btcRelay._bitcoinRpc.getMerkleProof(tx.txid, tx.blockhash);
         if (merkleProof == null)
             throw new Error(`Failed to generate merkle proof for tx: ${tx.txid}!`);
-        logger.debug("getWitness(): merkle proof computed: ", merkleProof);
+        logger.debug("(" + btcRelay.chainId + "): getWitness(): merkle proof computed: ", merkleProof);
         const txs = [];
         if (commitedHeader == null) {
             const headers = await EVMBtcRelay_1.EVMBtcRelay.getCommitedHeadersAndSynchronize(signer, btcRelay, [{ blockheight: tx.height, requiredConfirmations, blockhash: tx.blockhash }], txs, synchronizer, feeRate);

package/dist/evm/wallet/EVMPersistentSigner.js

@@ -32,7 +32,7 @@ class EVMPersistentSigner extends EVMSigner_1.EVMSigner {
         this.minFeeIncreasePpm = minFeeIncreasePpm ?? MIN_FEE_INCREASE_PPM;
         this.waitBeforeBump = waitBeforeBumpMillis ?? WAIT_BEFORE_BUMP;
         this.safeBlockTag = chainInterface._config.safeBlockTag;
-        this.logger = (0, Utils_1.getLogger)("EVMPersistentSigner(" + address + "): ");
+        this.logger = (0, Utils_1.getLogger)("EVMPersistentSigner(" + this.chainInterface.chainId + "," + address + "): ");
     }
     async load() {
         const fileExists = await fs.access(this.directory + "/txs.json", fs.constants.F_OK).then(() => true).catch(() => false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/evm/btcrelay/EVMBtcRelay.ts

@@ -1,6 +1,6 @@
 import {BitcoinNetwork, BitcoinRpc, BtcBlock, BtcRelay, RelaySynchronizer, StatePredictorUtils} from "@atomiqlabs/base";
 import {EVMBtcHeader} from "./headers/EVMBtcHeader";
-import {getLogger} from "../../utils/Utils";
+import {getLogger, LoggerType} from "../../utils/Utils";
 import {EVMContractBase, TypedFunctionCall} from "../contract/EVMContractBase";
 import {BtcRelay as BtcRelayTypechain} from "./BtcRelayTypechain";
 import {EVMBtcStoredHeader} from "./headers/EVMBtcStoredHeader";
@@ -24,8 +24,6 @@ function serializeBlockHeader(e: BtcBlock): EVMBtcHeader {
     });
 }
 
-const logger = getLogger("EVMBtcRelay: ");
-
 /**
  * EVM BTC Relay bitcoin light client contract representation.
  *
@@ -35,6 +33,10 @@ export class EVMBtcRelay<B extends BtcBlock>
     extends EVMContractBase<BtcRelayTypechain>
     implements BtcRelay<EVMBtcStoredHeader, EVMTx, B, EVMSigner> {
 
+    private readonly logger: LoggerType;
+
+    readonly chainId: string;
+
     /**
      * @internal
      */
@@ -118,6 +120,8 @@ export class EVMBtcRelay<B extends BtcBlock>
     ) {
         super(chainInterface, contractAddress, BtcRelayAbi, contractDeploymentHeight);
         this._bitcoinRpc = bitcoinRpc;
+        this.logger = getLogger("EVMBtcRelay("+chainInterface.chainId+"): ");
+        this.chainId = chainInterface.chainId;
     }
 
     /**
@@ -298,7 +302,7 @@ export class EVMBtcRelay<B extends BtcBlock>
         const chainCommitment = await this.contract.getCommitHash(storedBlockHeader.getBlockheight());
         if(chainCommitment!==commitHash) return null;
 
-        logger.debug("retrieveLogAndBlockheight(): block found," +
+        this.logger.debug("retrieveLogAndBlockheight(): block found," +
             " commit hash: "+commitHash+" blockhash: "+blockData.blockhash+" current btc relay height: "+blockHeight);
 
         return {header: storedBlockHeader, height: blockHeight};
@@ -317,7 +321,7 @@ export class EVMBtcRelay<B extends BtcBlock>
         const chainCommitment = await this.contract.getCommitHash(storedBlockHeader.getBlockheight());
         if(chainCommitment!==commitHash) return null;
 
-        logger.debug("retrieveLogByCommitHash(): block found," +
+        this.logger.debug("retrieveLogByCommitHash(): block found," +
             " commit hash: "+commitmentHashStr+" blockhash: "+blockData.blockhash+" height: "+storedBlockHeader.getBlockheight());
 
         return storedBlockHeader;
@@ -357,7 +361,7 @@ export class EVMBtcRelay<B extends BtcBlock>
             }
         )
 
-        if(data!=null) logger.debug("retrieveLatestKnownBlockLog(): block found," +
+        if(data!=null) this.logger.debug("retrieveLatestKnownBlockLog(): block found," +
             " commit hash: "+data.commitHash+" blockhash: "+data.resultBitcoinHeader.getHash()+
             " height: "+data.resultStoredHeader.getBlockheight());
 
@@ -369,7 +373,7 @@ export class EVMBtcRelay<B extends BtcBlock>
      */
     public async saveMainHeaders(signer: string, mainHeaders: BtcBlock[], storedHeader: EVMBtcStoredHeader, feeRate?: string) {
         feeRate ??= await this.Chain.Fees.getFeeRate();
-        logger.debug("saveMainHeaders(): submitting main blockheaders, count: "+mainHeaders.length);
+        this.logger.debug("saveMainHeaders(): submitting main blockheaders, count: "+mainHeaders.length);
         return this._saveHeaders(signer, mainHeaders, storedHeader, 0, feeRate, 0);
     }
 
@@ -380,7 +384,7 @@ export class EVMBtcRelay<B extends BtcBlock>
         let forkId: number = Math.floor(Math.random() * 0xFFFFFFFFFFFF);
         feeRate ??= await this.Chain.Fees.getFeeRate();
 
-        logger.debug("saveNewForkHeaders(): submitting new fork & blockheaders," +
+        this.logger.debug("saveNewForkHeaders(): submitting new fork & blockheaders," +
             " count: "+forkHeaders.length+" forkId: 0x"+forkId.toString(16));
 
         const result = await this._saveHeaders(signer, forkHeaders, storedHeader, forkId, feeRate, 100);
@@ -397,7 +401,7 @@ export class EVMBtcRelay<B extends BtcBlock>
     public async saveForkHeaders(signer: string, forkHeaders: BtcBlock[], storedHeader: EVMBtcStoredHeader, forkId: number, tipWork: Buffer, feeRate?: string) {
         feeRate ??= await this.Chain.Fees.getFeeRate();
 
-        logger.debug("saveForkHeaders(): submitting blockheaders to existing fork," +
+        this.logger.debug("saveForkHeaders(): submitting blockheaders to existing fork," +
             " count: "+forkHeaders.length+" forkId: 0x"+forkId.toString(16));
 
         const result = await this._saveHeaders(signer, forkHeaders, storedHeader, forkId, feeRate, 100);
@@ -414,7 +418,7 @@ export class EVMBtcRelay<B extends BtcBlock>
     public async saveShortForkHeaders(signer: string, forkHeaders: BtcBlock[], storedHeader: EVMBtcStoredHeader, tipWork: Buffer, feeRate?: string) {
         feeRate ??= await this.Chain.Fees.getFeeRate();
 
-        logger.debug("saveShortForkHeaders(): submitting short fork blockheaders," +
+        this.logger.debug("saveShortForkHeaders(): submitting short fork blockheaders," +
             " count: "+forkHeaders.length);
 
         const result = await this._saveHeaders(signer, forkHeaders, storedHeader, -1, feeRate, 0);
@@ -441,7 +445,7 @@ export class EVMBtcRelay<B extends BtcBlock>
 
         const synchronizationFee = (BigInt(blockheightDelta) * await this.getFeePerBlock(feeRate))
             + EVMFees.getGasFee(EVMBtcRelay._GasCosts.GAS_BASE_MAIN * Math.ceil(blockheightDelta / this.maxHeadersPerTx), feeRate);
-        logger.debug("estimateSynchronizeFee(): required blockheight: "+requiredBlockheight+
+        this.logger.debug("estimateSynchronizeFee(): required blockheight: "+requiredBlockheight+
             " blockheight delta: "+blockheightDelta+" fee: "+synchronizationFee.toString(10));
 
         return synchronizationFee;
@@ -529,6 +533,7 @@ export class EVMBtcRelay<B extends BtcBlock>
 
         //TODO: We don't have to synchronize to tip, only to our required blockheight
         const resp = await synchronizer.syncToLatestTxs(signer.toString(), feeRate);
+        const logger = getLogger("EVMBtcRelay("+btcRelay.Chain.chainId+"): ");
         logger.debug("getCommitedHeaderAndSynchronize(): BTC Relay not synchronized to required blockheight, "+
             "synchronizing ourselves in "+resp.txs.length+" txs");
         logger.debug("getCommitedHeaderAndSynchronize(): BTC Relay computed header map: ",resp.computedHeaderMap);

package/src/evm/chain/EVMChainInterface.ts

@@ -151,7 +151,7 @@ export class EVMChainInterface<ChainId extends string = string> implements Chain
 
         this.bitcoinNetwork = bitcoinNetwork;
 
-        this.logger = getLogger("EVMChainInterface("+this.evmChainId+"): ");
+        this.logger = getLogger("EVMChainInterface("+this.chainId+"): ");
 
         this.Fees = evmFeeEstimator;
         this.Tokens = new EVMTokens(this);

package/src/evm/chain/EVMModule.ts

@@ -1,4 +1,4 @@
-import {getLogger} from "../../utils/Utils";
+import {getLogger, LoggerType} from "../../utils/Utils";
 import {JsonRpcApiProvider} from "ethers";
 import {EVMChainInterface, EVMRetryPolicy} from "./EVMChainInterface";
 
@@ -13,7 +13,7 @@ export class EVMModule<ChainId extends string = string> {
     protected readonly retryPolicy?: EVMRetryPolicy;
     protected readonly root: EVMChainInterface<ChainId>;
 
-    protected readonly logger = getLogger(this.constructor.name+": ");
+    protected readonly logger: LoggerType;
 
     constructor(
         root: EVMChainInterface<ChainId>
@@ -21,6 +21,7 @@ export class EVMModule<ChainId extends string = string> {
         this.provider = root.provider;
         this.retryPolicy = root._retryPolicy;
         this.root = root;
+        this.logger = getLogger(this.constructor.name+"("+root.chainId+"): ");
     }
 
 }

package/src/evm/events/EVMChainEventsBrowser.ts

@@ -11,7 +11,7 @@ import {IClaimHandler} from "../swaps/handlers/claim/ClaimHandlers";
 import {EVMSwapData} from "../swaps/EVMSwapData";
 import {Block, hexlify, JsonRpcApiProvider, EventFilter, Log} from "ethers";
 import { EVMSwapContract } from "../swaps/EVMSwapContract";
-import {getLogger, onceAsync} from "../../utils/Utils";
+import {getLogger, LoggerType, onceAsync} from "../../utils/Utils";
 import {EVMSpvVaultContract, unpackOwnerAndVaultId} from "../spv_swap/EVMSpvVaultContract";
 import { EVMChainInterface } from "../chain/EVMChainInterface";
 import {TypedEventLog} from "../typechain/common";
@@ -75,7 +75,7 @@ export class EVMChainEventsBrowser implements ChainEvents<EVMSwapData, EVMEventL
     /**
      * @internal
      */
-    protected readonly logger = getLogger("EVMChainEventsBrowser: ");
+    protected readonly logger: LoggerType;
 
     /**
      * @internal
@@ -118,6 +118,7 @@ export class EVMChainEventsBrowser implements ChainEvents<EVMSwapData, EVMEventL
         this.evmSwapContract = evmSwapContract;
         this.evmSpvVaultContract = evmSpvVaultContract;
         this.pollIntervalSeconds = pollIntervalSeconds;
+        this.logger = getLogger("EVMChainEventsBrowser("+evmSwapContract.chainId+"): ");
 
         this.spvVaultContractLogFilter = {
             address: this.evmSpvVaultContract._contractAddress

package/src/evm/providers/ReconnectingWebSocketProvider.ts

@@ -1,9 +1,16 @@
-import {JsonRpcApiProviderOptions} from "ethers";
+import {JsonRpcApiProviderOptions, Network} from "ethers";
 import type {Networkish, WebSocketLike} from "ethers";
 import {SocketProvider} from "./SocketProvider";
-import {getLogger} from "../../utils/Utils";
-
-const logger = getLogger("ReconnectingWebSocketProvider: ");
+import {getLogger, LoggerType} from "../../utils/Utils";
+
+function getChainIdentifier(network?: Networkish): string {
+    if(network==null) return "UNKNOWN";
+    if(typeof(network)==="bigint") return network.toString(10);
+    if(typeof(network)==="number") return network.toString(10);
+    if(typeof(network)==="string") return network;
+    if(network instanceof Network) return network.name ?? network.chainId.toString(10);
+    return network.name ?? network.chainId?.toString(10) ?? "UNKNOWN";
+}
 
 /**
  * WebSocket RPC provider with automatic reconnect, heartbeat ping and connection timeout handling.
@@ -24,8 +31,11 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
     wsCtor: () => WebSocketLike;
     websocket: null | WebSocketLike & {onclose?: (...args: any[]) => void, ping?: () => void} = null;
 
+    readonly logger: LoggerType;
+
     constructor(url: string | (() => WebSocketLike), network?: Networkish, options?: JsonRpcApiProviderOptions) {
         super(network, options);
+        this.logger = getLogger("ReconnectingWebSocketProvider("+getChainIdentifier(network)+"): ");
         this.wsCtor = typeof(url)==="string" ? () => new WebSocket(url) : url;
         this.connect();
     }
@@ -43,7 +53,7 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
                 this._send({method: "eth_chainId", params: [], id: 1_000_000_000, jsonrpc: "2.0"}).catch(e => {
                     //Error
                     if(e.code==="NETWORK_ERROR") {
-                        logger.error("connect(): pingInterval: Websocket ping error: ", e);
+                        this.logger.error("connect(): pingInterval: Websocket ping error: ", e);
                         if(this.websocket!=null) {
                             this.websocket.close();
                             this.disconnectedAndScheduleReconnect();
@@ -52,11 +62,11 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
                 });
             }, this.pingIntervalSeconds * 1000);
 
-            logger.info("connect(): Websocket connected!");
+            this.logger.info("connect(): Websocket connected!");
         };
 
         this.websocket.onerror = (err) => {
-            logger.error(`connect(): onerror: Websocket connection error: `, err.error ?? err);
+            this.logger.error(`connect(): onerror: Websocket connection error: `, err.error ?? err);
             this.disconnectedAndScheduleReconnect();
         };
 
@@ -65,12 +75,12 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
         };
 
         this.websocket.onclose = (event) => {
-            logger.error(`connect(): onclose: Websocket connection closed: `, event);
+            this.logger.error(`connect(): onclose: Websocket connection closed: `, event);
             this.disconnectedAndScheduleReconnect();
         };
 
         this.connectTimer = setTimeout(() => {
-            logger.warn("connect(): Websocket connection taking too long, (above "+this.connectionTimeout+" seconds!), closing and re-attempting connection");
+            this.logger.warn("connect(): Websocket connection taking too long, (above "+this.connectionTimeout+" seconds!), closing and re-attempting connection");
             this.websocket!.close();
             this.disconnectedAndScheduleReconnect();
         }, this.connectionTimeout * 1000);
@@ -81,7 +91,7 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
         if(this.websocket==null) return;
         this.websocket.onclose = undefined;
         //Register dummy handler, otherwise we get unhandled `error` event which crashes the whole thing
-        this.websocket.onerror = (err) => logger.error("disconnectedAndScheduleReconnect(): Post-close onerror: ", err.error ?? err);
+        this.websocket.onerror = (err) => this.logger.error("disconnectedAndScheduleReconnect(): Post-close onerror: ", err.error ?? err);
         this.websocket.onmessage = null;
         this.websocket.onopen = null;
         this.websocket = null;
@@ -90,7 +100,7 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
 
         this._disconnected();
 
-        logger.info(`disconnectedAndScheduleReconnect(): Retrying in ${this.reconnectSeconds} seconds...`);
+        this.logger.info(`disconnectedAndScheduleReconnect(): Retrying in ${this.reconnectSeconds} seconds...`);
         this.reconnectTimer = setTimeout(() => this.connect(), this.reconnectSeconds * 1000);
     }
 

package/src/evm/spv_swap/EVMSpvVaultContract.ts

@@ -20,7 +20,7 @@ import {EVMSigner} from "../wallet/EVMSigner";
 import {SpvVaultContractAbi} from "./SpvVaultContractAbi";
 import {SpvVaultManager, SpvVaultParametersStructOutput} from "./SpvVaultContractTypechain";
 import {EVMBtcRelay} from "../btcrelay/EVMBtcRelay";
-import {getLogger} from "../../utils/Utils";
+import {getLogger, LoggerType} from "../../utils/Utils";
 import {EVMChainInterface} from "../chain/EVMChainInterface";
 import {AbiCoder, getAddress, hexlify, keccak256, TransactionRequest, ZeroAddress, ZeroHash} from "ethers";
 import {EVMAddresses} from "../chain/modules/EVMAddresses";
@@ -96,7 +96,7 @@ export class EVMSpvVaultContract<ChainId extends string>
     private readonly btcRelay: EVMBtcRelay<any>;
     private readonly bitcoinRpc: BitcoinRpc<any>;
 
-    private readonly logger = getLogger("EVMSpvVaultContract: ");
+    private readonly logger: LoggerType;
 
     constructor(
         chainInterface: EVMChainInterface<ChainId>,
@@ -106,6 +106,7 @@ export class EVMSpvVaultContract<ChainId extends string>
         contractDeploymentHeight?: number
     ) {
         super(chainInterface, contractAddress, SpvVaultContractAbi, contractDeploymentHeight);
+        this.logger = getLogger("EVMSpvVaultContract("+chainInterface.chainId+"): ");
         this.chainId = chainInterface.chainId;
         this.btcRelay = btcRelay;
         this.bitcoinRpc = bitcoinRpc;

package/src/evm/swaps/EVMSwapContract.ts

@@ -27,14 +27,12 @@ import {EVMPreFetchVerification, EVMSwapInit} from "./modules/EVMSwapInit";
 import { EVMSwapRefund } from "./modules/EVMSwapRefund";
 import {EVMSwapClaim} from "./modules/EVMSwapClaim";
 import {TypedEventLog} from "../typechain/common";
-import {getLogger} from "../../utils/Utils";
+import {getLogger, LoggerType} from "../../utils/Utils";
 
 const ESCROW_STATE_COMMITTED = 1;
 const ESCROW_STATE_CLAIMED = 2;
 const ESCROW_STATE_REFUNDED = 3;
 
-const logger = getLogger("EVMSwapContract: ");
-
 /**
  * EVM swap contract (escrow manager) representation handling PrTLC (on-chain) and HTLC (lightning)
  *  based swaps.
@@ -52,6 +50,8 @@ export class EVMSwapContract<ChainId extends string = string>
         ChainId
     > {
 
+    private readonly logger: LoggerType;
+
     readonly supportsInitWithoutClaimer = true;
 
     ////////////////////////
@@ -145,6 +145,8 @@ export class EVMSwapContract<ChainId extends string = string>
 
         this._timelockRefundHandler = new TimelockRefundHandler(handlerAddresses.refund.timelock);
         this._refundHandlersByAddress[this._timelockRefundHandler.address.toLowerCase()] = this._timelockRefundHandler;
+
+        this.logger = getLogger("EVMSwapContract("+this.chainId+"): ");
     }
 
     /**
@@ -485,14 +487,14 @@ export class EVMSwapContract<ChainId extends string = string>
 
                 const claimHandler = this._claimHandlersByAddress[claimHandlerHex.toLowerCase()];
                 if(claimHandler==null) {
-                    logger.warn(`getHistoricalSwaps(): Unknown claim handler in tx ${event.transactionHash} with claim handler: `+claimHandlerHex);
+                    this.logger.warn(`getHistoricalSwaps(): Unknown claim handler in tx ${event.transactionHash} with claim handler: `+claimHandlerHex);
                     return null;
                 }
 
                 const txTrace = await this.Chain.Transactions.traceTransaction(event.transactionHash);
                 const data = this.findInitSwapData(txTrace, event.args.escrowHash, claimHandler);
                 if(data==null) {
-                    logger.warn(`getHistoricalSwaps(): Cannot parse swap data from tx ${event.transactionHash} with escrow hash: `+escrowHash);
+                    this.logger.warn(`getHistoricalSwaps(): Cannot parse swap data from tx ${event.transactionHash} with escrow hash: `+escrowHash);
                     return null;
                 }
 
@@ -563,8 +565,8 @@ export class EVMSwapContract<ChainId extends string = string>
             startBlockheight
         );
 
-        logger.debug(`getHistoricalSwaps(): Found ${Object.keys(resultingSwaps).length} settled swaps!`);
-        logger.debug(`getHistoricalSwaps(): Found ${Object.keys(swapsOpened).length} unsettled swaps!`);
+        this.logger.debug(`getHistoricalSwaps(): Found ${Object.keys(resultingSwaps).length} settled swaps!`);
+        this.logger.debug(`getHistoricalSwaps(): Found ${Object.keys(swapsOpened).length} unsettled swaps!`);
 
         for(let escrowHash in swapsOpened) {
             const foundSwapData = swapsOpened[escrowHash];

package/src/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.ts

@@ -1,5 +1,4 @@
 import {ChainSwapType} from "@atomiqlabs/base";
-import {getLogger} from "../../../../../utils/Utils";
 import {BitcoinCommitmentData, BitcoinWitnessData, IBitcoinClaimHandler} from "./IBitcoinClaimHandler";
 import {Buffer} from "buffer";
 import {EVMSwapData} from "../../../EVMSwapData";

package/src/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.ts

@@ -31,7 +31,7 @@ export type BitcoinWitnessData = {
     synchronizer?: RelaySynchronizer<EVMBtcStoredHeader, EVMTx, any>
 };
 
-const logger = getLogger("IBitcoinClaimHandler: ");
+const logger = getLogger("IBitcoinClaimHandler");
 
 /**
  * Shared base implementation for bitcoin-backed claim handlers.
@@ -85,7 +85,7 @@ export abstract class IBitcoinClaimHandler<C, W extends BitcoinWitnessData> impl
 
         const merkleProof = await btcRelay._bitcoinRpc.getMerkleProof(tx.txid, tx.blockhash);
         if(merkleProof==null) throw new Error(`Failed to generate merkle proof for tx: ${tx.txid}!`);
-        logger.debug("getWitness(): merkle proof computed: ", merkleProof);
+        logger.debug("("+btcRelay.chainId+"): getWitness(): merkle proof computed: ", merkleProof);
 
         const txs: EVMTx[] = [];
         if(commitedHeader==null) {

package/src/evm/wallet/EVMPersistentSigner.ts

@@ -65,7 +65,7 @@ export class EVMPersistentSigner extends EVMSigner {
         this.minFeeIncreasePpm = minFeeIncreasePpm ?? MIN_FEE_INCREASE_PPM;
         this.waitBeforeBump = waitBeforeBumpMillis ?? WAIT_BEFORE_BUMP;
         this.safeBlockTag = chainInterface._config.safeBlockTag;
-        this.logger = getLogger("EVMPersistentSigner("+address+"): ");
+        this.logger = getLogger("EVMPersistentSigner("+this.chainInterface.chainId+","+address+"): ");
     }
 
     private async load() {