@atomiqlabs/chain-evm 1.0.0-dev.101 → 1.0.0-dev.103

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

@@ -4,6 +4,7 @@ exports.EVMTransactions = void 0;
 const EVMModule_1 = require("../EVMModule");
 const ethers_1 = require("ethers");
 const Utils_1 = require("../../../utils/Utils");
+const base_1 = require("@atomiqlabs/base");
 const MAX_UNCONFIRMED_TXNS = 10;
 class EVMTransactions extends EVMModule_1.EVMModule {
     constructor() {
@@ -68,7 +69,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
             this.latestConfirmedNonces[tx.from] = nextAccountNonce;
         }
         if (state === "reverted")
-            throw new Error("Transaction reverted!");
+            throw new base_1.TransactionRevertedError("Transaction reverted!");
         return confirmedTxId;
     }
     /**

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.101",
+  "version": "1.0.0-dev.103",
   "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.20",
+    "@atomiqlabs/base": "^10.0.0-dev.21",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "^1.6.0",
     "buffer": "6.0.3",

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

@@ -2,6 +2,7 @@ import {EVMModule} from "../EVMModule";
 import {Transaction, TransactionRequest, TransactionResponse} from "ethers";
 import {timeoutPromise} from "../../../utils/Utils";
 import {EVMSigner} from "../../wallet/EVMSigner";
+import {TransactionRevertedError} from "@atomiqlabs/base";
 
 export type EVMTx = TransactionRequest;
 
@@ -87,7 +88,7 @@ export class EVMTransactions extends EVMModule<any> {
         if(currentConfirmedNonce==null || nextAccountNonce > currentConfirmedNonce) {
             this.latestConfirmedNonces[tx.from] = nextAccountNonce;
         }
-        if(state==="reverted") throw new Error("Transaction reverted!");
+        if(state==="reverted") throw new TransactionRevertedError("Transaction reverted!");
 
         return confirmedTxId;
     }

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()))];