@cityofzion/bs-solana 2.0.2 → 2.0.4

package/dist/BSSolana.d.ts

@@ -1,36 +1,35 @@
-import { Account, BlockchainDataService, BlockchainService, BSCalculableFee, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, ExchangeDataService, ExplorerService, GetLedgerTransport, ITokenService, Network, NftDataService, Token, TransferParam } from '@cityofzion/blockchain-service';
-import { BSSolanaNetworkId } from './constants/BSSolanaConstants';
+import { TBSAccount, TGetLedgerTransport, IBlockchainDataService, IExchangeDataService, IExplorerService, INftDataService, ITokenService, TBSNetwork, TBSToken, TTransferParam, TPingNetworkResponse } from '@cityofzion/blockchain-service';
 import { Web3LedgerServiceSolana } from './services/ledger/Web3LedgerServiceSolana';
-type BSSolanaApiKeys = {
-    moralisApiKey: string;
-    tatumMainnetApiKey: string;
-    tatumTestnetApiKey: string;
-};
-export declare class BSSolana<BSName extends string = string> implements BlockchainService<BSName, any>, BSCalculableFee<BSName>, BSWithNameService, BSWithLedger<BSName>, BSWithNft, BSWithExplorerService {
+import { IBSSolana, TBSSolanaNetworkId } from './types';
+export declare class BSSolana<N extends string = string> implements IBSSolana<N> {
     #private;
-    name: BSName;
-    bip44DerivationPath: string;
-    feeToken: Token;
-    tokens: Token[];
-    nativeTokens: Token[];
-    network: Network<BSSolanaNetworkId>;
-    ledgerService: Web3LedgerServiceSolana<BSName>;
-    exchangeDataService: ExchangeDataService;
-    blockchainDataService: BlockchainDataService;
-    nftDataService: NftDataService;
-    explorerService: ExplorerService;
+    readonly name: N;
+    readonly bip44DerivationPath: string;
+    readonly isMultiTransferSupported: boolean;
+    readonly isCustomNetworkSupported: boolean;
+    readonly feeToken: TBSToken;
+    readonly tokens: TBSToken[];
+    readonly nativeTokens: TBSToken[];
+    network: TBSNetwork<TBSSolanaNetworkId>;
+    availableNetworkURLs: string[];
+    readonly availableNetworks: TBSNetwork<TBSSolanaNetworkId>[];
+    readonly defaultNetwork: TBSNetwork<TBSSolanaNetworkId>;
+    ledgerService: Web3LedgerServiceSolana<N>;
+    exchangeDataService: IExchangeDataService;
+    blockchainDataService: IBlockchainDataService;
+    nftDataService: INftDataService;
+    explorerService: IExplorerService;
     tokenService: ITokenService;
-    constructor(name: BSName, apiKeys: BSSolanaApiKeys, network?: Network<BSSolanaNetworkId>, getLedgerTransport?: GetLedgerTransport<BSName>);
-    setNetwork(partialNetwork: Network<BSSolanaNetworkId>): void;
-    testNetwork(network: Network<BSSolanaNetworkId>): Promise<void>;
+    constructor(name: N, network?: TBSNetwork<TBSSolanaNetworkId>, getLedgerTransport?: TGetLedgerTransport<N>);
+    setNetwork(network: TBSNetwork<TBSSolanaNetworkId>): void;
+    pingNode(url: string): Promise<TPingNetworkResponse>;
     validateAddress(address: string): boolean;
     validateKey(key: string): boolean;
-    generateAccountFromMnemonic(mnemonic: string, index: number): Account<BSName>;
-    generateAccountFromKey(key: string): Account<BSName>;
-    generateAccountFromPublicKey(publicKey: string): Account<BSName>;
-    transfer(param: TransferParam<BSName>): Promise<string[]>;
-    calculateTransferFee(param: TransferParam<BSName>): Promise<string>;
+    generateAccountFromMnemonic(mnemonic: string, index: number): TBSAccount<N>;
+    generateAccountFromKey(key: string): TBSAccount<N>;
+    generateAccountFromPublicKey(publicKey: string): TBSAccount<N>;
+    transfer(param: TTransferParam<N>): Promise<string[]>;
+    calculateTransferFee(param: TTransferParam<N>): Promise<string>;
     resolveNameServiceDomain(domainName: string): Promise<string>;
     validateNameServiceDomainFormat(domainName: string): boolean;
 }
-export {};

package/dist/BSSolana.js

@@ -41,21 +41,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _BSSolana_instances, _BSSolana_connection, _BSSolana_apiKeys, _BSSolana_generateKeyPairFromKey, _BSSolana_signTransaction, _BSSolana_buildTransferParams;
+var _BSSolana_instances, _BSSolana_connection, _BSSolana_generateKeyPairFromKey, _BSSolana_signTransaction, _BSSolana_buildTransferParams;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSSolana = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -72,35 +72,59 @@ const TatumRpcNDSSolana_1 = require("./services/nft-data/TatumRpcNDSSolana");
 const SolScanESSolana_1 = require("./services/explorer/SolScanESSolana");
 const MoralisEDSSolana_1 = require("./services/exchange/MoralisEDSSolana");
 const TokenServiceSolana_1 = require("./services/token/TokenServiceSolana");
+const axios_1 = __importDefault(require("axios"));
 const KEY_BYTES_LENGTH = 64;
 class BSSolana {
-    constructor(name, apiKeys, network, getLedgerTransport) {
+    constructor(name, network, getLedgerTransport) {
         _BSSolana_instances.add(this);
+        this.isMultiTransferSupported = true;
+        this.isCustomNetworkSupported = false;
         _BSSolana_connection.set(this, void 0);
-        _BSSolana_apiKeys.set(this, void 0);
-        network = network !== null && network !== void 0 ? network : BSSolanaConstants_1.BSSolanaConstants.DEFAULT_NETWORK;
         this.name = name;
         this.bip44DerivationPath = BSSolanaConstants_1.BSSolanaConstants.DEFAULT_BIP44_DERIVATION_PATH;
         this.ledgerService = new Web3LedgerServiceSolana_1.Web3LedgerServiceSolana(this, getLedgerTransport);
-        __classPrivateFieldSet(this, _BSSolana_apiKeys, apiKeys, "f");
-        this.setNetwork(network);
-    }
-    setNetwork(partialNetwork) {
         this.tokens = [BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN];
         this.nativeTokens = [BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN];
         this.feeToken = BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN;
-        this.network = partialNetwork;
+        this.availableNetworks = BSSolanaConstants_1.BSSolanaConstants.ALL_NETWORKS;
+        this.defaultNetwork = BSSolanaConstants_1.BSSolanaConstants.MAINNET_NETWORK;
+        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);
+        if (!isValidNetwork) {
+            throw new Error(`Network with id ${network.id} is not available for ${this.name}`);
+        }
+        this.network = network;
+        this.availableNetworkURLs = availableURLs;
         this.tokenService = new TokenServiceSolana_1.TokenServiceSolana();
-        this.blockchainDataService = new TatumRpcBDSSolana_1.TatumRpcBDSSolana(this.network, this.feeToken, __classPrivateFieldGet(this, _BSSolana_apiKeys, "f").tatumMainnetApiKey, __classPrivateFieldGet(this, _BSSolana_apiKeys, "f").tatumTestnetApiKey);
-        this.nftDataService = new TatumRpcNDSSolana_1.TatumRpcNDSSolana(this.network, __classPrivateFieldGet(this, _BSSolana_apiKeys, "f").tatumMainnetApiKey, __classPrivateFieldGet(this, _BSSolana_apiKeys, "f").tatumTestnetApiKey);
-        this.explorerService = new SolScanESSolana_1.SolScanESSolana(this.network, this.tokenService);
-        this.exchangeDataService = new MoralisEDSSolana_1.MoralisEDSSolana(this.network, __classPrivateFieldGet(this, _BSSolana_apiKeys, "f").moralisApiKey);
+        this.blockchainDataService = new TatumRpcBDSSolana_1.TatumRpcBDSSolana(this);
+        this.nftDataService = new TatumRpcNDSSolana_1.TatumRpcNDSSolana(this);
+        this.explorerService = new SolScanESSolana_1.SolScanESSolana(this);
+        this.exchangeDataService = new MoralisEDSSolana_1.MoralisEDSSolana(this);
         __classPrivateFieldSet(this, _BSSolana_connection, new web3_js_1.default.Connection(this.network.url), "f");
     }
-    testNetwork(network) {
+    // This method is done manually because we need to ensure that the request is aborted after timeout
+    pingNode(url) {
         return __awaiter(this, void 0, void 0, function* () {
-            const connection = new web3_js_1.default.Connection(network.url);
-            yield connection.getBlockHeight();
+            const abortController = new AbortController();
+            const timeout = setTimeout(() => {
+                abortController.abort();
+            }, 5000);
+            const timeStart = Date.now();
+            const response = yield axios_1.default.post(url, {
+                jsonrpc: '2.0',
+                id: 1234,
+                method: 'getBlockHeight',
+            }, { timeout: 5000, signal: abortController.signal });
+            clearTimeout(timeout);
+            const latency = Date.now() - timeStart;
+            return {
+                latency,
+                url,
+                height: response.data.result,
+            };
         });
     }
     validateAddress(address) {
@@ -119,7 +143,7 @@ class BSSolana {
         catch (_a) {
             keyBuffer = Uint8Array.from(key.split(',').map(Number));
         }
-        if (keyBuffer.length !== KEY_BYTES_LENGTH) {
+        if ((keyBuffer === null || keyBuffer === void 0 ? void 0 : keyBuffer.length) !== KEY_BYTES_LENGTH) {
             return false;
         }
         return true;
@@ -127,7 +151,7 @@ class BSSolana {
     generateAccountFromMnemonic(mnemonic, index) {
         const bip44Path = this.bip44DerivationPath.replace('?', index.toString());
         const seed = bip39.mnemonicToSeedSync(mnemonic);
-        const hd = slip10_js_1.default.fromMasterSeed(seed.toString('hex'));
+        const hd = slip10_js_1.default.fromMasterSeed(seed);
         const keypair = web3_js_1.default.Keypair.fromSeed(hd.derive(bip44Path).privateKey);
         const key = bs58_1.default.encode(keypair.secretKey);
         const address = keypair.publicKey.toBase58();
@@ -200,7 +224,7 @@ class BSSolana {
     }
 }
 exports.BSSolana = BSSolana;
-_BSSolana_connection = new WeakMap(), _BSSolana_apiKeys = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSolana_generateKeyPairFromKey = function _BSSolana_generateKeyPairFromKey(key) {
+_BSSolana_connection = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSolana_generateKeyPairFromKey = function _BSSolana_generateKeyPairFromKey(key) {
     let keyBuffer;
     try {
         keyBuffer = bs58_1.default.decode(key);

package/dist/constants/BSSolanaConstants.d.ts

@@ -1,15 +1,11 @@
-import { Network, NetworkId, Token } from '@cityofzion/blockchain-service';
-export type BSSolanaNetworkId = NetworkId<'mainnet-beta' | 'devnet'>;
+import { TBSNetwork, TBSToken } from '@cityofzion/blockchain-service';
+import { TBSSolanaNetworkId } from '../types';
 export declare class BSSolanaConstants {
-    static DEFAULT_BIP44_DERIVATION_PATH: string;
-    static RPC_LIST_BY_NETWORK_ID: Partial<Record<BSSolanaNetworkId, string[]>>;
-    static MAINNET_NETWORK_IDS: BSSolanaNetworkId[];
-    static TESTNET_NETWORK_IDS: BSSolanaNetworkId[];
-    static ALL_NETWORK_IDS: BSSolanaNetworkId[];
-    static MAINNET_NETWORKS: Network<BSSolanaNetworkId>[];
-    static TESTNET_NETWORKS: Network<BSSolanaNetworkId>[];
-    static ALL_NETWORKS: Network<BSSolanaNetworkId>[];
-    static DEFAULT_NETWORK: Network<BSSolanaNetworkId>;
-    static NATIVE_TOKEN: Token;
-    static NATIVE_WRAPPED_HASH: string;
+    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 MAINNET_NETWORK: TBSNetwork<TBSSolanaNetworkId>;
+    static readonly TESTNET_NETWORK: TBSNetwork<TBSSolanaNetworkId>;
+    static readonly ALL_NETWORKS: TBSNetwork<TBSSolanaNetworkId>[];
 }

package/dist/constants/BSSolanaConstants.js

@@ -7,28 +7,22 @@ class BSSolanaConstants {
 exports.BSSolanaConstants = BSSolanaConstants;
 _a = BSSolanaConstants;
 BSSolanaConstants.DEFAULT_BIP44_DERIVATION_PATH = "m/44'/501'/?'/0'";
+BSSolanaConstants.NATIVE_TOKEN = { symbol: 'SOL', name: 'SOL', decimals: 9, hash: '-' };
+BSSolanaConstants.NATIVE_WRAPPED_HASH = 'So11111111111111111111111111111111111111112';
 BSSolanaConstants.RPC_LIST_BY_NETWORK_ID = {
     'mainnet-beta': ['https://api.mainnet-beta.solana.com'],
     devnet: ['https://api.devnet.solana.com'],
 };
-BSSolanaConstants.MAINNET_NETWORK_IDS = ['mainnet-beta'];
-BSSolanaConstants.TESTNET_NETWORK_IDS = ['devnet'];
-BSSolanaConstants.ALL_NETWORK_IDS = [..._a.MAINNET_NETWORK_IDS, ..._a.TESTNET_NETWORK_IDS];
-BSSolanaConstants.MAINNET_NETWORKS = [
-    {
-        id: 'mainnet-beta',
-        name: 'Mainnet Beta',
-        url: _a.RPC_LIST_BY_NETWORK_ID['mainnet-beta'][0],
-    },
-];
-BSSolanaConstants.TESTNET_NETWORKS = [
-    {
-        id: 'devnet',
-        name: 'Devnet',
-        url: _a.RPC_LIST_BY_NETWORK_ID['devnet'][0],
-    },
-];
-BSSolanaConstants.ALL_NETWORKS = [..._a.MAINNET_NETWORKS, ..._a.TESTNET_NETWORKS];
-BSSolanaConstants.DEFAULT_NETWORK = _a.MAINNET_NETWORKS[0];
-BSSolanaConstants.NATIVE_TOKEN = { symbol: 'SOL', name: 'SOL', decimals: 9, hash: '-' };
-BSSolanaConstants.NATIVE_WRAPPED_HASH = 'So11111111111111111111111111111111111111112';
+BSSolanaConstants.MAINNET_NETWORK = {
+    id: 'mainnet-beta',
+    name: 'Mainnet Beta',
+    url: _a.RPC_LIST_BY_NETWORK_ID['mainnet-beta'][0],
+    type: 'mainnet',
+};
+BSSolanaConstants.TESTNET_NETWORK = {
+    id: 'devnet',
+    name: 'Devnet',
+    url: _a.RPC_LIST_BY_NETWORK_ID['devnet'][0],
+    type: 'testnet',
+};
+BSSolanaConstants.ALL_NETWORKS = [_a.MAINNET_NETWORK, _a.TESTNET_NETWORK];

package/dist/helpers/BSSolanaCachedMethodsHelper.js

@@ -75,14 +75,14 @@ class BSSolanaCachedMethodsHelper {
                     metadata = nftMetadata;
                 }
             }
-            catch (error) {
+            catch (_b) {
                 try {
                     const tokenMetadata = yield metaplexInstance.tokens().findMintByAddress({
                         address: new web3_js_1.default.PublicKey(tokenHash),
                     });
                     metadata = Object.assign(Object.assign({}, tokenMetadata), { name: tokenMetadata.currency.symbol });
                 }
-                catch (_b) {
+                catch (_c) {
                     /* empty */
                 }
             }

package/dist/helpers/BSSolanaHelper.d.ts

@@ -1,7 +1,7 @@
-import { Network } from '@cityofzion/blockchain-service';
-import { BSSolanaNetworkId } from '../constants/BSSolanaConstants';
+import { TBSNetwork } from '@cityofzion/blockchain-service';
+import { TBSSolanaNetworkId } from '../types';
 export declare class BSSolanaHelper {
-    static isMainnet(network: Network<BSSolanaNetworkId>): boolean;
     static fixBip44Path(bip44Path: string): string;
     static getBip44Path(path: string, index: number): string;
+    static isMainnetNetwork(network: TBSNetwork<TBSSolanaNetworkId>): boolean;
 }

package/dist/helpers/BSSolanaHelper.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSSolanaHelper = void 0;
 const BSSolanaConstants_1 = require("../constants/BSSolanaConstants");
 class BSSolanaHelper {
-    static isMainnet(network) {
-        return BSSolanaConstants_1.BSSolanaConstants.MAINNET_NETWORK_IDS.includes(network.id);
-    }
     static fixBip44Path(bip44Path) {
         return bip44Path.replace('m/', '');
     }
     static getBip44Path(path, index) {
         return this.fixBip44Path(path.replace('?', index.toString()));
     }
+    static isMainnetNetwork(network) {
+        return BSSolanaConstants_1.BSSolanaConstants.MAINNET_NETWORK.id === network.id && network.type === 'mainnet';
+    }
 }
 exports.BSSolanaHelper = BSSolanaHelper;

package/dist/index.d.ts

@@ -0,0 +1,11 @@
+export * from './constants/BSSolanaConstants';
+export * from './helpers/BSSolanaCachedMethodsHelper';
+export * from './helpers/BSSolanaHelper';
+export * from './services/blockchain-data/TatumRpcBDSSolana';
+export * from './services/exchange/MoralisEDSSolana';
+export * from './services/explorer/SolScanESSolana';
+export * from './services/ledger/Web3LedgerServiceSolana';
+export * from './services/nft-data/TatumRpcNDSSolana';
+export * from './services/token/TokenServiceSolana';
+export * from './BSSolana';
+export * from './types';

package/dist/index.js

@@ -0,0 +1,27 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./constants/BSSolanaConstants"), exports);
+__exportStar(require("./helpers/BSSolanaCachedMethodsHelper"), exports);
+__exportStar(require("./helpers/BSSolanaHelper"), exports);
+__exportStar(require("./services/blockchain-data/TatumRpcBDSSolana"), exports);
+__exportStar(require("./services/exchange/MoralisEDSSolana"), exports);
+__exportStar(require("./services/explorer/SolScanESSolana"), exports);
+__exportStar(require("./services/ledger/Web3LedgerServiceSolana"), exports);
+__exportStar(require("./services/nft-data/TatumRpcNDSSolana"), exports);
+__exportStar(require("./services/token/TokenServiceSolana"), exports);
+__exportStar(require("./BSSolana"), exports);
+__exportStar(require("./types"), exports);

package/dist/services/blockchain-data/TatumRpcBDSSolana.d.ts

@@ -1,19 +1,18 @@
-import { BalanceResponse, BlockchainDataService, ContractResponse, ExportTransactionsByAddressParams, FullTransactionsByAddressParams, FullTransactionsByAddressResponse, Network, RpcResponse, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
-import { BSSolanaNetworkId } from '../../constants/BSSolanaConstants';
+import { TBalanceResponse, ContractResponse, TExportTransactionsByAddressParams, TFullTransactionsByAddressParams, TFullTransactionsByAddressResponse, IBlockchainDataService, TBSNetwork, TBSToken, TTransactionResponse, TTransactionsByAddressParams, TTransactionsByAddressResponse } from '@cityofzion/blockchain-service';
 import solanaSDK from '@solana/web3.js';
-export declare class TatumRpcBDSSolana implements BlockchainDataService {
+import { IBSSolana, TBSSolanaNetworkId } from '../../types';
+export declare class TatumRpcBDSSolana<N extends string> implements IBlockchainDataService {
     #private;
-    static tatumUrlByNetworkId: Record<BSSolanaNetworkId, string>;
-    static getTatumConnection(network: Network<BSSolanaNetworkId>, apiKey: string): solanaSDK.Connection;
-    maxTimeToConfirmTransactionInMs: number;
-    constructor(network: Network<BSSolanaNetworkId>, feeToken: Token, mainnetApiKey: string, testnetApiKey: string);
-    getFullTransactionsByAddress(_params: FullTransactionsByAddressParams): Promise<FullTransactionsByAddressResponse>;
-    exportFullTransactionsByAddress(_params: ExportTransactionsByAddressParams): Promise<string>;
-    getTransaction(txid: string): Promise<TransactionResponse>;
-    getTransactionsByAddress(params: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;
+    static URL_BY_NETWORK_ID: Record<TBSSolanaNetworkId, string>;
+    static getConnection(network: TBSNetwork<TBSSolanaNetworkId>): solanaSDK.Connection;
+    readonly maxTimeToConfirmTransactionInMs: number;
+    constructor(service: IBSSolana<N>);
+    getTransaction(txid: string): Promise<TTransactionResponse>;
+    getTransactionsByAddress(params: TTransactionsByAddressParams): Promise<TTransactionsByAddressResponse>;
+    getFullTransactionsByAddress(_params: TFullTransactionsByAddressParams): Promise<TFullTransactionsByAddressResponse>;
+    exportFullTransactionsByAddress(_params: TExportTransactionsByAddressParams): Promise<string>;
     getContract(_contractHash: string): Promise<ContractResponse>;
-    getTokenInfo(tokenHash: string): Promise<Token>;
-    getBalance(address: string): Promise<BalanceResponse[]>;
+    getTokenInfo(tokenHash: string): Promise<TBSToken>;
+    getBalance(address: string): Promise<TBalanceResponse[]>;
     getBlockHeight(): Promise<number>;
-    getRpcList(): Promise<RpcResponse[]>;
 }

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

@@ -55,7 +55,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _TatumRpcBDSSolana_instances, _TatumRpcBDSSolana_network, _TatumRpcBDSSolana_feeToken, _TatumRpcBDSSolana_connection, _TatumRpcBDSSolana_mainnetApiKey, _TatumRpcBDSSolana_testnetApiKey, _TatumRpcBDSSolana_functionByProgramIdAndMethod, _TatumRpcBDSSolana_parseSplTransferCheckedInstruction, _TatumRpcBDSSolana_parseSplTransferInstruction, _TatumRpcBDSSolana_parseSystemInstruction, _TatumRpcBDSSolana_parseInstruction;
+var _TatumRpcBDSSolana_instances, _TatumRpcBDSSolana_service, _TatumRpcBDSSolana_connection, _TatumRpcBDSSolana_functionByProgramIdAndMethod, _TatumRpcBDSSolana_parseSplTransferCheckedInstruction, _TatumRpcBDSSolana_parseSplTransferInstruction, _TatumRpcBDSSolana_parseSystemInstruction, _TatumRpcBDSSolana_parseInstruction;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TatumRpcBDSSolana = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -65,21 +65,20 @@ const solanaSplSDK = __importStar(require("@solana/spl-token"));
 const BSSolanaCachedMethodsHelper_1 = require("../../helpers/BSSolanaCachedMethodsHelper");
 const BSSolanaHelper_1 = require("../../helpers/BSSolanaHelper");
 class TatumRpcBDSSolana {
-    static getTatumConnection(network, apiKey) {
-        return new web3_js_1.default.Connection(this.tatumUrlByNetworkId[network.id], {
+    static getConnection(network) {
+        return new web3_js_1.default.Connection(TatumRpcBDSSolana.URL_BY_NETWORK_ID[network.id], {
             httpHeaders: {
-                'x-api-key': apiKey,
+                'x-api-key': BSSolanaHelper_1.BSSolanaHelper.isMainnetNetwork(network)
+                    ? process.env.TATUM_MAINNET_API_KEY
+                    : process.env.TATUM_TESTNET_API_KEY,
             },
         });
     }
-    constructor(network, feeToken, mainnetApiKey, testnetApiKey) {
+    constructor(service) {
         _TatumRpcBDSSolana_instances.add(this);
-        this.maxTimeToConfirmTransactionInMs = 1000 * 60;
-        _TatumRpcBDSSolana_network.set(this, void 0);
-        _TatumRpcBDSSolana_feeToken.set(this, void 0);
+        this.maxTimeToConfirmTransactionInMs = 1000 * 60; // 1 minutes
+        _TatumRpcBDSSolana_service.set(this, void 0);
         _TatumRpcBDSSolana_connection.set(this, void 0);
-        _TatumRpcBDSSolana_mainnetApiKey.set(this, void 0);
-        _TatumRpcBDSSolana_testnetApiKey.set(this, void 0);
         _TatumRpcBDSSolana_functionByProgramIdAndMethod.set(this, {
             [solanaSplSDK.TOKEN_PROGRAM_ID.toString()]: {
                 transferChecked: __classPrivateFieldGet(this, _TatumRpcBDSSolana_instances, "m", _TatumRpcBDSSolana_parseSplTransferCheckedInstruction).bind(this),
@@ -89,17 +88,8 @@ class TatumRpcBDSSolana {
                 transfer: __classPrivateFieldGet(this, _TatumRpcBDSSolana_instances, "m", _TatumRpcBDSSolana_parseSystemInstruction).bind(this),
             },
         });
-        __classPrivateFieldSet(this, _TatumRpcBDSSolana_network, network, "f");
-        __classPrivateFieldSet(this, _TatumRpcBDSSolana_feeToken, feeToken, "f");
-        __classPrivateFieldSet(this, _TatumRpcBDSSolana_mainnetApiKey, mainnetApiKey, "f");
-        __classPrivateFieldSet(this, _TatumRpcBDSSolana_testnetApiKey, testnetApiKey, "f");
-        __classPrivateFieldSet(this, _TatumRpcBDSSolana_connection, TatumRpcBDSSolana.getTatumConnection(network, BSSolanaHelper_1.BSSolanaHelper.isMainnet(network) ? mainnetApiKey : testnetApiKey), "f");
-    }
-    getFullTransactionsByAddress(_params) {
-        throw new Error('Method not implemented.');
-    }
-    exportFullTransactionsByAddress(_params) {
-        throw new Error('Method not implemented.');
+        __classPrivateFieldSet(this, _TatumRpcBDSSolana_service, service, "f");
+        __classPrivateFieldSet(this, _TatumRpcBDSSolana_connection, TatumRpcBDSSolana.getConnection(service.network), "f");
     }
     getTransaction(txid) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -128,7 +118,7 @@ class TatumRpcBDSSolana {
                     /* empty */
                 }
             }
-            const feeBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(transaction.meta.fee, __classPrivateFieldGet(this, _TatumRpcBDSSolana_feeToken, "f").decimals);
+            const feeBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(transaction.meta.fee, __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").feeToken.decimals);
             const fee = blockchain_service_1.BSBigNumberHelper.toNumber(feeBn);
             return {
                 block: transaction.slot,
@@ -161,9 +151,19 @@ class TatumRpcBDSSolana {
             };
         });
     }
+    getFullTransactionsByAddress(_params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('Method not supported.');
+        });
+    }
+    exportFullTransactionsByAddress(_params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('Method not supported.');
+        });
+    }
     getContract(_contractHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('Method not implemented.');
+            throw new Error('Method not supported.');
         });
     }
     getTokenInfo(tokenHash) {
@@ -218,46 +218,9 @@ class TatumRpcBDSSolana {
             return yield __classPrivateFieldGet(this, _TatumRpcBDSSolana_connection, "f").getBlockHeight();
         });
     }
-    getRpcList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const list = [];
-            const urls = BSSolanaConstants_1.BSSolanaConstants.RPC_LIST_BY_NETWORK_ID[__classPrivateFieldGet(this, _TatumRpcBDSSolana_network, "f").id];
-            if (!urls) {
-                throw new Error('RPC list not found');
-            }
-            const promises = urls.map(url => {
-                // eslint-disable-next-line no-async-promise-executor
-                return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                    const timeout = setTimeout(() => {
-                        resolve();
-                    }, 5000);
-                    try {
-                        const connection = TatumRpcBDSSolana.getTatumConnection(Object.assign(Object.assign({}, __classPrivateFieldGet(this, _TatumRpcBDSSolana_network, "f")), { url }), BSSolanaHelper_1.BSSolanaHelper.isMainnet(__classPrivateFieldGet(this, _TatumRpcBDSSolana_network, "f")) ? __classPrivateFieldGet(this, _TatumRpcBDSSolana_mainnetApiKey, "f") : __classPrivateFieldGet(this, _TatumRpcBDSSolana_testnetApiKey, "f"));
-                        const timeStart = Date.now();
-                        const height = yield connection.getBlockHeight();
-                        const latency = Date.now() - timeStart;
-                        list.push({
-                            url,
-                            height,
-                            latency,
-                        });
-                    }
-                    catch (_a) {
-                        /* empty */
-                    }
-                    finally {
-                        resolve();
-                        clearTimeout(timeout);
-                    }
-                }));
-            });
-            yield Promise.allSettled(promises);
-            return list;
-        });
-    }
 }
 exports.TatumRpcBDSSolana = TatumRpcBDSSolana;
-_TatumRpcBDSSolana_network = new WeakMap(), _TatumRpcBDSSolana_feeToken = new WeakMap(), _TatumRpcBDSSolana_connection = new WeakMap(), _TatumRpcBDSSolana_mainnetApiKey = new WeakMap(), _TatumRpcBDSSolana_testnetApiKey = new WeakMap(), _TatumRpcBDSSolana_functionByProgramIdAndMethod = new WeakMap(), _TatumRpcBDSSolana_instances = new WeakSet(), _TatumRpcBDSSolana_parseSplTransferCheckedInstruction = function _TatumRpcBDSSolana_parseSplTransferCheckedInstruction(instruction, allInstructions) {
+_TatumRpcBDSSolana_service = new WeakMap(), _TatumRpcBDSSolana_connection = new WeakMap(), _TatumRpcBDSSolana_functionByProgramIdAndMethod = new WeakMap(), _TatumRpcBDSSolana_instances = new WeakSet(), _TatumRpcBDSSolana_parseSplTransferCheckedInstruction = function _TatumRpcBDSSolana_parseSplTransferCheckedInstruction(instruction, allInstructions) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
         const info = instruction.parsed.info;
@@ -402,7 +365,7 @@ _TatumRpcBDSSolana_network = new WeakMap(), _TatumRpcBDSSolana_feeToken = new We
         throw new Error('Unsupported instruction');
     });
 };
-TatumRpcBDSSolana.tatumUrlByNetworkId = {
+TatumRpcBDSSolana.URL_BY_NETWORK_ID = {
     'mainnet-beta': 'https://solana-mainnet.gateway.tatum.io/',
     devnet: 'https://solana-devnet.gateway.tatum.io',
 };

package/dist/services/exchange/MoralisEDSSolana.d.ts

@@ -1,8 +1,8 @@
-import { CryptoCompareEDS, ExchangeDataService, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
-import { BSSolanaNetworkId } from '../../constants/BSSolanaConstants';
-export declare class MoralisEDSSolana extends CryptoCompareEDS implements ExchangeDataService {
+import { CryptoCompareEDS, TGetTokenPriceHistoryParams, TGetTokenPricesParams, TTokenPricesHistoryResponse, TTokenPricesResponse } from '@cityofzion/blockchain-service';
+import { IBSSolana } from '../../types';
+export declare class MoralisEDSSolana<N extends string> extends CryptoCompareEDS {
     #private;
-    constructor(network: Network<BSSolanaNetworkId>, apiKey: string);
-    getTokenPrices({ tokens }: GetTokenPricesParams): Promise<TokenPricesResponse[]>;
-    getTokenPriceHistory(params: GetTokenPriceHistoryParams): Promise<TokenPricesHistoryResponse[]>;
+    constructor(service: IBSSolana<N>);
+    getTokenPrices({ tokens }: TGetTokenPricesParams): Promise<TTokenPricesResponse[]>;
+    getTokenPriceHistory(params: TGetTokenPriceHistoryParams): Promise<TTokenPricesHistoryResponse[]>;
 }

package/dist/services/exchange/MoralisEDSSolana.js

@@ -22,31 +22,31 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _MoralisEDSSolana_network, _MoralisEDSSolana_client, _MoralisEDSSolana_pairAddressCache;
+var _MoralisEDSSolana_client, _MoralisEDSSolana_service, _MoralisEDSSolana_pairAddressCache;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MoralisEDSSolana = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSSolanaHelper_1 = require("../../helpers/BSSolanaHelper");
 const BSSolanaConstants_1 = require("../../constants/BSSolanaConstants");
 const axios_1 = __importDefault(require("axios"));
-const dayjs_1 = __importDefault(require("dayjs"));
+const sub_1 = require("date-fns/sub");
 class MoralisEDSSolana extends blockchain_service_1.CryptoCompareEDS {
-    constructor(network, apiKey) {
+    constructor(service) {
         super();
-        _MoralisEDSSolana_network.set(this, void 0);
         _MoralisEDSSolana_client.set(this, void 0);
+        _MoralisEDSSolana_service.set(this, void 0);
         _MoralisEDSSolana_pairAddressCache.set(this, new Map());
-        __classPrivateFieldSet(this, _MoralisEDSSolana_network, network, "f");
+        __classPrivateFieldSet(this, _MoralisEDSSolana_service, service, "f");
         __classPrivateFieldSet(this, _MoralisEDSSolana_client, axios_1.default.create({
             baseURL: 'https://solana-gateway.moralis.io',
             headers: {
-                'X-API-Key': apiKey,
+                'X-API-Key': process.env.MORALIS_API_KEY,
             },
         }), "f");
     }
     getTokenPrices(_a) {
         return __awaiter(this, arguments, void 0, function* ({ tokens }) {
-            if (!BSSolanaHelper_1.BSSolanaHelper.isMainnet(__classPrivateFieldGet(this, _MoralisEDSSolana_network, "f")))
+            if (!BSSolanaHelper_1.BSSolanaHelper.isMainnetNetwork(__classPrivateFieldGet(this, _MoralisEDSSolana_service, "f").network))
                 throw new Error('Exchange is only available on mainnet');
             const promises = tokens.map((token) => __awaiter(this, void 0, void 0, function* () {
                 const hash = token.hash === BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.hash ? BSSolanaConstants_1.BSSolanaConstants.NATIVE_WRAPPED_HASH : token.hash;
@@ -69,7 +69,7 @@ class MoralisEDSSolana extends blockchain_service_1.CryptoCompareEDS {
     }
     getTokenPriceHistory(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSSolanaHelper_1.BSSolanaHelper.isMainnet(__classPrivateFieldGet(this, _MoralisEDSSolana_network, "f")))
+            if (!BSSolanaHelper_1.BSSolanaHelper.isMainnetNetwork(__classPrivateFieldGet(this, _MoralisEDSSolana_service, "f").network))
                 throw new Error('Exchange is only available on mainnet');
             const tokenHash = params.token.hash === BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.hash
                 ? BSSolanaConstants_1.BSSolanaConstants.NATIVE_WRAPPED_HASH
@@ -80,19 +80,23 @@ class MoralisEDSSolana extends blockchain_service_1.CryptoCompareEDS {
                 __classPrivateFieldGet(this, _MoralisEDSSolana_pairAddressCache, "f").set(tokenHash, priceResponse.data.pairAddress);
                 pairAddress = priceResponse.data.pairAddress;
             }
-            const toDate = (0, dayjs_1.default)().unix();
-            const fromDate = (0, dayjs_1.default)().subtract(params.limit, params.type).unix();
+            const toDate = new Date();
+            const fromDate = (0, sub_1.sub)(params.limit, {
+                [params.type === 'day' ? 'days' : 'hours']: params.limit,
+            });
+            const toDateTimestamp = toDate.getTime() / 1000;
+            const fromDateTimestamp = fromDate.getTime() / 1000;
             const pricesHistoryResponse = yield __classPrivateFieldGet(this, _MoralisEDSSolana_client, "f").get(`token/mainnet/pairs/${pairAddress}/ohlcv`, {
                 params: {
                     timeframe: params.type === 'day' ? '1d' : '1h',
                     currency: 'usd',
                     limit: params.limit,
-                    toDate,
-                    fromDate,
+                    toDate: toDateTimestamp,
+                    fromDate: fromDateTimestamp,
                 },
             });
             const pricesHistory = pricesHistoryResponse.data.result.map(price => ({
-                timestamp: (0, dayjs_1.default)(price.timestamp).unix(),
+                timestamp: new Date().getTime() / 1000,
                 token: params.token,
                 usdPrice: price.close,
             }));
@@ -101,4 +105,4 @@ class MoralisEDSSolana extends blockchain_service_1.CryptoCompareEDS {
     }
 }
 exports.MoralisEDSSolana = MoralisEDSSolana;
-_MoralisEDSSolana_network = new WeakMap(), _MoralisEDSSolana_client = new WeakMap(), _MoralisEDSSolana_pairAddressCache = new WeakMap();
+_MoralisEDSSolana_client = new WeakMap(), _MoralisEDSSolana_service = new WeakMap(), _MoralisEDSSolana_pairAddressCache = new WeakMap();

package/dist/services/explorer/SolScanESSolana.d.ts

@@ -1,11 +1,11 @@
-import { BuildNftUrlParams, ExplorerService, Network, TokenService } from '@cityofzion/blockchain-service';
-import { BSSolanaNetworkId } from '../../constants/BSSolanaConstants';
-export declare class SolScanESSolana implements ExplorerService {
+import { TBuildNftUrlParams, IExplorerService } from '@cityofzion/blockchain-service';
+import { IBSSolana } from '../../types';
+export declare class SolScanESSolana<N extends string> implements IExplorerService {
     #private;
-    constructor(network: Network<BSSolanaNetworkId>, tokenService: TokenService);
+    constructor(service: IBSSolana<N>);
     buildTransactionUrl(hash: string): string;
     buildContractUrl(contractHash: string): string;
-    buildNftUrl({ tokenHash }: BuildNftUrlParams): string;
+    buildNftUrl({ tokenHash }: TBuildNftUrlParams): string;
     getAddressTemplateUrl(): string | undefined;
     getTxTemplateUrl(): string;
     getNftTemplateUrl(): string;

package/dist/services/explorer/SolScanESSolana.js

@@ -10,25 +10,25 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SolScanESSolana_baseUrl, _SolScanESSolana_queryParams, _SolScanESSolana_tokenService;
+var _SolScanESSolana_baseUrl, _SolScanESSolana_queryParams, _SolScanESSolana_service;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolScanESSolana = void 0;
 const BSSolanaHelper_1 = require("../../helpers/BSSolanaHelper");
 class SolScanESSolana {
-    constructor(network, tokenService) {
+    constructor(service) {
         _SolScanESSolana_baseUrl.set(this, 'https://solscan.io');
         _SolScanESSolana_queryParams.set(this, '');
-        _SolScanESSolana_tokenService.set(this, void 0);
-        if (!BSSolanaHelper_1.BSSolanaHelper.isMainnet(network)) {
-            __classPrivateFieldSet(this, _SolScanESSolana_queryParams, `?cluster=${network.id}`, "f");
+        _SolScanESSolana_service.set(this, void 0);
+        if (!BSSolanaHelper_1.BSSolanaHelper.isMainnetNetwork(service.network)) {
+            __classPrivateFieldSet(this, _SolScanESSolana_queryParams, `?cluster=${service.network.id}`, "f");
         }
-        __classPrivateFieldSet(this, _SolScanESSolana_tokenService, tokenService, "f");
+        __classPrivateFieldSet(this, _SolScanESSolana_service, service, "f");
     }
     buildTransactionUrl(hash) {
-        return `${__classPrivateFieldGet(this, _SolScanESSolana_baseUrl, "f")}/tx/${__classPrivateFieldGet(this, _SolScanESSolana_tokenService, "f").normalizeHash(hash)}${__classPrivateFieldGet(this, _SolScanESSolana_queryParams, "f")}`;
+        return `${__classPrivateFieldGet(this, _SolScanESSolana_baseUrl, "f")}/tx/${__classPrivateFieldGet(this, _SolScanESSolana_service, "f").tokenService.normalizeHash(hash)}${__classPrivateFieldGet(this, _SolScanESSolana_queryParams, "f")}`;
     }
     buildContractUrl(contractHash) {
-        return `${__classPrivateFieldGet(this, _SolScanESSolana_baseUrl, "f")}/token/${__classPrivateFieldGet(this, _SolScanESSolana_tokenService, "f").normalizeHash(contractHash)}${__classPrivateFieldGet(this, _SolScanESSolana_queryParams, "f")}`;
+        return `${__classPrivateFieldGet(this, _SolScanESSolana_baseUrl, "f")}/token/${__classPrivateFieldGet(this, _SolScanESSolana_service, "f").tokenService.normalizeHash(contractHash)}${__classPrivateFieldGet(this, _SolScanESSolana_queryParams, "f")}`;
     }
     buildNftUrl({ tokenHash }) {
         return this.buildContractUrl(tokenHash);
@@ -47,4 +47,4 @@ class SolScanESSolana {
     }
 }
 exports.SolScanESSolana = SolScanESSolana;
-_SolScanESSolana_baseUrl = new WeakMap(), _SolScanESSolana_queryParams = new WeakMap(), _SolScanESSolana_tokenService = new WeakMap();
+_SolScanESSolana_baseUrl = new WeakMap(), _SolScanESSolana_queryParams = new WeakMap(), _SolScanESSolana_service = new WeakMap();

package/dist/services/ledger/Web3LedgerServiceSolana.d.ts

@@ -1,13 +1,13 @@
-import { Account, LedgerService, LedgerServiceEmitter, GetLedgerTransport, UntilIndexRecord } from '@cityofzion/blockchain-service';
-import { BSSolana } from '../../BSSolana';
+import { TBSAccount, TLedgerServiceEmitter, TGetLedgerTransport, TUntilIndexRecord, ILedgerService } from '@cityofzion/blockchain-service';
 import Transport from '@ledgerhq/hw-transport';
 import solanaSDK from '@solana/web3.js';
-export declare class Web3LedgerServiceSolana<BSName extends string = string> implements LedgerService<BSName> {
+import { IBSSolana } from '../../types';
+export declare class Web3LedgerServiceSolana<N extends string = string> implements ILedgerService<N> {
     #private;
-    emitter: LedgerServiceEmitter;
-    getLedgerTransport?: GetLedgerTransport<BSName>;
-    constructor(blockchainService: BSSolana<BSName>, getLedgerTransport?: GetLedgerTransport<BSName>);
-    getAccounts(transport: Transport, untilIndexByBlockchainService?: UntilIndexRecord<BSName>): Promise<Account<BSName>[]>;
-    getAccount(transport: Transport, index: number): Promise<Account<BSName>>;
-    signTransaction(transport: Transport, transaction: solanaSDK.Transaction, account: Account<BSName>): Promise<Buffer<ArrayBufferLike>>;
+    readonly getLedgerTransport?: TGetLedgerTransport<N>;
+    emitter: TLedgerServiceEmitter;
+    constructor(blockchainService: IBSSolana<N>, getLedgerTransport?: TGetLedgerTransport<N>);
+    getAccounts(transport: Transport, untilIndexByBlockchainService?: TUntilIndexRecord<N>): Promise<TBSAccount<N>[]>;
+    getAccount(transport: Transport, index: number): Promise<TBSAccount<N>>;
+    signTransaction(transport: Transport, transaction: solanaSDK.Transaction, account: TBSAccount<N>): Promise<Buffer<ArrayBufferLike>>;
 }

package/dist/services/ledger/Web3LedgerServiceSolana.js

@@ -22,7 +22,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _Web3LedgerServiceSolana_blockchainService;
+var _Web3LedgerServiceSolana_service;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Web3LedgerServiceSolana = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -32,24 +32,24 @@ const web3_js_1 = __importDefault(require("@solana/web3.js"));
 const BSSolanaHelper_1 = require("../../helpers/BSSolanaHelper");
 class Web3LedgerServiceSolana {
     constructor(blockchainService, getLedgerTransport) {
-        _Web3LedgerServiceSolana_blockchainService.set(this, void 0);
+        _Web3LedgerServiceSolana_service.set(this, void 0);
         this.emitter = new events_1.default();
-        __classPrivateFieldSet(this, _Web3LedgerServiceSolana_blockchainService, blockchainService, "f");
+        __classPrivateFieldSet(this, _Web3LedgerServiceSolana_service, blockchainService, "f");
         this.getLedgerTransport = getLedgerTransport;
     }
     getAccounts(transport, untilIndexByBlockchainService) {
         return __awaiter(this, void 0, void 0, function* () {
-            const accountsByBlockchainService = yield (0, blockchain_service_1.generateAccountForBlockchainService)([__classPrivateFieldGet(this, _Web3LedgerServiceSolana_blockchainService, "f")], (_service, index) => __awaiter(this, void 0, void 0, function* () {
+            const accountsByBlockchainService = yield (0, blockchain_service_1.generateAccountForBlockchainService)([__classPrivateFieldGet(this, _Web3LedgerServiceSolana_service, "f")], (_service, index) => __awaiter(this, void 0, void 0, function* () {
                 return this.getAccount(transport, index);
             }), untilIndexByBlockchainService);
-            const accounts = accountsByBlockchainService.get(__classPrivateFieldGet(this, _Web3LedgerServiceSolana_blockchainService, "f").name);
+            const accounts = accountsByBlockchainService.get(__classPrivateFieldGet(this, _Web3LedgerServiceSolana_service, "f").name);
             return accounts !== null && accounts !== void 0 ? accounts : [];
         });
     }
     getAccount(transport, index) {
         return __awaiter(this, void 0, void 0, function* () {
             const ledgerApp = new hw_app_solana_1.default(transport);
-            const bip44Path = BSSolanaHelper_1.BSSolanaHelper.getBip44Path(__classPrivateFieldGet(this, _Web3LedgerServiceSolana_blockchainService, "f").bip44DerivationPath, index);
+            const bip44Path = BSSolanaHelper_1.BSSolanaHelper.getBip44Path(__classPrivateFieldGet(this, _Web3LedgerServiceSolana_service, "f").bip44DerivationPath, index);
             const publicKey = yield blockchain_service_1.BSUtilsHelper.retry(() => __awaiter(this, void 0, void 0, function* () {
                 const response = yield ledgerApp.getAddress(bip44Path);
                 return new web3_js_1.default.PublicKey(response.address);
@@ -61,7 +61,7 @@ class Web3LedgerServiceSolana {
                 type: 'publicKey',
                 bip44Path,
                 isHardware: true,
-                blockchain: __classPrivateFieldGet(this, _Web3LedgerServiceSolana_blockchainService, "f").name,
+                blockchain: __classPrivateFieldGet(this, _Web3LedgerServiceSolana_service, "f").name,
             };
         });
     }
@@ -69,7 +69,7 @@ class Web3LedgerServiceSolana {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (!account.bip44Path)
-                throw new Error('Account must have bip44Path to sign with Ledger');
+                throw new Error('TBSAccount must have bip44Path to sign with Ledger');
             const ledgerApp = new hw_app_solana_1.default(transport);
             const serializedTransaction = transaction.compileMessage().serialize();
             (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
@@ -82,4 +82,4 @@ class Web3LedgerServiceSolana {
     }
 }
 exports.Web3LedgerServiceSolana = Web3LedgerServiceSolana;
-_Web3LedgerServiceSolana_blockchainService = new WeakMap();
+_Web3LedgerServiceSolana_service = new WeakMap();

package/dist/services/nft-data/TatumRpcNDSSolana.d.ts

@@ -1,9 +1,9 @@
-import { GetNftParam, GetNftsByAddressParams, HasTokenParam, Network, NftDataService, NftResponse, NftsResponse } from '@cityofzion/blockchain-service';
-import { BSSolanaNetworkId } from '../../constants/BSSolanaConstants';
-export declare class TatumRpcNDSSolana implements NftDataService {
+import { TGetNftParam, TGetNftsByAddressParams, THasTokenParam, INftDataService, TNftResponse, TNftsResponse } from '@cityofzion/blockchain-service';
+import { IBSSolana } from '../../types';
+export declare class TatumRpcNDSSolana<N extends string> implements INftDataService {
     #private;
-    constructor(network: Network<BSSolanaNetworkId>, mainnetApiKey: string, testnetApiKey: string);
-    getNft(params: GetNftParam): Promise<NftResponse>;
-    getNftsByAddress({ address }: GetNftsByAddressParams): Promise<NftsResponse>;
-    hasToken({ address, collectionHash }: HasTokenParam): Promise<boolean>;
+    constructor(service: IBSSolana<N>);
+    getNft(params: TGetNftParam): Promise<TNftResponse>;
+    getNftsByAddress({ address }: TGetNftsByAddressParams): Promise<TNftsResponse>;
+    hasToken({ address, collectionHash }: THasTokenParam): Promise<boolean>;
 }

package/dist/services/nft-data/TatumRpcNDSSolana.js

@@ -19,21 +19,18 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TatumRpcNDSSolana_network, _TatumRpcNDSSolana_connection, _TatumRpcNDSSolana_metaplex;
+var _TatumRpcNDSSolana_connection, _TatumRpcNDSSolana_metaplex;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TatumRpcNDSSolana = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const js_1 = require("@metaplex-foundation/js");
 const BSSolanaCachedMethodsHelper_1 = require("../../helpers/BSSolanaCachedMethodsHelper");
 const TatumRpcBDSSolana_1 = require("../blockchain-data/TatumRpcBDSSolana");
-const BSSolanaHelper_1 = require("../../helpers/BSSolanaHelper");
 class TatumRpcNDSSolana {
-    constructor(network, mainnetApiKey, testnetApiKey) {
-        _TatumRpcNDSSolana_network.set(this, void 0);
+    constructor(service) {
         _TatumRpcNDSSolana_connection.set(this, void 0);
         _TatumRpcNDSSolana_metaplex.set(this, void 0);
-        __classPrivateFieldSet(this, _TatumRpcNDSSolana_network, network, "f");
-        __classPrivateFieldSet(this, _TatumRpcNDSSolana_connection, TatumRpcBDSSolana_1.TatumRpcBDSSolana.getTatumConnection(__classPrivateFieldGet(this, _TatumRpcNDSSolana_network, "f"), BSSolanaHelper_1.BSSolanaHelper.isMainnet(network) ? mainnetApiKey : testnetApiKey), "f");
+        __classPrivateFieldSet(this, _TatumRpcNDSSolana_connection, TatumRpcBDSSolana_1.TatumRpcBDSSolana.getConnection(service.network), "f");
         __classPrivateFieldSet(this, _TatumRpcNDSSolana_metaplex, js_1.Metaplex.make(__classPrivateFieldGet(this, _TatumRpcNDSSolana_connection, "f")), "f");
     }
     getNft(params) {
@@ -126,4 +123,4 @@ class TatumRpcNDSSolana {
     }
 }
 exports.TatumRpcNDSSolana = TatumRpcNDSSolana;
-_TatumRpcNDSSolana_network = new WeakMap(), _TatumRpcNDSSolana_connection = new WeakMap(), _TatumRpcNDSSolana_metaplex = new WeakMap();
+_TatumRpcNDSSolana_connection = new WeakMap(), _TatumRpcNDSSolana_metaplex = new WeakMap();

package/dist/types.d.ts

@@ -0,0 +1,4 @@
+import { IBlockchainService, IBSWithExplorer, IBSWithFee, IBSWithLedger, IBSWithNameService, IBSWithNft, TBSNetworkId } from '@cityofzion/blockchain-service';
+export type TBSSolanaNetworkId = TBSNetworkId<'mainnet-beta' | 'devnet'>;
+export interface IBSSolana<N extends string = string> extends IBlockchainService<N, TBSSolanaNetworkId>, IBSWithFee<N>, IBSWithNameService, IBSWithLedger<N>, IBSWithNft, IBSWithExplorer {
+}

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-solana",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -10,34 +10,33 @@
     "/dist"
   ],
   "dependencies": {
-    "@solana/web3.js": "~1.98.0",
-    "axios": "~1.11.0",
+    "@solana/web3.js": "~1.98.4",
+    "axios": "~1.12.2",
     "bip39": "~3.1.0",
     "micro-key-producer": "~0.7.5",
     "bs58": "~6.0.0",
-    "@solana/spl-token": "~0.4.12",
-    "@bonfida/spl-name-service": "~3.0.9",
-    "@ledgerhq/hw-app-solana": "~7.2.4",
-    "@ledgerhq/hw-transport": "~6.30.5",
+    "@solana/spl-token": "~0.4.14",
+    "@bonfida/spl-name-service": "~3.0.16",
+    "@ledgerhq/hw-app-solana": "~7.5.4",
+    "@ledgerhq/hw-transport": "~6.31.11",
     "@metaplex-foundation/js": "~0.20.1",
-    "dayjs": "~1.11.13",
-    "@cityofzion/blockchain-service": "1.21.2"
+    "date-fns": "~4.1.0",
+    "@cityofzion/blockchain-service": "1.22.1"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "~6.28.5",
-    "@types/jest": "29.5.3",
-    "@typescript-eslint/eslint-plugin": "^6.5.0",
-    "@typescript-eslint/parser": "^6.5.0",
-    "eslint": "^8.48.0",
-    "jest": "29.6.2",
-    "ts-jest": "29.1.1",
+    "@ledgerhq/hw-transport-node-hid": "~6.29.12",
+    "@types/jest": "~30.0.0",
+    "eslint": "~9.36.0",
+    "jest": "~30.1.3",
+    "ts-jest": "~29.4.4",
     "ts-node": "~10.9.2",
-    "typescript": "5.7.3"
+    "typescript": "~5.9.2"
   },
   "scripts": {
-    "build": "tsc --project tsconfig.build.json",
-    "test": "jest --config jest.config.ts",
+    "build": "rm -rf ./dist && tsc --project tsconfig.build.json",
+    "test": "jest -i --config jest.config.ts",
     "lint": "eslint .",
-    "format": "eslint --fix"
+    "format": "eslint --fix",
+    "package": "npm run build && npm pack"
   }
 }