@atomiqlabs/chain-solana 13.2.2 → 13.2.4

package/dist/solana/chain/modules/SolanaBlocks.d.ts

@@ -1,5 +1,5 @@
 import { SolanaModule } from "../SolanaModule";
-import { Commitment, ParsedAccountsModeBlockResponse } from "@solana/web3.js";
+import { Finality, ParsedAccountsModeBlockResponse } from "@solana/web3.js";
 export type BlockChecked = ParsedAccountsModeBlockResponse & {
     blockTime: number;
     blockHeight: number;
@@ -19,7 +19,7 @@ export declare class SolanaBlocks extends SolanaModule {
      *
      * @param commitment
      */
-    findLatestParsedBlock(commitment: Commitment): Promise<{
+    findLatestParsedBlock(commitment: Finality): Promise<{
         block: BlockChecked;
         slot: number;
     }>;

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

@@ -40,7 +40,7 @@ class SolanaBlocks extends SolanaModule_1.SolanaModule {
      */
     async findLatestParsedBlock(commitment) {
         let slot = await this.root.Slots.getSlot(commitment);
-        for (let i = 0; i < 10; i++) {
+        for (let i = 0; i < 16; i++) {
             const block = await this.getParsedBlock(slot).catch(e => {
                 const errorStr = e.toString();
                 if (errorStr.startsWith("SolanaJSONRPCError: failed to get block:") && (errorStr.includes("Block not available for slot") ||
@@ -60,7 +60,7 @@ class SolanaBlocks extends SolanaModule_1.SolanaModule {
             }
             slot--;
         }
-        throw new Error("Ran out of tries trying to find a parsedBlock");
+        throw new Error(`Ran out of tries trying to find a parsedBlock, last attempted slot: ${slot + 1}`);
     }
     /**
      * Gets parsed block for a given slot, uses block cache if the block was already fetched before

package/dist/solana/chain/modules/SolanaSlots.d.ts

@@ -25,6 +25,8 @@ export declare class SolanaSlots extends SolanaModule {
      * Gets the slot for a given commitment, uses slot cache & tries to estimate current slot based on the cached
      *  value, cache has relatively short expiry of just 12 slots (4.8 seconds)
      *
+     * @remarks Doesn't try to extrapolate the slot number for `finalized` commitment level
+     *
      * @param commitment
      */
     getSlot(commitment: Commitment): Promise<number>;

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

@@ -54,11 +54,15 @@ class SolanaSlots extends SolanaModule_1.SolanaModule {
      * Gets the slot for a given commitment, uses slot cache & tries to estimate current slot based on the cached
      *  value, cache has relatively short expiry of just 12 slots (4.8 seconds)
      *
+     * @remarks Doesn't try to extrapolate the slot number for `finalized` commitment level
+     *
      * @param commitment
      */
     async getSlot(commitment) {
         let cachedSlotData = this.slotCache[commitment];
         if (cachedSlotData != null && Date.now() - cachedSlotData.timestamp < this.SLOT_CACHE_TIME) {
+            if (commitment === "finalized")
+                return await cachedSlotData.slot;
             return (await cachedSlotData.slot) + Math.floor((Date.now() - cachedSlotData.timestamp) / this.root._SLOT_TIME);
         }
         cachedSlotData = this.fetchAndSaveSlot(commitment);

package/dist/solana/swaps/modules/SwapInit.js

@@ -244,7 +244,7 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
         txToSign.feePayer = swapData.isPayIn() ? swapData.offerer : swapData.claimer;
         txToSign.recentBlockhash = latestBlock.blockhash;
         txToSign.sign(signer.keypair);
-        this.logger.debug("signSwapInitialization(): Signed tx: ", txToSign);
+        // this.logger.debug("signSwapInitialization(): Signed tx: ",txToSign);
         const sig = txToSign.signatures.find(e => e.publicKey.equals(signer.getPublicKey()));
         if (sig == null || sig.signature == null)
             throw new Error(`Unable to extract transaction signature! Signer: ${signer.getAddress()}`);
@@ -299,7 +299,7 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
         txToSign.feePayer = new web3_js_1.PublicKey(sender);
         txToSign.recentBlockhash = blockhash;
         txToSign.addSignature(signer, buffer_1.Buffer.from(signatureString, "hex"));
-        this.logger.debug("isSignatureValid(): Signed tx: ", txToSign);
+        // this.logger.debug("isSignatureValid(): Signed tx: ",txToSign);
         const valid = txToSign.verifySignatures(false);
         if (!valid)
             throw new base_1.SignatureVerificationError("Invalid signature!");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "13.2.2",
+  "version": "13.2.4",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

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

@@ -1,5 +1,5 @@
 import {SolanaModule} from "../SolanaModule";
-import {Commitment, ParsedAccountsModeBlockResponse} from "@solana/web3.js";
+import {Commitment, Finality, ParsedAccountsModeBlockResponse} from "@solana/web3.js";
 
 
 export type BlockChecked = ParsedAccountsModeBlockResponse & {blockTime: number, blockHeight: number};
@@ -38,13 +38,13 @@ export class SolanaBlocks extends SolanaModule {
      *
      * @param commitment
      */
-    public async findLatestParsedBlock(commitment: Commitment): Promise<{
+    public async findLatestParsedBlock(commitment: Finality): Promise<{
         block: BlockChecked,
         slot: number
     }> {
         let slot = await this.root.Slots.getSlot(commitment);
 
-        for(let i=0;i<10;i++) {
+        for(let i=0;i<16;i++) {
             const block = await this.getParsedBlock(slot).catch(e => {
                 const errorStr = e.toString();
                 if(
@@ -71,7 +71,7 @@ export class SolanaBlocks extends SolanaModule {
             slot--;
         }
 
-        throw new Error("Ran out of tries trying to find a parsedBlock");
+        throw new Error(`Ran out of tries trying to find a parsedBlock, last attempted slot: ${slot + 1}`);
     }
 
     /**

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

@@ -65,12 +65,15 @@ export class SolanaSlots extends SolanaModule {
      * Gets the slot for a given commitment, uses slot cache & tries to estimate current slot based on the cached
      *  value, cache has relatively short expiry of just 12 slots (4.8 seconds)
      *
+     * @remarks Doesn't try to extrapolate the slot number for `finalized` commitment level
+     *
      * @param commitment
      */
     public async getSlot(commitment: Commitment): Promise<number> {
         let cachedSlotData = this.slotCache[commitment];
 
         if(cachedSlotData!=null && Date.now()-cachedSlotData.timestamp<this.SLOT_CACHE_TIME) {
+            if(commitment==="finalized") return await cachedSlotData.slot;
             return (await cachedSlotData.slot) + Math.floor((Date.now()-cachedSlotData.timestamp)/this.root._SLOT_TIME);
         }
 

package/src/solana/swaps/modules/SwapInit.ts

@@ -326,7 +326,7 @@ export class SwapInit extends SolanaSwapModule {
         txToSign.feePayer = swapData.isPayIn() ? swapData.offerer : swapData.claimer;
         txToSign.recentBlockhash = latestBlock.blockhash;
         txToSign.sign(signer.keypair);
-        this.logger.debug("signSwapInitialization(): Signed tx: ",txToSign);
+        // this.logger.debug("signSwapInitialization(): Signed tx: ",txToSign);
 
         const sig = txToSign.signatures.find(e => e.publicKey.equals(signer.getPublicKey()));
         if(sig==null || sig.signature==null) throw new Error(`Unable to extract transaction signature! Signer: ${signer.getAddress()}`);
@@ -393,7 +393,7 @@ export class SwapInit extends SolanaSwapModule {
         txToSign.feePayer = new PublicKey(sender);
         txToSign.recentBlockhash = blockhash;
         txToSign.addSignature(signer, Buffer.from(signatureString, "hex"));
-        this.logger.debug("isSignatureValid(): Signed tx: ",txToSign);
+        // this.logger.debug("isSignatureValid(): Signed tx: ",txToSign);
 
         const valid = txToSign.verifySignatures(false);