@atomiqlabs/chain-solana 10.0.0-dev.3 → 11.0.0

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

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

@@ -1,57 +1,57 @@
-import {SolanaModule} from "../SolanaModule";
-import {ConfirmedSignatureInfo, PublicKey} from "@solana/web3.js";
-
-export class SolanaEvents extends SolanaModule {
-
-    public readonly LOG_FETCH_LIMIT = 500;
-
-    /**
-     * Gets the signatures for a given topicKey public key, if lastProcessedSignature is specified, it fetches only
-     *  the signatures before this signature
-     *
-     * @param topicKey
-     * @param logFetchLimit
-     * @param lastProcessedSignature
-     * @private
-     */
-    private getSignatures(topicKey: PublicKey, logFetchLimit: number, lastProcessedSignature?: string): Promise<ConfirmedSignatureInfo[]> {
-        if(lastProcessedSignature==null) {
-            return this.connection.getSignaturesForAddress(topicKey, {
-                limit: logFetchLimit,
-            }, "confirmed");
-        } else {
-            return this.connection.getSignaturesForAddress(topicKey, {
-                before: lastProcessedSignature,
-                limit: logFetchLimit
-            }, "confirmed");
-        }
-    }
-
-    /**
-     * Runs a search backwards in time, processing transaction signatures for a specific topic public key
-     *
-     * @param topicKey
-     * @param processor called for every batch of returned signatures, should return a value if the correct signature
-     *  was found, or null if the search should continue
-     * @param abortSignal
-     * @param logFetchLimit
-     */
-    public async findInSignatures<T>(
-        topicKey: PublicKey,
-        processor: (signatures: ConfirmedSignatureInfo[]) => Promise<T>,
-        abortSignal?: AbortSignal,
-        logFetchLimit?: number
-    ): Promise<T> {
-        if(logFetchLimit==null || logFetchLimit>this.LOG_FETCH_LIMIT) logFetchLimit = this.LOG_FETCH_LIMIT;
-        let signatures: ConfirmedSignatureInfo[] = null;
-        while(signatures==null || signatures.length>0) {
-            signatures = await this.getSignatures(topicKey, logFetchLimit, signatures!=null ? signatures[signatures.length-1].signature : null);
-            if(abortSignal!=null) abortSignal.throwIfAborted();
-            const result: T = await processor(signatures);
-            if(result!=null) return result;
-            if(signatures.length<logFetchLimit) break;
-        }
-        return null;
-    }
-
+import {SolanaModule} from "../SolanaModule";
+import {ConfirmedSignatureInfo, PublicKey} from "@solana/web3.js";
+
+export class SolanaEvents extends SolanaModule {
+
+    public readonly LOG_FETCH_LIMIT = 500;
+
+    /**
+     * Gets the signatures for a given topicKey public key, if lastProcessedSignature is specified, it fetches only
+     *  the signatures before this signature
+     *
+     * @param topicKey
+     * @param logFetchLimit
+     * @param lastProcessedSignature
+     * @private
+     */
+    private getSignatures(topicKey: PublicKey, logFetchLimit: number, lastProcessedSignature?: string): Promise<ConfirmedSignatureInfo[]> {
+        if(lastProcessedSignature==null) {
+            return this.connection.getSignaturesForAddress(topicKey, {
+                limit: logFetchLimit,
+            }, "confirmed");
+        } else {
+            return this.connection.getSignaturesForAddress(topicKey, {
+                before: lastProcessedSignature,
+                limit: logFetchLimit
+            }, "confirmed");
+        }
+    }
+
+    /**
+     * Runs a search backwards in time, processing transaction signatures for a specific topic public key
+     *
+     * @param topicKey
+     * @param processor called for every batch of returned signatures, should return a value if the correct signature
+     *  was found, or null if the search should continue
+     * @param abortSignal
+     * @param logFetchLimit
+     */
+    public async findInSignatures<T>(
+        topicKey: PublicKey,
+        processor: (signatures: ConfirmedSignatureInfo[]) => Promise<T>,
+        abortSignal?: AbortSignal,
+        logFetchLimit?: number
+    ): Promise<T> {
+        if(logFetchLimit==null || logFetchLimit>this.LOG_FETCH_LIMIT) logFetchLimit = this.LOG_FETCH_LIMIT;
+        let signatures: ConfirmedSignatureInfo[] = null;
+        while(signatures==null || signatures.length>0) {
+            signatures = await this.getSignatures(topicKey, logFetchLimit, signatures!=null ? signatures[signatures.length-1].signature : null);
+            if(abortSignal!=null) abortSignal.throwIfAborted();
+            const result: T = await processor(signatures);
+            if(result!=null) return result;
+            if(signatures.length<logFetchLimit) break;
+        }
+        return null;
+    }
+
 }