@cityofzion/bs-solana 2.0.8 → 2.0.10

package/dist/BSSolana.d.ts

@@ -11,7 +11,7 @@ export declare class BSSolana<N extends string = string> implements IBSSolana<N>
     readonly tokens: TBSToken[];
     readonly nativeTokens: TBSToken[];
     network: TBSNetwork<TBSSolanaNetworkId>;
-    availableNetworkURLs: string[];
+    rpcNetworkUrls: string[];
     readonly availableNetworks: TBSNetwork<TBSSolanaNetworkId>[];
     readonly defaultNetwork: TBSNetwork<TBSSolanaNetworkId>;
     ledgerService: Web3LedgerServiceSolana<N>;

package/dist/BSSolana.js

@@ -91,13 +91,13 @@ class BSSolana {
         this.setNetwork(network !== null && network !== void 0 ? network : this.defaultNetwork);
     }
     setNetwork(network) {
-        const availableURLs = BSSolanaConstants_1.BSSolanaConstants.RPC_LIST_BY_NETWORK_ID[network.id] || [];
-        const isValidNetwork = blockchain_service_1.BSUtilsHelper.validateNetwork(network, this.availableNetworks, availableURLs);
+        const rpcNetworkUrls = BSSolanaConstants_1.BSSolanaConstants.RPC_LIST_BY_NETWORK_ID[network.id] || [];
+        const isValidNetwork = blockchain_service_1.BSUtilsHelper.validateNetwork(network, this.availableNetworks, rpcNetworkUrls);
         if (!isValidNetwork) {
             throw new Error(`Network with id ${network.id} is not available for ${this.name}`);
         }
         this.network = network;
-        this.availableNetworkURLs = availableURLs;
+        this.rpcNetworkUrls = rpcNetworkUrls;
         this.tokenService = new TokenServiceSolana_1.TokenServiceSolana();
         this.blockchainDataService = new TatumRpcBDSSolana_1.TatumRpcBDSSolana(this);
         this.nftDataService = new TatumRpcNDSSolana_1.TatumRpcNDSSolana(this);
@@ -143,10 +143,7 @@ class BSSolana {
         catch (_a) {
             keyBuffer = Uint8Array.from(key.split(',').map(Number));
         }
-        if ((keyBuffer === null || keyBuffer === void 0 ? void 0 : keyBuffer.length) !== KEY_BYTES_LENGTH) {
-            return false;
-        }
-        return true;
+        return (keyBuffer === null || keyBuffer === void 0 ? void 0 : keyBuffer.length) === KEY_BYTES_LENGTH;
     }
     generateAccountFromMnemonic(mnemonic, index) {
         const bip44Path = this.bip44DerivationPath.replace('?', index.toString());

package/dist/constants/BSSolanaConstants.d.ts

@@ -4,7 +4,7 @@ export declare class BSSolanaConstants {
     static readonly DEFAULT_BIP44_DERIVATION_PATH = "m/44'/501'/?'/0'";
     static readonly NATIVE_TOKEN: TBSToken;
     static readonly NATIVE_WRAPPED_HASH = "So11111111111111111111111111111111111111112";
-    static readonly RPC_LIST_BY_NETWORK_ID: Partial<Record<TBSSolanaNetworkId, string[]>>;
+    static readonly RPC_LIST_BY_NETWORK_ID: Record<TBSSolanaNetworkId, string[]>;
     static readonly MAINNET_NETWORK: TBSNetwork<TBSSolanaNetworkId>;
     static readonly TESTNET_NETWORK: TBSNetwork<TBSSolanaNetworkId>;
     static readonly ALL_NETWORKS: TBSNetwork<TBSSolanaNetworkId>[];

package/dist/services/blockchain-data/TatumRpcBDSSolana.js

@@ -63,16 +63,9 @@ const BSSolanaConstants_1 = require("../../constants/BSSolanaConstants");
 const web3_js_1 = __importDefault(require("@solana/web3.js"));
 const solanaSplSDK = __importStar(require("@solana/spl-token"));
 const BSSolanaCachedMethodsHelper_1 = require("../../helpers/BSSolanaCachedMethodsHelper");
-const BSSolanaHelper_1 = require("../../helpers/BSSolanaHelper");
 class TatumRpcBDSSolana {
     static getConnection(network) {
-        return new web3_js_1.default.Connection(TatumRpcBDSSolana.URL_BY_NETWORK_ID[network.id], {
-            httpHeaders: {
-                'x-api-key': BSSolanaHelper_1.BSSolanaHelper.isMainnetNetwork(network)
-                    ? process.env.TATUM_MAINNET_API_KEY
-                    : process.env.TATUM_TESTNET_API_KEY,
-            },
-        });
+        return new web3_js_1.default.Connection(TatumRpcBDSSolana.URL_BY_NETWORK_ID[network.id]);
     }
     constructor(service) {
         _TatumRpcBDSSolana_instances.add(this);
@@ -366,6 +359,6 @@ _TatumRpcBDSSolana_service = new WeakMap(), _TatumRpcBDSSolana_connection = new
     });
 };
 TatumRpcBDSSolana.URL_BY_NETWORK_ID = {
-    'mainnet-beta': 'https://solana-mainnet.gateway.tatum.io/',
-    devnet: 'https://solana-devnet.gateway.tatum.io',
+    'mainnet-beta': 'https://api.coz.io/api/v2/solana/meta/mainnet',
+    devnet: 'https://api.coz.io/api/v2/solana/meta/devnet',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-solana",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -21,7 +21,7 @@
     "@ledgerhq/hw-transport": "~6.31.11",
     "@metaplex-foundation/js": "~0.20.1",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.22.5"
+    "@cityofzion/blockchain-service": "1.22.7"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.29.12",