@tonappchain/sdk 0.7.0-rc31 → 0.7.0-rc33

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.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/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-rc33",
   "repository": "https://github.com/TacBuild/tac-sdk.git",
   "author": "TAC. <developers@tac>",
   "license": "MIT",