@cityofzion/bs-solana 3.1.3 → 3.1.5

package/dist/BSSolana.d.ts

@@ -1,10 +1,10 @@
 import { type TBSAccount, type TGetLedgerTransport, type IBlockchainDataService, type IExchangeDataService, type IExplorerService, type INftDataService, type ITokenService, type TBSNetwork, type TBSToken, type TPingNetworkResponse, type TTransferParams, type IWalletConnectService, type TTransactionDefault } from '@cityofzion/blockchain-service';
 import { Web3LedgerServiceSolana } from './services/ledger/Web3LedgerServiceSolana';
-import type { IBSSolana, TBSSolanaNetworkId } from './types';
+import type { IBSSolana, TBSSolanaName, TBSSolanaNetworkId } from './types';
 import * as solanaKit from '@solana/kit';
-export declare class BSSolana<N extends string = string> implements IBSSolana<N> {
+export declare class BSSolana implements IBSSolana {
     #private;
-    readonly name: N;
+    readonly name = "solana";
     readonly bipDerivationPath: string;
     readonly isMultiTransferSupported = true;
     readonly isCustomNetworkSupported = false;
@@ -15,25 +15,25 @@ export declare class BSSolana<N extends string = string> implements IBSSolana<N>
     networkUrls: string[];
     readonly availableNetworks: TBSNetwork<TBSSolanaNetworkId>[];
     readonly defaultNetwork: TBSNetwork<TBSSolanaNetworkId>;
-    ledgerService: Web3LedgerServiceSolana<N>;
+    ledgerService: Web3LedgerServiceSolana;
     exchangeDataService: IExchangeDataService;
-    blockchainDataService: IBlockchainDataService<N>;
+    blockchainDataService: IBlockchainDataService;
     nftDataService: INftDataService;
     explorerService: IExplorerService;
     tokenService: ITokenService;
-    walletConnectService: IWalletConnectService<N>;
-    solanaKitRpc: solanaKit.Rpc<solanaKit.SolanaRpcApi>;
-    constructor(name: N, network?: TBSNetwork<TBSSolanaNetworkId>, getLedgerTransport?: TGetLedgerTransport<N>);
-    signTransaction(transaction: solanaKit.Transaction, senderAccount: TBSAccount<N>): Promise<solanaKit.Base64EncodedWireTransaction>;
+    walletConnectService: IWalletConnectService<TBSSolanaName>;
+    _solanaKitRpc: solanaKit.Rpc<solanaKit.SolanaRpcApi>;
+    constructor(network?: TBSNetwork<TBSSolanaNetworkId>, getLedgerTransport?: TGetLedgerTransport<TBSSolanaName>);
+    _signTransaction(transaction: solanaKit.Transaction, senderAccount: TBSAccount<TBSSolanaName>): Promise<solanaKit.Base64EncodedWireTransaction>;
     setNetwork(network: TBSNetwork<TBSSolanaNetworkId>): void;
     pingNetwork(url: string): Promise<TPingNetworkResponse>;
     validateAddress(address: string): boolean;
     validateKey(key: string): boolean;
-    generateAccountFromMnemonic(mnemonic: string, index: number): Promise<TBSAccount<N>>;
-    generateAccountFromKey(key: string): Promise<TBSAccount<N>>;
-    generateAccountFromPublicKey(publicKey: string): Promise<TBSAccount<N>>;
-    transfer(params: TTransferParams<N>): Promise<TTransactionDefault<N>[]>;
-    calculateTransferFee(params: TTransferParams<N>): Promise<string>;
+    generateAccountFromMnemonic(mnemonic: string, index: number): Promise<TBSAccount<TBSSolanaName>>;
+    generateAccountFromKey(key: string): Promise<TBSAccount<TBSSolanaName>>;
+    generateAccountFromPublicKey(publicKey: string): Promise<TBSAccount<TBSSolanaName>>;
+    transfer(params: TTransferParams<TBSSolanaName>): Promise<TTransactionDefault[]>;
+    calculateTransferFee(params: TTransferParams<TBSSolanaName>): Promise<string>;
     resolveNameServiceDomain(domainName: string): Promise<string>;
     validateNameServiceDomainFormat(domainName: string): boolean;
 }

package/dist/BSSolana.js

@@ -58,11 +58,11 @@ const axios_1 = __importDefault(require("axios"));
 const WalletConnectServiceSolana_1 = require("./services/wallet-connect/WalletConnectServiceSolana");
 const KEY_BYTES_LENGTH = 64;
 class BSSolana {
-    constructor(name, network, getLedgerTransport) {
+    constructor(network, getLedgerTransport) {
         _BSSolana_instances.add(this);
+        this.name = 'solana';
         this.isMultiTransferSupported = true;
         this.isCustomNetworkSupported = false;
-        this.name = name;
         this.bipDerivationPath = BSSolanaConstants_1.BSSolanaConstants.DEFAULT_BIP_DERIVATION_PATH;
         this.ledgerService = new Web3LedgerServiceSolana_1.Web3LedgerServiceSolana(this, getLedgerTransport);
         this.tokens = [BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN];
@@ -72,7 +72,7 @@ class BSSolana {
         this.defaultNetwork = BSSolanaConstants_1.BSSolanaConstants.MAINNET_NETWORK;
         this.setNetwork(network ?? this.defaultNetwork);
     }
-    async signTransaction(transaction, senderAccount) {
+    async _signTransaction(transaction, senderAccount) {
         if (senderAccount.isHardware) {
             if (!this.ledgerService.getLedgerTransport)
                 throw new Error('You must provide getLedgerTransport function to use Ledger');
@@ -94,13 +94,13 @@ class BSSolana {
         }
         this.network = network;
         this.networkUrls = networkUrls;
-        this.tokenService = new TokenServiceSolana_1.TokenServiceSolana();
+        this.tokenService = new TokenServiceSolana_1.TokenServiceSolana(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);
         this.walletConnectService = new WalletConnectServiceSolana_1.WalletConnectServiceSolana(this);
-        this.solanaKitRpc = solanaKit.createSolanaRpc(this.network.url);
+        this._solanaKitRpc = solanaKit.createSolanaRpc(this.network.url);
     }
     // This method is done manually because we need to ensure that the request is aborted after timeout
     async pingNetwork(url) {
@@ -109,7 +109,7 @@ class BSSolana {
             abortController.abort();
         }, 5000);
         const timeStart = Date.now();
-        const blockHeight = await this.solanaKitRpc.getBlockHeight().send({ abortSignal: abortController.signal });
+        const blockHeight = await this._solanaKitRpc.getBlockHeight().send({ abortSignal: abortController.signal });
         const latency = Date.now() - timeStart;
         clearTimeout(timeout);
         return {
@@ -175,8 +175,8 @@ class BSSolana {
         const compiledTransaction = solanaKit.compileTransaction(transactionMessage);
         const fee = await __classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_getFeeByMessageBytes).call(this, compiledTransaction.messageBytes);
         const { intents, senderAccount } = params;
-        const encodedSignedTransaction = await this.signTransaction(compiledTransaction, senderAccount);
-        const txId = await this.solanaKitRpc.sendTransaction(encodedSignedTransaction, { encoding: 'base64' }).send();
+        const encodedSignedTransaction = await this._signTransaction(compiledTransaction, senderAccount);
+        const txId = await this._solanaKitRpc.sendTransaction(encodedSignedTransaction, { encoding: 'base64' }).send();
         const { address } = senderAccount;
         const addressUrl = this.explorerService.buildAddressUrl(address);
         const nativeTokenHash = BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.hash;
@@ -186,7 +186,6 @@ class BSSolana {
                 txIdUrl: this.explorerService.buildTransactionUrl(txId),
                 date: new Date().toJSON(),
                 networkFeeAmount: fee,
-                type: 'default',
                 view: 'default',
                 events: intents.map(({ amount, receiverAddress, token }) => {
                     const tokenHash = token.hash;
@@ -199,7 +198,6 @@ class BSSolana {
                         fromUrl: addressUrl,
                         to: receiverAddress,
                         toUrl: this.explorerService.buildAddressUrl(receiverAddress),
-                        tokenType: isNativeToken ? 'native' : 'spl',
                         tokenUrl: this.explorerService.buildContractUrl(tokenHash),
                         token,
                     };
@@ -257,7 +255,7 @@ _BSSolana_instances = new WeakSet(), _BSSolana_buildTransferParams = async funct
             owner: receiverAddress,
             tokenProgram: solanaToken.TOKEN_PROGRAM_ADDRESS,
         });
-        const receiverAccountInfo = await this.solanaKitRpc.getAccountInfo(receiverATA, { encoding: 'base64' }).send();
+        const receiverAccountInfo = await this._solanaKitRpc.getAccountInfo(receiverATA, { encoding: 'base64' }).send();
         if (!receiverAccountInfo.value) {
             // Create associated token account for receiver
             const createAtaInstruction = solanaToken.getCreateAssociatedTokenInstruction({
@@ -278,14 +276,14 @@ _BSSolana_instances = new WeakSet(), _BSSolana_buildTransferParams = async funct
         });
         instructions.push(transferInstruction);
     }
-    const { value: latestBlockhash } = await this.solanaKitRpc.getLatestBlockhash().send();
+    const { value: latestBlockhash } = await this._solanaKitRpc.getLatestBlockhash().send();
     const transactionMessage = solanaKit.pipe(solanaKit.createTransactionMessage({ version: 0 }), tx => solanaKit.setTransactionMessageFeePayerSigner(signer, tx), tx => solanaKit.setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), tx => solanaKit.appendTransactionMessageInstructions(instructions, tx));
     return {
         transactionMessage,
     };
 }, _BSSolana_getFeeByMessageBytes = async function _BSSolana_getFeeByMessageBytes(messageBytes) {
     const messageBase64 = solanaKit.getBase64Decoder().decode(messageBytes);
-    const feeResponse = await this.solanaKitRpc
+    const feeResponse = await this._solanaKitRpc
         .getFeeForMessage(messageBase64, { commitment: 'confirmed' })
         .send();
     if (!feeResponse.value) {

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

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

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

@@ -66,7 +66,7 @@ class RpcBDSSolana {
     }
     async getTransaction(txid) {
         const signature = solanaKit.signature(txid);
-        const transaction = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").solanaKitRpc
+        const transaction = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f")._solanaKitRpc
             .getTransaction(signature, { encoding: 'jsonParsed', maxSupportedTransactionVersion: 0 })
             .send();
         const parsedTransaction = await __classPrivateFieldGet(this, _RpcBDSSolana_instances, "m", _RpcBDSSolana_parseTransaction).call(this, transaction, transaction?.blockTime, transaction?.slot);
@@ -76,7 +76,7 @@ class RpcBDSSolana {
     }
     async getTransactionsByAddress(params) {
         const solanaKitAddress = solanaKit.address(params.address);
-        const signaturesResponse = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").solanaKitRpc
+        const signaturesResponse = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f")._solanaKitRpc
             .getSignaturesForAddress(solanaKitAddress, {
             limit: 15,
             before: params.nextPageParams,
@@ -140,8 +140,8 @@ class RpcBDSSolana {
     }
     async getBalance(address) {
         const solanaKitAddress = solanaKit.address(address);
-        const nativeBalance = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").solanaKitRpc.getBalance(solanaKitAddress).send();
-        const splBalance = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").solanaKitRpc
+        const nativeBalance = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f")._solanaKitRpc.getBalance(solanaKitAddress).send();
+        const splBalance = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f")._solanaKitRpc
             .getTokenAccountsByOwner(solanaKitAddress, { programId: solanaToken.TOKEN_PROGRAM_ADDRESS }, { encoding: 'jsonParsed' })
             .send();
         const nativeBalanceBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(nativeBalance.value, BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.decimals);
@@ -162,7 +162,7 @@ class RpcBDSSolana {
         return balances;
     }
     async getBlockHeight() {
-        const blockHeight = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").solanaKitRpc.getBlockHeight().send();
+        const blockHeight = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f")._solanaKitRpc.getBlockHeight().send();
         return blockchain_service_1.BSBigNumberHelper.fromNumber(blockHeight).toNumber();
     }
 }
@@ -175,7 +175,7 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
     let accountInfoValue = null;
     try {
         const sourcePubkey = solanaKit.address(address);
-        const accountInfo = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").solanaKitRpc
+        const accountInfo = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f")._solanaKitRpc
             .getAccountInfo(sourcePubkey, { encoding: 'jsonParsed' })
             .send();
         accountInfoValue = accountInfo.value;
@@ -232,7 +232,6 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
             fromUrl,
             to,
             toUrl,
-            tokenType: 'spl',
             nft,
         };
     }
@@ -246,7 +245,6 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
         fromUrl,
         to,
         toUrl,
-        tokenType: 'spl',
         tokenUrl: __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").explorerService.buildContractUrl(token.hash),
         token,
     };
@@ -291,7 +289,6 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
             fromUrl,
             to,
             toUrl,
-            tokenType: 'spl',
             nft,
         };
     }
@@ -305,7 +302,6 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
         fromUrl,
         to,
         toUrl,
-        tokenType: 'spl',
         tokenUrl: __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").explorerService.buildContractUrl(token.hash),
         token,
     };
@@ -326,7 +322,6 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
         fromUrl: __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").explorerService.buildAddressUrl(from),
         to,
         toUrl: __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").explorerService.buildAddressUrl(to),
-        tokenType: 'native',
         tokenUrl: __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").explorerService.buildContractUrl(BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.hash),
         token: BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN,
     };
@@ -366,7 +361,6 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
         block: blockchain_service_1.BSBigNumberHelper.fromNumber(block).toNumber(),
         date: new Date(blockchain_service_1.BSBigNumberHelper.fromNumber(blockTime).multipliedBy(1000).toNumber()).toJSON(),
         networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(transaction.meta.fee, __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").feeToken.decimals), { decimals: __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").feeToken.decimals }),
-        type: 'default',
         view: 'default',
         events,
     };

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

@@ -1,8 +1,8 @@
 import { CryptoCompareEDS, type TGetTokenPriceHistoryParams, type TGetTokenPricesParams, type TTokenPricesHistoryResponse, type TTokenPricesResponse } from '@cityofzion/blockchain-service';
 import type { IBSSolana } from '../../types';
-export declare class MoralisEDSSolana<N extends string> extends CryptoCompareEDS {
+export declare class MoralisEDSSolana extends CryptoCompareEDS {
     #private;
-    constructor(service: IBSSolana<N>);
+    constructor(service: IBSSolana);
     getTokenPrices({ tokens }: TGetTokenPricesParams): Promise<TTokenPricesResponse[]>;
     getTokenPriceHistory(params: TGetTokenPriceHistoryParams): Promise<TTokenPricesHistoryResponse[]>;
 }

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

@@ -1,8 +1,8 @@
 import type { TBuildNftUrlParams, IExplorerService } from '@cityofzion/blockchain-service';
 import type { IBSSolana } from '../../types';
-export declare class SolScanESSolana<N extends string> implements IExplorerService {
+export declare class SolScanESSolana implements IExplorerService {
     #private;
-    constructor(service: IBSSolana<N>);
+    constructor(service: IBSSolana);
     buildTransactionUrl(transactionId: string): string | undefined;
     buildContractUrl(contractHash: string): string | undefined;
     buildNftUrl({ tokenHash }: TBuildNftUrlParams): string | undefined;

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

@@ -1,13 +1,13 @@
 import { type TBSAccount, type TLedgerServiceEmitter, type TGetLedgerTransport, type TUntilIndexRecord, type ILedgerService } from '@cityofzion/blockchain-service';
 import Transport from '@ledgerhq/hw-transport';
-import type { IBSSolana } from '../../types';
+import type { IBSSolana, TBSSolanaName } from '../../types';
 import * as solanaKit from '@solana/kit';
-export declare class Web3LedgerServiceSolana<N extends string = string> implements ILedgerService<N> {
+export declare class Web3LedgerServiceSolana implements ILedgerService<TBSSolanaName> {
     #private;
-    readonly getLedgerTransport?: TGetLedgerTransport<N>;
+    readonly getLedgerTransport?: TGetLedgerTransport<TBSSolanaName>;
     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: solanaKit.Transaction, account: TBSAccount<N>): Promise<solanaKit.Base64EncodedWireTransaction>;
+    constructor(blockchainService: IBSSolana, getLedgerTransport?: TGetLedgerTransport<TBSSolanaName>);
+    getAccounts(transport: Transport, untilIndexByBlockchainService?: TUntilIndexRecord<TBSSolanaName>): Promise<TBSAccount<TBSSolanaName>[]>;
+    getAccount(transport: Transport, index: number): Promise<TBSAccount<TBSSolanaName>>;
+    signTransaction(transport: Transport, transaction: solanaKit.Transaction, account: TBSAccount<TBSSolanaName>): Promise<solanaKit.Base64EncodedWireTransaction>;
 }

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

@@ -1,9 +1,9 @@
 import type { TGetNftParams, TGetNftsByAddressParams, THasTokenParams, INftDataService, TNftResponse, TNftsResponse } from '@cityofzion/blockchain-service';
 import type { IBSSolana } from '../../types';
-export declare class RpcNDSSolana<N extends string> implements INftDataService {
+export declare class RpcNDSSolana implements INftDataService {
     #private;
     static readonly SUPPORTED_MIME_TYPES: string[];
-    constructor(service: IBSSolana<N>);
+    constructor(service: IBSSolana);
     getNft(params: TGetNftParams): Promise<TNftResponse>;
     getNftsByAddress({ address }: TGetNftsByAddressParams): Promise<TNftsResponse>;
     hasToken({ address, collectionHash }: THasTokenParams): Promise<boolean>;

package/dist/services/token/TokenServiceSolana.d.ts

@@ -1,4 +1,5 @@
 import { TokenService } from '@cityofzion/blockchain-service';
-export declare class TokenServiceSolana extends TokenService {
+import type { TBSSolanaName, TBSSolanaNetworkId } from '../../types';
+export declare class TokenServiceSolana extends TokenService<TBSSolanaName, TBSSolanaNetworkId> {
     normalizeHash(hash: string): string;
 }

package/dist/services/wallet-connect/WalletConnectServiceSolana.d.ts

@@ -1,7 +1,7 @@
 import { type IWalletConnectService, type TWalletConnectServiceRequestMethodParams } from '@cityofzion/blockchain-service';
-import type { IBSSolana, TBSSolanaNetworkId } from '../../types';
+import type { IBSSolana, TBSSolanaName, TBSSolanaNetworkId } from '../../types';
 import * as solanaKit from '@solana/kit';
-export declare class WalletConnectServiceSolana<N extends string> implements IWalletConnectService<N> {
+export declare class WalletConnectServiceSolana implements IWalletConnectService<TBSSolanaName> {
     #private;
     static networkIdByNetworkType: Record<TBSSolanaNetworkId, string>;
     readonly namespace = "solana";
@@ -10,25 +10,25 @@ export declare class WalletConnectServiceSolana<N extends string> implements IWa
     readonly supportedEvents: string[];
     readonly calculableMethods: string[];
     readonly autoApproveMethods: string[];
-    constructor(service: IBSSolana<N>);
+    constructor(service: IBSSolana);
     [methodName: string]: any;
-    solana_getAccounts(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+    solana_getAccounts(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
         pubkey: string;
     }[]>;
-    solana_requestAccounts(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+    solana_requestAccounts(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
         pubkey: string;
     }[]>;
-    solana_signMessage(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+    solana_signMessage(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
         signature: string;
     }>;
-    solana_signTransaction(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+    solana_signTransaction(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
         transaction: solanaKit.Base64EncodedWireTransaction;
     }>;
-    solana_signAllTransactions(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+    solana_signAllTransactions(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
         transactions: solanaKit.Base64EncodedWireTransaction[];
     }>;
-    solana_signAndSendTransaction(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+    solana_signAndSendTransaction(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
         signature: solanaKit.Signature;
     }>;
-    calculateRequestFee(args: TWalletConnectServiceRequestMethodParams<N>): Promise<string>;
+    calculateRequestFee(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<string>;
 }

package/dist/services/wallet-connect/WalletConnectServiceSolana.js

@@ -92,7 +92,7 @@ class WalletConnectServiceSolana {
             throw new Error('Invalid params');
         }
         const parsedTransaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_parseTransaction).call(this, args.params.transaction);
-        const signedTransaction = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").signTransaction(parsedTransaction, args.account);
+        const signedTransaction = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f")._signTransaction(parsedTransaction, args.account);
         return { transaction: signedTransaction };
     }
     async solana_signAllTransactions(args) {
@@ -102,7 +102,7 @@ class WalletConnectServiceSolana {
         const signedTransactions = [];
         for (const transaction of args.params.transactions) {
             const parsedTransaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_parseTransaction).call(this, transaction);
-            const signedTransaction = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").signTransaction(parsedTransaction, args.account);
+            const signedTransaction = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f")._signTransaction(parsedTransaction, args.account);
             signedTransactions.push(signedTransaction);
         }
         return {
@@ -115,8 +115,8 @@ class WalletConnectServiceSolana {
         }
         const options = args.params.sendOptions ?? {};
         const parsedTransaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_parseTransaction).call(this, args.params.transaction);
-        const signedTransaction = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").signTransaction(parsedTransaction, args.account);
-        const signature = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").solanaKitRpc
+        const signedTransaction = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f")._signTransaction(parsedTransaction, args.account);
+        const signature = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f")._solanaKitRpc
             .sendTransaction(signedTransaction, {
             maxRetries: options.maxRetries,
             preflightCommitment: options.preflightCommitment,
@@ -132,7 +132,7 @@ class WalletConnectServiceSolana {
         }
         const transaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_parseTransaction).call(this, args.params.transaction);
         const messageBase64 = solanaKit.getBase64Decoder().decode(transaction.messageBytes);
-        const feeResponse = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").solanaKitRpc
+        const feeResponse = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f")._solanaKitRpc
             .getFeeForMessage(messageBase64, { commitment: 'confirmed' })
             .send();
         if (!feeResponse.value) {

package/dist/types.d.ts

@@ -1,9 +1,10 @@
 import type { IBlockchainService, IBSWithExplorer, IBSWithFee, IBSWithLedger, IBSWithNameService, IBSWithNft, IBSWithWalletConnect, TBSAccount, TBSNetworkId } from '@cityofzion/blockchain-service';
 import type { SolanaRpcApi, Rpc, Transaction, Base64EncodedWireTransaction, TransactionForFullJsonParsed } from '@solana/kit';
 export type TBSSolanaNetworkId = TBSNetworkId<'mainnet-beta' | 'devnet'>;
-export interface IBSSolana<N extends string = string, A extends string = TBSSolanaNetworkId> extends IBlockchainService<N, A>, IBSWithFee<N>, IBSWithNameService, IBSWithLedger<N>, IBSWithNft, IBSWithExplorer, IBSWithWalletConnect<N> {
-    solanaKitRpc: Rpc<SolanaRpcApi>;
-    signTransaction(transaction: Transaction, senderAccount: TBSAccount<N>): Promise<Base64EncodedWireTransaction>;
+export type TBSSolanaName = 'solana';
+export interface IBSSolana extends IBlockchainService<TBSSolanaName, TBSSolanaNetworkId>, IBSWithFee<TBSSolanaName>, IBSWithNameService, IBSWithLedger<TBSSolanaName>, IBSWithNft, IBSWithExplorer, IBSWithWalletConnect<TBSSolanaName> {
+    _solanaKitRpc: Rpc<SolanaRpcApi>;
+    _signTransaction(transaction: Transaction, senderAccount: TBSAccount<TBSSolanaName>): Promise<Base64EncodedWireTransaction>;
 }
 export type TMetaplexAssetByOwnerResponse = {
     jsonrpc: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-solana",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "license": "MIT",
   "author": "Coz",
@@ -17,7 +17,7 @@
     "@solana/kit": "~6.1.0",
     "axios": "~1.13.5",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "3.1.3"
+    "@cityofzion/blockchain-service": "3.1.5"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.30.0",
@@ -28,7 +28,7 @@
     "vitest": "~4.0.18"
   },
   "scripts": {
-    "build": "rm -rf ./dist && npm run typecheck && tsc --project tsconfig.build.json",
+    "build": "rm -rf ./dist && rm -f *.tgz && npm run typecheck && tsc --project tsconfig.build.json",
     "format": "eslint --fix",
     "lint": "eslint .",
     "package": "npm run build && npm pack",