@atomiqlabs/chain-solana 13.5.13 → 13.5.14

package/src/solana/chain/SolanaModule.ts

@@ -1,21 +1,21 @@
-import {Connection} from "@solana/web3.js";
-import {SolanaChainInterface, SolanaRetryPolicy} from "./SolanaChainInterface";
-import {getLogger} from "../../utils/Utils";
-
-export class SolanaModule {
-
-    protected readonly connection: Connection;
-    protected readonly retryPolicy?: SolanaRetryPolicy;
-    protected readonly root: SolanaChainInterface;
-
-    protected readonly logger = getLogger(this.constructor.name+": ");
-
-    constructor(
-        root: SolanaChainInterface
-    ) {
-        this.connection = root._connection;
-        this.retryPolicy = root._retryPolicy;
-        this.root = root;
-    }
-
+import {Connection} from "@solana/web3.js";
+import {SolanaChainInterface, SolanaRetryPolicy} from "./SolanaChainInterface";
+import {getLogger} from "../../utils/Utils";
+
+export class SolanaModule {
+
+    protected readonly connection: Connection;
+    protected readonly retryPolicy?: SolanaRetryPolicy;
+    protected readonly root: SolanaChainInterface;
+
+    protected readonly logger = getLogger(this.constructor.name+": ");
+
+    constructor(
+        root: SolanaChainInterface
+    ) {
+        this.connection = root._connection;
+        this.retryPolicy = root._retryPolicy;
+        this.root = root;
+    }
+
 }

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

@@ -1,21 +1,21 @@
-import {PublicKey} from "@solana/web3.js";
-
-
-export class SolanaAddresses {
-
-    ///////////////////
-    //// Address utils
-    /**
-     * Checks whether an address is a valid Solana address (base58 encoded ed25519 public key)
-     *
-     * @param address
-     */
-    static isValidAddress(address: string): boolean {
-        try {
-            return PublicKey.isOnCurve(address);
-        } catch (e) {
-            return false;
-        }
-    }
-
+import {PublicKey} from "@solana/web3.js";
+
+
+export class SolanaAddresses {
+
+    ///////////////////
+    //// Address utils
+    /**
+     * Checks whether an address is a valid Solana address (base58 encoded ed25519 public key)
+     *
+     * @param address
+     */
+    static isValidAddress(address: string): boolean {
+        try {
+            return PublicKey.isOnCurve(address);
+        } catch (e) {
+            return false;
+        }
+    }
+
 }

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

@@ -1,90 +1,90 @@
-import {SolanaModule} from "../SolanaModule";
-import {Commitment, Finality, ParsedAccountsModeBlockResponse} from "@solana/web3.js";
-
-
-export type BlockChecked = ParsedAccountsModeBlockResponse & {blockTime: number, blockHeight: number};
-
-export class SolanaBlocks extends SolanaModule {
-
-    private blockCache: Map<number, Promise<BlockChecked>> = new Map<number, Promise<BlockChecked>>();
-
-    /**
-     * Initiates a fetch of the block at specified slot & saves the fetch promise into a block cache
-     *
-     * @param slot
-     * @private
-     */
-    private fetchAndSaveParsedBlock(slot: number): Promise<BlockChecked> {
-        const blockCacheData = this.connection.getParsedBlock(slot, {
-            transactionDetails: "none",
-            commitment: "confirmed",
-            rewards: false
-        }).then(val => {
-            if(val.blockHeight==null || val.blockTime==null) throw new Error(`Cannot get block for slot ${slot}: blockHeight or blockTime empty!`);
-            return val as BlockChecked;
-        });
-        this.blockCache.set(slot, blockCacheData);
-        blockCacheData.catch(() => {
-            if(this.blockCache.get(slot)==blockCacheData) this.blockCache.delete(slot);
-        });
-        return blockCacheData;
-    }
-
-    ///////////////////
-    //// Blocks
-    /**
-     * Tries to find the latest existing block for a given commitment, skipping blocks that are not available, runs a
-     *  search backwards from the latest slot for the given commitment and fails after 10 tries
-     *
-     * @param commitment
-     */
-    public async findLatestParsedBlock(commitment: Finality): Promise<{
-        block: BlockChecked,
-        slot: number
-    }> {
-        let slot = await this.root.Slots.getSlot(commitment);
-
-        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") ||
-                        errorStr.includes("was skipped") ||
-                        errorStr.includes("missing in long-term storage")
-                    )
-                ) {
-                    return null;
-                }
-                throw e;
-            });
-
-            if(block!=null) {
-                this.logger.debug("findLatestParsedBlock(): Found valid block, slot: "+slot+
-                    " blockhash: "+block.blockhash+" tries: "+i);
-                return {
-                    block,
-                    slot
-                }
-            }
-
-            slot--;
-        }
-
-        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
-     *
-     * @param slot
-     */
-    public getParsedBlock(slot: number): Promise<BlockChecked> {
-        let blockCacheData = this.blockCache.get(slot);
-        if(blockCacheData==null) {
-            blockCacheData = this.fetchAndSaveParsedBlock(slot);
-        }
-        return blockCacheData;
-    }
-
+import {SolanaModule} from "../SolanaModule";
+import {Commitment, Finality, ParsedAccountsModeBlockResponse} from "@solana/web3.js";
+
+
+export type BlockChecked = ParsedAccountsModeBlockResponse & {blockTime: number, blockHeight: number};
+
+export class SolanaBlocks extends SolanaModule {
+
+    private blockCache: Map<number, Promise<BlockChecked>> = new Map<number, Promise<BlockChecked>>();
+
+    /**
+     * Initiates a fetch of the block at specified slot & saves the fetch promise into a block cache
+     *
+     * @param slot
+     * @private
+     */
+    private fetchAndSaveParsedBlock(slot: number): Promise<BlockChecked> {
+        const blockCacheData = this.connection.getParsedBlock(slot, {
+            transactionDetails: "none",
+            commitment: "confirmed",
+            rewards: false
+        }).then(val => {
+            if(val.blockHeight==null || val.blockTime==null) throw new Error(`Cannot get block for slot ${slot}: blockHeight or blockTime empty!`);
+            return val as BlockChecked;
+        });
+        this.blockCache.set(slot, blockCacheData);
+        blockCacheData.catch(() => {
+            if(this.blockCache.get(slot)==blockCacheData) this.blockCache.delete(slot);
+        });
+        return blockCacheData;
+    }
+
+    ///////////////////
+    //// Blocks
+    /**
+     * Tries to find the latest existing block for a given commitment, skipping blocks that are not available, runs a
+     *  search backwards from the latest slot for the given commitment and fails after 10 tries
+     *
+     * @param commitment
+     */
+    public async findLatestParsedBlock(commitment: Finality): Promise<{
+        block: BlockChecked,
+        slot: number
+    }> {
+        let slot = await this.root.Slots.getSlot(commitment);
+
+        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") ||
+                        errorStr.includes("was skipped") ||
+                        errorStr.includes("missing in long-term storage")
+                    )
+                ) {
+                    return null;
+                }
+                throw e;
+            });
+
+            if(block!=null) {
+                this.logger.debug("findLatestParsedBlock(): Found valid block, slot: "+slot+
+                    " blockhash: "+block.blockhash+" tries: "+i);
+                return {
+                    block,
+                    slot
+                }
+            }
+
+            slot--;
+        }
+
+        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
+     *
+     * @param slot
+     */
+    public getParsedBlock(slot: number): Promise<BlockChecked> {
+        let blockCacheData = this.blockCache.get(slot);
+        if(blockCacheData==null) {
+            blockCacheData = this.fetchAndSaveParsedBlock(slot);
+        }
+        return blockCacheData;
+    }
+
 }