ALL-4448 - Add Solana lb for archive methods

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [4.2.6] - 2024.2.12
+
+### Added
+
+- Added support for Solana load balancer based on the method name.
+
 ## [4.2.5] - 2024.1.31
 
 ### Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tatumio/tatum",
-  "version": "4.2.5",
+  "version": "4.2.6",
   "description": "Tatum JS SDK",
   "author": "Tatum",
   "repository": "https://github.com/tatumio/tatum-js",

src/e2e/rpc/other/tatum.rpc.solana.spec.ts

@@ -59,26 +59,6 @@ describe('Solana', () => {
       })
     })
 
-    // Too unstable
-    describe.skip('getBlock', () => {
-      it('should return a recent block', async () => {
-        const tatum = await getClient()
-        const { result: slot } = await tatum.rpc.getSlot()
-        const { result } = await tatum.rpc.getBlock(slot || 0, {
-          encoding: Encoding.JsonParsed,
-          maxSupportedTransactionVersion: 0,
-        })
-        await tatum.destroy()
-        expect(result).toHaveProperty('blockhash')
-        expect(result?.blockhash).toBeTruthy()
-        expect(result?.previousBlockhash).toBeTruthy()
-        expect(result?.blockHeight).toBeGreaterThan(0)
-        expect(result?.parentSlot).toBeGreaterThan(0)
-        expect(result?.blockTime).toBeGreaterThan(0)
-        expect(Array.isArray(result?.transactions)).toBe(true)
-      })
-    })
-
     describe('getBlockProduction', () => {
       it('should return block production information', async () => {
         const tatum = await getClient()
@@ -410,5 +390,24 @@ describe('Solana', () => {
         expect(result?.totalStake).toBeGreaterThan(0)
       })
     })
+
+    describe('getBlock', () => {
+      it('should return a recent block', async () => {
+        const tatum = await getClient(true)
+        const { result: slot } = await tatum.rpc.getSlot()
+        const { result } = await tatum.rpc.getBlock(slot || 0, {
+          encoding: Encoding.JsonParsed,
+          maxSupportedTransactionVersion: 0,
+        })
+        await tatum.destroy()
+        expect(result).toHaveProperty('blockhash')
+        expect(result?.blockhash).toBeTruthy()
+        expect(result?.previousBlockhash).toBeTruthy()
+        expect(result?.blockHeight).toBeGreaterThan(0)
+        expect(result?.parentSlot).toBeGreaterThan(0)
+        expect(result?.blockTime).toBeGreaterThan(0)
+        expect(Array.isArray(result?.transactions)).toBe(true)
+      })
+    })
   })
 })

src/service/rpc/other/SolanaLoadBalancerRpc.ts → src/service/rpc/other/SolanaArchiveLoadBalancerRpc.ts

@@ -8,11 +8,11 @@ import { AbstractSolanaRpc } from './AbstractSolanaRpc'
 
 @Service({
   factory: (data: { id: string }) => {
-    return new SolanaLoadBalancerRpc(data.id)
+    return new SolanaArchiveLoadBalancerRpc(data.id)
   },
   transient: true,
 })
-export class SolanaLoadBalancerRpc extends AbstractSolanaRpc implements SolanaRpcSuite {
+export class SolanaArchiveLoadBalancerRpc extends AbstractSolanaRpc implements SolanaRpcSuite {
   protected readonly loadBalancer: LoadBalancer
 
   constructor(id: string) {
@@ -22,7 +22,22 @@ export class SolanaLoadBalancerRpc extends AbstractSolanaRpc implements SolanaRp
 
   protected async rpcCall<T>(method: string, params?: unknown[]): Promise<T> {
     const preparedCall = Utils.prepareRpcCall(method, params)
-    return (await this.loadBalancer.rawRpcCall(preparedCall)) as T
+    const isArchive = this.isArchiveMethod(preparedCall)
+    return (await this.loadBalancer.rawRpcCall(preparedCall, isArchive)) as T
+  }
+
+  private isArchiveMethod(body: JsonRpcCall): boolean {
+    const archiveMethods = [
+      'getBlock',
+      'getBlocks',
+      'getBlocksWithLimit',
+      'getBlockTime',
+      'getInflationReward',
+      'getProgramAccounts',
+      'getSignaturesForAddress',
+      'getConfirmedSignaturesForAddress2',
+    ]
+    return archiveMethods.some((method) => body.method.includes(method))
   }
 
   async rawRpcCall(body: JsonRpcCall): Promise<JsonRpcResponse<any>> {

src/util/util.shared.ts

@@ -94,7 +94,7 @@ import { BnbLoadBalancerRpc } from '../service/rpc/other/BnbLoadBalancerRpc'
 import { CardanoLoadBalancerRpc } from '../service/rpc/other/CardanoLoadBalancerRpc'
 import { EosLoadBalancerRpc } from '../service/rpc/other/EosLoadBalancerRpc'
 import { EosRpc } from '../service/rpc/other/EosRpc'
-import { SolanaLoadBalancerRpc } from '../service/rpc/other/SolanaLoadBalancerRpc'
+import { SolanaArchiveLoadBalancerRpc } from '../service/rpc/other/SolanaArchiveLoadBalancerRpc'
 import { StellarLoadBalancerRpc } from '../service/rpc/other/StellarLoadBalancerRpc'
 import { StellarRpc } from '../service/rpc/other/StellarRpc'
 import { TezosLoadBalancerRpc } from '../service/rpc/other/TezosLoadBalancerRpc'
@@ -178,7 +178,7 @@ export const Utils = {
     }
 
     if (isSolanaNetwork(network)) {
-      return Container.of(id).get(SolanaLoadBalancerRpc) as T
+      return Container.of(id).get(SolanaArchiveLoadBalancerRpc) as T
     }
 
     if (isTronLoadBalancerNetwork(network)) {