@tonappchain/sdk 0.7.0-rc31 → 0.7.0-rc34

package/dist/src/agnosticSdk/AbiHandler.js

@@ -56,7 +56,7 @@ class AbiHandler {
         // Build parameter list with proper tuple handling
         const params = func.inputs
             .map((input) => {
-            let paramType = this._buildParameterType(input);
+            const paramType = this._buildParameterType(input);
             // Add parameter name if available
             if (input.name) {
                 return `${paramType} ${input.name}`;

package/dist/src/agnosticSdk/HooksHandler.js

@@ -30,7 +30,7 @@ class HooksHandler {
         }
         const customHookData = {
             isFromSAPerspective,
-            contractAddress,
+            contractAddress: ethers_1.ethers.getAddress(contractAddress.toLowerCase()), // Normalize address to checksum format
             value,
             data,
             improvedMissionInfo,

package/dist/src/errors/instances.d.ts

@@ -31,4 +31,4 @@ export declare const missingDecimals: MetadataError;
 export declare const missingJettonDataError: MetadataError;
 export declare const zeroRawAmountError: (assetAddress: string) => TokenError;
 export declare const sendCrossChainTransactionFailedError: (msg: string) => WalletError;
-export declare const convertCurrencyZeroValueError: FormatError;
+export declare const convertCurrencyNegativeOrZeroValueError: FormatError;

package/dist/src/errors/instances.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertCurrencyZeroValueError = exports.sendCrossChainTransactionFailedError = exports.zeroRawAmountError = exports.missingJettonDataError = exports.missingDecimals = exports.missingGasLimitError = exports.missingTvmExecutorFeeError = exports.missingFeeParamsError = exports.getTONFeeInfoFetchError = exports.simulationFetchError = exports.convertCurrencyFetchError = exports.indexRequiredError = exports.unknownTokenTypeError = exports.insufficientBalanceError = exports.allContractOpenerFailedError = exports.allEndpointsFailedError = exports.noValidGroupFoundError = exports.prepareMessageGroupError = exports.invalidAssetType = exports.emptyArrayError = exports.profilingFetchError = exports.invalidMethodNameError = exports.emptySettingError = exports.prefixError = exports.notMultiplyOf8Error = exports.unsupportedFormatError = exports.unsupportedKeyError = exports.unknownWalletError = exports.evmAddressError = exports.tvmAddressError = exports.statusFetchError = exports.operationFetchError = exports.emptyContractError = void 0;
+exports.convertCurrencyNegativeOrZeroValueError = exports.sendCrossChainTransactionFailedError = exports.zeroRawAmountError = exports.missingJettonDataError = exports.missingDecimals = exports.missingGasLimitError = exports.missingTvmExecutorFeeError = exports.missingFeeParamsError = exports.getTONFeeInfoFetchError = exports.simulationFetchError = exports.convertCurrencyFetchError = exports.indexRequiredError = exports.unknownTokenTypeError = exports.insufficientBalanceError = exports.allContractOpenerFailedError = exports.allEndpointsFailedError = exports.noValidGroupFoundError = exports.prepareMessageGroupError = exports.invalidAssetType = exports.emptyArrayError = exports.profilingFetchError = exports.invalidMethodNameError = exports.emptySettingError = exports.prefixError = exports.notMultiplyOf8Error = exports.unsupportedFormatError = exports.unsupportedKeyError = exports.unknownWalletError = exports.evmAddressError = exports.tvmAddressError = exports.statusFetchError = exports.operationFetchError = exports.emptyContractError = void 0;
 const errors_1 = require("./errors");
 exports.emptyContractError = new errors_1.ContractError('unexpected empty contract code of given jetton.', 100);
 const operationFetchError = (msg, inner) => new errors_1.FetchError(`failed to fetch OperationId: ${msg}`, 101, inner);
@@ -30,7 +30,7 @@ exports.invalidAssetType = new errors_1.FormatError('Invalid asset type', 114);
 const prepareMessageGroupError = (isBocSizeValid, isDepthValid) => new errors_1.PrepareMessageGroupError(`Failed to prepare message group: BOC size valid: ${isBocSizeValid}, depth valid: ${isDepthValid}`, 115);
 exports.prepareMessageGroupError = prepareMessageGroupError;
 exports.noValidGroupFoundError = new errors_1.NoValidGroupFoundError('Failed to prepare valid message group', 116);
-const allEndpointsFailedError = (inner) => new errors_1.FetchError('All endpoints failed', 117, inner);
+const allEndpointsFailedError = (inner) => new errors_1.FetchError('All endpoints failed, last err: ' + inner.message, 117, inner);
 exports.allEndpointsFailedError = allEndpointsFailedError;
 const allContractOpenerFailedError = (inner) => new errors_1.FetchError('All contract opener failed', 118, inner);
 exports.allContractOpenerFailedError = allContractOpenerFailedError;
@@ -55,4 +55,4 @@ const zeroRawAmountError = (assetAddress) => new errors_1.TokenError(`FT asset w
 exports.zeroRawAmountError = zeroRawAmountError;
 const sendCrossChainTransactionFailedError = (msg) => new errors_1.WalletError(`failed to send cross chain transaction: ${msg}`, 131);
 exports.sendCrossChainTransactionFailedError = sendCrossChainTransactionFailedError;
-exports.convertCurrencyZeroValueError = new errors_1.FormatError('Value cannot be zero for currency conversion', 132);
+exports.convertCurrencyNegativeOrZeroValueError = new errors_1.FormatError('Value cannot be negative or zero for currency conversion', 132);

package/dist/src/sdk/LiteSequencerClient.js

@@ -123,9 +123,6 @@ class LiteSequencerClient {
         }
     }
     async convertCurrency(params) {
-        if (params.value === 0n) {
-            throw instances_1.convertCurrencyZeroValueError;
-        }
         try {
             const payload = {
                 currency: params.currency,

package/dist/src/sdk/Logger.d.ts

@@ -6,8 +6,8 @@ export declare class ConsoleLogger implements ILogger {
     error(...arg: unknown[]): void;
 }
 export declare class NoopLogger implements ILogger {
-    debug(): void;
-    info(): void;
-    warn(): void;
-    error(): void;
+    debug(..._arg: unknown[]): void;
+    info(..._arg: unknown[]): void;
+    warn(..._arg: unknown[]): void;
+    error(..._arg: unknown[]): void;
 }

package/dist/src/sdk/Logger.js

@@ -17,9 +17,17 @@ class ConsoleLogger {
 }
 exports.ConsoleLogger = ConsoleLogger;
 class NoopLogger {
-    debug() { }
-    info() { }
-    warn() { }
-    error() { }
+    debug(..._arg) {
+        void _arg;
+    }
+    info(..._arg) {
+        void _arg;
+    }
+    warn(..._arg) {
+        void _arg;
+    }
+    error(..._arg) {
+        void _arg;
+    }
 }
 exports.NoopLogger = NoopLogger;

package/dist/src/sdk/OperationTracker.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationTracker = exports.DefaultLiteSequencerClientFactory = void 0;
 const artifacts_1 = require("../../artifacts");
 const errors_1 = require("../errors");
+const instances_1 = require("../errors/instances");
 const Struct_1 = require("../structs/Struct");
 const LiteSequencerClient_1 = require("./LiteSequencerClient");
 const Logger_1 = require("./Logger");
@@ -239,6 +240,9 @@ class OperationTracker {
         return Struct_1.SimplifiedStatuses.SUCCESSFUL;
     }
     async convertCurrency(params, waitOptions) {
+        if (params.value <= 0n) {
+            throw instances_1.convertCurrencyNegativeOrZeroValueError;
+        }
         this.logger.debug(`Converting currency: ${(0, Utils_1.formatObjectForLogging)(params)}`);
         const requestFn = async () => {
             let lastError;

package/dist/src/sdk/Simulator.js

@@ -27,7 +27,7 @@ class Simulator {
         Validator_1.Validator.validateEVMAddress(evmProxyMsg.evmTargetAddress);
         Validator_1.Validator.validateEVMAddresses(evmValidExecutors);
         Validator_1.Validator.validateTVMAddresses(tvmValidExecutors);
-        const aggregatedData = await (0, Utils_1.aggregateTokens)(assets);
+        const aggregatedData = (0, Utils_1.aggregateTokens)(assets);
         const shardCount = aggregatedData.jettons.length || 1;
         const transactionLinker = (0, Utils_1.generateTransactionLinker)(sender.getSenderAddress(), shardCount);
         const tacSimulationParams = {

package/dist/src/sdk/TONTransactionManager.d.ts

@@ -1,13 +1,13 @@
 import { IConfiguration, ILogger, IOperationTracker, ISimulator, ITONTransactionManager } from '../interfaces';
 import type { SenderAbstraction } from '../sender';
-import { BatchCrossChainTx, CrossChainTransactionsOptions, CrosschainTx, EvmProxyMsg, TransactionLinkerWithOperationId } from '../structs/Struct';
+import { BatchCrossChainTx, CrossChainTransactionOptions, CrossChainTransactionsOptions, CrosschainTx, EvmProxyMsg, FeeParams, TransactionLinkerWithOperationId } from '../structs/Struct';
 export declare class TONTransactionManager implements ITONTransactionManager {
     private readonly config;
     private readonly simulator;
     private readonly operationTracker;
     private readonly logger;
     constructor(config: IConfiguration, simulator: ISimulator, operationTracker: IOperationTracker, logger?: ILogger);
-    private buildFeeParams;
+    protected buildFeeParams(options: CrossChainTransactionOptions, evmProxyMsg: EvmProxyMsg, sender: SenderAbstraction, tx: CrosschainTx): Promise<FeeParams>;
     private prepareCrossChainTransaction;
     private generateCrossChainMessages;
     sendCrossChainTransaction(evmProxyMsg: EvmProxyMsg, sender: SenderAbstraction, tx: CrosschainTx): Promise<TransactionLinkerWithOperationId>;

package/dist/src/sdk/TONTransactionManager.js

@@ -54,7 +54,7 @@ class TONTransactionManager {
         const { allowSimulationError = false, isRoundTrip = undefined, calculateRollbackFee = true, validateAssetsBalance = true, } = options || {};
         const { evmValidExecutors = [], tvmValidExecutors = [] } = options || {};
         Validator_1.Validator.validateEVMAddress(evmProxyMsg.evmTargetAddress);
-        const aggregatedData = await (0, Utils_1.aggregateTokens)(assets);
+        const aggregatedData = (0, Utils_1.aggregateTokens)(assets);
         Validator_1.Validator.validateEVMAddresses(evmValidExecutors);
         Validator_1.Validator.validateTVMAddresses(tvmValidExecutors);
         const shouldValidateAssets = validateAssetsBalance && !skipAssetsBalanceValidation;
@@ -183,7 +183,7 @@ class TONTransactionManager {
         if (txsRequiringValidation.length) {
             // Aggregate only assets from txs that require validation and validate once per unique asset
             const assetsToValidate = txsRequiringValidation.flatMap((tx) => tx.assets ?? []);
-            const aggregatedData = await (0, Utils_1.aggregateTokens)(assetsToValidate);
+            const aggregatedData = (0, Utils_1.aggregateTokens)(assetsToValidate);
             await Promise.all([
                 ...aggregatedData.jettons.map((jetton) => jetton.checkCanBeTransferredBy(caller)),
                 ...aggregatedData.nfts.map((nft) => nft.checkCanBeTransferredBy(caller)),

package/dist/src/sdk/TxFinalizer.js

@@ -46,6 +46,9 @@ class TonTxFinalizer {
                 const errorMessage = error.message;
                 // Rate limit error (429) - retry
                 if (errorMessage.includes('429')) {
+                    if (i > 0) {
+                        await (0, Utils_1.sleep)(delay);
+                    }
                     continue;
                 }
                 // Log all errors except 404 Not Found
@@ -53,8 +56,10 @@ class TonTxFinalizer {
                     const logMessage = error instanceof Error ? error.message : error;
                     console.warn(`Failed to fetch adjacent transactions for ${hash}:`, logMessage);
                 }
+                if (i > 0) {
+                    await (0, Utils_1.sleep)(delay);
+                }
             }
-            await (0, Utils_1.sleep)(delay);
         }
         return [];
     }

package/dist/src/sdk/Utils.d.ts

@@ -20,11 +20,11 @@ export declare const generateFeeData: (feeParams?: FeeParams) => Cell | undefine
 export declare function waitUntilSuccess<T, TContext = unknown, A extends unknown[] = unknown[]>(options: WaitOptions<T, TContext> | undefined, operation: (...args: A) => Promise<T>, operationDescription?: string, ...args: A): Promise<T>;
 export declare function formatObjectForLogging(obj: unknown): string;
 export declare function getBouncedAddress(tvmAddress: string): string;
-export declare function aggregateTokens(assets?: Asset[]): Promise<{
+export declare function aggregateTokens(assets?: Asset[]): {
     jettons: FT[];
     nfts: NFT[];
     ton?: TON;
-}>;
+};
 export declare function sha256toBigInt(ContractName: string): bigint;
 export declare function mapAssetsToTonAssets(assets: Asset[]): TONAsset[];
 export declare function normalizeAsset(config: IConfiguration, input: AssetLike): Promise<Asset>;

package/dist/src/sdk/Utils.js

@@ -199,39 +199,30 @@ function getBouncedAddress(tvmAddress) {
         bounceable: true,
     });
 }
-async function aggregateTokens(assets) {
-    const uniqueAssetsMap = new Map();
+function aggregateTokens(assets) {
+    const jettonsMap = new Map();
+    const nftsMap = new Map();
     let ton;
-    for await (const asset of assets ?? []) {
-        if (asset.type !== Struct_1.AssetType.FT)
-            continue;
-        if (asset.rawAmount === 0n) {
+    for (const asset of assets ?? []) {
+        if (asset.rawAmount === 0n && asset.type === Struct_1.AssetType.FT) {
             throw (0, errors_1.zeroRawAmountError)(asset.address || 'NATIVE TON');
         }
-        if (!asset.address) {
-            ton = ton ? ton.addRawAmount(asset.rawAmount) : asset.clone;
-            continue;
-        }
-        let jetton = uniqueAssetsMap.get(asset.address);
-        if (!jetton) {
-            jetton = asset.clone;
+        if (asset.type === Struct_1.AssetType.FT) {
+            if (!asset.address) {
+                ton = ton ? ton.addRawAmount(asset.rawAmount) : asset.clone;
+            }
+            else {
+                const existing = jettonsMap.get(asset.address);
+                jettonsMap.set(asset.address, (existing ? existing.addRawAmount(asset.rawAmount) : asset.clone));
+            }
         }
-        else {
-            jetton = jetton.addRawAmount(asset.rawAmount);
+        else if (asset.type === Struct_1.AssetType.NFT) {
+            nftsMap.set(asset.address, asset.clone);
         }
-        uniqueAssetsMap.set(asset.address, jetton);
-    }
-    const jettons = Array.from(uniqueAssetsMap.values());
-    uniqueAssetsMap.clear();
-    for await (const asset of assets ?? []) {
-        if (asset.type !== Struct_1.AssetType.NFT)
-            continue;
-        uniqueAssetsMap.set(asset.address, asset.clone);
     }
-    const nfts = Array.from(uniqueAssetsMap.values());
     return {
-        jettons,
-        nfts,
+        jettons: Array.from(jettonsMap.values()),
+        nfts: Array.from(nftsMap.values()),
         ton,
     };
 }
@@ -240,7 +231,11 @@ function sha256toBigInt(ContractName) {
     return BigInt('0x' + hash.toString('hex'));
 }
 function mapAssetsToTonAssets(assets) {
-    return assets.map((asset) => ({
+    const { jettons, nfts, ton } = aggregateTokens(assets);
+    const result = [...jettons, ...nfts];
+    if (ton)
+        result.push(ton);
+    return result.map((asset) => ({
         amount: asset.rawAmount.toString(),
         tokenAddress: asset.address || '',
         assetType: asset.type,
@@ -268,9 +263,15 @@ async function normalizeAsset(config, input) {
         const asset = await assets_1.AssetFactory.from(config, ftArgs);
         const rawAmount = 'rawAmount' in input ? input.rawAmount : undefined;
         const amount = 'amount' in input ? input.amount : 0;
+        if (!rawAmount && !amount && asset.type === Struct_1.AssetType.FT) {
+            throw (0, errors_1.zeroRawAmountError)(asset.address || 'NATIVE TON');
+        }
         return rawAmount ? asset.withRawAmount(rawAmount) : asset.withAmount(amount);
     }
     catch (e) {
+        if (e instanceof errors_1.TokenError && e.errorCode === (0, errors_1.zeroRawAmountError)('').errorCode) {
+            throw e;
+        }
         console.warn('Failed to normalize FT asset', e);
     }
     const itemArgs = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonappchain/sdk",
-  "version": "0.7.0-rc31",
+  "version": "0.7.0-rc34",
   "repository": "https://github.com/TacBuild/tac-sdk.git",
   "author": "TAC. <developers@tac>",
   "license": "MIT",