@cityofzion/bs-multichain 3.1.10 → 3.1.11

package/dist/features/bridge/Neo3NeoXBridgeOrchestrator.js

@@ -153,14 +153,14 @@ class Neo3NeoXBridgeOrchestrator {
             const constants = await neo3NeoXBridgeService.getBridgeConstants(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value);
             __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { value: constants.bridgeMinAmount }, "a", _Neo3NeoXBridgeOrchestrator_amountToUseMin_set);
             __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { value: constants.bridgeFee }, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_set);
-            const bridgeMaxAmountBn = blockchain_service_1.BSBigNumberHelper.fromNumber(constants.bridgeMaxAmount);
-            const tokenBalanceAmountBn = blockchain_service_1.BSBigNumberHelper.fromNumber(tokenToUseBalance?.amount ?? 0);
+            const bridgeMaxAmountBn = new blockchain_service_1.BSBigHumanAmount(constants.bridgeMaxAmount);
+            const tokenBalanceAmountBn = new blockchain_service_1.BSBigHumanAmount(tokenToUseBalance?.amount);
             const isFeeToken = this.fromService.tokenService.predicateByHash(this.fromService.feeToken, __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value);
             const maxTokenBalanceAmountBn = isFeeToken
                 ? tokenBalanceAmountBn.minus(constants.bridgeFee)
                 : tokenBalanceAmountBn;
-            const max = blockchain_service_1.BSBigNumber.max(0, blockchain_service_1.BSBigNumber.min(bridgeMaxAmountBn, maxTokenBalanceAmountBn));
-            __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { value: blockchain_service_1.BSBigNumberHelper.format(max, { decimals: __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value.decimals }) }, "a", _Neo3NeoXBridgeOrchestrator_amountToUseMax_set);
+            const amountToUseMax = new blockchain_service_1.BSBigHumanAmount(blockchain_service_1.BSBigNumber.max(0, blockchain_service_1.BSBigNumber.min(bridgeMaxAmountBn, maxTokenBalanceAmountBn)), __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value.decimals).toFormatted();
+            __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { value: amountToUseMax }, "a", _Neo3NeoXBridgeOrchestrator_amountToUseMax_set);
         }
         catch (error) {
             const treatedError = __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "m", _Neo3NeoXBridgeOrchestrator_treatError).call(this, error);
@@ -187,7 +187,8 @@ class Neo3NeoXBridgeOrchestrator {
         __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_amountToUseTimeout, setTimeout(async () => {
             if (!__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value)
                 return;
-            const formattedAmount = blockchain_service_1.BSBigNumberHelper.format(amount, { decimals: __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value.decimals });
+            const amountToUseBn = new blockchain_service_1.BSBigHumanAmount(amount, __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value.decimals);
+            const formattedAmount = amountToUseBn.toFormatted();
             __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { value: formattedAmount }, "a", _Neo3NeoXBridgeOrchestrator_amountToReceive_set);
             __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { value: formattedAmount }, "a", _Neo3NeoXBridgeOrchestrator_amountToUse_set);
             try {
@@ -201,7 +202,6 @@ class Neo3NeoXBridgeOrchestrator {
                 }
                 __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { loading: true }, "a", _Neo3NeoXBridgeOrchestrator_amountToUse_set);
                 __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { loading: true }, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_set);
-                const amountToUseBn = blockchain_service_1.BSBigNumberHelper.fromNumber(formattedAmount);
                 if (amountToUseBn.isLessThan(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_amountToUseMin_get).value)) {
                     throw new blockchain_service_1.BSError('Amount is below the minimum', 'AMOUNT_BELOW_MINIMUM');
                 }
@@ -217,12 +217,10 @@ class Neo3NeoXBridgeOrchestrator {
                 })
                     .then(fee => fee)
                     .catch(() => '0');
-                const newBridgeFee = blockchain_service_1.BSBigNumberHelper.fromNumber(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_get).value).plus(approvalFee);
-                __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, {
-                    value: blockchain_service_1.BSBigNumberHelper.format(newBridgeFee, { decimals: this.fromService.feeToken.decimals }),
-                }, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_set);
+                const newBridgeFeeBn = new blockchain_service_1.BSBigHumanAmount(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_get).value, this.fromService.feeToken.decimals).plus(approvalFee);
+                __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { value: newBridgeFeeBn.toFormatted() }, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_set);
                 const isFeeToken = this.fromService.tokenService.predicateByHash(this.fromService.feeToken, __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value);
-                if (newBridgeFee.plus(isFeeToken ? amountToUseBn : 0).isGreaterThan(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_feeTokenBalance, "f")?.amount ?? 0)) {
+                if (newBridgeFeeBn.plus(isFeeToken ? amountToUseBn : 0).isGreaterThan(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_feeTokenBalance, "f")?.amount ?? 0)) {
                     throw new blockchain_service_1.BSError('You do not have enough fee token balance to cover the bridge fee', 'INSUFFICIENT_FEE_TOKEN_BALANCE');
                 }
                 __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { valid: true, error: null }, "a", _Neo3NeoXBridgeOrchestrator_amountToUse_set);

package/dist/features/swap/SimpleSwapOrchestrator.js

@@ -96,9 +96,7 @@ class SimpleSwapOrchestrator {
         __classPrivateFieldSet(this, _SimpleSwapOrchestrator_amountToUseTimeout, setTimeout(() => {
             __classPrivateFieldSet(this, _SimpleSwapOrchestrator_instances, {
                 value: __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_amountToUse_get).value
-                    ? blockchain_service_1.BSBigNumberHelper.format(__classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_amountToUse_get).value, {
-                        decimals: __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToUse_get).value?.decimals,
-                    })
+                    ? new blockchain_service_1.BSBigHumanAmount(__classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_amountToUse_get).value, __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToUse_get).value?.decimals).toFormatted()
                     : __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_amountToUse_get).value,
             }, "a", _SimpleSwapOrchestrator_amountToUse_set);
             __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "m", _SimpleSwapOrchestrator_recalculateValues).call(this, ['amountToReceive']);
@@ -369,23 +367,18 @@ _SimpleSwapOrchestrator_api = new WeakMap(), _SimpleSwapOrchestrator_blockchainS
                     const { decimals } = __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToUse_get).value;
                     const rangeResponse = await __classPrivateFieldGet(this, _SimpleSwapOrchestrator_api, "f").getRange(__classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToUse_get).value, __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToReceive_get).value);
                     // Add 1% because the SimpleSwap sends us a smaller minimum than the required
-                    const minWithOnePercent = blockchain_service_1.BSBigNumberHelper.format((Number(rangeResponse.min) * 1.01).toString(), {
-                        decimals,
-                    });
+                    const minWithOnePercentBn = new blockchain_service_1.BSBigHumanAmount(rangeResponse.min, decimals).multipliedBy(1.01);
                     // Add the smallest number to round up correctly because the SimpleSwap doesn't have the decimals, and we need to apply the decimals here
                     const smallestNumberToRoundUp = decimals ? `0.${'2'.padStart(decimals, '0')}` : '1';
-                    range = {
-                        min: blockchain_service_1.BSBigNumberHelper.format(Number(minWithOnePercent) + Number(smallestNumberToRoundUp), {
-                            decimals,
-                        }),
-                        max: rangeResponse.max ? blockchain_service_1.BSBigNumberHelper.format(rangeResponse.max, { decimals }) : rangeResponse.max,
-                    };
+                    const min = minWithOnePercentBn.plus(smallestNumberToRoundUp).toFormatted();
+                    const max = rangeResponse.max ? new blockchain_service_1.BSBigHumanAmount(rangeResponse.max, decimals).toFormatted() : null;
+                    range = { min, max };
                 }
                 __classPrivateFieldSet(this, _SimpleSwapOrchestrator_instances, { value: range }, "a", _SimpleSwapOrchestrator_amountToUseMinMax_set);
                 if (shouldRecalculateAmountToUse && range) {
                     __classPrivateFieldSet(this, _SimpleSwapOrchestrator_instances, {
                         value: range.min
-                            ? blockchain_service_1.BSBigNumberHelper.format(range.min, { decimals: __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToUse_get).value.decimals })
+                            ? new blockchain_service_1.BSBigHumanAmount(range.min, __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToUse_get).value.decimals).toFormatted()
                             : range.min,
                     }, "a", _SimpleSwapOrchestrator_amountToUse_set);
                 }

package/dist/features/wallet-connect/WalletKitHelper.d.ts

@@ -2,7 +2,7 @@ import { type IBlockchainService, type IBSWithWalletConnect, type TBSNetworkId }
 import { ErrorResponse } from '@walletconnect/jsonrpc-utils';
 import type { PendingRequestTypes, SessionTypes } from '@walletconnect/types';
 import { SdkErrorKey } from '@walletconnect/utils';
-import type { TWalletKitHelperFilterSessionsParams, TWalletKitHelperGetProposalDetailsParams, TWalletKitHelperGetSessionDetailsParams, TWalletKitHelperProcessRequestParams, TWalletKitHelperProposalDetails, TWalletKitHelperSessionDetails, TWalletKitHelperGetProposalServicesParams } from './types';
+import type { TWalletKitHelperFilterSessionsParams, TWalletKitHelperGetProposalDetailsParams, TWalletKitHelperGetSessionDetailsParams, TWalletKitHelperProcessRequestParams, TWalletKitHelperProposalDetails, TWalletKitHelperSessionDetails, TWalletKitHelperGetProposalServicesParams, TWalletKitHelperValidateRequestParams } from './types';
 export declare class WalletKitHelper {
     static getProposalDetails({ address, proposal, service, }: TWalletKitHelperGetProposalDetailsParams): TWalletKitHelperProposalDetails;
     static getProposalServices({ proposal, services }: TWalletKitHelperGetProposalServicesParams): (IBlockchainService<"ethereum" | "polygon" | "base" | "arbitrum" | "neo3" | "neoLegacy" | "neox" | "solana" | "stellar" | "bitcoin", TBSNetworkId> & IBSWithWalletConnect<"ethereum" | "polygon" | "base" | "arbitrum" | "neo3" | "neoLegacy" | "neox" | "solana" | "stellar" | "bitcoin">)[];
@@ -13,7 +13,11 @@ export declare class WalletKitHelper {
     };
     static formatRequestResult(request: PendingRequestTypes.Struct, response: any): import("@walletconnect/jsonrpc-utils").JsonRpcResult<any>;
     static formatRequestError(request: PendingRequestTypes.Struct, reason: ErrorResponse): import("@walletconnect/jsonrpc-utils").JsonRpcError;
-    static processRequest({ sessionDetails, account, request }: TWalletKitHelperProcessRequestParams): Promise<any>;
+    static validateRequest({ account, sessionDetails, request }: TWalletKitHelperValidateRequestParams): Promise<{
+        handler: import("@cityofzion/blockchain-service").TWalletConnectServiceMethodHandler<"ethereum" | "polygon" | "base" | "arbitrum" | "neo3" | "neoLegacy" | "neox" | "solana" | "stellar" | "bitcoin", any>;
+        validatedParams: any;
+    }>;
+    static processRequest({ account, request, sessionDetails }: TWalletKitHelperProcessRequestParams): Promise<any>;
     static filterSessions(sessions: SessionTypes.Struct[], filters: TWalletKitHelperFilterSessionsParams): SessionTypes.Struct[];
     static isValidURI(uri: string): boolean;
 }

package/dist/features/wallet-connect/WalletKitHelper.js

@@ -54,7 +54,7 @@ class WalletKitHelper {
     static formatRequestError(request, reason) {
         return (0, jsonrpc_utils_1.formatJsonRpcError)(request.id, reason ?? (0, utils_1.getSdkError)('USER_REJECTED'));
     }
-    static async processRequest({ sessionDetails, account, request }) {
+    static async validateRequest({ account, sessionDetails, request }) {
         if (account.address !== sessionDetails.address) {
             throw new blockchain_service_1.BSError('Account address does not match session address', 'INVALID_ACCOUNT');
         }
@@ -62,12 +62,22 @@ class WalletKitHelper {
         if (!sessionDetails.methods.includes(method)) {
             throw new blockchain_service_1.BSError('Method not supported by session', 'UNSUPPORTED_METHOD');
         }
-        const serviceMethod = sessionDetails.service.walletConnectService[method];
-        if (!serviceMethod || typeof serviceMethod !== 'function')
+        const handler = sessionDetails.service.walletConnectService.handlers[method];
+        if (!handler)
             throw new blockchain_service_1.BSError('Method not supported', 'UNSUPPORTED_METHOD');
-        const response = await serviceMethod.apply(sessionDetails.service.walletConnectService, [
-            { account, params: request.params.request.params },
-        ]);
+        const validatedParams = await handler.validate(request.params.request.params);
+        return {
+            handler,
+            validatedParams,
+        };
+    }
+    static async processRequest({ account, request, sessionDetails }) {
+        const { handler, validatedParams } = await this.validateRequest({ account, request, sessionDetails });
+        const response = await handler.process({
+            account,
+            params: validatedParams,
+            method: request.params.request.method,
+        });
         return response;
     }
     static filterSessions(sessions, filters) {

package/dist/features/wallet-connect/types.d.ts

@@ -31,6 +31,11 @@ export type TWalletKitHelperProcessRequestParams = {
     sessionDetails: TWalletKitHelperSessionDetails;
     account: TBSAccount<TBSServiceName>;
 };
+export type TWalletKitHelperValidateRequestParams = {
+    request: PendingRequestTypes.Struct;
+    sessionDetails: TWalletKitHelperSessionDetails;
+    account: TBSAccount<TBSServiceName>;
+};
 export type TWalletKitHelperFilterSessionsParams = {
     addresses?: string[];
     chains?: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-multichain",
-  "version": "3.1.10",
+  "version": "3.1.11",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "license": "GPL-3.0-only",
   "author": "Coz",
@@ -13,7 +13,7 @@
     "@walletconnect/utils": "~2.21.9",
     "@walletconnect/jsonrpc-utils": "~1.0.8",
     "axios": "~1.15.0",
-    "@cityofzion/blockchain-service": "3.1.10"
+    "@cityofzion/blockchain-service": "3.1.11"
   },
   "devDependencies": {
     "@types/node": "~24.5.2",
@@ -23,13 +23,13 @@
     "typed-emitter": "~2.1.0",
     "typescript": "~5.9.2",
     "vitest": "~4.0.18",
-    "@cityofzion/bs-bitcoin": "3.1.10",
-    "@cityofzion/bs-ethereum": "3.1.10",
-    "@cityofzion/bs-neo3": "3.1.10",
-    "@cityofzion/bs-neox": "3.1.10",
-    "@cityofzion/bs-solana": "3.1.10",
-    "@cityofzion/bs-neo-legacy": "3.1.10",
-    "@cityofzion/bs-stellar": "3.1.10"
+    "@cityofzion/bs-bitcoin": "3.1.11",
+    "@cityofzion/bs-ethereum": "3.1.11",
+    "@cityofzion/bs-neo3": "3.1.11",
+    "@cityofzion/bs-neox": "3.1.11",
+    "@cityofzion/bs-solana": "3.1.11",
+    "@cityofzion/bs-neo-legacy": "3.1.11",
+    "@cityofzion/bs-stellar": "3.1.11"
   },
   "scripts": {
     "build": "rm -rf ./dist && rm -f *.tgz && npm run typecheck && tsc --project tsconfig.build.json",