@tonappchain/sdk 0.7.0-rc13 → 0.7.0-rc15

package/dist/sdk/TONTransactionManager.js

@@ -0,0 +1,209 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TONTransactionManager = void 0;
+const assets_1 = require("../assets");
+const errors_1 = require("../errors");
+const Consts_1 = require("./Consts");
+const Logger_1 = require("./Logger");
+const Utils_1 = require("./Utils");
+const Validator_1 = require("./Validator");
+class TONTransactionManager {
+    constructor(config, simulator, operationTracker, logger = new Logger_1.NoopLogger()) {
+        this.config = config;
+        this.simulator = simulator;
+        this.operationTracker = operationTracker;
+        this.logger = logger;
+    }
+    async buildFeeParams(options, evmProxyMsg, sender, tx) {
+        const { withoutSimulation, protocolFee, evmExecutorFee, tvmExecutorFee, isRoundTrip } = options;
+        if (withoutSimulation) {
+            if (protocolFee === undefined || evmExecutorFee === undefined) {
+                throw errors_1.missingFeeParamsError;
+            }
+            if (isRoundTrip && tvmExecutorFee === undefined) {
+                throw errors_1.missingTvmExecutorFeeError;
+            }
+            if (!evmProxyMsg.gasLimit) {
+                throw errors_1.missingGasLimitError;
+            }
+            return {
+                protocolFee,
+                evmExecutorFee,
+                tvmExecutorFee: tvmExecutorFee || 0n,
+                gasLimit: evmProxyMsg.gasLimit,
+                isRoundTrip: isRoundTrip || false,
+            };
+        }
+        const simulationResult = await this.simulator.getSimulationInfo(sender, tx);
+        if (!evmProxyMsg.gasLimit)
+            evmProxyMsg.gasLimit = simulationResult.feeParams.gasLimit;
+        return {
+            protocolFee: protocolFee ?? simulationResult.feeParams.protocolFee,
+            evmExecutorFee: evmExecutorFee ?? simulationResult.feeParams.evmExecutorFee,
+            tvmExecutorFee: simulationResult.feeParams.isRoundTrip && tvmExecutorFee !== undefined
+                ? tvmExecutorFee
+                : simulationResult.feeParams.tvmExecutorFee,
+            gasLimit: evmProxyMsg.gasLimit ?? simulationResult.feeParams.gasLimit,
+            isRoundTrip: isRoundTrip ?? simulationResult.feeParams.isRoundTrip,
+        };
+    }
+    async prepareCrossChainTransaction(evmProxyMsg, sender, assets, options, skipAssetsBalanceValidation = false) {
+        this.logger.debug('Preparing cross-chain transaction');
+        const caller = sender.getSenderAddress();
+        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);
+        Validator_1.Validator.validateEVMAddresses(evmValidExecutors);
+        Validator_1.Validator.validateTVMAddresses(tvmValidExecutors);
+        const shouldValidateAssets = validateAssetsBalance && !skipAssetsBalanceValidation;
+        if (shouldValidateAssets) {
+            await Promise.all([
+                ...aggregatedData.jettons.map((jetton) => jetton.checkCanBeTransferredBy(caller)),
+                ...aggregatedData.nfts.map((nft) => nft.checkCanBeTransferredBy(caller)),
+                aggregatedData.ton?.checkCanBeTransferredBy(caller),
+            ].filter(Boolean));
+        }
+        const tokensLength = aggregatedData.jettons.length + aggregatedData.nfts.length;
+        const transactionLinker = (0, Utils_1.generateTransactionLinker)(caller, tokensLength || 1);
+        this.logger.debug(`Generated transaction linker: ${(0, Utils_1.formatObjectForLogging)(transactionLinker)}`);
+        const tacExecutors = evmValidExecutors.length ? evmValidExecutors : this.config.getTrustedTACExecutors;
+        const tonExecutors = tvmValidExecutors.length ? tvmValidExecutors : this.config.getTrustedTONExecutors;
+        const tx = {
+            evmProxyMsg,
+            assets: assets ?? [],
+            options: {
+                allowSimulationError,
+                isRoundTrip,
+                evmValidExecutors: tacExecutors,
+                tvmValidExecutors: tonExecutors,
+                calculateRollbackFee,
+            },
+        };
+        const feeParams = await this.buildFeeParams(options || {}, evmProxyMsg, sender, tx);
+        this.logger.debug(`Resulting fee params: ${(0, Utils_1.formatObjectForLogging)(feeParams)}`);
+        const validExecutors = {
+            tac: tacExecutors,
+            ton: tonExecutors,
+        };
+        const evmData = (0, Utils_1.buildEvmDataCell)(transactionLinker, evmProxyMsg, validExecutors);
+        const messages = await this.generateCrossChainMessages(caller, evmData, aggregatedData, feeParams);
+        return {
+            transaction: {
+                validUntil: Date.now() + Consts_1.FIFTEEN_MINUTES,
+                messages,
+                network: this.config.network,
+            },
+            transactionLinker,
+        };
+    }
+    async generateCrossChainMessages(caller, evmData, aggregatedData, feeParams) {
+        this.logger.debug('Generating cross-chain messages');
+        const { jettons, nfts, ton = assets_1.TON.create(this.config) } = aggregatedData;
+        const totalAssets = [...jettons, ...nfts];
+        let crossChainTonAmount = ton.rawAmount;
+        let feeTonAmount = feeParams.protocolFee + feeParams.evmExecutorFee + feeParams.tvmExecutorFee;
+        this.logger.debug(`Crosschain ton amount: ${crossChainTonAmount}, Fee ton amount: ${feeTonAmount}`);
+        if (!totalAssets.length) {
+            return [
+                {
+                    address: this.config.TONParams.crossChainLayerAddress,
+                    value: crossChainTonAmount + feeTonAmount + Consts_1.TRANSACTION_TON_AMOUNT,
+                    payload: await ton.generatePayload({ excessReceiver: caller, evmData, feeParams }),
+                },
+            ];
+        }
+        const messages = [];
+        let currentFeeParams = feeParams;
+        for (const asset of totalAssets) {
+            const payload = await asset.generatePayload({
+                excessReceiver: caller,
+                evmData,
+                crossChainTonAmount,
+                forwardFeeTonAmount: feeTonAmount,
+                feeParams: currentFeeParams,
+            });
+            const address = asset instanceof assets_1.FT ? await asset.getUserWalletAddress(caller) : asset.address;
+            messages.push({
+                address,
+                value: crossChainTonAmount + feeTonAmount + Consts_1.TRANSACTION_TON_AMOUNT,
+                payload,
+            });
+            crossChainTonAmount = 0n;
+            feeTonAmount = 0n;
+            currentFeeParams = undefined;
+        }
+        this.logger.debug('Cross-chain messages generated successfully');
+        return messages;
+    }
+    async sendCrossChainTransaction(evmProxyMsg, sender, tx, waitOptions) {
+        const { transaction, transactionLinker } = await this.prepareCrossChainTransaction(evmProxyMsg, sender, tx.assets, tx.options);
+        await assets_1.TON.checkBalance(sender, this.config, [transaction]);
+        this.logger.debug(`Sending transaction: ${(0, Utils_1.formatObjectForLogging)(transactionLinker)}`);
+        const sendTransactionResult = await sender.sendShardTransaction(transaction, this.config.network, this.config.TONParams.contractOpener);
+        if (!waitOptions) {
+            return { sendTransactionResult, ...transactionLinker };
+        }
+        const operationId = await this.operationTracker.getOperationId(transactionLinker, {
+            ...waitOptions,
+            successCheck: (id) => !!id,
+            logger: this.logger,
+        })
+            .catch((error) => {
+            this.logger.error(`Error while waiting for operation ID: ${error}`);
+            return undefined;
+        });
+        return { sendTransactionResult, operationId, ...transactionLinker };
+    }
+    async sendCrossChainTransactions(sender, txs, waitOptions) {
+        const caller = sender.getSenderAddress();
+        this.logger.debug(`Preparing ${txs.length} cross-chain transactions for ${caller}`);
+        const { transactions, transactionLinkers } = await this.prepareBatchTransactions(txs, sender);
+        await assets_1.TON.checkBalance(sender, this.config, transactions);
+        this.logger.debug(`Sending transactions: ${(0, Utils_1.formatObjectForLogging)(transactionLinkers)}`);
+        await sender.sendShardTransactions(transactions, this.config.network, this.config.TONParams.contractOpener);
+        return waitOptions
+            ? await this.waitForOperationIds(transactionLinkers, caller, waitOptions)
+            : transactionLinkers;
+    }
+    async prepareBatchTransactions(txs, sender) {
+        const caller = sender.getSenderAddress();
+        const txsRequiringValidation = txs.filter((tx) => tx.options?.validateAssetsBalance ?? true);
+        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);
+            await Promise.all([
+                ...aggregatedData.jettons.map((jetton) => jetton.checkCanBeTransferredBy(caller)),
+                ...aggregatedData.nfts.map((nft) => nft.checkCanBeTransferredBy(caller)),
+                aggregatedData.ton?.checkCanBeTransferredBy(caller),
+            ].filter(Boolean));
+        }
+        const results = await Promise.all(txs.map(({ evmProxyMsg, assets, options }) => this.prepareCrossChainTransaction(evmProxyMsg, sender, assets, options, true)));
+        return {
+            transactions: results.map((r) => r.transaction),
+            transactionLinkers: results.map((r) => r.transactionLinker),
+        };
+    }
+    async waitForOperationIds(transactionLinkers, caller, waitOptions) {
+        this.logger.debug(`Waiting for operation IDs`);
+        try {
+            const operationIds = await this.operationTracker.getOperationIdsByShardsKeys(transactionLinkers.map((linker) => linker.shardsKey), caller, {
+                ...waitOptions,
+                logger: this.logger,
+                successCheck: (operationIds) => Object.keys(operationIds).length == transactionLinkers.length &&
+                    Object.values(operationIds).every((ids) => ids.operationIds.length > 0),
+            });
+            this.logger.debug(`Operation IDs: ${(0, Utils_1.formatObjectForLogging)(operationIds)}`);
+            return transactionLinkers.map((linker) => ({
+                ...linker,
+                operationId: operationIds[linker.shardsKey].operationIds.at(0),
+            }));
+        }
+        catch (error) {
+            this.logger.error(`Error while waiting for operation IDs: ${error}`);
+            return transactionLinkers;
+        }
+    }
+}
+exports.TONTransactionManager = TONTransactionManager;

package/dist/sdk/TacSdk.d.ts

@@ -1,28 +1,33 @@
+import { AgnosticProxySDK } from '@tonappchain/agnostic-sdk';
 import { Wallet } from 'ethers';
 import { FT, NFT } from '../assets';
-import { Asset, IConfiguration, ILogger, ITacSDK } from '../interfaces';
+import { IConfiguration, ILogger, IOperationTracker, ITacSDK } from '../interfaces';
 import type { SenderAbstraction } from '../sender';
-import { AssetFromFTArg, AssetFromNFTCollectionArg, AssetFromNFTItemArg, CrossChainTransactionOptions, CrosschainTx, EVMAddress, EvmProxyMsg, ExecutionFeeEstimationResult, NFTAddressType, NFTItemData, OperationIdsByShardsKey, SDKParams, SuggestedTONExecutorFee, TACSimulationRequest, TACSimulationResult, TransactionLinkerWithOperationId, TVMAddress, UserWalletBalanceExtended, WaitOptions } from '../structs/Struct';
+import { AssetFromFTArg, AssetFromNFTCollectionArg, AssetFromNFTItemArg, AssetLike, CrossChainTransactionOptions, CrosschainTx, CrosschainTxWithAssetLike, EVMAddress, EvmProxyMsg, ExecutionFeeEstimationResult, NFTAddressType, NFTItemData, OperationIdsByShardsKey, SDKParams, SuggestedTVMExecutorFee, TACSimulationParams, TACSimulationResult, TransactionLinkerWithOperationId, TVMAddress, UserWalletBalanceExtended, WaitOptions } from '../structs/Struct';
 import { JettonMasterData } from '../wrappers/JettonMaster';
 export declare class TacSdk implements ITacSDK {
     readonly config: IConfiguration;
+    readonly operationTracker: IOperationTracker;
     private readonly simulator;
-    private readonly transactionManager;
+    private readonly tonTransactionManager;
+    private readonly tacTransactionManager;
     private constructor();
     static create(sdkParams: SDKParams, logger?: ILogger): Promise<TacSdk>;
     closeConnections(): unknown;
     get nativeTONAddress(): string;
+    getAgnosticProxySDK(agnosticProxyAddress?: string, smartAccountFactoryAddress?: string): AgnosticProxySDK;
+    getSmartAccountAddressForTvmWallet(tvmWallet: string, applicationAddress: string): Promise<string>;
     nativeTACAddress(): Promise<string>;
     get getTrustedTACExecutors(): string[];
     get getTrustedTONExecutors(): string[];
-    getTransactionSimulationInfo(evmProxyMsg: EvmProxyMsg, sender: SenderAbstraction, assets?: Asset[]): Promise<ExecutionFeeEstimationResult>;
-    getTVMExecutorFeeInfo(assets: Asset[], feeSymbol: string, tvmValidExecutors?: string[]): Promise<SuggestedTONExecutorFee>;
-    sendCrossChainTransaction(evmProxyMsg: EvmProxyMsg, sender: SenderAbstraction, assets?: Asset[], options?: CrossChainTransactionOptions, waitOptions?: WaitOptions<string>): Promise<TransactionLinkerWithOperationId>;
-    sendCrossChainTransactions(sender: SenderAbstraction, txs: CrosschainTx[], waitOptions?: WaitOptions<OperationIdsByShardsKey>): Promise<TransactionLinkerWithOperationId[]>;
-    bridgeTokensToTON(signer: Wallet, value: bigint, tonTarget: string, assets?: Asset[], tvmExecutorFee?: bigint, tvmValidExecutors?: string[]): Promise<string>;
+    getSimulationInfo(evmProxyMsg: EvmProxyMsg, sender: SenderAbstraction, assets?: AssetLike[], options?: CrossChainTransactionOptions): Promise<ExecutionFeeEstimationResult>;
+    getTVMExecutorFeeInfo(assets: AssetLike[], feeSymbol: string, tvmValidExecutors?: string[]): Promise<SuggestedTVMExecutorFee>;
+    sendCrossChainTransaction(evmProxyMsg: EvmProxyMsg, sender: SenderAbstraction, assets?: AssetLike[], options?: CrossChainTransactionOptions, waitOptions?: WaitOptions<string>): Promise<TransactionLinkerWithOperationId>;
+    sendCrossChainTransactions(sender: SenderAbstraction, txs: CrosschainTxWithAssetLike[], waitOptions?: WaitOptions<OperationIdsByShardsKey>): Promise<TransactionLinkerWithOperationId[]>;
+    bridgeTokensToTON(signer: Wallet, value: bigint, tonTarget: string, assets?: AssetLike[], tvmExecutorFee?: bigint, tvmValidExecutors?: string[]): Promise<string>;
     isContractDeployedOnTVM(address: string): Promise<boolean>;
-    simulateTACMessage(req: TACSimulationRequest): Promise<TACSimulationResult>;
-    simulateTransactions(sender: SenderAbstraction, txs: CrosschainTx[]): Promise<TACSimulationResult[]>;
+    simulateTACMessage(req: TACSimulationParams): Promise<TACSimulationResult>;
+    simulateTransactions(sender: SenderAbstraction, txs: CrosschainTx[]): Promise<ExecutionFeeEstimationResult[]>;
     getAsset(args: AssetFromFTArg): Promise<FT>;
     getAsset(args: AssetFromNFTCollectionArg): Promise<NFT>;
     getAsset(args: AssetFromNFTItemArg): Promise<NFT>;
@@ -37,4 +42,5 @@ export declare class TacSdk implements ITacSDK {
     getTVMTokenAddress(evmTokenAddress: string): Promise<string>;
     getTVMNFTAddress(evmNFTAddress: string, tokenId?: number | bigint): Promise<string>;
     getEVMNFTAddress(tvmNFTAddress: string, addressType: NFTAddressType): Promise<string>;
+    getOperationTracker(): IOperationTracker;
 }

package/dist/sdk/TacSdk.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TacSdk = void 0;
+const agnostic_sdk_1 = require("@tonappchain/agnostic-sdk");
 const assets_1 = require("../assets");
 const Struct_1 = require("../structs/Struct");
 const Configuration_1 = require("./Configuration");
@@ -41,12 +42,16 @@ const Consts_1 = require("./Consts");
 const Logger_1 = require("./Logger");
 const OperationTracker_1 = require("./OperationTracker");
 const Simulator_1 = require("./Simulator");
-const TransactionManager_1 = require("./TransactionManager");
+const TACTransactionManager_1 = require("./TACTransactionManager");
+const TONTransactionManager_1 = require("./TONTransactionManager");
+const Utils_1 = require("./Utils");
 class TacSdk {
-    constructor(config, simulator, transactionManager) {
+    constructor(config, simulator, tonTransactionManager, tacTransactionManager, operationTracker) {
         this.config = config;
         this.simulator = simulator;
-        this.transactionManager = transactionManager;
+        this.tonTransactionManager = tonTransactionManager;
+        this.tacTransactionManager = tacTransactionManager;
+        this.operationTracker = operationTracker;
     }
     static async create(sdkParams, logger = new Logger_1.NoopLogger()) {
         const network = sdkParams.network;
@@ -54,10 +59,11 @@ class TacSdk {
         const { testnet, mainnet } = await Promise.resolve().then(() => __importStar(require('@tonappchain/artifacts')));
         const artifacts = network === Struct_1.Network.TESTNET ? testnet : mainnet;
         const config = await Configuration_1.Configuration.create(network, artifacts, sdkParams.TONParams, sdkParams.TACParams, sdkParams.customLiteSequencerEndpoints, delay);
-        const simulator = new Simulator_1.Simulator(config, logger);
         const operationTracker = new OperationTracker_1.OperationTracker(network, config.liteSequencerEndpoints);
-        const transactionManager = new TransactionManager_1.TransactionManager(config, simulator, operationTracker, logger);
-        return new TacSdk(config, simulator, transactionManager);
+        const simulator = new Simulator_1.Simulator(config, operationTracker, logger);
+        const tonTransactionManager = new TONTransactionManager_1.TONTransactionManager(config, simulator, operationTracker, logger);
+        const tacTransactionManager = new TACTransactionManager_1.TACTransactionManager(config, operationTracker, logger);
+        return new TacSdk(config, simulator, tonTransactionManager, tacTransactionManager, operationTracker);
     }
     closeConnections() {
         return this.config.closeConnections();
@@ -65,6 +71,13 @@ class TacSdk {
     get nativeTONAddress() {
         return this.config.nativeTONAddress;
     }
+    getAgnosticProxySDK(agnosticProxyAddress, smartAccountFactoryAddress) {
+        return new agnostic_sdk_1.AgnosticProxySDK(smartAccountFactoryAddress ?? this.config.artifacts.TAC_SMART_ACCOUNT_FACTORY_ADDRESS, this.config.TACParams.provider, agnosticProxyAddress ?? this.config.artifacts.AGNOSTIC_PROXY_ADDRESS);
+    }
+    async getSmartAccountAddressForTvmWallet(tvmWallet, applicationAddress) {
+        const bouncedAddress = (0, Utils_1.getBouncedAddress)(tvmWallet);
+        return await this.config.TACParams.smartAccountFactory.getSmartAccountForApplication(bouncedAddress, applicationAddress);
+    }
     async nativeTACAddress() {
         return this.config.nativeTACAddress();
     }
@@ -74,29 +87,45 @@ class TacSdk {
     get getTrustedTONExecutors() {
         return this.config.getTrustedTONExecutors;
     }
-    async getTransactionSimulationInfo(evmProxyMsg, sender, assets) {
-        return this.simulator.getTransactionSimulationInfo(evmProxyMsg, sender, assets);
+    async getSimulationInfo(evmProxyMsg, sender, assets, options) {
+        const normalizedAssets = await (0, Utils_1.normalizeAssets)(this.config, assets);
+        const tx = { evmProxyMsg, assets: normalizedAssets, options };
+        return this.simulator.getSimulationInfo(sender, tx);
     }
     async getTVMExecutorFeeInfo(assets, feeSymbol, tvmValidExecutors) {
-        return this.simulator.getTVMExecutorFeeInfo(assets, feeSymbol, tvmValidExecutors);
+        const normalized = await (0, Utils_1.normalizeAssets)(this.config, assets);
+        const params = {
+            tonAssets: (0, Utils_1.mapAssetsToTonAssets)(normalized),
+            feeSymbol: feeSymbol,
+            tvmValidExecutors: tvmValidExecutors ?? [],
+        };
+        return this.operationTracker.getTVMExecutorFee(params);
     }
-    async sendCrossChainTransaction(evmProxyMsg, sender, assets, options, waitOptions) {
-        return this.transactionManager.sendCrossChainTransaction(evmProxyMsg, sender, assets, options, waitOptions);
+    async sendCrossChainTransaction(evmProxyMsg, sender, assets = [], options, waitOptions) {
+        const normalizedAssets = await (0, Utils_1.normalizeAssets)(this.config, assets);
+        const tx = { evmProxyMsg, assets: normalizedAssets, options };
+        return this.tonTransactionManager.sendCrossChainTransaction(evmProxyMsg, sender, tx, waitOptions);
     }
     async sendCrossChainTransactions(sender, txs, waitOptions) {
-        return this.transactionManager.sendCrossChainTransactions(sender, txs, waitOptions);
+        const normalizedTxs = await Promise.all(txs.map(async (tx) => ({
+            evmProxyMsg: tx.evmProxyMsg,
+            options: tx.options,
+            assets: await (0, Utils_1.normalizeAssets)(this.config, tx.assets),
+        })));
+        return this.tonTransactionManager.sendCrossChainTransactions(sender, normalizedTxs, waitOptions);
     }
     async bridgeTokensToTON(signer, value, tonTarget, assets, tvmExecutorFee, tvmValidExecutors) {
-        return this.transactionManager.bridgeTokensToTON(signer, value, tonTarget, assets, tvmExecutorFee, tvmValidExecutors);
+        const normalizedAssets = await (0, Utils_1.normalizeAssets)(this.config, assets);
+        return this.tacTransactionManager.bridgeTokensToTON(signer, value, tonTarget, normalizedAssets, tvmExecutorFee, tvmValidExecutors);
     }
     async isContractDeployedOnTVM(address) {
         return this.config.isContractDeployedOnTVM(address);
     }
     async simulateTACMessage(req) {
-        return this.simulator.simulateTACMessage(req);
+        return this.operationTracker.simulateTACMessage(req);
     }
     async simulateTransactions(sender, txs) {
-        return this.simulator.simulateTransactions(sender, txs);
+        return this.simulator.getSimulationsInfo(sender, txs);
     }
     async getAsset(args) {
         return await assets_1.AssetFactory.from(this.config, args);
@@ -147,10 +176,11 @@ class TacSdk {
     }
     // Address conversion methods
     async getEVMTokenAddress(tvmTokenAddress) {
-        if (tvmTokenAddress === this.nativeTONAddress || tvmTokenAddress === '') {
-            return assets_1.TON.create(this.config).getEVMAddress();
-        }
-        return assets_1.FT.getEVMAddress(this.config, tvmTokenAddress);
+        const asset = await assets_1.AssetFactory.from(this.config, {
+            address: tvmTokenAddress,
+            tokenType: Struct_1.AssetType.FT,
+        });
+        return asset.getEVMAddress();
     }
     async getTVMTokenAddress(evmTokenAddress) {
         return assets_1.FT.getTVMAddress(this.config, evmTokenAddress);
@@ -168,5 +198,8 @@ class TacSdk {
             return nftCollection.getEVMAddress();
         }
     }
+    getOperationTracker() {
+        return this.operationTracker;
+    }
 }
 exports.TacSdk = TacSdk;

package/dist/sdk/TxFinalizer.d.ts

@@ -1,9 +1,10 @@
-import { ILogger } from '../interfaces';
+import { IHttpClient, ILogger } from '../interfaces';
 import { TxFinalizerConfig } from '../structs/InternalStruct';
 export declare class TonTxFinalizer {
     private logger;
     private apiConfig;
-    constructor(apiConfig: TxFinalizerConfig, logger?: ILogger);
+    private readonly httpClient;
+    constructor(apiConfig: TxFinalizerConfig, logger?: ILogger, httpClient?: IHttpClient);
     private logHashFormats;
     private fetchAdjacentTransactions;
     trackTransactionTree(hash: string, maxDepth?: number): Promise<void>;

package/dist/sdk/TxFinalizer.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonTxFinalizer = void 0;
-const axios_1 = __importDefault(require("axios"));
+const AxiosHttpClient_1 = require("./AxiosHttpClient");
 const Logger_1 = require("./Logger");
 const Utils_1 = require("./Utils");
 const IGNORE_OPCODE = [
@@ -12,9 +9,10 @@ const IGNORE_OPCODE = [
     '0x7362d09c', // Jetton Notify
 ];
 class TonTxFinalizer {
-    constructor(apiConfig, logger = new Logger_1.NoopLogger()) {
+    constructor(apiConfig, logger = new Logger_1.NoopLogger(), httpClient = new AxiosHttpClient_1.AxiosHttpClient()) {
         this.apiConfig = apiConfig;
         this.logger = logger;
+        this.httpClient = httpClient;
     }
     logHashFormats(hash) {
         let hex, base64;
@@ -34,10 +32,9 @@ class TonTxFinalizer {
     // Fetches adjacent transactions from toncenter
     async fetchAdjacentTransactions(hash, retries = 5, delay = 1000) {
         for (let i = retries; i >= 0; i--) {
-            await (0, Utils_1.sleep)(delay);
             try {
                 const url = this.apiConfig.urlBuilder(hash);
-                const response = await axios_1.default.get(url, {
+                const response = await this.httpClient.get(url, {
                     headers: {
                         [this.apiConfig.authorization.header]: this.apiConfig.authorization.value,
                     },
@@ -57,6 +54,7 @@ class TonTxFinalizer {
                     console.warn(`Failed to fetch adjacent transactions for ${hash}:`, logMessage);
                 }
             }
+            await (0, Utils_1.sleep)(delay);
         }
         return [];
     }
@@ -91,7 +89,9 @@ class TonTxFinalizer {
                             `action.result_code = ${action.resultCode}`);
                     }
                     if (currentDepth + 1 < maxDepth) {
-                        queue.push({ hash: tx.hash, depth: currentDepth + 1 });
+                        if (tx.outMsgs.length > 0) {
+                            queue.push({ hash: tx.hash, depth: currentDepth + 1 });
+                        }
                     }
                 }
                 else {

package/dist/sdk/Utils.d.ts

@@ -1,9 +1,9 @@
 import { Address, Cell } from '@ton/ton';
 import { AbiCoder } from 'ethers';
-import { FT, NFT, TON } from '../assets';
-import { Asset } from '../interfaces';
+import type { FT, NFT, TON } from '../assets';
+import { Asset, IConfiguration } from '../interfaces';
 import { RandomNumberByTimestamp } from '../structs/InternalStruct';
-import { EvmProxyMsg, FeeParams, TransactionLinker, ValidExecutors, WaitOptions } from '../structs/Struct';
+import { AssetLike, EvmProxyMsg, FeeParams, TONAsset, TransactionLinker, ValidExecutors, WaitOptions } from '../structs/Struct';
 export declare const sleep: (ms: number) => Promise<unknown>;
 export declare function generateRandomNumber(interval: number): number;
 export declare function generateRandomNumberByTimestamp(): RandomNumberByTimestamp;
@@ -17,10 +17,15 @@ export declare const calculateRawAmount: (amount: number, decimals: number) => b
 export declare const calculateAmount: (rawAmount: bigint, decimals: number) => number;
 export declare const toCamelCaseTransformer: (data: string) => any;
 export declare const generateFeeData: (feeParams?: FeeParams) => Cell | undefined;
-export declare function waitUntilSuccess<T, A extends unknown[]>(options: WaitOptions<T> | undefined, operation: (...args: A) => Promise<T>, ...args: A): Promise<T>;
+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<{
     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>;
+export declare function normalizeAssets(config: IConfiguration, assets?: AssetLike[]): Promise<Asset[]>;

package/dist/sdk/Utils.js

@@ -10,9 +10,16 @@ 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;
 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 +138,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 +153,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,6 +191,11 @@ async function waitUntilSuccess(options = {}, operation, ...args) {
 function formatObjectForLogging(obj) {
     return JSON.stringify(obj, (key, value) => (typeof value === 'bigint' ? value.toString() : value));
 }
+function getBouncedAddress(tvmAddress) {
+    return ton_1.Address.parse(tvmAddress).toString({
+        bounceable: true,
+    });
+}
 async function aggregateTokens(assets) {
     const uniqueAssetsMap = new Map();
     let ton;
@@ -180,7 +203,7 @@ async function aggregateTokens(assets) {
         if (asset.type !== Struct_1.AssetType.FT)
             continue;
         if (!asset.address) {
-            ton = ton ? await ton.addAmount({ rawAmount: asset.rawAmount }) : asset.clone;
+            ton = ton ? ton.addRawAmount(asset.rawAmount) : asset.clone;
             continue;
         }
         let jetton = uniqueAssetsMap.get(asset.address);
@@ -188,7 +211,7 @@ async function aggregateTokens(assets) {
             jetton = asset.clone;
         }
         else {
-            jetton = await jetton.addAmount({ rawAmount: asset.rawAmount });
+            jetton = jetton.addRawAmount(asset.rawAmount);
         }
         uniqueAssetsMap.set(asset.address, jetton);
     }
@@ -206,3 +229,54 @@ async function aggregateTokens(assets) {
         ton,
     };
 }
+function sha256toBigInt(ContractName) {
+    const hash = (0, ton_crypto_1.sha256_sync)(ContractName);
+    return BigInt('0x' + hash.toString('hex'));
+}
+function mapAssetsToTonAssets(assets) {
+    return assets.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);
+    }
+    if ('rawAmount' in input || 'amount' in input) {
+        const ftArgs = {
+            address,
+            tokenType: Struct_1.AssetType.FT,
+        };
+        const asset = await assets_1.AssetFactory.from(config, ftArgs);
+        return 'rawAmount' in input
+            ? asset.withRawAmount(input.rawAmount)
+            : asset.withAmount(input.amount);
+    }
+    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;
+}