@atomiqlabs/chain-solana 12.0.11 → 12.0.13

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,79 +1,79 @@
-import {SolanaModule} from "../SolanaModule";
-import {Commitment, ParsedAccountsModeBlockResponse} from "@solana/web3.js";
-
-
-export class SolanaBlocks extends SolanaModule {
-
-    private blockCache: Map<number, Promise<ParsedAccountsModeBlockResponse>> = new Map<number, Promise<ParsedAccountsModeBlockResponse>>();
-
-    /**
-     * 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<ParsedAccountsModeBlockResponse> {
-        const blockCacheData = this.connection.getParsedBlock(slot, {
-            transactionDetails: "none",
-            commitment: "confirmed",
-            rewards: false
-        });
-        this.blockCache.set(slot, blockCacheData);
-        blockCacheData.catch(e => {
-            if(this.blockCache.get(slot)==blockCacheData) this.blockCache.delete(slot);
-            throw e;
-        });
-        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: Commitment): Promise<{
-        block: ParsedAccountsModeBlockResponse,
-        slot: number
-    }> {
-        let slot = await this.root.Slots.getSlot(commitment);
-
-        for(let i=0;i<10;i++) {
-            const block = await this.getParsedBlock(slot).catch(e => {
-                if(e.toString().startsWith("SolanaJSONRPCError: failed to get block: Block not available for slot")) {
-                    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");
-    }
-
-    /**
-     * Gets parsed block for a given slot, uses block cache if the block was already fetched before
-     *
-     * @param slot
-     */
-    public getParsedBlock(slot: number): Promise<ParsedAccountsModeBlockResponse> {
-        let blockCacheData = this.blockCache.get(slot);
-        if(blockCacheData==null) {
-            blockCacheData = this.fetchAndSaveParsedBlock(slot);
-        }
-        return blockCacheData;
-    }
-
+import {SolanaModule} from "../SolanaModule";
+import {Commitment, ParsedAccountsModeBlockResponse} from "@solana/web3.js";
+
+
+export class SolanaBlocks extends SolanaModule {
+
+    private blockCache: Map<number, Promise<ParsedAccountsModeBlockResponse>> = new Map<number, Promise<ParsedAccountsModeBlockResponse>>();
+
+    /**
+     * 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<ParsedAccountsModeBlockResponse> {
+        const blockCacheData = this.connection.getParsedBlock(slot, {
+            transactionDetails: "none",
+            commitment: "confirmed",
+            rewards: false
+        });
+        this.blockCache.set(slot, blockCacheData);
+        blockCacheData.catch(e => {
+            if(this.blockCache.get(slot)==blockCacheData) this.blockCache.delete(slot);
+            throw e;
+        });
+        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: Commitment): Promise<{
+        block: ParsedAccountsModeBlockResponse,
+        slot: number
+    }> {
+        let slot = await this.root.Slots.getSlot(commitment);
+
+        for(let i=0;i<10;i++) {
+            const block = await this.getParsedBlock(slot).catch(e => {
+                if(e.toString().startsWith("SolanaJSONRPCError: failed to get block: Block not available for slot")) {
+                    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");
+    }
+
+    /**
+     * Gets parsed block for a given slot, uses block cache if the block was already fetched before
+     *
+     * @param slot
+     */
+    public getParsedBlock(slot: number): Promise<ParsedAccountsModeBlockResponse> {
+        let blockCacheData = this.blockCache.get(slot);
+        if(blockCacheData==null) {
+            blockCacheData = this.fetchAndSaveParsedBlock(slot);
+        }
+        return blockCacheData;
+    }
+
 }