@atomiqlabs/chain-evm 1.0.0-dev.86 → 1.0.0-dev.88

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

@@ -10,4 +10,4 @@ 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", 3636>, EVMChainEventsBrowser, EVMBtcRelay<any>, EVMSpvVaultData, EVMSpvWithdrawalData, EVMSpvVaultContract<"BOTANIX">>;
+export type BotanixChainType = ChainType<"BOTANIX", never, EVMPreFetchVerification, EVMTx, EVMSigner, EVMSwapData, EVMSwapContract<"BOTANIX">, EVMChainInterface<"BOTANIX">, EVMChainEventsBrowser, EVMBtcRelay<any>, EVMSpvVaultData, EVMSpvWithdrawalData, EVMSpvVaultContract<"BOTANIX">>;

package/dist/chains/botanix/BotanixInitializer.js

@@ -13,26 +13,26 @@ const EVMSwapData_1 = require("../../evm/swaps/EVMSwapData");
 const EVMSpvVaultData_1 = require("../../evm/spv_swap/EVMSpvVaultData");
 const EVMSpvWithdrawalData_1 = require("../../evm/spv_swap/EVMSpvWithdrawalData");
 const BotanixChainIds = {
-    MAINNET: null,
+    MAINNET: 3637,
     TESTNET: 3636
 };
 const BotanixContractAddresses = {
     MAINNET: {
-        executionContract: "",
-        swapContract: "",
-        btcRelayContract: "",
-        btcRelayDeploymentHeight: 0,
-        spvVaultContract: "",
-        spvVaultDeploymentHeight: 0,
+        executionContract: "0x5bb0C725939cB825d1322A99a3FeB570097628c3",
+        swapContract: "0x8A44f1995a54fD976c904Cccf9EbaB49c3182eb3",
+        btcRelayContract: "0x6a373b6Adad83964727bA0fa15E22Be05173fc12",
+        btcRelayDeploymentHeight: 1791247,
+        spvVaultContract: "0xc98Ef084d3911C8447DBbE4dDa18bC2c9bB0584e",
+        spvVaultDeploymentHeight: 1791249,
         handlerContracts: {
             refund: {
-                timelock: ""
+                timelock: "0x3887B02217726bB36958Dd595e57293fB63D5082"
             },
             claim: {
-                [base_1.ChainSwapType.HTLC]: "",
-                [base_1.ChainSwapType.CHAIN_TXID]: "",
-                [base_1.ChainSwapType.CHAIN]: "",
-                [base_1.ChainSwapType.CHAIN_NONCED]: ""
+                [base_1.ChainSwapType.HTLC]: "0x59A54378B6bA9C21ba66487C6A701D702baDEabE",
+                [base_1.ChainSwapType.CHAIN_TXID]: "0x32EB4DbDdC31e19ba908fecc7cae03F0d04F01Fa",
+                [base_1.ChainSwapType.CHAIN]: "0xaB2D14745362B26a732dD8B7F95daAE3D2914bBF",
+                [base_1.ChainSwapType.CHAIN_NONCED]: "0x2920EE496693A5027249a027A6FD3F643E743745"
             }
         }
     },

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

@@ -10,4 +10,4 @@ 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", 5115>, EVMChainEventsBrowser, CitreaBtcRelay<any>, EVMSpvVaultData, EVMSpvWithdrawalData, CitreaSpvVaultContract>;
+export type CitreaChainType = ChainType<"CITREA", never, EVMPreFetchVerification, EVMTx, EVMSigner, EVMSwapData, CitreaSwapContract, EVMChainInterface<"CITREA">, EVMChainEventsBrowser, CitreaBtcRelay<any>, EVMSpvVaultData, EVMSpvWithdrawalData, CitreaSpvVaultContract>;

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

@@ -17,11 +17,11 @@ export type EVMConfiguration = {
     safeBlockTag: EVMBlockTag;
     maxLogsBlockRange: number;
 };
-export declare class EVMChainInterface<ChainId extends string = string, EVMChainId extends number = number> implements ChainInterface {
+export declare class EVMChainInterface<ChainId extends string = string> implements ChainInterface {
     readonly chainId: ChainId;
     readonly provider: JsonRpcApiProvider;
     readonly retryPolicy: EVMRetryPolicy;
-    readonly evmChainId: EVMChainId;
+    readonly evmChainId: number;
     readonly config: EVMConfiguration;
     Fees: EVMFees;
     Tokens: EVMTokens;
@@ -30,7 +30,7 @@ export declare class EVMChainInterface<ChainId extends string = string, EVMChain
     Events: EVMEvents;
     Blocks: EVMBlocks;
     protected logger: LoggerType;
-    constructor(chainId: ChainId, evmChainId: EVMChainId, provider: JsonRpcApiProvider, config: EVMConfiguration, retryPolicy?: EVMRetryPolicy, evmFeeEstimator?: EVMFees);
+    constructor(chainId: ChainId, evmChainId: number, provider: JsonRpcApiProvider, config: EVMConfiguration, retryPolicy?: EVMRetryPolicy, evmFeeEstimator?: EVMFees);
     getBalance(signer: string, tokenAddress: string): Promise<bigint>;
     getNativeCurrencyAddress(): string;
     isValidToken(tokenIdentifier: string): boolean;

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

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

package/dist/evm/providers/ReconnectingWebSocketProvider.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReconnectingWebSocketProvider = void 0;
 const SocketProvider_1 = require("./SocketProvider");
+const Utils_1 = require("../../utils/Utils");
+const logger = (0, Utils_1.getLogger)("ReconnectingWebSocketProvider: ");
 class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
     constructor(url, network, options) {
         super(network, options);
@@ -23,7 +25,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") {
-                        console.error("Websocket ping error: ", e);
+                        logger.error("connect(): pingInterval: Websocket ping error: ", e);
                         if (this.websocket != null) {
                             this.websocket.close();
                             this.disconnectedAndScheduleReconnect();
@@ -31,20 +33,21 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
                     }
                 });
             }, this.pingIntervalSeconds * 1000);
+            logger.info("connect(): Websocket connected!");
         };
         this.websocket.onerror = (err) => {
-            console.error(`Websocket connection error: `, err);
+            logger.error(`connect(): onerror: Websocket connection error: `, err);
             this.disconnectedAndScheduleReconnect();
         };
         this.websocket.onmessage = (message) => {
             this._processMessage(message.data);
         };
         this.websocket.onclose = (event) => {
-            console.error(`Websocket connection closed: `, event);
+            logger.error(`connect(): onclose: Websocket connection closed: `, event);
             this.disconnectedAndScheduleReconnect();
         };
         this.connectTimer = setTimeout(() => {
-            console.error("Websocket connection taking too long, (above " + this.connectionTimeout + " seconds!), closing and re-attempting connection");
+            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);
@@ -55,7 +58,8 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
         if (this.websocket == null)
             return;
         this.websocket.onclose = null;
-        this.websocket.onerror = null;
+        //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);
         this.websocket.onmessage = null;
         this.websocket.onopen = null;
         this.websocket = null;
@@ -64,7 +68,7 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
         if (this.connectTimer != null)
             clearInterval(this.connectTimer);
         this._disconnected();
-        console.error(`Retrying in ${this.reconnectSeconds} seconds...`);
+        logger.info(`disconnectedAndScheduleReconnect(): Retrying in ${this.reconnectSeconds} seconds...`);
         this.reconnectTimer = setTimeout(() => this.connect(), this.reconnectSeconds * 1000);
     }
     async _write(message) {

package/package.json

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

package/src/chains/botanix/BotanixChainType.ts

@@ -19,7 +19,7 @@ export type BotanixChainType = ChainType<
     EVMSigner,
     EVMSwapData,
     EVMSwapContract<"BOTANIX">,
-    EVMChainInterface<"BOTANIX", 3636>,
+    EVMChainInterface<"BOTANIX">,
     EVMChainEventsBrowser,
     EVMBtcRelay<any>,
     EVMSpvVaultData,

package/src/chains/botanix/BotanixInitializer.ts

@@ -12,27 +12,27 @@ import {EVMSpvWithdrawalData} from "../../evm/spv_swap/EVMSpvWithdrawalData";
 import {BotanixChainType} from "./BotanixChainType";
 
 const BotanixChainIds = {
-    MAINNET: null,
+    MAINNET: 3637,
     TESTNET: 3636
 };
 
 const BotanixContractAddresses = {
     MAINNET: {
-        executionContract: "",
-        swapContract: "",
-        btcRelayContract: "",
-        btcRelayDeploymentHeight: 0,
-        spvVaultContract: "",
-        spvVaultDeploymentHeight: 0,
+        executionContract: "0x5bb0C725939cB825d1322A99a3FeB570097628c3",
+        swapContract: "0x8A44f1995a54fD976c904Cccf9EbaB49c3182eb3",
+        btcRelayContract: "0x6a373b6Adad83964727bA0fa15E22Be05173fc12",
+        btcRelayDeploymentHeight: 1791247,
+        spvVaultContract: "0xc98Ef084d3911C8447DBbE4dDa18bC2c9bB0584e",
+        spvVaultDeploymentHeight: 1791249,
         handlerContracts: {
             refund: {
-                timelock: ""
+                timelock: "0x3887B02217726bB36958Dd595e57293fB63D5082"
             },
             claim: {
-                [ChainSwapType.HTLC]: "",
-                [ChainSwapType.CHAIN_TXID]: "",
-                [ChainSwapType.CHAIN]: "",
-                [ChainSwapType.CHAIN_NONCED]: ""
+                [ChainSwapType.HTLC]: "0x59A54378B6bA9C21ba66487C6A701D702baDEabE",
+                [ChainSwapType.CHAIN_TXID]: "0x32EB4DbDdC31e19ba908fecc7cae03F0d04F01Fa",
+                [ChainSwapType.CHAIN]: "0xaB2D14745362B26a732dD8B7F95daAE3D2914bBF",
+                [ChainSwapType.CHAIN_NONCED]: "0x2920EE496693A5027249a027A6FD3F643E743745"
             }
         }
     },

package/src/chains/citrea/CitreaChainType.ts

@@ -19,7 +19,7 @@ export type CitreaChainType = ChainType<
     EVMSigner,
     EVMSwapData,
     CitreaSwapContract,
-    EVMChainInterface<"CITREA", 5115>,
+    EVMChainInterface<"CITREA">,
     EVMChainEventsBrowser,
     CitreaBtcRelay<any>,
     EVMSpvVaultData,

package/src/evm/chain/EVMChainInterface.ts

@@ -21,14 +21,14 @@ export type EVMConfiguration = {
     maxLogsBlockRange: number
 };
 
-export class EVMChainInterface<ChainId extends string = string, EVMChainId extends number = number> implements ChainInterface {
+export class EVMChainInterface<ChainId extends string = string> implements ChainInterface {
 
     readonly chainId: ChainId;
 
     readonly provider: JsonRpcApiProvider;
     readonly retryPolicy: EVMRetryPolicy;
 
-    public readonly evmChainId: EVMChainId;
+    public readonly evmChainId: number;
 
     public readonly config: EVMConfiguration;
 
@@ -43,7 +43,7 @@ export class EVMChainInterface<ChainId extends string = string, EVMChainId exten
 
     constructor(
         chainId: ChainId,
-        evmChainId: EVMChainId,
+        evmChainId: number,
         provider: JsonRpcApiProvider,
         config: EVMConfiguration,
         retryPolicy?: EVMRetryPolicy,

package/src/evm/chain/EVMModule.ts

@@ -2,16 +2,16 @@ import {getLogger} from "../../utils/Utils";
 import {JsonRpcApiProvider} from "ethers";
 import {EVMChainInterface, EVMRetryPolicy} from "./EVMChainInterface";
 
-export class EVMModule<ChainId extends string = string, EVMChainId extends number = number> {
+export class EVMModule<ChainId extends string = string> {
 
     protected readonly provider: JsonRpcApiProvider;
     protected readonly retryPolicy: EVMRetryPolicy;
-    protected readonly root: EVMChainInterface<ChainId, EVMChainId>;
+    protected readonly root: EVMChainInterface<ChainId>;
 
     protected readonly logger = getLogger(this.constructor.name+": ");
 
     constructor(
-        root: EVMChainInterface<ChainId, EVMChainId>
+        root: EVMChainInterface<ChainId>
     ) {
         this.provider = root.provider;
         this.retryPolicy = root.retryPolicy;

package/src/evm/providers/ReconnectingWebSocketProvider.ts

@@ -1,7 +1,9 @@
 import {JsonRpcApiProviderOptions} from "ethers";
 import type {Networkish, WebSocketLike} from "ethers";
 import {SocketProvider} from "./SocketProvider";
+import {getLogger} from "../../utils/Utils";
 
+const logger = getLogger("ReconnectingWebSocketProvider: ");
 
 export class ReconnectingWebSocketProvider extends SocketProvider {
 
@@ -36,7 +38,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") {
-                        console.error("Websocket ping error: ", e);
+                        logger.error("connect(): pingInterval: Websocket ping error: ", e);
                         if(this.websocket!=null) {
                             this.websocket.close();
                             this.disconnectedAndScheduleReconnect();
@@ -44,10 +46,12 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
                     }
                 });
             }, this.pingIntervalSeconds * 1000);
+
+            logger.info("connect(): Websocket connected!");
         };
 
         this.websocket.onerror = (err) => {
-            console.error(`Websocket connection error: `, err);
+            logger.error(`connect(): onerror: Websocket connection error: `, err);
             this.disconnectedAndScheduleReconnect();
         };
 
@@ -56,12 +60,12 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
         };
 
         this.websocket.onclose = (event) => {
-            console.error(`Websocket connection closed: `, event);
+            logger.error(`connect(): onclose: Websocket connection closed: `, event);
             this.disconnectedAndScheduleReconnect();
         };
 
         this.connectTimer = setTimeout(() => {
-            console.error("Websocket connection taking too long, (above "+this.connectionTimeout+" seconds!), closing and re-attempting connection");
+            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);
@@ -71,7 +75,8 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
         if(this.destroyed) return;
         if(this.websocket==null) return;
         this.websocket.onclose = null;
-        this.websocket.onerror = null;
+        //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);
         this.websocket.onmessage = null;
         this.websocket.onopen = null;
         this.websocket = null;
@@ -80,7 +85,7 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
 
         this._disconnected();
 
-        console.error(`Retrying in ${this.reconnectSeconds} seconds...`);
+        logger.info(`disconnectedAndScheduleReconnect(): Retrying in ${this.reconnectSeconds} seconds...`);
         this.reconnectTimer = setTimeout(() => this.connect(), this.reconnectSeconds * 1000);
     }