@tonappchain/sdk 0.7.0-rc9 → 0.7.1

package/dist/{sdk → src/sdk}/Utils.js

@@ -10,9 +10,19 @@ exports.generateTransactionLinker = generateTransactionLinker;
 exports.calculateEVMTokenAddress = calculateEVMTokenAddress;
 exports.waitUntilSuccess = waitUntilSuccess;
 exports.formatObjectForLogging = formatObjectForLogging;
+exports.getBouncedAddress = getBouncedAddress;
 exports.aggregateTokens = aggregateTokens;
+exports.sha256toBigInt = sha256toBigInt;
+exports.mapAssetsToTonAssets = mapAssetsToTonAssets;
+exports.normalizeAsset = normalizeAsset;
+exports.normalizeAssets = normalizeAssets;
+exports.getAddressString = getAddressString;
+exports.getNumber = getNumber;
+exports.getString = getString;
 const ton_1 = require("@ton/ton");
 const ethers_1 = require("ethers");
+const ton_crypto_1 = require("ton-crypto");
+const assets_1 = require("../assets");
 const errors_1 = require("../errors");
 const Struct_1 = require("../structs/Struct");
 const Consts_1 = require("./Consts");
@@ -131,12 +141,14 @@ const generateFeeData = (feeParams) => {
     }
 };
 exports.generateFeeData = generateFeeData;
-async function waitUntilSuccess(options = {}, operation, ...args) {
+async function waitUntilSuccess(options = {}, operation, operationDescription, ...args) {
     const timeout = options.timeout ?? 300000;
     const maxAttempts = options.maxAttempts ?? 30;
     const delay = options.delay ?? 10000;
     const successCheck = options.successCheck;
-    options.logger?.debug(`Starting wait for success with timeout=${timeout}ms, maxAttempts=${maxAttempts}, delay=${delay}ms`);
+    const context = options.context;
+    const contextPrefix = operationDescription ? `[${operationDescription}] ` : '';
+    options.logger?.debug(`${contextPrefix}Starting wait for success with timeout=${timeout}ms, maxAttempts=${maxAttempts}, delay=${delay}ms`);
     const startTime = Date.now();
     let attempt = 1;
     while (true) {
@@ -144,27 +156,36 @@ async function waitUntilSuccess(options = {}, operation, ...args) {
         const elapsedTime = currentTime - startTime;
         try {
             const result = await operation(...args);
-            if (!result) {
+            if (result === undefined || result === null) {
                 throw new Error(`Empty result`);
             }
-            options.logger?.debug(`Result: ${formatObjectForLogging(result)}`);
-            if (successCheck && !successCheck(result)) {
+            options.logger?.debug(`${contextPrefix}Result: ${formatObjectForLogging(result)}`);
+            if (successCheck && !successCheck(result, context)) {
                 throw new Error(`Result is not successful`);
             }
-            options.logger?.debug(`Attempt ${attempt} successful`);
+            options.logger?.debug(`${contextPrefix}Attempt ${attempt} successful`);
+            // Execute custom onSuccess callback if provided
+            if (options.onSuccess) {
+                try {
+                    await options.onSuccess(result, context);
+                }
+                catch (callbackError) {
+                    options.logger?.warn(`${contextPrefix}onSuccess callback error: ${callbackError}`);
+                }
+            }
             return result;
         }
         catch (error) {
             if (elapsedTime >= timeout) {
-                options.logger?.debug(`Timeout after ${elapsedTime}ms`);
+                options.logger?.debug(`${contextPrefix}Timeout after ${elapsedTime}ms`);
                 throw error;
             }
             if (attempt >= maxAttempts) {
-                options.logger?.debug(`Max attempts (${maxAttempts}) reached`);
+                options.logger?.debug(`${contextPrefix}Max attempts (${maxAttempts}) reached`);
                 throw error;
             }
-            options.logger?.debug(`Error on attempt ${attempt}: ${error}`);
-            options.logger?.debug(`Waiting ${delay}ms before next attempt`);
+            options.logger?.debug(`${contextPrefix}Error on attempt ${attempt}: ${error}`);
+            options.logger?.debug(`${contextPrefix}Waiting ${delay}ms before next attempt`);
             await (0, exports.sleep)(delay);
             attempt++;
         }
@@ -173,36 +194,108 @@ async function waitUntilSuccess(options = {}, operation, ...args) {
 function formatObjectForLogging(obj) {
     return JSON.stringify(obj, (key, value) => (typeof value === 'bigint' ? value.toString() : value));
 }
-async function aggregateTokens(assets) {
-    const uniqueAssetsMap = new Map();
+function getBouncedAddress(tvmAddress) {
+    return ton_1.Address.parse(tvmAddress).toString({
+        bounceable: true,
+    });
+}
+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.address) {
-            ton = ton ? await ton.addAmount({ rawAmount: asset.rawAmount }) : asset.clone;
-            continue;
+    for (const asset of assets ?? []) {
+        if (asset.rawAmount === 0n && asset.type === Struct_1.AssetType.FT) {
+            throw (0, errors_1.zeroRawAmountError)(asset.address || 'NATIVE TON');
         }
-        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 = await jetton.addAmount({ rawAmount: 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,
     };
 }
+function sha256toBigInt(ContractName) {
+    const hash = (0, ton_crypto_1.sha256_sync)(ContractName);
+    return BigInt('0x' + hash.toString('hex'));
+}
+function mapAssetsToTonAssets(assets) {
+    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,
+    }));
+}
+async function normalizeAsset(config, input) {
+    if (typeof input.generatePayload === 'function') {
+        return input;
+    }
+    const address = 'address' in input && input.address ? input.address : '';
+    if ('itemIndex' in input) {
+        const args = {
+            address,
+            tokenType: Struct_1.AssetType.NFT,
+            addressType: Struct_1.NFTAddressType.COLLECTION,
+            index: BigInt(input.itemIndex),
+        };
+        return await assets_1.AssetFactory.from(config, args);
+    }
+    try {
+        const ftArgs = {
+            address,
+            tokenType: Struct_1.AssetType.FT,
+        };
+        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 = {
+        address,
+        tokenType: Struct_1.AssetType.NFT,
+        addressType: Struct_1.NFTAddressType.ITEM,
+    };
+    return await assets_1.AssetFactory.from(config, itemArgs);
+}
+async function normalizeAssets(config, assets) {
+    if (!assets || assets.length === 0)
+        return [];
+    const normalized = [];
+    for (const a of assets) {
+        normalized.push(await normalizeAsset(config, a));
+    }
+    return normalized;
+}
+function getAddressString(cell) {
+    return cell?.beginParse().loadAddress().toString({ bounceable: true, testOnly: false }) ?? '';
+}
+function getNumber(len, cell) {
+    return cell?.beginParse().loadUint(len) ?? 0;
+}
+function getString(cell) {
+    return cell?.beginParse().loadStringTail() ?? '';
+}

package/dist/{sdk → src/sdk}/Validator.d.ts

@@ -1,6 +1,6 @@
-import { EvmProxyMsg, TACSimulationRequest } from '../structs/Struct';
+import { EvmProxyMsg, TACSimulationParams } from '../structs/Struct';
 export declare class Validator {
-    static validateTACSimulationRequest(req: TACSimulationRequest): void;
+    static validateTACSimulationParams(req: TACSimulationParams): void;
     static validateEVMProxyMsg(evmProxyMsg: EvmProxyMsg): void;
     static validateTVMAddresses(addresses?: string[]): void;
     static validateEVMAddresses(addresses?: string[]): void;

package/dist/{sdk → src/sdk}/Validator.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Validator = void 0;
 const ton_1 = require("@ton/ton");
 const ethers_1 = require("ethers");
-const instances_1 = require("../errors/instances");
+const errors_1 = require("../errors");
 class Validator {
-    static validateTACSimulationRequest(req) {
+    static validateTACSimulationParams(req) {
         this.validateEVMAddress(req.tacCallParams.target);
-        req.evmValidExecutors.forEach(this.validateEVMAddress);
-        req.tvmValidExecutors.forEach(this.validateTVMAddress);
+        req.evmValidExecutors?.forEach(this.validateEVMAddress);
+        req.tvmValidExecutors?.forEach(this.validateTVMAddress);
         req.tonAssets.forEach((asset) => {
             // if empty then it's native TON
             if (asset.tokenAddress !== '') {
@@ -31,12 +31,12 @@ class Validator {
             ton_1.Address.parse(address); // will throw on error address
         }
         catch {
-            throw (0, instances_1.tvmAddressError)(address);
+            throw (0, errors_1.tvmAddressError)(address);
         }
     }
     static validateEVMAddress(address) {
         if (!address.startsWith('0x') || !(0, ethers_1.isAddress)(address)) {
-            throw (0, instances_1.evmAddressError)(address);
+            throw (0, errors_1.evmAddressError)(address);
         }
     }
 }

package/dist/{sender → src/sender}/BatchSender.d.ts

@@ -1,8 +1,7 @@
+import type { Asset, ContractOpener, SenderAbstraction } from '../interfaces';
 import type { SendResult, ShardTransaction } from '../structs/InternalStruct';
-import type { Asset, ContractOpener } from '../structs/Struct';
 import { Network } from '../structs/Struct';
 import { HighloadWalletV3 } from '../wrappers/HighloadWalletV3';
-import { SenderAbstraction } from './SenderAbstraction';
 export declare class BatchSender implements SenderAbstraction {
     private wallet;
     private secretKey;

package/dist/{sender → src/sender}/RawSender.d.ts

@@ -1,12 +1,12 @@
+import type { Asset, ContractOpener } from '../interfaces';
+import { SenderAbstraction, WalletInstanse } from '../interfaces';
 import type { SendResult, ShardTransaction } from '../structs/InternalStruct';
-import type { Asset, ContractOpener } from '../structs/Struct';
 import { Network } from '../structs/Struct';
-import { SenderAbstraction, WalletInstance } from './SenderAbstraction';
 export declare class RawSender implements SenderAbstraction {
     private wallet;
     private secretKey;
     private maxBatchSize;
-    constructor(wallet: WalletInstance, secretKey: Buffer, maxBatchSize?: number);
+    constructor(wallet: WalletInstanse, secretKey: Buffer, maxBatchSize?: number);
     getBalanceOf(asset: Asset): Promise<bigint>;
     getBalance(contractOpener: ContractOpener): Promise<bigint>;
     sendShardTransactions(shardTransactions: ShardTransaction[], _chain: Network, contractOpener: ContractOpener): Promise<SendResult[]>;

package/dist/{sender → src/sender}/SenderFactory.d.ts

@@ -1,8 +1,8 @@
 import { WalletContractV2R1, WalletContractV2R2, WalletContractV3R1, WalletContractV3R2, WalletContractV4, WalletContractV5R1 } from '@ton/ton';
 import { TonConnectUI } from '@tonconnect/ui';
+import { SenderAbstraction } from '../interfaces';
 import { Network } from '../structs/Struct';
 import { HighloadWalletV3 } from '../wrappers/HighloadWalletV3';
-import { SenderAbstraction } from './SenderAbstraction';
 export type WalletVersion = 'V2R1' | 'V2R2' | 'V3R1' | 'V3R2' | 'V4' | 'V5R1' | 'HIGHLOAD_V3';
 export declare const wallets: {
     V2R1: typeof WalletContractV2R1;

package/dist/{sender → src/sender}/SenderFactory.js

@@ -38,7 +38,7 @@ class SenderFactory {
         if (params.version === 'V5R1') {
             // manual setup of wallet id required to support wallet w5 both on mainnet and testnet
             config.walletId = {
-                networkGlobalId: params.network === Struct_1.Network.TESTNET ? -3 : -239,
+                networkGlobalId: params.network === Struct_1.Network.MAINNET ? -239 : -3,
                 context: {
                     walletVersion: 'v5r1',
                     workchain: 0,

package/dist/{sender → src/sender}/TonConnectSender.d.ts

@@ -1,7 +1,7 @@
 import { TonConnectUI } from '@tonconnect/ui';
+import { Asset, ContractOpener, SenderAbstraction } from '../interfaces';
 import type { SendResult, ShardTransaction } from '../structs/InternalStruct';
-import { Asset, ContractOpener, Network } from '../structs/Struct';
-import { SenderAbstraction } from './SenderAbstraction';
+import { Network } from '../structs/Struct';
 export declare class TonConnectSender implements SenderAbstraction {
     readonly tonConnect: TonConnectUI;
     constructor(tonConnect: TonConnectUI);

package/dist/{sender → src/sender}/TonConnectSender.js

@@ -4,8 +4,8 @@ exports.TonConnectSender = void 0;
 const ton_1 = require("@ton/ton");
 const protocol_1 = require("@tonconnect/protocol");
 const ui_1 = require("@tonconnect/ui");
+const Utils_1 = require("../sdk/Utils");
 const Struct_1 = require("../structs/Struct");
-const SenderAbstraction_1 = require("./SenderAbstraction");
 const CHUNK_SIZE = 4;
 class TonConnectSender {
     constructor(tonConnect) {
@@ -28,7 +28,7 @@ class TonConnectSender {
             const transaction = {
                 validUntil,
                 messages: chunk,
-                network: chain == Struct_1.Network.TESTNET ? ui_1.CHAIN.TESTNET : ui_1.CHAIN.MAINNET,
+                network: chain == Struct_1.Network.MAINNET ? ui_1.CHAIN.MAINNET : ui_1.CHAIN.TESTNET,
             };
             try {
                 const response = await this.tonConnect.sendTransaction(transaction);
@@ -48,7 +48,7 @@ class TonConnectSender {
                 break; // Stop sending after first error
             }
             if (i + chunkSize < messages.length) {
-                await (0, SenderAbstraction_1.sleep)(1000);
+                await (0, Utils_1.sleep)(1000);
             }
         }
         return responses;

package/dist/{sender → src/sender}/index.d.ts

@@ -1,3 +1,3 @@
+export * from '../interfaces/SenderAbstraction';
 export * from './BatchSender';
-export * from './SenderAbstraction';
 export * from './SenderFactory';

package/dist/{sender → src/sender}/index.js

@@ -14,6 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("../interfaces/SenderAbstraction"), exports);
 __exportStar(require("./BatchSender"), exports);
-__exportStar(require("./SenderAbstraction"), exports);
 __exportStar(require("./SenderFactory"), exports);

package/dist/{structs → src/structs}/InternalStruct.d.ts

@@ -1,7 +1,8 @@
 import { Cell } from '@ton/ton';
-import { mainnet, testnet } from '@tonappchain/artifacts';
 import { AbstractProvider, ethers } from 'ethers';
-import { ContractOpener, ExecutionStagesByOperationId, Network, OperationIdsByShardsKey, OperationType, StatusInfosByOperationId, SuggestedTONExecutorFee, TACSimulationResult } from './Struct';
+import { ICrossChainLayer, ISAFactory, ISettings, ITokenUtils } from '../../artifacts/tacTypes';
+import { ContractOpener } from '../interfaces';
+import { CurrencyType, ExecutionStagesByOperationId, Network, OperationIdsByShardsKey, OperationType, StatusInfosByOperationId, SuggestedTVMExecutorFee, TACSimulationResult } from './Struct';
 export type ShardMessage = {
     address: string;
     value: bigint;
@@ -34,9 +35,10 @@ export type InternalTONParams = {
 };
 export type InternalTACParams = {
     provider: AbstractProvider;
-    crossChainLayer: testnet.tac.wrappers.CrossChainLayerTAC | mainnet.tac.wrappers.CrossChainLayerTAC;
-    settings: testnet.tac.wrappers.SettingsTAC | mainnet.tac.wrappers.SettingsTAC;
-    tokenUtils: testnet.tac.wrappers.TokenUtilsTAC | mainnet.tac.wrappers.TokenUtilsTAC;
+    crossChainLayer: ICrossChainLayer;
+    settings: ISettings;
+    tokenUtils: ITokenUtils;
+    smartAccountFactory: ISAFactory;
     trustedTACExecutors: string[];
     trustedTONExecutors: string[];
     abiCoder: ethers.AbiCoder;
@@ -50,7 +52,13 @@ export type StatusesResponse = ResponseBase<StatusInfosByOperationId>;
 export type OperationIdsByShardsKeyResponse = ResponseBase<OperationIdsByShardsKey>;
 export type StageProfilingResponse = ResponseBase<ExecutionStagesByOperationId>;
 export type TACSimulationResponse = ResponseBase<TACSimulationResult>;
-export type SuggestedTONExecutorFeeResponse = ResponseBase<SuggestedTONExecutorFee>;
+export type SuggestedTVMExecutorFeeResponse = ResponseBase<SuggestedTVMExecutorFee>;
+export type ConvertCurrencyResponse = ResponseBase<ConvertedCurrencyRawResult>;
+export type OperationIdWithLogIndex = {
+    operationId: string;
+    logIndex: number;
+};
+export type OperationIdWithLogIndexResponse = ResponseBase<OperationIdWithLogIndex>;
 export interface SendResult {
     success: boolean;
     result?: unknown;
@@ -75,6 +83,9 @@ export type ToncenterTransaction = {
         hash: string;
         opcode: string;
     };
+    outMsgs: {
+        hash: string;
+    }[];
 };
 export type TransactionDepth = {
     hash: string;
@@ -90,3 +101,16 @@ export type TxFinalizerConfig = {
         value: string;
     };
 };
+export type USDPriceInfoRaw = {
+    spot: string;
+    ema: string;
+    decimals: number;
+};
+export type ConvertedCurrencyRawResult = {
+    spotValue: string;
+    emaValue: string;
+    decimals: number;
+    currency: CurrencyType;
+    tacPrice: USDPriceInfoRaw;
+    tonPrice: USDPriceInfoRaw;
+};