refactor: imporove get default nodes

Author: tabaktoni

src/channel/rpc_0_7.ts

@@ -82,11 +82,11 @@ export class RpcChannel {
       waitMode,
     } = optionsOrProvider || {};
     if (Object.values(NetworkName).includes(nodeUrl as NetworkName)) {
-      this.nodeUrl = getDefaultNodeUrl(nodeUrl as NetworkName, optionsOrProvider?.default);
+      this.nodeUrl = getDefaultNodeUrl(nodeUrl as NetworkName, optionsOrProvider?.default, '0.7');
     } else if (nodeUrl) {
       this.nodeUrl = nodeUrl;
     } else {
-      this.nodeUrl = getDefaultNodeUrl(undefined, optionsOrProvider?.default);
+      this.nodeUrl = getDefaultNodeUrl(undefined, optionsOrProvider?.default, '0.7');
     }
     this.baseFetch = baseFetch ?? fetch;
     this.blockIdentifier = blockIdentifier ?? defaultOptions.blockIdentifier;

src/channel/rpc_0_8.ts

@@ -89,11 +89,11 @@ export class RpcChannel {
       waitMode,
     } = optionsOrProvider || {};
     if (Object.values(NetworkName).includes(nodeUrl as NetworkName)) {
-      this.nodeUrl = getDefaultNodeUrl(nodeUrl as NetworkName, optionsOrProvider?.default);
+      this.nodeUrl = getDefaultNodeUrl(nodeUrl as NetworkName, optionsOrProvider?.default, '0.8');
     } else if (nodeUrl) {
       this.nodeUrl = nodeUrl;
     } else {
-      this.nodeUrl = getDefaultNodeUrl(undefined, optionsOrProvider?.default);
+      this.nodeUrl = getDefaultNodeUrl(undefined, optionsOrProvider?.default, '0.8');
     }
     this.baseFetch = baseFetch ?? fetch;
     this.blockIdentifier = blockIdentifier ?? defaultOptions.blockIdentifier;

src/global/constants.ts

@@ -116,17 +116,14 @@ export const DEFAULT_GLOBAL_CONFIG: {
   },
 };
 
-const vToUrl = (versionString: SupportedRpcVersion) =>
-  `v${versionString.replace(/^v/, '').replace(/\./g, '_')}`;
-
-export const RPC_NODES = {
+export const RPC_DEFAULT_NODES = {
   SN_MAIN: [
-    `https://starknet-mainnet.public.blastapi.io/rpc/${vToUrl(DEFAULT_GLOBAL_CONFIG.rpcVersion)}`,
-    `https://free-rpc.nethermind.io/mainnet-juno/${vToUrl(DEFAULT_GLOBAL_CONFIG.rpcVersion)}`,
+    `https://starknet-mainnet.public.blastapi.io/rpc/`,
+    `https://free-rpc.nethermind.io/mainnet-juno/`,
   ],
   SN_SEPOLIA: [
-    `https://starknet-sepolia.public.blastapi.io/rpc/${vToUrl(DEFAULT_GLOBAL_CONFIG.rpcVersion)}`,
-    `https://free-rpc.nethermind.io/sepolia-juno/${vToUrl(DEFAULT_GLOBAL_CONFIG.rpcVersion)}`,
+    `https://starknet-sepolia.public.blastapi.io/rpc/`,
+    `https://free-rpc.nethermind.io/sepolia-juno/`,
   ],
 } as const;
 

src/utils/provider.ts

@@ -1,4 +1,4 @@
-import { NetworkName, RPC_NODES, SupportedRpcVersion } from '../global/constants';
+import { NetworkName, RPC_DEFAULT_NODES, SupportedRpcVersion } from '../global/constants';
 import {
   BlockIdentifier,
   BlockTag,
@@ -24,6 +24,7 @@ import { compressProgram } from './stark';
 import type { GetTransactionReceiptResponse } from './transactionReceipt/transactionReceipt.type';
 import { logger } from '../global/logger';
 import { ETransactionVersion } from '../provider/types/spec.type';
+import { config } from '../global/config';
 
 /**
  * Helper - Async Sleep for 'delay' time
@@ -120,15 +121,39 @@ export function parseContract(contract: CompiledContract | string): ContractClas
  * // result = "https://starknet-mainnet.public.blastapi.io/rpc/v0_7"
  * ```
  */
-export const getDefaultNodeUrl = (networkName?: NetworkName, mute: boolean = false): string => {
+export const getDefaultNodeUrl = (
+  networkName?: NetworkName,
+  mute: boolean = false,
+  rpcVersion?: SupportedRpcVersion
+): string => {
   if (!mute) {
     logger.info('Using default public node url, please provide nodeUrl in provider options!');
   }
-  const nodes = RPC_NODES[networkName ?? NetworkName.SN_SEPOLIA];
+  const rpcNodes = getDefaultNodes(rpcVersion ?? config.get('rpcVersion'));
+
+  const nodes = rpcNodes[networkName ?? NetworkName.SN_SEPOLIA];
   const randIdx = Math.floor(Math.random() * nodes.length);
   return nodes[randIdx];
 };
 
+/**
+ * return Defaults RPC Nodes endpoints
+ */
+export function getDefaultNodes(rpcVersion: SupportedRpcVersion) {
+  const vToUrl = (versionString: SupportedRpcVersion) =>
+    `v${versionString.replace(/^v/, '').replace(/\./g, '_')}`;
+
+  const nodes: any = { ...RPC_DEFAULT_NODES };
+
+  Object.keys(nodes).forEach(function (key, _) {
+    nodes[key] = nodes[key].map((it: any) => {
+      return `${it}${vToUrl(rpcVersion)}`;
+    });
+  });
+
+  return nodes;
+}
+
 export const validBlockTags = Object.values(BlockTag);
 
 /**