@cityofzion/bs-solana 2.0.11 → 3.0.1

package/dist/BSSolana.d.ts

@@ -1,4 +1,5 @@
 import { TBSAccount, TGetLedgerTransport, IBlockchainDataService, IExchangeDataService, IExplorerService, INftDataService, ITokenService, TBSNetwork, TBSToken, TTransferParam, TPingNetworkResponse } from '@cityofzion/blockchain-service';
+import solanaSDK from '@solana/web3.js';
 import { Web3LedgerServiceSolana } from './services/ledger/Web3LedgerServiceSolana';
 import { IBSSolana, TBSSolanaNetworkId } from './types';
 export declare class BSSolana<N extends string = string> implements IBSSolana<N> {
@@ -16,10 +17,11 @@ export declare class BSSolana<N extends string = string> implements IBSSolana<N>
     readonly defaultNetwork: TBSNetwork<TBSSolanaNetworkId>;
     ledgerService: Web3LedgerServiceSolana<N>;
     exchangeDataService: IExchangeDataService;
-    blockchainDataService: IBlockchainDataService;
+    blockchainDataService: IBlockchainDataService<N>;
     nftDataService: INftDataService;
     explorerService: IExplorerService;
     tokenService: ITokenService;
+    connection: solanaSDK.Connection;
     constructor(name: N, network?: TBSNetwork<TBSSolanaNetworkId>, getLedgerTransport?: TGetLedgerTransport<N>);
     setNetwork(network: TBSNetwork<TBSSolanaNetworkId>): void;
     pingNode(url: string): Promise<TPingNetworkResponse>;

package/dist/BSSolana.js

@@ -46,29 +46,21 @@ 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 __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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _BSSolana_instances, _BSSolana_connection, _BSSolana_generateKeyPairFromKey, _BSSolana_signTransaction, _BSSolana_buildTransferParams;
+var _BSSolana_instances, _BSSolana_generateKeyPairFromKey, _BSSolana_signTransaction, _BSSolana_buildTransferParams;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSSolana = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const web3_js_1 = __importDefault(require("@solana/web3.js"));
 const solanaSplSDK = __importStar(require("@solana/spl-token"));
-const bip39 = __importStar(require("bip39"));
 const spl_name_service_1 = __importDefault(require("@bonfida/spl-name-service"));
-const slip10_js_1 = __importDefault(require("micro-key-producer/slip10.js"));
 const BSSolanaConstants_1 = require("./constants/BSSolanaConstants");
 const bs58_1 = __importDefault(require("bs58"));
 const Web3LedgerServiceSolana_1 = require("./services/ledger/Web3LedgerServiceSolana");
-const TatumRpcBDSSolana_1 = require("./services/blockchain-data/TatumRpcBDSSolana");
-const TatumRpcNDSSolana_1 = require("./services/nft-data/TatumRpcNDSSolana");
+const RpcBDSSolana_1 = require("./services/blockchain-data/RpcBDSSolana");
+const RpcNDSSolana_1 = require("./services/nft-data/RpcNDSSolana");
 const SolScanESSolana_1 = require("./services/explorer/SolScanESSolana");
 const MoralisEDSSolana_1 = require("./services/exchange/MoralisEDSSolana");
 const TokenServiceSolana_1 = require("./services/token/TokenServiceSolana");
@@ -79,7 +71,6 @@ class BSSolana {
         _BSSolana_instances.add(this);
         this.isMultiTransferSupported = true;
         this.isCustomNetworkSupported = false;
-        _BSSolana_connection.set(this, void 0);
         this.name = name;
         this.bip44DerivationPath = BSSolanaConstants_1.BSSolanaConstants.DEFAULT_BIP44_DERIVATION_PATH;
         this.ledgerService = new Web3LedgerServiceSolana_1.Web3LedgerServiceSolana(this, getLedgerTransport);
@@ -99,11 +90,11 @@ class BSSolana {
         this.network = network;
         this.rpcNetworkUrls = rpcNetworkUrls;
         this.tokenService = new TokenServiceSolana_1.TokenServiceSolana();
-        this.blockchainDataService = new TatumRpcBDSSolana_1.TatumRpcBDSSolana(this);
-        this.nftDataService = new TatumRpcNDSSolana_1.TatumRpcNDSSolana(this);
+        this.blockchainDataService = new RpcBDSSolana_1.RpcBDSSolana(this);
+        this.nftDataService = new RpcNDSSolana_1.RpcNDSSolana(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");
+        this.connection = new web3_js_1.default.Connection(this.network.url);
     }
     // This method is done manually because we need to ensure that the request is aborted after timeout
     pingNode(url) {
@@ -147,9 +138,8 @@ 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);
-        const keypair = web3_js_1.default.Keypair.fromSeed(hd.derive(bip44Path).privateKey);
+        const keyBuffer = blockchain_service_1.BSKeychainHelper.generateEd25519KeyFromMnemonic(mnemonic, bip44Path);
+        const keypair = web3_js_1.default.Keypair.fromSeed(keyBuffer);
         const key = bs58_1.default.encode(keypair.secretKey);
         const address = keypair.publicKey.toBase58();
         return {
@@ -181,28 +171,20 @@ class BSSolana {
     }
     transfer(param) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { transaction, latestBlockhash } = yield __classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_buildTransferParams).call(this, param);
+            const { transaction } = yield __classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_buildTransferParams).call(this, param);
             const signedTransaction = yield __classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_signTransaction).call(this, transaction, param.senderAccount);
-            const signature = yield __classPrivateFieldGet(this, _BSSolana_connection, "f").sendRawTransaction(signedTransaction);
-            const status = yield __classPrivateFieldGet(this, _BSSolana_connection, "f").confirmTransaction({
-                blockhash: latestBlockhash.blockhash,
-                lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
-                signature,
-            });
-            if (status.value.err) {
-                throw new Error('Transaction failed: ' + status.value.err);
-            }
+            const signature = yield this.connection.sendRawTransaction(signedTransaction);
             return [signature];
         });
     }
     calculateTransferFee(param) {
         return __awaiter(this, void 0, void 0, function* () {
             const { senderPublicKey, transaction } = yield __classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_buildTransferParams).call(this, param);
-            const { blockhash } = yield __classPrivateFieldGet(this, _BSSolana_connection, "f").getLatestBlockhash();
+            const { blockhash } = yield this.connection.getLatestBlockhash();
             transaction.recentBlockhash = blockhash;
             transaction.feePayer = senderPublicKey;
             const message = transaction.compileMessage();
-            const fee = yield __classPrivateFieldGet(this, _BSSolana_connection, "f").getFeeForMessage(message);
+            const fee = yield this.connection.getFeeForMessage(message);
             if (!fee.value) {
                 throw new Error('Failed to calculate fee');
             }
@@ -212,7 +194,7 @@ class BSSolana {
     }
     resolveNameServiceDomain(domainName) {
         return __awaiter(this, void 0, void 0, function* () {
-            const address = yield spl_name_service_1.default.resolve(__classPrivateFieldGet(this, _BSSolana_connection, "f"), domainName);
+            const address = yield spl_name_service_1.default.resolve(this.connection, domainName);
             return address.toBase58();
         });
     }
@@ -221,7 +203,7 @@ class BSSolana {
     }
 }
 exports.BSSolana = BSSolana;
-_BSSolana_connection = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSolana_generateKeyPairFromKey = function _BSSolana_generateKeyPairFromKey(key) {
+_BSSolana_instances = new WeakSet(), _BSSolana_generateKeyPairFromKey = function _BSSolana_generateKeyPairFromKey(key) {
     let keyBuffer;
     try {
         keyBuffer = bs58_1.default.decode(key);
@@ -245,8 +227,7 @@ _BSSolana_connection = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSo
     });
 }, _BSSolana_buildTransferParams = function _BSSolana_buildTransferParams(param) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const latestBlockhash = yield __classPrivateFieldGet(this, _BSSolana_connection, "f").getLatestBlockhash();
+        const latestBlockhash = yield this.connection.getLatestBlockhash();
         const senderPublicKey = new web3_js_1.default.PublicKey(param.senderAccount.address);
         const transaction = new web3_js_1.default.Transaction();
         transaction.feePayer = senderPublicKey;
@@ -254,9 +235,9 @@ _BSSolana_connection = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSo
         transaction.lastValidBlockHeight = latestBlockhash.lastValidBlockHeight;
         for (const intent of param.intents) {
             const amountBn = blockchain_service_1.BSBigNumberHelper.fromNumber(intent.amount);
-            const amount = Number(blockchain_service_1.BSBigNumberHelper.toDecimals(amountBn, (_a = intent.tokenDecimals) !== null && _a !== void 0 ? _a : 0));
+            const amount = Number(blockchain_service_1.BSBigNumberHelper.toDecimals(amountBn, intent.token.decimals));
             const receiverPublicKey = new web3_js_1.default.PublicKey(intent.receiverAddress);
-            const normalizedTokenHash = this.tokenService.normalizeHash(intent.tokenHash);
+            const normalizedTokenHash = this.tokenService.normalizeHash(intent.token.hash);
             const isNative = normalizedTokenHash === this.tokenService.normalizeHash(BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.hash);
             if (isNative) {
                 transaction.add(web3_js_1.default.SystemProgram.transfer({
@@ -270,7 +251,7 @@ _BSSolana_connection = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSo
             const senderTokenAddress = yield solanaSplSDK.getAssociatedTokenAddress(tokenMintPublicKey, senderPublicKey);
             const receiverTokenAddress = yield solanaSplSDK.getAssociatedTokenAddress(tokenMintPublicKey, receiverPublicKey);
             try {
-                yield solanaSplSDK.getAccount(__classPrivateFieldGet(this, _BSSolana_connection, "f"), receiverTokenAddress);
+                yield solanaSplSDK.getAccount(this.connection, receiverTokenAddress);
             }
             catch (error) {
                 if (error instanceof solanaSplSDK.TokenAccountNotFoundError ||
@@ -286,7 +267,6 @@ _BSSolana_connection = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSo
         return {
             transaction,
             senderPublicKey,
-            latestBlockhash,
         };
     });
 };

package/dist/constants/BSSolanaConstants.d.ts

@@ -4,6 +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 PUBLIC_RPC_LIST_BY_NETWORK_ID: 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>;

package/dist/constants/BSSolanaConstants.js

@@ -9,9 +9,13 @@ _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.PUBLIC_RPC_LIST_BY_NETWORK_ID = {
+    'mainnet-beta': 'https://api.mainnet-beta.solana.com',
+    devnet: 'https://api.devnet.solana.com',
+};
 BSSolanaConstants.RPC_LIST_BY_NETWORK_ID = {
-    'mainnet-beta': ['https://api.mainnet-beta.solana.com'],
-    devnet: ['https://api.devnet.solana.com'],
+    'mainnet-beta': ['https://api.coz.io/api/v2/solana/meta/mainnet'],
+    devnet: ['https://api.coz.io/api/v2/solana/meta/devnet'],
 };
 BSSolanaConstants.MAINNET_NETWORK = {
     id: 'mainnet-beta',

package/dist/helpers/BSSolanaHelper.d.ts

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

package/dist/helpers/BSSolanaHelper.js

@@ -3,12 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSSolanaHelper = void 0;
 const BSSolanaConstants_1 = require("../constants/BSSolanaConstants");
 class BSSolanaHelper {
-    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';
     }

package/dist/index.d.ts

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

package/dist/index.js

@@ -15,13 +15,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 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/blockchain-data/RpcBDSSolana"), 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/nft-data/RpcNDSSolana"), exports);
 __exportStar(require("./services/token/TokenServiceSolana"), exports);
 __exportStar(require("./BSSolana"), exports);
 __exportStar(require("./types"), exports);

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

@@ -0,0 +1,13 @@
+import { TBalanceResponse, IBlockchainDataService, TBSToken, type TContractResponse, type TTransaction, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse } from '@cityofzion/blockchain-service';
+import { IBSSolana } from '../../types';
+export declare class RpcBDSSolana<N extends string> implements IBlockchainDataService<N> {
+    #private;
+    readonly maxTimeToConfirmTransactionInMs: number;
+    constructor(service: IBSSolana<N>);
+    getTransaction(txid: string): Promise<TTransaction<N>>;
+    getTransactionsByAddress(params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N>>;
+    getContract(_contractHash: string): Promise<TContractResponse>;
+    getTokenInfo(tokenHash: string): Promise<TBSToken>;
+    getBalance(address: string): Promise<TBalanceResponse[]>;
+    getBlockHeight(): Promise<number>;
+}