@atomiqlabs/chain-solana 10.0.0-dev.9 → 12.0.0

package/dist/solana/chain/SolanaChainInterface.d.ts

@@ -48,6 +48,10 @@ export declare class SolanaChainInterface implements ChainInterface<SolanaTx, So
     deserializeTx(txData: string): Promise<SolanaTx>;
     getTxIdStatus(txId: string): Promise<"not_found" | "pending" | "success" | "reverted">;
     getTxStatus(tx: string): Promise<"not_found" | "pending" | "success" | "reverted">;
+    getFinalizedBlock(): Promise<{
+        height: number;
+        blockHash: 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: SolanaTx) => Promise<void>): void;

package/dist/solana/chain/SolanaChainInterface.js

@@ -76,6 +76,13 @@ class SolanaChainInterface {
     getTxStatus(tx) {
         return this.Transactions.getTxStatus(tx);
     }
+    async getFinalizedBlock() {
+        const { block } = await this.Blocks.findLatestParsedBlock("finalized");
+        return {
+            height: block.blockHeight,
+            blockHash: block.blockhash
+        };
+    }
     ///////////////////////////////////
     //// Callbacks & handlers
     offBeforeTxReplace(callback) {

package/dist/solana/chain/modules/SolanaTransactions.js

@@ -6,6 +6,7 @@ const SolanaModule_1 = require("../SolanaModule");
 const bs58 = require("bs58");
 const Utils_1 = require("../../../utils/Utils");
 const buffer_1 = require("buffer");
+const base_1 = require("@atomiqlabs/base");
 class SolanaTransactions extends SolanaModule_1.SolanaModule {
     /**
      * Sends raw solana transaction, first through the cbkSendTransaction callback (for e.g. sending the transaction
@@ -54,7 +55,7 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
                     resolve(signature);
                 }
                 if (status === "reverted")
-                    reject(new Error("Transaction reverted!"));
+                    reject(new base_1.TransactionRevertedError("Transaction reverted!"));
                 clearInterval(watchdogInterval);
             }, this.retryPolicy?.transactionResendInterval || 3000);
             if (abortSignal != null)
@@ -95,7 +96,7 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
             if (status === "success")
                 return signature;
             if (status === "reverted")
-                throw new Error("Transaction reverted!");
+                throw new base_1.TransactionRevertedError("Transaction reverted!");
             if (err instanceof web3_js_1.TransactionExpiredBlockheightExceededError || err.toString().startsWith("TransactionExpiredBlockheightExceededError")) {
                 throw new Error("Transaction expired before confirmation, please try again!");
             }
@@ -104,7 +105,7 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
             }
         }
         if (result.value.err != null)
-            throw new Error("Transaction reverted!");
+            throw new base_1.TransactionRevertedError("Transaction reverted!");
         return signature;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "10.0.0-dev.9",
+  "version": "12.0.0",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^10.0.0-dev.18",
+    "@atomiqlabs/base": "^12.0.0",
     "@noble/hashes": "^1.7.1",
     "bn.js": "5.2.1",
     "bs58": "4.0.1",

package/src/solana/chain/SolanaChainInterface.ts

@@ -134,6 +134,14 @@ export class SolanaChainInterface implements ChainInterface<
         return this.Transactions.getTxStatus(tx);
     }
 
+    async getFinalizedBlock(): Promise<{ height: number; blockHash: string }> {
+        const {block} = await this.Blocks.findLatestParsedBlock("finalized");
+        return {
+            height: block.blockHeight,
+            blockHash: block.blockhash
+        };
+    }
+
 
     ///////////////////////////////////
     //// Callbacks & handlers

package/src/solana/chain/modules/SolanaTransactions.ts

@@ -9,6 +9,7 @@ import * as bs58 from "bs58";
 import {tryWithRetries} from "../../../utils/Utils";
 import {Buffer} from "buffer";
 import {SolanaSigner} from "../../wallet/SolanaSigner";
+import {TransactionRevertedError} from "@atomiqlabs/base";
 
 export type SolanaTx = {tx: Transaction, signers: Signer[]};
 
@@ -74,7 +75,7 @@ export class SolanaTransactions extends SolanaModule {
                     this.logger.info("txConfirmationAndResendWatchdog(): transaction confirmed from HTTP polling, signature: "+signature);
                     resolve(signature);
                 }
-                if(status==="reverted") reject(new Error("Transaction reverted!"));
+                if(status==="reverted") reject(new TransactionRevertedError("Transaction reverted!"));
                 clearInterval(watchdogInterval);
             }, this.retryPolicy?.transactionResendInterval || 3000);
 
@@ -119,14 +120,14 @@ export class SolanaTransactions extends SolanaModule {
             );
             this.logger.info("txConfirmFromWebsocket(): transaction status: "+status+" signature: "+signature);
             if(status==="success") return signature;
-            if(status==="reverted") throw new Error("Transaction reverted!");
+            if(status==="reverted") throw new TransactionRevertedError("Transaction reverted!");
             if(err instanceof TransactionExpiredBlockheightExceededError || err.toString().startsWith("TransactionExpiredBlockheightExceededError")) {
                 throw new Error("Transaction expired before confirmation, please try again!");
             } else {
                 throw err;
             }
         }
-        if(result.value.err!=null) throw new Error("Transaction reverted!");
+        if(result.value.err!=null) throw new TransactionRevertedError("Transaction reverted!");
         return signature;
     }