@atomiqlabs/chain-solana 13.2.1 → 13.2.3

package/dist/solana/btcrelay/headers/SolanaBtcHeader.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { BtcHeader } from "@atomiqlabs/base";
 import { Buffer } from "buffer";
-type SolanaBtcHeaderType = {
+export type SolanaBtcHeaderType = {
     version: number;
     reversedPrevBlockhash: number[];
     merkleRoot: number[];
@@ -82,4 +82,3 @@ export declare class SolanaBtcHeader implements BtcHeader {
      */
     getHash(): Buffer;
 }
-export {};

package/dist/solana/btcrelay/headers/SolanaBtcStoredHeader.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { BtcStoredHeader } from "@atomiqlabs/base";
-import { SolanaBtcHeader } from "./SolanaBtcHeader";
+import { SolanaBtcHeader, SolanaBtcHeaderType } from "./SolanaBtcHeader";
 import { Buffer } from "buffer";
 export type SolanaBtcStoredHeaderType = {
     chainWork: number[];
-    header: SolanaBtcHeader;
+    header: SolanaBtcHeaderType | SolanaBtcHeader;
     lastDiffAdjustment: number;
     blockheight: number;
     prevBlockTimestamps: number[];

package/dist/solana/btcrelay/headers/SolanaBtcStoredHeader.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaBtcStoredHeader = void 0;
 const base_1 = require("@atomiqlabs/base");
+const SolanaBtcHeader_1 = require("./SolanaBtcHeader");
 const buffer_1 = require("buffer");
 /**
  * Represents a bitcoin blockheader that has already been stored and committed in the Solana BTC relay program.
@@ -18,7 +19,7 @@ class SolanaBtcStoredHeader {
      */
     constructor(obj) {
         this.chainWork = obj.chainWork;
-        this.header = obj.header;
+        this.header = obj.header instanceof SolanaBtcHeader_1.SolanaBtcHeader ? obj.header : new SolanaBtcHeader_1.SolanaBtcHeader(obj.header);
         this.lastDiffAdjustment = obj.lastDiffAdjustment;
         this.blockheight = obj.blockheight;
         this.prevBlockTimestamps = obj.prevBlockTimestamps;

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/package.json

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

package/src/solana/btcrelay/headers/SolanaBtcHeader.ts

@@ -1,7 +1,7 @@
 import {BtcHeader} from "@atomiqlabs/base";
 import {Buffer} from "buffer";
 
-type SolanaBtcHeaderType = {
+export type SolanaBtcHeaderType = {
     version: number,
     reversedPrevBlockhash: number[],
     merkleRoot: number[],

package/src/solana/btcrelay/headers/SolanaBtcStoredHeader.ts

@@ -1,10 +1,10 @@
 import {BtcStoredHeader, StatePredictorUtils} from "@atomiqlabs/base";
-import {SolanaBtcHeader} from "./SolanaBtcHeader";
+import {SolanaBtcHeader, SolanaBtcHeaderType} from "./SolanaBtcHeader";
 import {Buffer} from "buffer";
 
 export type SolanaBtcStoredHeaderType = {
     chainWork: number[],
-    header: SolanaBtcHeader,
+    header: SolanaBtcHeaderType | SolanaBtcHeader,
     lastDiffAdjustment: number,
     blockheight: number,
     prevBlockTimestamps: number[]
@@ -47,7 +47,7 @@ export class SolanaBtcStoredHeader implements BtcStoredHeader<SolanaBtcHeader> {
      */
     constructor(obj: SolanaBtcStoredHeaderType) {
         this.chainWork = obj.chainWork;
-        this.header = obj.header;
+        this.header = obj.header instanceof SolanaBtcHeader ? obj.header : new SolanaBtcHeader(obj.header);
         this.lastDiffAdjustment = obj.lastDiffAdjustment;
         this.blockheight = obj.blockheight;
         this.prevBlockTimestamps = obj.prevBlockTimestamps;

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);
         }