@tonappchain/sdk 0.6.3 → 0.6.5-mainnet-alpha

package/dist/sdk/Consts.js

@@ -12,5 +12,5 @@ exports.SOLIDITY_METHOD_NAME_REGEX = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 exports.MAX_EXT_MSG_SIZE = 65535;
 exports.MAX_HIGHLOAD_GROUP_MSG_NUM = 254;
 exports.MAX_MSG_DEPTH = 512;
-exports.TON_SYMBOL = "TON";
-exports.TAC_SYMBOL = "TAC";
+exports.TON_SYMBOL = 'TON';
+exports.TAC_SYMBOL = 'TAC';

package/dist/sdk/TacSdk.js

@@ -35,7 +35,7 @@ class TacSdk {
         const network = sdkParams.network;
         const delay = sdkParams.delay ?? Consts_1.DEFAULT_DELAY;
         const artifacts = network === Struct_1.Network.TESTNET ? artifacts_1.testnet : artifacts_1.mainnet;
-        const TONParams = await this.prepareTONParams(network, delay, artifacts, sdkParams.TONParams);
+        const TONParams = await this.prepareTONParams(delay, artifacts, sdkParams.TONParams);
         const TACParams = await this.prepareTACParams(artifacts, delay, sdkParams.TACParams);
         const liteSequencerEndpoints = sdkParams.customLiteSequencerEndpoints ??
             (network === Struct_1.Network.TESTNET
@@ -43,14 +43,13 @@ class TacSdk {
                 : artifacts_1.mainnet.PUBLIC_LITE_SEQUENCER_ENDPOINTS);
         return new TacSdk(network, delay, artifacts, TONParams, TACParams, liteSequencerEndpoints);
     }
-    static async prepareTONParams(network, delay, artifacts, TONParams) {
+    static async prepareTONParams(delay, artifacts, TONParams) {
         const contractOpener = TONParams?.contractOpener ??
             new ton_1.TonClient({
-                endpoint: network == Struct_1.Network.TESTNET
-                    ? new URL('api/v2/jsonRPC', artifacts_1.testnet.TON_RPC_ENDPOINT_BY_TAC).toString()
-                    : artifacts_1.mainnet.TON_PUBLIC_RPC_ENDPOINT,
+                endpoint: new URL('api/v2/jsonRPC', artifacts.TON_RPC_ENDPOINT_BY_TAC).toString()
             });
-        const settingsAddress = TONParams?.settingsAddress ?? artifacts.ton.addresses.TON_SETTINGS_ADDRESS;
+        const settingsAddress = TONParams?.settingsAddress
+            ?? artifacts.TON_SETTINGS_ADDRESS;
         const settings = contractOpener.open(new Settings_1.Settings(ton_1.Address.parse(settingsAddress)));
         const jettonProxyAddress = await settings.getAddressSetting('JettonProxyAddress');
         await (0, Utils_1.sleep)(delay * 1000);
@@ -79,7 +78,8 @@ class TacSdk {
     }
     static async prepareTACParams(artifacts, delay, TACParams) {
         const provider = TACParams?.provider ?? ethers_1.ethers.getDefaultProvider(artifacts.TAC_RPC_ENDPOINT);
-        const settingsAddress = TACParams?.settingsAddress?.toString() ?? artifacts.tac.addresses.TAC_SETTINGS_ADDRESS;
+        const settingsAddress = TACParams?.settingsAddress?.toString()
+            ?? artifacts.TAC_SETTINGS_ADDRESS;
         const settings = artifacts.tac.wrappers.SettingsFactoryTAC.connect(settingsAddress, provider);
         const crossChainLayerABI = TACParams?.crossChainLayerABI ?? artifacts.tac.compilationArtifacts.CrossChainLayer.abi;
         const crossChainLayerAddress = await settings.getAddressSetting((0, ethers_1.keccak256)((0, ethers_1.toUtf8Bytes)('CrossChainLayerAddress')));
@@ -421,7 +421,7 @@ class TacSdk {
             throw instances_1.invalidAssetType;
         }));
     }
-    async getFeeInfo(evmProxyMsg, transactionLinker, rawAssets, evmValidExecutors, forceSend = false, isRoundTrip) {
+    async getFeeInfo(evmProxyMsg, transactionLinker, rawAssets, forceSend = false, isRoundTrip = true, evmValidExecutors = this.TACParams.trustedTACExecutors) {
         const crossChainLayer = this.TONParams.contractOpener.open(this.artifacts.ton.wrappers.CrossChainLayer.createFromAddress(ton_1.Address.parse(this.TONParams.crossChainLayerAddress)));
         const fullStateCCL = await crossChainLayer.getFullData();
         const tacSimulationBody = {
@@ -440,28 +440,24 @@ class TacSdk {
             })),
             tonCaller: transactionLinker.caller,
         };
+        isRoundTrip = isRoundTrip ?? (rawAssets.length != 0);
         const tacSimulationResult = await this.simulateTACMessage(tacSimulationBody);
         if (!tacSimulationResult.simulationStatus) {
             if (forceSend) {
                 return {
                     feeParams: {
-                        isRoundTrip: isRoundTrip ?? false,
+                        isRoundTrip,
                         gasLimit: 0n,
                         protocolFee: BigInt((0, ton_1.toNano)(fullStateCCL.tacProtocolFee)) +
-                            BigInt(isRoundTrip ?? false) * BigInt((0, ton_1.toNano)(fullStateCCL.tonProtocolFee)),
-                        evmExecutorFee: 0n,
-                        tvmExecutorFee: 0n,
+                            BigInt(isRoundTrip) * BigInt((0, ton_1.toNano)(fullStateCCL.tonProtocolFee)),
+                        evmExecutorFee: BigInt(tacSimulationResult.suggestedTacExecutionFee),
+                        tvmExecutorFee: BigInt(tacSimulationResult.suggestedTonExecutionFee) * BigInt(isRoundTrip),
                     },
                     simulation: tacSimulationResult,
                 };
             }
             throw tacSimulationResult;
         }
-        isRoundTrip = isRoundTrip ?? tacSimulationResult.outMessages != null;
-        let tonExecutorFeeInTON = 0n;
-        if (isRoundTrip) {
-            tonExecutorFeeInTON = BigInt(tacSimulationResult.suggestedTonExecutionFee);
-        }
         const protocolFee = BigInt((0, ton_1.toNano)(fullStateCCL.tacProtocolFee)) +
             BigInt(isRoundTrip) * BigInt((0, ton_1.toNano)(fullStateCCL.tonProtocolFee));
         const feeParams = {
@@ -469,7 +465,7 @@ class TacSdk {
             gasLimit: tacSimulationResult.estimatedGas,
             protocolFee: protocolFee,
             evmExecutorFee: BigInt(tacSimulationResult.suggestedTacExecutionFee),
-            tvmExecutorFee: tonExecutorFeeInTON,
+            tvmExecutorFee: BigInt(tacSimulationResult.suggestedTonExecutionFee) * BigInt(isRoundTrip),
         };
         return { feeParams: feeParams, simulation: tacSimulationResult };
     }
@@ -478,8 +474,7 @@ class TacSdk {
         const aggregatedData = await this.aggregateTokens(rawAssets);
         const transactionLinkerShardCount = aggregatedData.jettons.length == 0 ? 1 : aggregatedData.jettons.length;
         const transactionLinker = (0, Utils_1.generateTransactionLinker)(sender.getSenderAddress(), transactionLinkerShardCount);
-        const evmValidExecutors = this.TACParams.trustedTACExecutors;
-        return await this.getFeeInfo(evmProxyMsg, transactionLinker, rawAssets, evmValidExecutors, false, undefined);
+        return await this.getFeeInfo(evmProxyMsg, transactionLinker, rawAssets);
     }
     async getTVMExecutorFeeInfo(assets, feeSymbol) {
         const rawAssets = await this.convertAssetsToRawFormat(assets);
@@ -517,7 +512,7 @@ class TacSdk {
         if (tvmValidExecutors.length == 0) {
             tvmValidExecutors = this.TACParams.trustedTONExecutors;
         }
-        const { feeParams } = await this.getFeeInfo(evmProxyMsg, transactionLinker, rawAssets, evmValidExecutors, forceSend, isRoundTrip);
+        const { feeParams } = await this.getFeeInfo(evmProxyMsg, transactionLinker, rawAssets, forceSend, isRoundTrip, evmValidExecutors);
         if (evmProxyMsg.gasLimit == undefined) {
             evmProxyMsg.gasLimit = feeParams.gasLimit;
         }

package/dist/wrappers/JettonWallet.js

@@ -62,7 +62,7 @@ class JettonWallet {
             .storeAddress(ton_1.Address.parse(to))
             .storeAddress(responseAddress ? ton_1.Address.parse(responseAddress) : null)
             .storeMaybeRef(null)
-            .storeCoins((forwardTonAmount || 0n))
+            .storeCoins(forwardTonAmount || 0n)
             .storeMaybeRef((0, ton_1.beginCell)()
             .storeCoins(crossChainTonAmount ?? 0n)
             .storeMaybeRef(feeData)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonappchain/sdk",
-  "version": "0.6.3",
+  "version": "0.6.5-mainnet-alpha",
   "repository": "https://github.com/TacBuild/tac-sdk.git",
   "author": "TAC. <developers@tac>",
   "license": "MIT",
@@ -20,7 +20,7 @@
     "@aws-crypto/sha256-js": "^5.2.0",
     "@orbs-network/ton-access": "^2.3.3",
     "@ton/ton": "15.1.0",
-    "@tonappchain/artifacts": "0.0.17-test",
+    "@tonappchain/artifacts": "0.0.19-mainnet-rc2",
     "@tonappchain/ton-lite-client": "3.0.6",
     "@tonconnect/ui": "^2.0.11",
     "bn.js": "^5.2.1",