@cityofzion/bs-solana 3.1.9 → 3.1.11

package/dist/BSSolana.d.ts

@@ -1,7 +1,8 @@
-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 { type TBSAccount, type TGetLedgerTransport, type IBlockchainDataService, type IExchangeDataService, type IExplorerService, type INftDataService, type ITokenService, type TBSNetwork, type TBSToken, type TPingNetworkResponse, type TTransferParams, type TTransactionDefault } from '@cityofzion/blockchain-service';
 import { Web3LedgerServiceSolana } from './services/ledger/Web3LedgerServiceSolana';
 import type { IBSSolana, TBSSolanaName, TBSSolanaNetworkId } from './types';
 import * as solanaKit from '@solana/kit';
+import { WalletConnectServiceSolana } from './services/wallet-connect/WalletConnectServiceSolana';
 export declare class BSSolana implements IBSSolana {
     #private;
     readonly name = "solana";
@@ -21,7 +22,7 @@ export declare class BSSolana implements IBSSolana {
     nftDataService: INftDataService;
     explorerService: IExplorerService;
     tokenService: ITokenService;
-    walletConnectService: IWalletConnectService<TBSSolanaName>;
+    walletConnectService: WalletConnectServiceSolana;
     _solanaKitRpc: solanaKit.Rpc<solanaKit.SolanaRpcApi>;
     constructor(network?: TBSNetwork<TBSSolanaNetworkId>, getLedgerTransport?: TGetLedgerTransport<TBSSolanaName>);
     _signTransaction(transaction: solanaKit.Transaction, senderAccount: TBSAccount<TBSSolanaName>): Promise<solanaKit.Base64EncodedWireTransaction>;

package/dist/BSSolana.js

@@ -234,8 +234,7 @@ _BSSolana_instances = new WeakSet(), _BSSolana_buildTransferParams = async funct
     const signer = solanaKit.createNoopSigner(solanaKit.address(params.senderAccount.address));
     const instructions = [];
     for (const intent of params.intents) {
-        const amountBn = blockchain_service_1.BSBigNumberHelper.fromNumber(intent.amount);
-        const amount = Number(blockchain_service_1.BSBigNumberHelper.toDecimals(amountBn, intent.token.decimals));
+        const amount = new blockchain_service_1.BSBigHumanAmount(intent.amount, intent.token.decimals).toUnit().toBigInt();
         const receiverAddress = solanaKit.address(intent.receiverAddress);
         const isNative = this.tokenService.predicate(intent.token, BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN);
         if (isNative) {
@@ -292,6 +291,5 @@ _BSSolana_instances = new WeakSet(), _BSSolana_buildTransferParams = async funct
     if (!feeResponse.value) {
         throw new blockchain_service_1.BSError('Failed to calculate fee', 'NO_CALCULATE_FEE');
     }
-    const feeBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(feeResponse.value.toString(), this.feeToken.decimals);
-    return blockchain_service_1.BSBigNumberHelper.format(feeBn, { decimals: this.feeToken.decimals });
+    return new blockchain_service_1.BSBigUnitAmount(feeResponse.value.toString(), this.feeToken.decimals).toHuman().toFormatted();
 };

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

@@ -55,6 +55,7 @@ const solanaKit = __importStar(require("@solana/kit"));
 const solanaToken = __importStar(require("@solana-program/token"));
 const solanaSystem = __importStar(require("@solana-program/system"));
 const axios_1 = __importDefault(require("axios"));
+const blockchain_service_2 = require("@cityofzion/blockchain-service");
 class RpcBDSSolana {
     constructor(service) {
         _RpcBDSSolana_instances.add(this);
@@ -144,15 +145,16 @@ class RpcBDSSolana {
         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);
-        const nativeBalanceAmount = blockchain_service_1.BSBigNumberHelper.toNumber(nativeBalanceBn);
+        const nativeBalanceAmount = new blockchain_service_1.BSBigUnitAmount(nativeBalance.value, BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.decimals)
+            .toHuman()
+            .toFormatted();
         const balances = [{ amount: nativeBalanceAmount, token: BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN }];
         const promises = splBalance.value.map(async (item) => {
             const token = await this.getTokenInfo(item.account.data.parsed.info.mint);
-            const amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(item.account.data.parsed.info.tokenAmount.amount, token.decimals);
+            const amountBn = new blockchain_service_1.BSBigUnitAmount(item.account.data.parsed.info.tokenAmount.amount, token.decimals);
             if (amountBn.isNaN() || amountBn.isLessThanOrEqualTo(0))
                 return;
-            const amount = blockchain_service_1.BSBigNumberHelper.format(amountBn, { decimals: token.decimals });
+            const amount = amountBn.toHuman().toFormatted();
             balances.push({
                 amount,
                 token,
@@ -163,7 +165,7 @@ class RpcBDSSolana {
     }
     async getBlockHeight() {
         const blockHeight = await __classPrivateFieldGet(this, _RpcBDSSolana_service, "f")._solanaKitRpc.getBlockHeight().send();
-        return blockchain_service_1.BSBigNumberHelper.fromNumber(blockHeight).toNumber();
+        return blockchain_service_2.BSBigNumber.ensureNumber(blockHeight);
     }
 }
 exports.RpcBDSSolana = RpcBDSSolana;
@@ -201,7 +203,7 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
         token = {
             symbol: 'UNKNOWN',
             name: 'Unknown Token',
-            decimals: blockchain_service_1.BSBigNumberHelper.fromNumber(info.tokenAmount.decimals).toNumber(),
+            decimals: blockchain_service_2.BSBigNumber.ensureNumber(info.tokenAmount.decimals),
             hash: contractHash,
         };
     }
@@ -235,8 +237,7 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
             nft,
         };
     }
-    const amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(tokenAmount, token.decimals);
-    const amount = blockchain_service_1.BSBigNumberHelper.format(amountBn, { decimals: token.decimals });
+    const amount = new blockchain_service_1.BSBigUnitAmount(tokenAmount, token.decimals).toHuman().toFormatted();
     return {
         eventType: 'token',
         amount,
@@ -292,8 +293,7 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
             nft,
         };
     }
-    const amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(info.amount, token.decimals);
-    const amount = blockchain_service_1.BSBigNumberHelper.format(amountBn, { decimals: token.decimals });
+    const amount = new blockchain_service_1.BSBigUnitAmount(info.amount, token.decimals).toHuman().toFormatted();
     return {
         eventType: 'token',
         amount,
@@ -310,8 +310,7 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
     const method = instruction.parsed.type;
     if (!info || method !== 'transfer' || !info.lamports || !info.source || !info.destination)
         return;
-    const amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(info.lamports, BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.decimals);
-    const amount = blockchain_service_1.BSBigNumberHelper.format(amountBn, { decimals: BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.decimals });
+    const amount = new blockchain_service_1.BSBigUnitAmount(info.lamports, BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.decimals).toHuman().toFormatted();
     const from = info.source;
     const to = info.destination;
     return {
@@ -361,9 +360,11 @@ _RpcBDSSolana_service = new WeakMap(), _RpcBDSSolana_tokenCache = new WeakMap(),
         relatedAddress,
         txId,
         txIdUrl,
-        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 }),
+        block: blockchain_service_2.BSBigNumber.ensureNumber(block),
+        date: new Date(new blockchain_service_2.BSBigNumber(blockTime).multipliedBy(1000).toNumber()).toJSON(),
+        networkFeeAmount: new blockchain_service_1.BSBigUnitAmount(transaction.meta.fee, __classPrivateFieldGet(this, _RpcBDSSolana_service, "f").feeToken.decimals)
+            .toHuman()
+            .toFormatted(),
         view: 'default',
         events,
     };

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

@@ -1,34 +1,43 @@
-import { type IWalletConnectService, type TWalletConnectServiceRequestMethodParams } from '@cityofzion/blockchain-service';
-import type { IBSSolana, TBSSolanaName, TBSSolanaNetworkId } from '../../types';
-import * as solanaKit from '@solana/kit';
-export declare class WalletConnectServiceSolana implements IWalletConnectService<TBSSolanaName> {
+import { type IWalletConnectService, type TWalletConnectServiceHandlers, type TWalletConnectServiceRequestMethodParams } from '@cityofzion/blockchain-service';
+import type { IBSSolana, TBSSolanaName, TBSSolanaNetworkId, TWalletConnectServiceSolanaMethod } from '../../types';
+import z from 'zod';
+declare const signMessageParamsSchema: z.ZodObject<{
+    message: z.ZodString;
+    pubkey: z.ZodString;
+}, z.core.$strip>;
+declare const signTransactionParamsSchema: z.ZodObject<{
+    transaction: z.ZodString;
+}, z.core.$strip>;
+declare const signAndSendTransactionParamsSchema: z.ZodObject<{
+    transactions: z.ZodArray<z.ZodString>;
+}, z.core.$strip>;
+declare const signAndSendTransactionOptionsSchema: z.ZodObject<{
+    transaction: z.ZodString;
+    sendOptions: z.ZodOptional<z.ZodObject<{
+        maxRetries: z.ZodOptional<z.ZodBigInt>;
+        preflightCommitment: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"confirmed">, z.ZodLiteral<"finalized">, z.ZodLiteral<"processed">]>>;
+        minContextSlot: z.ZodOptional<z.ZodBigInt>;
+        skipPreflight: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
+export declare class WalletConnectServiceSolana implements IWalletConnectService<TBSSolanaName, TWalletConnectServiceSolanaMethod> {
     #private;
     static networkIdByNetworkType: Record<TBSSolanaNetworkId, string>;
     readonly namespace = "solana";
     readonly chain: string;
-    readonly supportedMethods: string[];
+    readonly supportedMethods: TWalletConnectServiceSolanaMethod[];
     readonly supportedEvents: string[];
-    readonly calculableMethods: string[];
-    readonly autoApproveMethods: string[];
-    constructor(service: IBSSolana);
-    [methodName: string]: any;
-    solana_getAccounts(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
-        pubkey: string;
-    }[]>;
-    solana_requestAccounts(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
-        pubkey: string;
-    }[]>;
-    solana_signMessage(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
-        signature: string;
-    }>;
-    solana_signTransaction(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
-        transaction: solanaKit.Base64EncodedWireTransaction;
-    }>;
-    solana_signAllTransactions(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
-        transactions: solanaKit.Base64EncodedWireTransaction[];
-    }>;
-    solana_signAndSendTransaction(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<{
-        signature: solanaKit.Signature;
+    readonly calculableMethods: TWalletConnectServiceSolanaMethod[];
+    readonly autoApproveMethods: TWalletConnectServiceSolanaMethod[];
+    handlers: TWalletConnectServiceHandlers<TBSSolanaName, {
+        solana_getAccounts: unknown;
+        solana_requestAccounts: unknown;
+        solana_signMessage: z.infer<typeof signMessageParamsSchema>;
+        solana_signTransaction: z.infer<typeof signTransactionParamsSchema>;
+        solana_signAllTransactions: z.infer<typeof signAndSendTransactionParamsSchema>;
+        solana_signAndSendTransaction: z.infer<typeof signAndSendTransactionOptionsSchema>;
     }>;
+    constructor(service: IBSSolana);
     calculateRequestFee(args: TWalletConnectServiceRequestMethodParams<TBSSolanaName>): Promise<string>;
 }
+export {};

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

@@ -43,94 +43,117 @@ 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 _WalletConnectServiceSolana_instances, _WalletConnectServiceSolana_service, _WalletConnectServiceSolana_parseTransaction;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _WalletConnectServiceSolana_instances, _WalletConnectServiceSolana_service, _WalletConnectServiceSolana_getAccountsHandler, _WalletConnectServiceSolana_signMessageHandler, _WalletConnectServiceSolana_signTransactionHandler, _WalletConnectServiceSolana_signAllTransactionsHandler, _WalletConnectServiceSolana_signAndSendTransactionHandler, _WalletConnectServiceSolana_parseTransaction;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WalletConnectServiceSolana = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const solanaKit = __importStar(require("@solana/kit"));
+const zod_1 = __importDefault(require("zod"));
+const signMessageParamsSchema = zod_1.default.object({ message: zod_1.default.string(), pubkey: zod_1.default.string() });
+const signTransactionParamsSchema = zod_1.default.object({ transaction: zod_1.default.string() });
+const signAndSendTransactionParamsSchema = zod_1.default.object({ transactions: zod_1.default.array(zod_1.default.string()) });
+const signAndSendTransactionOptionsSchema = zod_1.default.object({
+    transaction: zod_1.default.string(),
+    sendOptions: zod_1.default
+        .object({
+        maxRetries: zod_1.default.bigint().optional(),
+        preflightCommitment: zod_1.default.union([zod_1.default.literal('confirmed'), zod_1.default.literal('finalized'), zod_1.default.literal('processed')]).optional(),
+        minContextSlot: zod_1.default.bigint().optional(),
+        skipPreflight: zod_1.default.boolean().optional(),
+    })
+        .optional(),
+});
 class WalletConnectServiceSolana {
     constructor(service) {
         _WalletConnectServiceSolana_instances.add(this);
         this.namespace = 'solana';
+        // prettier-ignore
         this.supportedMethods = [
-            'solana_getAccounts',
-            'solana_requestAccounts',
-            'solana_signMessage',
-            'solana_signTransaction',
-            'solana_signAllTransactions',
-            'solana_signAndSendTransaction',
+            'solana_getAccounts', 'solana_requestAccounts', 'solana_signMessage', 'solana_signTransaction',
+            'solana_signAllTransactions', 'solana_signAndSendTransaction',
         ];
         this.supportedEvents = [];
         this.calculableMethods = ['solana_signAndSendTransaction'];
         this.autoApproveMethods = ['solana_getAccounts', 'solana_requestAccounts'];
         _WalletConnectServiceSolana_service.set(this, void 0);
+        _WalletConnectServiceSolana_getAccountsHandler.set(this, {
+            validate: async () => { },
+            process: async (args) => {
+                return [{ pubkey: args.account.address }];
+            },
+        });
+        _WalletConnectServiceSolana_signMessageHandler.set(this, {
+            validate: async (params) => await signMessageParamsSchema.parseAsync(params),
+            process: async (args) => {
+                if (args.params.pubkey !== args.account.address) {
+                    throw new blockchain_service_1.BSError('Public key does not match account address', 'PUBKEY_MISMATCH');
+                }
+                const messageBytes = solanaKit.getBase58Codec().encode(args.params.message);
+                const keypair = await solanaKit.createKeyPairFromBytes(solanaKit.getBase58Encoder().encode(args.account.key));
+                const signatureBuffer = await crypto.subtle.sign('Ed25519', keypair.privateKey, new Uint8Array(messageBytes));
+                const signature = solanaKit.getBase58Codec().decode(new Uint8Array(signatureBuffer));
+                return { signature };
+            },
+        });
+        _WalletConnectServiceSolana_signTransactionHandler.set(this, {
+            validate: async (params) => await signTransactionParamsSchema.parseAsync(params),
+            process: async (args) => {
+                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);
+                return { transaction: signedTransaction };
+            },
+        });
+        _WalletConnectServiceSolana_signAllTransactionsHandler.set(this, {
+            validate: async (params) => await signAndSendTransactionParamsSchema.parseAsync(params),
+            process: async (args) => {
+                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);
+                    signedTransactions.push(signedTransaction);
+                }
+                return {
+                    transactions: signedTransactions,
+                };
+            },
+        });
+        _WalletConnectServiceSolana_signAndSendTransactionHandler.set(this, {
+            validate: async (params) => await signAndSendTransactionOptionsSchema.parseAsync(params),
+            process: async (args) => {
+                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
+                    .sendTransaction(signedTransaction, {
+                    maxRetries: options.maxRetries,
+                    preflightCommitment: options.preflightCommitment,
+                    minContextSlot: options.minContextSlot,
+                    skipPreflight: options.skipPreflight,
+                })
+                    .send();
+                return { signature };
+            },
+        });
         __classPrivateFieldSet(this, _WalletConnectServiceSolana_service, service, "f");
         const networkId = WalletConnectServiceSolana.networkIdByNetworkType[__classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").network.id];
         this.chain = `${this.namespace}:${networkId}`;
-    }
-    async solana_getAccounts(args) {
-        return [{ pubkey: args.account.address }];
-    }
-    async solana_requestAccounts(args) {
-        return await this.solana_getAccounts(args);
-    }
-    async solana_signMessage(args) {
-        if (typeof args.params.message !== 'string' || typeof args.params.pubkey !== 'string') {
-            throw new Error('Invalid params');
-        }
-        if (args.params.pubkey !== args.account.address) {
-            throw new Error('Public key does not match account address');
-        }
-        const messageBytes = solanaKit.getBase58Codec().encode(args.params.message);
-        const keypair = await solanaKit.createKeyPairFromBytes(solanaKit.getBase58Encoder().encode(args.account.key));
-        const signatureBuffer = await crypto.subtle.sign('Ed25519', keypair.privateKey, new Uint8Array(messageBytes));
-        const signature = solanaKit.getBase58Codec().decode(new Uint8Array(signatureBuffer));
-        return { signature };
-    }
-    async solana_signTransaction(args) {
-        if (typeof args.params.transaction !== 'string') {
-            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);
-        return { transaction: signedTransaction };
-    }
-    async solana_signAllTransactions(args) {
-        if (!Array.isArray(args.params.transactions)) {
-            throw new Error('Invalid params');
-        }
-        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);
-            signedTransactions.push(signedTransaction);
-        }
-        return {
-            transactions: signedTransactions,
+        this.handlers = {
+            solana_getAccounts: __classPrivateFieldGet(this, _WalletConnectServiceSolana_getAccountsHandler, "f"),
+            solana_requestAccounts: __classPrivateFieldGet(this, _WalletConnectServiceSolana_getAccountsHandler, "f"),
+            solana_signMessage: __classPrivateFieldGet(this, _WalletConnectServiceSolana_signMessageHandler, "f"),
+            solana_signTransaction: __classPrivateFieldGet(this, _WalletConnectServiceSolana_signTransactionHandler, "f"),
+            solana_signAllTransactions: __classPrivateFieldGet(this, _WalletConnectServiceSolana_signAllTransactionsHandler, "f"),
+            solana_signAndSendTransaction: __classPrivateFieldGet(this, _WalletConnectServiceSolana_signAndSendTransactionHandler, "f"),
         };
     }
-    async solana_signAndSendTransaction(args) {
-        if (typeof args.params.transaction !== 'string') {
-            throw new Error('Invalid params');
-        }
-        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
-            .sendTransaction(signedTransaction, {
-            maxRetries: options.maxRetries,
-            preflightCommitment: options.preflightCommitment,
-            minContextSlot: options.minContextSlot,
-            skipPreflight: options.skipPreflight,
-        })
-            .send();
-        return { signature };
-    }
     async calculateRequestFee(args) {
-        if (typeof args.params.transaction !== 'string') {
-            throw new Error('Invalid params');
-        }
-        const transaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_parseTransaction).call(this, args.params.transaction);
+        const params = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_signAndSendTransactionHandler, "f").validate(args.params).catch(error => {
+            throw new blockchain_service_1.BSError('Params validation failed: ' + error.message, 'INVALID_PARAMS');
+        });
+        const transaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_parseTransaction).call(this, params.transaction);
         const messageBase64 = solanaKit.getBase64Decoder().decode(transaction.messageBytes);
         const feeResponse = await __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f")._solanaKitRpc
             .getFeeForMessage(messageBase64, { commitment: 'confirmed' })
@@ -138,12 +161,11 @@ class WalletConnectServiceSolana {
         if (!feeResponse.value) {
             throw new Error('Failed to calculate fee');
         }
-        const feeBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(feeResponse.value.toString(), __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").feeToken.decimals);
-        return blockchain_service_1.BSBigNumberHelper.toNumber(feeBn).toString();
+        return new blockchain_service_1.BSBigUnitAmount(feeResponse.value.toString(), __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").feeToken.decimals).toHuman().toFormatted();
     }
 }
 exports.WalletConnectServiceSolana = WalletConnectServiceSolana;
-_WalletConnectServiceSolana_service = new WeakMap(), _WalletConnectServiceSolana_instances = new WeakSet(), _WalletConnectServiceSolana_parseTransaction = function _WalletConnectServiceSolana_parseTransaction(encodedTransaction) {
+_WalletConnectServiceSolana_service = new WeakMap(), _WalletConnectServiceSolana_getAccountsHandler = new WeakMap(), _WalletConnectServiceSolana_signMessageHandler = new WeakMap(), _WalletConnectServiceSolana_signTransactionHandler = new WeakMap(), _WalletConnectServiceSolana_signAllTransactionsHandler = new WeakMap(), _WalletConnectServiceSolana_signAndSendTransactionHandler = new WeakMap(), _WalletConnectServiceSolana_instances = new WeakSet(), _WalletConnectServiceSolana_parseTransaction = function _WalletConnectServiceSolana_parseTransaction(encodedTransaction) {
     const transactionBytes = solanaKit.getBase64Encoder().encode(encodedTransaction);
     const transaction = solanaKit.getTransactionCodec().decode(transactionBytes);
     return transaction;

package/dist/types.d.ts

@@ -82,3 +82,4 @@ export type TMetaplexAssetResponse = {
 export type TRpcBDSSolanaParsedInstruction = Extract<TransactionForFullJsonParsed<'legacy'>['transaction']['message']['instructions'][number], {
     parsed: any;
 }>;
+export type TWalletConnectServiceSolanaMethod = 'solana_getAccounts' | 'solana_requestAccounts' | 'solana_signMessage' | 'solana_signTransaction' | 'solana_signAllTransactions' | 'solana_signAndSendTransaction';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-solana",
-  "version": "3.1.9",
+  "version": "3.1.11",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "license": "MIT",
   "author": "Coz",
@@ -15,9 +15,10 @@
     "@solana-program/system": "~0.12.0",
     "@solana-program/token": "~0.11.0",
     "@solana/kit": "~6.1.0",
-    "axios": "~1.13.5",
+    "axios": "~1.15.0",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "3.1.9"
+    "zod": "~4.3.6",
+    "@cityofzion/blockchain-service": "3.1.11"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.30.0",