@atomiqlabs/chain-evm 1.0.0-dev.100 → 1.0.0-dev.102

package/dist/chains/botanix/BotanixInitializer.js

@@ -84,6 +84,7 @@ function initializeBotanix(options, bitcoinRpc, network) {
     const Fees = options.fees ?? new EVMFees_1.EVMFees(provider, 2n * 1000000000n, 1000000n);
     const chainInterface = new EVMChainInterface_1.EVMChainInterface("BOTANIX", chainId, provider, {
         safeBlockTag: "finalized",
+        finalizedBlockTag: "finalized",
         maxLogsBlockRange: options?.evmConfig?.maxLogsBlockRange ?? 950,
         maxLogTopics: options?.evmConfig?.maxLogTopics ?? 64,
         maxParallelLogRequests: options?.evmConfig?.maxParallelLogRequests ?? 5,

package/dist/chains/citrea/CitreaInitializer.js

@@ -90,6 +90,7 @@ function initializeCitrea(options, bitcoinRpc, network) {
     const Fees = options.fees ?? new CitreaFees_1.CitreaFees(provider, 2n * 1000000000n, 1000000n);
     const chainInterface = new EVMChainInterface_1.EVMChainInterface("CITREA", chainId, provider, {
         safeBlockTag: "latest",
+        finalizedBlockTag: "safe",
         maxLogsBlockRange: options?.evmConfig?.maxLogsBlockRange ?? 950,
         maxLogTopics: options?.evmConfig?.maxLogTopics ?? 64,
         maxParallelLogRequests: options?.evmConfig?.maxParallelLogRequests ?? 5,

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

@@ -15,6 +15,7 @@ export type EVMRetryPolicy = {
 };
 export type EVMConfiguration = {
     safeBlockTag: EVMBlockTag;
+    finalizedBlockTag: EVMBlockTag;
     maxLogsBlockRange: number;
     maxParallelLogRequests: number;
     maxParallelCalls: number;

package/dist/evm/chain/EVMChainInterface.js

@@ -14,13 +14,14 @@ 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;
+        var _a, _b;
         this.chainId = chainId;
         this.evmChainId = evmChainId;
         this.provider = provider;
         this.retryPolicy = retryPolicy;
         this.config = config;
         (_a = this.config).safeBlockTag ?? (_a.safeBlockTag = "safe");
+        (_b = this.config).finalizedBlockTag ?? (_b.finalizedBlockTag = "finalized");
         this.logger = (0, Utils_1.getLogger)("EVMChainInterface(" + this.evmChainId + "): ");
         this.Fees = evmFeeEstimator;
         this.Tokens = new EVMTokens_1.EVMTokens(this);
@@ -82,7 +83,7 @@ class EVMChainInterface {
         return this.Transactions.getTxStatus(tx);
     }
     async getFinalizedBlock() {
-        const block = await this.Blocks.getBlock("finalized");
+        const block = await this.Blocks.getBlock(this.config.finalizedBlockTag);
         return {
             height: block.number,
             blockHash: block.hash

package/dist/evm/spv_swap/EVMSpvVaultContract.d.ts

@@ -72,7 +72,7 @@ export declare class EVMSpvVaultContract<ChainId extends string> extends EVMCont
     getWithdrawalState(withdrawalTx: EVMSpvWithdrawalData, scStartHeight?: number): Promise<SpvWithdrawalState>;
     getWithdrawalStates(withdrawalTxs: {
         withdrawal: EVMSpvWithdrawalData;
-        scStartHeight?: number;
+        scStartBlockheight?: number;
     }[]): Promise<{
         [btcTxId: string]: SpvWithdrawalState;
     }>;

package/dist/evm/spv_swap/EVMSpvVaultContract.js

@@ -303,11 +303,11 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
             const checkWithdrawalTxsMap = new Map(checkWithdrawalTxs.map(val => [val.withdrawal.getTxId(), val.withdrawal]));
             let scStartHeight = null;
             for (let val of checkWithdrawalTxs) {
-                if (val.scStartHeight == null) {
+                if (val.scStartBlockheight == null) {
                     scStartHeight = null;
                     break;
                 }
-                scStartHeight = Math.min(scStartHeight ?? Infinity, val.scStartHeight);
+                scStartHeight = Math.min(scStartHeight ?? Infinity, val.scStartBlockheight);
             }
             const keys = [null, null, checkWithdrawalTxs.map(withdrawal => (0, ethers_1.hexlify)(buffer_1.Buffer.from(withdrawal.withdrawal.getTxId(), "hex").reverse()))];
             if (scStartHeight == null) {

package/package.json

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

package/src/chains/botanix/BotanixInitializer.ts

@@ -121,6 +121,7 @@ export function initializeBotanix(
 
     const chainInterface = new EVMChainInterface("BOTANIX", chainId, provider, {
         safeBlockTag: "finalized",
+        finalizedBlockTag: "finalized",
         maxLogsBlockRange: options?.evmConfig?.maxLogsBlockRange ?? 950,
         maxLogTopics: options?.evmConfig?.maxLogTopics ?? 64,
         maxParallelLogRequests: options?.evmConfig?.maxParallelLogRequests ?? 5,

package/src/chains/citrea/CitreaInitializer.ts

@@ -127,6 +127,7 @@ export function initializeCitrea(
 
     const chainInterface = new EVMChainInterface("CITREA", chainId, provider, {
         safeBlockTag: "latest",
+        finalizedBlockTag: "safe",
         maxLogsBlockRange: options?.evmConfig?.maxLogsBlockRange ?? 950,
         maxLogTopics: options?.evmConfig?.maxLogTopics ?? 64,
         maxParallelLogRequests: options?.evmConfig?.maxParallelLogRequests ?? 5,

package/src/evm/chain/EVMChainInterface.ts

@@ -28,6 +28,7 @@ export type EVMRetryPolicy = {
 
 export type EVMConfiguration = {
     safeBlockTag: EVMBlockTag,
+    finalizedBlockTag: EVMBlockTag,
     maxLogsBlockRange: number,
     maxParallelLogRequests: number,
     maxParallelCalls: number,
@@ -68,6 +69,7 @@ export class EVMChainInterface<ChainId extends string = string> implements Chain
         this.retryPolicy = retryPolicy;
         this.config = config;
         this.config.safeBlockTag ??= "safe";
+        this.config.finalizedBlockTag ??= "finalized";
 
         this.logger = getLogger("EVMChainInterface("+this.evmChainId+"): ");
 
@@ -155,7 +157,7 @@ export class EVMChainInterface<ChainId extends string = string> implements Chain
     }
 
     async getFinalizedBlock(): Promise<{ height: number; blockHash: string }> {
-        const block = await this.Blocks.getBlock("finalized");
+        const block = await this.Blocks.getBlock(this.config.finalizedBlockTag);
         return {
             height: block.number,
             blockHash: block.hash

package/src/evm/spv_swap/EVMSpvVaultContract.ts

@@ -408,7 +408,7 @@ export class EVMSpvVaultContract<ChainId extends string>
         return result;
     }
 
-    async getWithdrawalStates(withdrawalTxs: {withdrawal: EVMSpvWithdrawalData, scStartHeight?: number}[]): Promise<{[btcTxId: string]: SpvWithdrawalState}> {
+    async getWithdrawalStates(withdrawalTxs: {withdrawal: EVMSpvWithdrawalData, scStartBlockheight?: number}[]): Promise<{[btcTxId: string]: SpvWithdrawalState}> {
         const result: {[btcTxId: string]: SpvWithdrawalState} = {};
 
         const events: ["Fronted", "Claimed", "Closed"] = ["Fronted", "Claimed", "Closed"];
@@ -419,11 +419,11 @@ export class EVMSpvVaultContract<ChainId extends string>
 
             let scStartHeight = null;
             for(let val of checkWithdrawalTxs) {
-                if(val.scStartHeight==null) {
+                if(val.scStartBlockheight==null) {
                     scStartHeight = null;
                     break;
                 }
-                scStartHeight = Math.min(scStartHeight ?? Infinity, val.scStartHeight);
+                scStartHeight = Math.min(scStartHeight ?? Infinity, val.scStartBlockheight);
             }
 
             const keys = [null, null, checkWithdrawalTxs.map(withdrawal => hexlify(Buffer.from(withdrawal.withdrawal.getTxId(), "hex").reverse()))];