@tonappchain/sdk 0.7.0-rc14 → 0.7.0-rc15

package/dist/sdk/Simulator.d.ts

@@ -1,17 +1,11 @@
-import { Asset, IConfiguration, ILogger, ISimulator } from '../interfaces';
-import { IHttpClient } from '../interfaces';
+import { IConfiguration, ILogger, IOperationTracker, ISimulator } from '../interfaces';
 import type { SenderAbstraction } from '../sender';
-import { CrosschainTx, EvmProxyMsg, ExecutionFeeEstimationResult, SuggestedTONExecutorFee, TACSimulationRequest, TACSimulationResult, TransactionLinker } from '../structs/Struct';
+import { CrosschainTx, ExecutionFeeEstimationResult } from '../structs/Struct';
 export declare class Simulator implements ISimulator {
     private readonly config;
+    private readonly operationTracker;
     private readonly logger;
-    private readonly httpClient;
-    constructor(config: IConfiguration, logger?: ILogger, httpClient?: IHttpClient);
-    simulateTACMessage(req: TACSimulationRequest): Promise<TACSimulationResult>;
-    simulateTransactions(sender: SenderAbstraction, txs: CrosschainTx[]): Promise<TACSimulationResult[]>;
-    private buildTACSimulationRequest;
-    getTVMExecutorFeeInfo(assets: Asset[], feeSymbol: string, tvmValidExecutors?: string[]): Promise<SuggestedTONExecutorFee>;
-    private getFeeInfo;
-    getTransactionSimulationInfo(evmProxyMsg: EvmProxyMsg, sender: SenderAbstraction, assets?: Asset[]): Promise<ExecutionFeeEstimationResult>;
-    getSimulationInfoForTransaction(evmProxyMsg: EvmProxyMsg, transactionLinker: TransactionLinker, assets: Asset[], allowSimulationError?: boolean, isRoundTrip?: boolean, evmValidExecutors?: string[], tvmValidExecutors?: string[], calculateRollbackFee?: boolean): Promise<ExecutionFeeEstimationResult>;
+    constructor(config: IConfiguration, operationTracker: IOperationTracker, logger?: ILogger);
+    getSimulationsInfo(sender: SenderAbstraction, txs: CrosschainTx[]): Promise<ExecutionFeeEstimationResult[]>;
+    getSimulationInfo(sender: SenderAbstraction, tx: CrosschainTx): Promise<ExecutionFeeEstimationResult>;
 }

package/dist/sdk/Simulator.js

@@ -2,162 +2,68 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Simulator = void 0;
 const ton_1 = require("@ton/ton");
-const errors_1 = require("../errors");
-const AxiosHttpClient_1 = require("./AxiosHttpClient");
 const Logger_1 = require("./Logger");
 const Utils_1 = require("./Utils");
 const Validator_1 = require("./Validator");
 class Simulator {
-    constructor(config, logger = new Logger_1.NoopLogger(), httpClient = new AxiosHttpClient_1.AxiosHttpClient()) {
+    constructor(config, operationTracker, logger = new Logger_1.NoopLogger()) {
         this.config = config;
+        this.operationTracker = operationTracker;
         this.logger = logger;
-        this.httpClient = httpClient;
     }
-    async simulateTACMessage(req) {
-        Validator_1.Validator.validateTACSimulationRequest(req);
-        this.logger.debug('Simulating TAC message');
-        let lastError;
-        for (const endpoint of this.config.liteSequencerEndpoints) {
-            try {
-                const response = await this.httpClient.post(new URL('tac/simulator/simulate-message', endpoint).toString(), req, {
-                    transformResponse: [Utils_1.toCamelCaseTransformer],
-                });
-                this.logger.debug('TAC message simulation success');
-                return response.data.response;
-            }
-            catch (error) {
-                this.logger.error(`Error while simulating with ${endpoint}: ${error}`);
-                lastError = error;
-            }
-        }
-        throw (0, errors_1.simulationError)(lastError);
-    }
-    async simulateTransactions(sender, txs) {
+    async getSimulationsInfo(sender, txs) {
         this.logger.debug(`Simulating ${txs.length} TAC messages`);
         const results = [];
         for (const tx of txs) {
-            const req = await this.buildTACSimulationRequest(sender, tx);
-            const result = await this.simulateTACMessage(req);
+            const result = await this.getSimulationInfo(sender, tx);
             results.push(result);
         }
         return results;
     }
-    async buildTACSimulationRequest(sender, tx) {
+    async getSimulationInfo(sender, tx) {
+        this.logger.debug('Getting simulation info');
         const { evmProxyMsg, assets = [], options = {} } = tx;
-        const { evmValidExecutors = this.config.TACParams.trustedTACExecutors, tvmValidExecutors = this.config.TACParams.trustedTONExecutors, calculateRollbackFee = true, } = options;
+        const { evmValidExecutors = this.config.TACParams.trustedTACExecutors, tvmValidExecutors = this.config.TACParams.trustedTONExecutors, calculateRollbackFee = true, allowSimulationError = false, } = options;
+        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 transactionLinkerShardCount = aggregatedData.jettons.length == 0 ? 1 : aggregatedData.jettons.length;
-        const transactionLinker = (0, Utils_1.generateTransactionLinker)(sender.getSenderAddress(), transactionLinkerShardCount);
-        return {
+        const shardCount = aggregatedData.jettons.length || 1;
+        const transactionLinker = (0, Utils_1.generateTransactionLinker)(sender.getSenderAddress(), shardCount);
+        const tacSimulationParams = {
             tacCallParams: {
                 arguments: evmProxyMsg.encodedParameters ?? '0x',
                 methodName: (0, Utils_1.formatSolidityMethodName)(evmProxyMsg.methodName),
                 target: evmProxyMsg.evmTargetAddress,
             },
-            evmValidExecutors: evmValidExecutors,
-            tvmValidExecutors: tvmValidExecutors,
+            evmValidExecutors,
+            tvmValidExecutors,
             extraData: '0x',
             shardsKey: transactionLinker.shardsKey,
-            tonAssets: assets.map((asset) => ({
-                amount: asset.rawAmount.toString(),
-                tokenAddress: asset.address || '',
-                assetType: asset.type,
-            })),
+            tonAssets: (0, Utils_1.mapAssetsToTonAssets)(assets),
             tonCaller: transactionLinker.caller,
-            calculateRollbackFee: calculateRollbackFee,
+            calculateRollbackFee,
         };
-    }
-    async getTVMExecutorFeeInfo(assets, feeSymbol, tvmValidExecutors = this.config.TACParams.trustedTONExecutors) {
-        this.logger.debug('Getting TVM executor fee info');
-        const requestBody = {
-            tonAssets: assets.map((asset) => ({
-                amount: asset.rawAmount.toString(),
-                tokenAddress: asset.address || '',
-                assetType: asset.type,
-            })),
-            feeSymbol: feeSymbol,
-            tvmValidExecutors: tvmValidExecutors,
-        };
-        let lastError;
-        for (const endpoint of this.config.liteSequencerEndpoints) {
-            try {
-                const response = await this.httpClient.post(`${endpoint}/ton/calculator/ton-executor-fee`, requestBody);
-                return response.data.response;
-            }
-            catch (error) {
-                this.logger.error(`Error while calculating tvm executor fee ${endpoint}: ${error}`);
-                lastError = error;
-            }
-        }
-        this.logger.error('Error while calculating tvm executor fee on all endpoints');
-        throw (0, errors_1.simulationError)(lastError);
-    }
-    async getFeeInfo(evmProxyMsg, transactionLinker, assets, allowSimulationError = false, isRoundTrip = true, evmValidExecutors = this.config.TACParams.trustedTACExecutors, tvmValidExecutors = this.config.TACParams.trustedTONExecutors, calculateRollbackFee = true) {
-        this.logger.debug('Getting fee info');
-        Validator_1.Validator.validateEVMAddress(evmProxyMsg.evmTargetAddress);
-        Validator_1.Validator.validateEVMAddresses(evmValidExecutors);
-        Validator_1.Validator.validateTVMAddresses(tvmValidExecutors);
+        const simulation = await this.operationTracker.simulateTACMessage(tacSimulationParams);
+        this.logger.debug(`TAC simulation ${simulation.simulationStatus ? 'success' : 'failed'}`);
+        const isRoundTrip = options.isRoundTrip ?? assets.length !== 0;
         const crossChainLayer = this.config.TONParams.contractOpener.open(this.config.artifacts.ton.wrappers.CrossChainLayer.createFromAddress(ton_1.Address.parse(this.config.TONParams.crossChainLayerAddress)));
         const fullStateCCL = await crossChainLayer.getFullData();
-        this.logger.debug(`Full state CCL: ${(0, Utils_1.formatObjectForLogging)(fullStateCCL)}`);
-        const tacSimulationBody = {
-            tacCallParams: {
-                arguments: evmProxyMsg.encodedParameters ?? '0x',
-                methodName: (0, Utils_1.formatSolidityMethodName)(evmProxyMsg.methodName),
-                target: evmProxyMsg.evmTargetAddress,
-            },
-            evmValidExecutors: evmValidExecutors,
-            tvmValidExecutors: tvmValidExecutors,
-            extraData: '0x',
-            shardsKey: transactionLinker.shardsKey,
-            tonAssets: assets.map((asset) => ({
-                amount: asset.rawAmount.toString(),
-                tokenAddress: asset.address || '',
-                assetType: asset.type,
-            })),
-            tonCaller: transactionLinker.caller,
-            calculateRollbackFee: calculateRollbackFee,
-        };
-        isRoundTrip = isRoundTrip ?? assets.length != 0;
-        this.logger.debug(`Is round trip: ${isRoundTrip}`);
-        const tacSimulationResult = await this.simulateTACMessage(tacSimulationBody);
-        this.logger.debug(`TAC simulation ${tacSimulationResult.simulationStatus ? 'success' : 'failed'}`);
-        const protocolFee = BigInt((0, ton_1.toNano)(fullStateCCL.tacProtocolFee)) +
-            BigInt(isRoundTrip) * BigInt((0, ton_1.toNano)(fullStateCCL.tonProtocolFee));
         const feeParams = {
-            isRoundTrip: isRoundTrip,
-            gasLimit: !tacSimulationResult.simulationStatus ? 0n : tacSimulationResult.estimatedGas,
-            protocolFee: protocolFee,
-            evmExecutorFee: BigInt(tacSimulationResult.suggestedTacExecutionFee),
-            tvmExecutorFee: BigInt(tacSimulationResult.suggestedTonExecutionFee) * BigInt(isRoundTrip),
+            isRoundTrip,
+            gasLimit: simulation.simulationStatus ? simulation.estimatedGas : 0n,
+            protocolFee: BigInt((0, ton_1.toNano)(fullStateCCL.tacProtocolFee)) +
+                BigInt(isRoundTrip) * BigInt((0, ton_1.toNano)(fullStateCCL.tonProtocolFee)),
+            evmExecutorFee: BigInt(simulation.suggestedTacExecutionFee),
+            tvmExecutorFee: BigInt(simulation.suggestedTonExecutionFee) * BigInt(isRoundTrip),
         };
-        if (!tacSimulationResult.simulationStatus) {
-            if (allowSimulationError) {
-                this.logger.info('Force send is true, returning fee params');
-                return {
-                    feeParams,
-                    simulation: tacSimulationResult,
-                };
-            }
-            throw tacSimulationResult;
+        if (!simulation.simulationStatus && !allowSimulationError) {
+            throw simulation;
         }
-        this.logger.debug(`Collected fee params: ${(0, Utils_1.formatObjectForLogging)(feeParams)}`);
-        return { feeParams, simulation: tacSimulationResult };
-    }
-    async getTransactionSimulationInfo(evmProxyMsg, sender, assets) {
-        this.logger.debug('Getting transaction simulation info');
-        Validator_1.Validator.validateEVMAddress(evmProxyMsg.evmTargetAddress);
-        const aggregatedData = await (0, Utils_1.aggregateTokens)(assets);
-        const transactionLinkerShardCount = aggregatedData.jettons.length == 0 ? 1 : aggregatedData.jettons.length;
-        this.logger.debug(`Transaction linker shard count: ${transactionLinkerShardCount}`);
-        const transactionLinker = (0, Utils_1.generateTransactionLinker)(sender.getSenderAddress(), transactionLinkerShardCount);
-        this.logger.debug(`Transaction linker: ${(0, Utils_1.formatObjectForLogging)(transactionLinker)}`);
-        return await this.getFeeInfo(evmProxyMsg, transactionLinker, assets ?? []);
-    }
-    async getSimulationInfoForTransaction(evmProxyMsg, transactionLinker, assets, allowSimulationError = false, isRoundTrip, evmValidExecutors, tvmValidExecutors, calculateRollbackFee) {
-        return await this.getFeeInfo(evmProxyMsg, transactionLinker, assets, allowSimulationError, isRoundTrip, evmValidExecutors, tvmValidExecutors, calculateRollbackFee);
+        if (allowSimulationError && !simulation.simulationStatus) {
+            this.logger.info('Simulation failed but allowSimulationError is true, returning partial fee params');
+        }
+        return { feeParams, simulation };
     }
 }
 exports.Simulator = Simulator;

package/dist/sdk/TACTransactionManager.d.ts

@@ -0,0 +1,10 @@
+import { Wallet } from 'ethers';
+import { Asset, IConfiguration, ILogger, IOperationTracker, ITACTransactionManager } from '../interfaces';
+export declare class TACTransactionManager implements ITACTransactionManager {
+    private readonly config;
+    private readonly operationTracker;
+    private readonly logger;
+    constructor(config: IConfiguration, operationTracker: IOperationTracker, logger?: ILogger);
+    private approveAsset;
+    bridgeTokensToTON(signer: Wallet, value: bigint, tonTarget: string, assets?: Asset[], tvmExecutorFee?: bigint, tvmValidExecutors?: string[]): Promise<string>;
+}

package/dist/sdk/TACTransactionManager.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TACTransactionManager = void 0;
+const assets_1 = require("../assets");
+const Struct_1 = require("../structs/Struct");
+const Consts_1 = require("./Consts");
+const Logger_1 = require("./Logger");
+const Utils_1 = require("./Utils");
+const Validator_1 = require("./Validator");
+class TACTransactionManager {
+    constructor(config, operationTracker, logger = new Logger_1.NoopLogger()) {
+        this.config = config;
+        this.operationTracker = operationTracker;
+        this.logger = logger;
+    }
+    async approveAsset(asset, signer, spenderAddress) {
+        const evmAddress = await asset.getEVMAddress();
+        if (asset.type === Struct_1.AssetType.FT) {
+            this.logger.debug(`Approving FT ${evmAddress} for ${spenderAddress}`);
+            const contract = this.config.artifacts.tac.wrappers.ERC20FactoryTAC.connect(evmAddress, this.config.TACParams.provider);
+            const tx = await contract.connect(signer).approve(spenderAddress, asset.rawAmount);
+            await tx.wait();
+        }
+        else if (asset.type === Struct_1.AssetType.NFT) {
+            this.logger.debug(`Approving NFT ${evmAddress} for ${spenderAddress}`);
+            const contract = this.config.artifacts.tac.wrappers.ERC721FactoryTAC.connect(evmAddress, this.config.TACParams.provider);
+            const tx = await contract.connect(signer).approve(spenderAddress, asset.addresses.index);
+            await tx.wait();
+        }
+        this.logger.debug(`Approved ${evmAddress} for ${spenderAddress}`);
+    }
+    async bridgeTokensToTON(signer, value, tonTarget, assets = [], tvmExecutorFee, tvmValidExecutors) {
+        this.logger.debug('Bridging tokens to TON');
+        Validator_1.Validator.validateTVMAddress(tonTarget);
+        // Add native TAC asset if value > 0
+        if (value > 0n) {
+            const nativeTacAsset = (await assets_1.AssetFactory.from(this.config, {
+                address: await this.config.nativeTACAddress(),
+                tokenType: Struct_1.AssetType.FT,
+            })).withRawAmount(value);
+            assets = [...assets, nativeTacAsset];
+        }
+        // Calculate executor fee if not provided
+        if (!tvmExecutorFee) {
+            const feeParams = {
+                tonAssets: (0, Utils_1.mapAssetsToTonAssets)(assets),
+                feeSymbol: Consts_1.TAC_SYMBOL,
+                tvmValidExecutors: tvmValidExecutors ?? [],
+            };
+            const suggestedFee = await this.operationTracker.getTVMExecutorFee(feeParams);
+            this.logger.debug(`Suggested TON executor fee: ${(0, Utils_1.formatObjectForLogging)(suggestedFee)}`);
+            tvmExecutorFee = BigInt(suggestedFee.inTAC);
+        }
+        // Approve all assets
+        const crossChainLayerAddress = await this.config.TACParams.crossChainLayer.getAddress();
+        await Promise.all(assets.map(asset => this.approveAsset(asset, signer, crossChainLayerAddress)));
+        const protocolFee = await this.config.TACParams.crossChainLayer.getProtocolFee();
+        const shardsKey = BigInt(Math.round(Math.random() * 1e18));
+        this.logger.debug(`Shards key: ${shardsKey}, Protocol fee: ${protocolFee}`);
+        // Prepare bridge data
+        const [toBridge, toBridgeNFT] = await Promise.all([
+            Promise.all(assets.filter(a => a.type === Struct_1.AssetType.FT).map(async (a) => ({
+                evmAddress: await a.getEVMAddress(),
+                amount: a.rawAmount,
+            }))),
+            Promise.all(assets.filter(a => a.type === Struct_1.AssetType.NFT).map(async (a) => ({
+                evmAddress: await a.getEVMAddress(),
+                amount: 1n,
+                tokenId: a.addresses.index,
+            }))),
+        ]);
+        const outMessage = {
+            shardsKey,
+            tvmTarget: tonTarget,
+            tvmPayload: '',
+            tvmProtocolFee: protocolFee,
+            tvmExecutorFee,
+            tvmValidExecutors: this.config.getTrustedTONExecutors,
+            toBridge,
+            toBridgeNFT,
+        };
+        const totalValue = value + BigInt(outMessage.tvmProtocolFee) + BigInt(outMessage.tvmExecutorFee);
+        this.logger.debug(`Total value: ${totalValue}`);
+        const tx = await this.config.TACParams.crossChainLayer
+            .connect(signer)
+            .sendMessage(1n, this.config.artifacts.tac.utils.encodeOutMessageV1(outMessage), { value: totalValue });
+        await tx.wait();
+        this.logger.debug(`Transaction hash: ${tx.hash}`);
+        return tx.hash;
+    }
+}
+exports.TACTransactionManager = TACTransactionManager;

package/dist/sdk/TONTransactionManager.d.ts

@@ -0,0 +1,17 @@
+import { IConfiguration, ILogger, IOperationTracker, ISimulator, ITONTransactionManager } from '../interfaces';
+import type { SenderAbstraction } from '../sender';
+import { CrosschainTx, EvmProxyMsg, OperationIdsByShardsKey, TransactionLinkerWithOperationId, WaitOptions } 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;
+    private prepareCrossChainTransaction;
+    private generateCrossChainMessages;
+    sendCrossChainTransaction(evmProxyMsg: EvmProxyMsg, sender: SenderAbstraction, tx: CrosschainTx, waitOptions?: WaitOptions<string>): Promise<TransactionLinkerWithOperationId>;
+    sendCrossChainTransactions(sender: SenderAbstraction, txs: CrosschainTx[], waitOptions?: WaitOptions<OperationIdsByShardsKey>): Promise<TransactionLinkerWithOperationId[]>;
+    private prepareBatchTransactions;
+    private waitForOperationIds;
+}

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;
 }