@tonappchain/sdk 0.7.2-alpha-3 → 0.7.2-alpha-5

package/dist/src/sdk/Simulator.js

@@ -6,7 +6,7 @@ const assets_1 = require("../assets");
 const errors_1 = require("../errors");
 const instances_1 = require("../errors/instances");
 const Struct_1 = require("../structs/Struct");
-const Consts_1 = require("./Consts");
+const Fees_1 = require("./Fees");
 const Logger_1 = require("./Logger");
 const Utils_1 = require("./Utils");
 const Validator_1 = require("./Validator");
@@ -77,153 +77,63 @@ class Simulator {
     // Message size
     msgBits, msgCells, 
     // Gas and computation
-    gasUsed, 
-    // Config values (defaults for BaseChain)
-    bitPricePs = 1, cellPricePs = 500, lumpPrice = 400000, gasPrice = 400, firstFrac = 21845, ihrPriceFactor = 0, }) {
+    gasUsed, accountBitPrice, accountCellPrice, lumpPrice, gasPrice, firstFrac, ihrPriceFactor, msgBitPrice, msgCellPrice, }) {
         // Storage Fee (nanotons)
-        const storageFee = Math.ceil(((accountBits * bitPricePs + accountCells * cellPricePs) * timeDelta) / Consts_1.FIXED_POINT_SHIFT);
+        const storageFee = Math.ceil(((accountBits * accountBitPrice + accountCells * accountCellPrice) * timeDelta) / Fees_1.FIXED_POINT_SHIFT);
         // Computation Fee (nanotons)
         const computeFee = gasUsed * gasPrice;
         // Forwarding Fee (nanotons)
-        const msgFwdFees = lumpPrice + Math.ceil((bitPricePs * msgBits + cellPricePs * msgCells) / Consts_1.FIXED_POINT_SHIFT);
-        const ihrFwdFees = Math.ceil((msgFwdFees * ihrPriceFactor) / Consts_1.FIXED_POINT_SHIFT);
+        const msgFwdFees = lumpPrice + Math.ceil((msgBitPrice * msgBits + msgCellPrice * msgCells) / Fees_1.FIXED_POINT_SHIFT);
+        const ihrFwdFees = Math.ceil((msgFwdFees * ihrPriceFactor) / Fees_1.FIXED_POINT_SHIFT);
         const totalFwdFees = msgFwdFees + ihrFwdFees;
         // Action Fee (nanotons)
-        const actionFee = Math.floor((msgFwdFees * firstFrac) / Consts_1.FIXED_POINT_SHIFT);
+        const actionFee = Math.floor((msgFwdFees * firstFrac) / Fees_1.FIXED_POINT_SHIFT);
         // Combine all fees
         const totalFees = BigInt(storageFee) + BigInt(computeFee) + BigInt(actionFee) + BigInt(totalFwdFees);
         return totalFees;
     }
     calculateTransactionPipeline(steps) {
-        return steps.reduce((total, step) => total + this.calculateTONFees(step), 0n);
+        return steps.reduce((total, step) => total + this.calculateTONFees({ ...step, ...this.config.TONParams.feesParams }), 0n);
     }
     calculateTONCrosschainFee(msgBits, msgCells) {
-        return this.calculateTransactionPipeline([
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.gas.tvmMsgToEvm,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
-        ]);
+        return this.calculateTransactionPipeline([(0, Fees_1.createCrossChainLayerTvmMsgToEvmStep)(msgBits, msgCells)]);
     }
     calculateJettonTransferCrosschainFee(msgBits, msgCells) {
         return this.calculateTransactionPipeline([
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonWallet.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonWallet.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonWallet.gas.internalTransfer,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonWallet.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonWallet.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonWallet.gas.receive,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonProxy.accountbits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonProxy.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonProxy.gas.ownershipAssigned,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.gas.tvmMsgToEvm,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
+            (0, Fees_1.createJettonWalletInternalTransferStep)(msgBits, msgCells),
+            (0, Fees_1.createJettonWalletReceiveStep)(msgBits, msgCells),
+            (0, Fees_1.createJettonProxyOwnershipAssignedStep)(msgBits, msgCells),
+            (0, Fees_1.createCrossChainLayerTvmMsgToEvmStep)(msgBits, msgCells),
+            (0, Fees_1.createErrorNotificationGasStep)(msgBits, msgCells),
+            (0, Fees_1.createEstimatedSendTransferGasStep)(msgBits, msgCells),
+            (0, Fees_1.createEstimatedReceiveTransferGasStep)(msgBits, msgCells),
         ]);
     }
     calculateJettonBurnCrosschainFee(msgBits, msgCells) {
         return this.calculateTransactionPipeline([
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonWallet.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonWallet.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonWallet.gas.burn,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonMinter.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonMinter.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.jettonMinter.gas.burnNotification,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.gas.tvmMsgToEvm,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
+            (0, Fees_1.createJettonWalletBurnStep)(msgBits, msgCells),
+            (0, Fees_1.createJettonMinterBurnNotificationStep)(msgBits, msgCells),
+            (0, Fees_1.createCrossChainLayerTvmMsgToEvmStep)(msgBits, msgCells),
+            (0, Fees_1.createMintAfterErrorGasStep)(msgBits, msgCells),
+            (0, Fees_1.createJettonWalletReceiveStep)(msgBits, msgCells),
         ]);
     }
     calculateNftTransferCrosschainFee(msgBits, msgCells) {
         return this.calculateTransactionPipeline([
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.nftItem.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.nftItem.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.nftItem.gas.send,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.nftProxy.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.nftProxy.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.nftProxy.gas.ownershipAssigned,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.gas.tvmMsgToEvm,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
+            (0, Fees_1.createNftItemSendStep)(msgBits, msgCells),
+            (0, Fees_1.createNftProxyOwnershipAssignedStep)(msgBits, msgCells),
+            (0, Fees_1.createCrossChainLayerTvmMsgToEvmStep)(msgBits, msgCells),
+            (0, Fees_1.createNftProxyErrorNotificationStep)(msgBits, msgCells),
+            (0, Fees_1.createNftItemSendStep)(msgBits, msgCells),
         ]);
     }
     calculateNftBurnCrosschainFee(msgBits, msgCells) {
         return this.calculateTransactionPipeline([
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.nftItem.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.nftItem.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.nftItem.gas.burn,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
-            {
-                accountBits: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountBits,
-                accountCells: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.accountCells,
-                gasUsed: Consts_1.CONTRACT_FEE_USAGE_PARAMS.crossChainLayer.gas.tvmMsgToEvm,
-                msgBits,
-                msgCells,
-                timeDelta: Consts_1.ONE_YEAR_SECONDS,
-            },
+            (0, Fees_1.createNftItemBurnStep)(msgBits, msgCells),
+            (0, Fees_1.createCrossChainLayerTvmMsgToEvmStep)(msgBits, msgCells),
+            (0, Fees_1.createNftItemErrorNotificationStep)(),
         ]);
     }
-    estimateTONFees(assets, params) {
-        return assets.reduce((totalFees, asset) => totalFees + this.estimateTONFee(asset, params), 0n);
-    }
     estimateTONFee(asset, params) {
         const payload = asset.generatePayload(params);
         const { bits: msgBits, cells: msgCells } = (0, Utils_1.recurisivelyCollectCellStats)(payload);

package/dist/src/sdk/StartTracking.js

@@ -71,7 +71,7 @@ async function startTracking(transactionLinker, network, options) {
             for (const tx of transactions) {
                 try {
                     logger.debug(`Verifying transaction: ${tx.hash}`);
-                    await txFinalizer.trackTransactionTree(cclAddress, tx.hash, { maxDepth: 10 });
+                    await txFinalizer.trackTransactionTree(cclAddress, tx.hash, { maxDepth: Consts_1.DEFAULT_FIND_TX_MAX_DEPTH });
                     logger.debug(`Transaction ${tx.hash} verified successfully in TON`);
                 }
                 catch (error) {

package/dist/src/sdk/TONTransactionManager.js

@@ -55,7 +55,7 @@ class TONTransactionManager {
     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 { allowSimulationError = false, isRoundTrip = undefined, calculateRollbackFee = true, validateAssetsBalance = true, evmDataBuilder = Utils_1.buildEvmDataCell, } = options || {};
         const { evmValidExecutors = [], tvmValidExecutors = [] } = options || {};
         Validator_1.Validator.validateEVMAddress(evmProxyMsg.evmTargetAddress);
         const aggregatedData = (0, Utils_1.aggregateTokens)(assets);
@@ -91,7 +91,7 @@ class TONTransactionManager {
             tac: tacExecutors,
             ton: tonExecutors,
         };
-        const evmData = (0, Utils_1.buildEvmDataCell)(transactionLinker, evmProxyMsg, validExecutors);
+        const evmData = evmDataBuilder(transactionLinker, evmProxyMsg, validExecutors);
         const messages = await this.generateCrossChainMessages(caller, evmData, aggregatedData, feeParams);
         return {
             transaction: {
@@ -176,7 +176,7 @@ class TONTransactionManager {
             const hash = (0, Utils_1.getNormalizedExtMessageHash)((0, ton_1.loadMessage)(ton_1.Cell.fromBase64(sendTransactionResult.boc).beginParse()));
             this.logger.info(`Tracking transaction tree for hash: ${hash}`);
             await this.txFinalizer.trackTransactionTree(sender.getSenderAddress(), hash, {
-                maxDepth: 10,
+                maxDepth: Consts_1.DEFAULT_FIND_TX_MAX_DEPTH,
             });
             this.logger.info(`Transaction tree successful`);
         }

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

@@ -42,4 +42,9 @@ export declare class TacSdk implements ITacSDK {
     getEVMNFTAddress(tvmNFTAddress: string, addressType: NFTAddressType): Promise<string>;
     getOperationTracker(): IOperationTracker;
     prepareCrossChainTransactionPayload(evmProxyMsg: EvmProxyMsg, senderAddress: string, assets?: AssetLike[], options?: CrossChainTransactionOptions): Promise<CrossChainPayloadResult[]>;
+    getTACGasPrice(): Promise<{
+        average: number;
+        fast: number;
+        slow: number;
+    }>;
 }

package/dist/src/sdk/TacSdk.js

@@ -183,5 +183,13 @@ class TacSdk {
         const normalizedAssets = await (0, Utils_1.normalizeAssets)(this.config, assets);
         return this.tonTransactionManager.prepareCrossChainTransactionPayload(evmProxyMsg, senderAddress, normalizedAssets, options);
     }
+    async getTACGasPrice() {
+        const response = await this.operationTracker.getTACGasPrice();
+        return {
+            average: response.gasPrices.average,
+            fast: response.gasPrices.fast,
+            slow: response.gasPrices.slow,
+        };
+    }
 }
 exports.TacSdk = TacSdk;

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

@@ -6,7 +6,7 @@ export declare class TonTxFinalizer implements ITxFinalizer {
     private contractOpener;
     constructor(contractOpener: ContractOpener, logger?: ILogger);
     private fetchAdjacentTransactions;
-    trackTransactionTree(address: string, hash: string, params: {
+    trackTransactionTree(address: string, hash: string, params?: {
         maxDepth?: number;
     }): Promise<void>;
 }

package/dist/src/sdk/TxFinalizer.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonIndexerTxFinalizer = exports.TonTxFinalizer = void 0;
 const ton_1 = require("@ton/ton");
 const AxiosHttpClient_1 = require("./AxiosHttpClient");
+const Consts_1 = require("./Consts");
 const Logger_1 = require("./Logger");
 const Utils_1 = require("./Utils");
 const IGNORE_OPCODE = [
@@ -42,8 +43,8 @@ class TonTxFinalizer {
         return [];
     }
     // Checks if all transactions in the tree are successful
-    async trackTransactionTree(address, hash, params) {
-        const { maxDepth = 10 } = params;
+    async trackTransactionTree(address, hash, params = { maxDepth: Consts_1.DEFAULT_FIND_TX_MAX_DEPTH }) {
+        const { maxDepth = Consts_1.DEFAULT_FIND_TX_MAX_DEPTH } = params;
         const parsedAddress = ton_1.Address.parse(address);
         const visitedHashes = new Set();
         const queue = [{ address: parsedAddress, hash, depth: 0 }];
@@ -64,6 +65,8 @@ class TonTxFinalizer {
             for (const tx of transactions) {
                 if (tx.description.type !== 'generic' || !tx.inMessage)
                     continue;
+                if (tx.inMessage.info.type === 'internal' && tx.inMessage.info.value.coins === Consts_1.IGNORE_MSG_VALUE_1_NANO)
+                    continue; // we ignore messages with 1 nanoton value as they are for notification purpose only
                 const bodySlice = tx.inMessage.body.beginParse();
                 if (bodySlice.remainingBits < 32)
                     continue;
@@ -141,8 +144,8 @@ class TonIndexerTxFinalizer {
         return [];
     }
     // Checks if all transactions in the tree are successful
-    async trackTransactionTree(_, hash, params = { maxDepth: 10 }) {
-        const { maxDepth = 10 } = params;
+    async trackTransactionTree(_, hash, params = { maxDepth: Consts_1.DEFAULT_FIND_TX_MAX_DEPTH }) {
+        const { maxDepth = Consts_1.DEFAULT_FIND_TX_MAX_DEPTH } = params;
         const visitedHashes = new Set();
         const queue = [{ hash, depth: 0 }];
         while (queue.length > 0) {
@@ -156,6 +159,8 @@ class TonIndexerTxFinalizer {
             if (transactions.length === 0)
                 continue;
             for (const tx of transactions) {
+                if (tx.inMsg.value === Consts_1.IGNORE_MSG_VALUE_1_NANO.toString())
+                    continue; // we ignore messages with 1 nanoton value as they are for notification purpose only
                 if (!IGNORE_OPCODE.includes(Number(tx.inMsg.opcode)) && tx.inMsg.opcode !== null) {
                     const { aborted, computePh: compute_ph, action } = tx.description;
                     if (aborted ||

package/dist/src/sdk/Utils.js

@@ -341,12 +341,12 @@ async function retry(fn, options) {
     throw lastError;
 }
 function recurisivelyCollectCellStats(cell) {
-    let bits = 0;
-    let cells = 0;
+    let bits = cell.bits.length;
+    let cells = 1;
     for (const ref of cell.refs) {
         const stats = recurisivelyCollectCellStats(ref);
         bits += stats.bits;
         cells += stats.cells;
     }
-    return { bits: cell.bits.length + bits, cells: 1 + cells };
+    return { bits, cells };
 }

package/dist/src/structs/InternalStruct.d.ts

@@ -36,6 +36,7 @@ export type InternalTONParams = {
     jettonWalletCode: Cell;
     nftItemCode: Cell;
     nftCollectionCode: Cell;
+    feesParams: TONFeesParams;
 };
 export type InternalTACParams = {
     provider: AbstractProvider;
@@ -87,6 +88,7 @@ export type ToncenterTransaction = {
     inMsg: {
         hash: string;
         opcode: string;
+        value: string;
     };
     outMsgs: {
         hash: string;
@@ -136,19 +138,15 @@ export type AddressInformation = {
         hash: string;
     };
 };
-export type TONFeeCalculationParams = {
-    accountBits: number;
-    accountCells: number;
-    timeDelta: number;
-    msgBits: number;
-    msgCells: number;
-    gasUsed: number;
-    bitPricePs?: number;
-    cellPricePs?: number;
-    lumpPrice?: number;
-    gasPrice?: number;
-    firstFrac?: number;
-    ihrPriceFactor?: number;
+export type TONFeesParams = {
+    accountBitPrice: number;
+    accountCellPrice: number;
+    lumpPrice: number;
+    gasPrice: number;
+    firstFrac: number;
+    ihrPriceFactor: number;
+    msgBitPrice: number;
+    msgCellPrice: number;
 };
 export type TransactionFeeCalculationStep = {
     accountBits: number;
@@ -158,3 +156,4 @@ export type TransactionFeeCalculationStep = {
     msgCells: number;
     timeDelta: number;
 };
+export type TONFeeCalculationParams = TransactionFeeCalculationStep & TONFeesParams;

package/dist/src/structs/Struct.d.ts

@@ -109,7 +109,6 @@ export type EvmProxyMsg = {
     methodName?: string;
     encodedParameters?: string;
     gasLimit?: bigint;
-    [key: string]: unknown;
 };
 export type TransactionLinker = {
     caller: string;
@@ -287,6 +286,7 @@ export type FeeParams = {
     tvmExecutorFee: bigint;
     evmEstimatedGas?: bigint;
 };
+export type evmDataBuilder = (transactionLinker: TransactionLinker, evmProxyMsg: EvmProxyMsg, validExecutors: ValidExecutors) => Cell;
 export type CrossChainTransactionOptions = {
     allowSimulationError?: boolean;
     isRoundTrip?: boolean;
@@ -300,6 +300,7 @@ export type CrossChainTransactionOptions = {
     validateAssetsBalance?: boolean;
     waitOperationId?: boolean;
     waitOptions?: WaitOptions<string>;
+    evmDataBuilder?: evmDataBuilder;
 };
 export type BatchCrossChainTransactionOptions = Omit<CrossChainTransactionOptions, 'waitOperationId' | 'waitOptions'>;
 export type CrossChainTransactionsOptions = {
@@ -445,3 +446,10 @@ export type GeneratePayloadParams = {
     forwardFeeTonAmount?: bigint;
     feeParams?: FeeParams;
 };
+export type TacGasPriceResponse = {
+    gasPrices: {
+        average: number;
+        fast: number;
+        slow: number;
+    };
+};

package/package.json

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