@tonappchain/sdk 0.7.0-rc17 → 0.7.0-rc19

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

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Configuration = void 0;
 const ton_1 = require("@ton/ton");
-const artifacts_1 = require("@tonappchain/artifacts");
 const ethers_1 = require("ethers");
+const artifacts_1 = require("../../artifacts");
 const retryableContractOpener_1 = require("../adapters/retryableContractOpener");
 const Struct_1 = require("../structs/Struct");
-const Settings_1 = require("../wrappers/Settings");
 const Utils_1 = require("./Utils");
 const Validator_1 = require("./Validator");
 class Configuration {
@@ -19,24 +18,47 @@ class Configuration {
     }
     static async create(network, artifacts, TONParams, TACParams, customLiteSequencerEndpoints, delay) {
         const [internalTONParams, internalTACParams] = await Promise.all([
-            this.prepareTONParams(artifacts, TONParams, delay),
-            this.prepareTACParams(artifacts, TACParams),
+            this.prepareTONParams(network, TONParams, delay),
+            this.prepareTACParams(network, TACParams),
         ]);
-        const liteSequencerEndpoints = customLiteSequencerEndpoints ??
-            (network === Struct_1.Network.TESTNET
-                ? artifacts_1.testnet.PUBLIC_LITE_SEQUENCER_ENDPOINTS
-                : artifacts_1.mainnet.PUBLIC_LITE_SEQUENCER_ENDPOINTS);
+        let liteSequencerEndpoints;
+        if (network === Struct_1.Network.DEV) {
+            if (!customLiteSequencerEndpoints || customLiteSequencerEndpoints.length === 0) {
+                throw new Error('For dev network, custom lite sequencer endpoints must be provided');
+            }
+            liteSequencerEndpoints = customLiteSequencerEndpoints;
+        }
+        else {
+            liteSequencerEndpoints =
+                customLiteSequencerEndpoints ??
+                    artifacts.PUBLIC_LITE_SEQUENCER_ENDPOINTS;
+        }
         return new Configuration(network, artifacts, internalTONParams, internalTACParams, liteSequencerEndpoints);
     }
-    static async prepareTONParams(artifacts, TONParams, delay) {
-        const contractOpener = TONParams?.contractOpener ?? (await (0, retryableContractOpener_1.createDefaultRetryableOpener)(artifacts, 3, delay));
-        const settingsAddress = TONParams?.settingsAddress ?? artifacts.TON_SETTINGS_ADDRESS;
-        const settings = contractOpener.open(Settings_1.Settings.create(ton_1.Address.parse(settingsAddress)));
+    static async prepareTONParams(network, TONParams, delay) {
+        let contractOpener;
+        let settingsAddress;
+        const artifacts = network === Struct_1.Network.MAINNET ? artifacts_1.mainnet : network === Struct_1.Network.TESTNET ? artifacts_1.testnet : artifacts_1.dev;
+        if (network === Struct_1.Network.DEV) {
+            if (!TONParams || !TONParams.contractOpener) {
+                throw new Error('For dev network, a custom contract opener must be provided in TONParams');
+            }
+            contractOpener = TONParams.contractOpener;
+            if (!TONParams.settingsAddress) {
+                throw new Error('For dev network, a custom settings address must be provided in TONParams');
+            }
+            settingsAddress = TONParams.settingsAddress;
+        }
+        else {
+            contractOpener = TONParams?.contractOpener ?? (await (0, retryableContractOpener_1.createDefaultRetryableOpener)(artifacts.TON_RPC_ENDPOINT_BY_TAC, network, 5, delay));
+            settingsAddress = TONParams?.settingsAddress ?? artifacts.TON_SETTINGS_ADDRESS;
+        }
+        const settings = contractOpener.open(artifacts.ton.wrappers.Settings.createFromAddress(ton_1.Address.parse(settingsAddress)));
         const allSettingsSlice = (await settings.getAll()).beginParse();
         const allSettings = allSettingsSlice.loadDictDirect(ton_1.Dictionary.Keys.BigUint(256), ton_1.Dictionary.Values.Cell());
-        const crossChainLayerAddress = (0, Settings_1.getAddressString)(allSettings.get((0, Utils_1.sha256toBigInt)('CrossChainLayerAddress')));
-        const jettonProxyAddress = (0, Settings_1.getAddressString)(allSettings.get((0, Utils_1.sha256toBigInt)('JettonProxyAddress')));
-        const nftProxyAddress = (0, Settings_1.getAddressString)(allSettings.get((0, Utils_1.sha256toBigInt)('NFTProxyAddress')));
+        const crossChainLayerAddress = (0, Utils_1.getAddressString)(allSettings.get((0, Utils_1.sha256toBigInt)('CrossChainLayerAddress')));
+        const jettonProxyAddress = (0, Utils_1.getAddressString)(allSettings.get((0, Utils_1.sha256toBigInt)('JettonProxyAddress')));
+        const nftProxyAddress = (0, Utils_1.getAddressString)(allSettings.get((0, Utils_1.sha256toBigInt)('NFTProxyAddress')));
         const jettonWalletCode = allSettings.get((0, Utils_1.sha256toBigInt)('JettonWalletCode'));
         const jettonMinterCode = allSettings.get((0, Utils_1.sha256toBigInt)('JettonMinterCode'));
         const nftItemCode = allSettings.get((0, Utils_1.sha256toBigInt)('NFTItemCode'));
@@ -52,12 +74,27 @@ class Configuration {
             nftCollectionCode,
         };
     }
-    static async prepareTACParams(artifacts, TACParams) {
-        const provider = TACParams?.provider ?? ethers_1.ethers.getDefaultProvider(artifacts.TAC_RPC_ENDPOINT);
-        const settingsAddress = TACParams?.settingsAddress?.toString() ?? artifacts.TAC_SETTINGS_ADDRESS;
+    static async prepareTACParams(network, TACParams) {
+        const artifacts = network === Struct_1.Network.MAINNET ? artifacts_1.mainnet : network === Struct_1.Network.TESTNET ? artifacts_1.testnet : artifacts_1.dev;
+        let provider;
+        let settingsAddress;
+        if (network === Struct_1.Network.DEV) {
+            if (!TACParams || !TACParams.provider) {
+                throw new Error('For dev network, a custom provider must be provided in TACParams');
+            }
+            provider = TACParams.provider;
+            if (!TACParams.settingsAddress) {
+                throw new Error('For dev network, a custom settings address must be provided in TACParams');
+            }
+            settingsAddress = TACParams.settingsAddress.toString();
+        }
+        else {
+            provider = TACParams?.provider ?? ethers_1.ethers.getDefaultProvider(artifacts.TAC_RPC_ENDPOINT);
+            settingsAddress = TACParams?.settingsAddress?.toString() ?? artifacts.TAC_SETTINGS_ADDRESS;
+        }
         Validator_1.Validator.validateEVMAddress(settingsAddress);
         const settings = artifacts.tac.wrappers.SettingsFactoryTAC.connect(settingsAddress, provider);
-        const loaded = await this.loadSettingsViaMulticall(artifacts, provider, settingsAddress, TACParams);
+        const loaded = await this.loadTACSettingsViaMulticall(network, provider, settingsAddress);
         let crossChainLayerAddress;
         let tokenUtilsAddress;
         let trustedTACExecutors;
@@ -88,9 +125,14 @@ class Configuration {
             abiCoder: new ethers_1.ethers.AbiCoder(),
         };
     }
-    static async loadSettingsViaMulticall(artifacts, provider, settingsAddress, TACParams) {
-        const multicallAddress = TACParams?.multicallAddress?.toString() ?? artifacts.MULTICALL_3_ADDRESS;
-        const multicallAbi = TACParams?.multicallABI ?? artifacts.tac.multicall.MULTICALL_ABI_ETHERS;
+    static async loadTACSettingsViaMulticall(network, provider, settingsAddress) {
+        if (network === Struct_1.Network.DEV) {
+            // skip multicall in dev, because it's not guaranteed that multicall contract is deployed
+            return null;
+        }
+        const artifacts = network === Struct_1.Network.MAINNET ? artifacts_1.mainnet : artifacts_1.testnet;
+        const multicallAddress = artifacts.MULTICALL_3_ADDRESS;
+        const multicallAbi = artifacts.tac.multicall.MULTICALL_ABI_ETHERS;
         try {
             Validator_1.Validator.validateEVMAddress(multicallAddress);
             const multicall = new ethers_1.ethers.Contract(multicallAddress, multicallAbi, provider);

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

@@ -11,3 +11,5 @@ export declare const MAX_MSG_DEPTH = 512;
 export declare const TON_SYMBOL = "TON";
 export declare const TAC_SYMBOL = "TAC";
 export declare const FIFTEEN_MINUTES: number;
+export declare const TON_DECIMALS = 9;
+export declare const TAC_DECIMALS = 18;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FIFTEEN_MINUTES = exports.TAC_SYMBOL = exports.TON_SYMBOL = exports.MAX_MSG_DEPTH = exports.MAX_HIGHLOAD_GROUP_MSG_NUM = exports.MAX_EXT_MSG_SIZE = exports.SOLIDITY_METHOD_NAME_REGEX = exports.SOLIDITY_SIGNATURE_REGEX = exports.DEFAULT_DELAY = exports.MAX_ITERATION_COUNT = exports.NFT_TRANSFER_FORWARD_TON_AMOUNT = exports.JETTON_TRANSFER_FORWARD_TON_AMOUNT = exports.TRANSACTION_TON_AMOUNT = void 0;
+exports.TAC_DECIMALS = exports.TON_DECIMALS = exports.FIFTEEN_MINUTES = exports.TAC_SYMBOL = exports.TON_SYMBOL = exports.MAX_MSG_DEPTH = exports.MAX_HIGHLOAD_GROUP_MSG_NUM = exports.MAX_EXT_MSG_SIZE = exports.SOLIDITY_METHOD_NAME_REGEX = exports.SOLIDITY_SIGNATURE_REGEX = exports.DEFAULT_DELAY = exports.MAX_ITERATION_COUNT = exports.NFT_TRANSFER_FORWARD_TON_AMOUNT = exports.JETTON_TRANSFER_FORWARD_TON_AMOUNT = exports.TRANSACTION_TON_AMOUNT = void 0;
 const ton_1 = require("@ton/ton");
 exports.TRANSACTION_TON_AMOUNT = (0, ton_1.toNano)(0.55);
 exports.JETTON_TRANSFER_FORWARD_TON_AMOUNT = (0, ton_1.toNano)(0.2);
@@ -15,3 +15,5 @@ exports.MAX_MSG_DEPTH = 512;
 exports.TON_SYMBOL = 'TON';
 exports.TAC_SYMBOL = 'TAC';
 exports.FIFTEEN_MINUTES = 15 * 60 * 1000;
+exports.TON_DECIMALS = 9;
+exports.TAC_DECIMALS = 18;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationTracker = exports.DefaultLiteSequencerClientFactory = void 0;
-const artifacts_1 = require("@tonappchain/artifacts");
+const artifacts_1 = require("../../artifacts");
 const errors_1 = require("../errors");
 const Struct_1 = require("../structs/Struct");
 const LiteSequencerClient_1 = require("./LiteSequencerClient");
@@ -16,10 +16,19 @@ class DefaultLiteSequencerClientFactory {
 exports.DefaultLiteSequencerClientFactory = DefaultLiteSequencerClientFactory;
 class OperationTracker {
     constructor(network, customLiteSequencerEndpoints, logger = new Logger_1.NoopLogger(), clientFactory = new DefaultLiteSequencerClientFactory()) {
-        const endpoints = customLiteSequencerEndpoints ??
-            (network === Struct_1.Network.TESTNET
-                ? artifacts_1.testnet.PUBLIC_LITE_SEQUENCER_ENDPOINTS
-                : artifacts_1.mainnet.PUBLIC_LITE_SEQUENCER_ENDPOINTS);
+        let endpoints;
+        if (network === Struct_1.Network.DEV) {
+            if (!customLiteSequencerEndpoints || customLiteSequencerEndpoints.length === 0) {
+                throw new Error('For DEV network, custom lite sequencer endpoints must be provided');
+            }
+            endpoints = customLiteSequencerEndpoints;
+        }
+        else {
+            const artifacts = network === Struct_1.Network.MAINNET ? artifacts_1.mainnet : artifacts_1.testnet;
+            endpoints = customLiteSequencerEndpoints && customLiteSequencerEndpoints.length !== 0 ?
+                customLiteSequencerEndpoints :
+                artifacts.PUBLIC_LITE_SEQUENCER_ENDPOINTS;
+        }
         this.clients = clientFactory.createClients(endpoints);
         this.logger = logger;
     }

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

@@ -47,7 +47,8 @@ class Simulator {
         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 CrossChainLayerC = this.config.artifacts.ton.wrappers.CrossChainLayer;
+        const crossChainLayer = this.config.TONParams.contractOpener.open(CrossChainLayerC.createFromAddress(ton_1.Address.parse(this.config.TONParams.crossChainLayerAddress)));
         const fullStateCCL = await crossChainLayer.getFullData();
         const feeParams = {
             isRoundTrip,

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

@@ -33,17 +33,17 @@ class TACTransactionManager {
         this.logger.debug('Bridging tokens to TON');
         Validator_1.Validator.validateTVMAddress(tonTarget);
         // Add native TAC asset if value > 0
+        const tonAssets = [...assets];
         if (value > 0n) {
-            const nativeTacAsset = (await assets_1.AssetFactory.from(this.config, {
+            tonAssets.push((await assets_1.AssetFactory.from(this.config, {
                 address: await this.config.nativeTACAddress(),
                 tokenType: Struct_1.AssetType.FT,
-            })).withRawAmount(value);
-            assets = [...assets, nativeTacAsset];
+            })).withRawAmount(value));
         }
         // Calculate executor fee if not provided
         if (!tvmExecutorFee) {
             const feeParams = {
-                tonAssets: (0, Utils_1.mapAssetsToTonAssets)(assets),
+                tonAssets: (0, Utils_1.mapAssetsToTonAssets)(tonAssets),
                 feeSymbol: Consts_1.TAC_SYMBOL,
                 tvmValidExecutors: tvmValidExecutors ?? [],
             };
@@ -53,17 +53,21 @@ class TACTransactionManager {
         }
         // Approve all assets
         const crossChainLayerAddress = await this.config.TACParams.crossChainLayer.getAddress();
-        await Promise.all(assets.map(asset => this.approveAsset(asset, signer, crossChainLayerAddress)));
+        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) => ({
+            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) => ({
+            Promise.all(assets
+                .filter((a) => a.type === Struct_1.AssetType.NFT)
+                .map(async (a) => ({
                 evmAddress: await a.getEVMAddress(),
                 amount: 1n,
                 tokenId: a.addresses.index,

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

@@ -1,10 +1,9 @@
-import { AgnosticProxySDK } from '@tonappchain/agnostic-sdk';
 import { Wallet } from 'ethers';
+import { JettonMinterData, NFTItemData } from '../../artifacts';
 import { FT, NFT } from '../assets';
 import { IConfiguration, ILogger, IOperationTracker, ITacSDK } from '../interfaces';
 import type { SenderAbstraction } from '../sender';
-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';
+import { AssetFromFTArg, AssetFromNFTCollectionArg, AssetFromNFTItemArg, AssetLike, CrossChainTransactionOptions, CrosschainTx, CrosschainTxWithAssetLike, EVMAddress, EvmProxyMsg, ExecutionFeeEstimationResult, NFTAddressType, OperationIdsByShardsKey, SDKParams, SuggestedTVMExecutorFee, TACSimulationParams, TACSimulationResult, TransactionLinkerWithOperationId, TVMAddress, UserWalletBalanceExtended, WaitOptions } from '../structs/Struct';
 export declare class TacSdk implements ITacSDK {
     readonly config: IConfiguration;
     readonly operationTracker: IOperationTracker;
@@ -15,7 +14,6 @@ export declare class TacSdk implements ITacSDK {
     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[];
@@ -34,7 +32,7 @@ export declare class TacSdk implements ITacSDK {
     getUserJettonWalletAddress(userAddress: string, tokenAddress: string): Promise<string>;
     getUserJettonBalance(userAddress: string, tokenAddress: string): Promise<bigint>;
     getUserJettonBalanceExtended(userAddress: string, tokenAddress: string): Promise<UserWalletBalanceExtended>;
-    getJettonData(itemAddress: TVMAddress): Promise<JettonMasterData>;
+    getJettonData(itemAddress: TVMAddress): Promise<JettonMinterData>;
     getFT(address: TVMAddress | EVMAddress): Promise<FT>;
     getNFTItemData(itemAddress: TVMAddress): Promise<NFTItemData>;
     getNFT(args: AssetFromNFTCollectionArg | AssetFromNFTItemArg): Promise<NFT>;

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

@@ -34,7 +34,6 @@ 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");
@@ -56,8 +55,21 @@ class TacSdk {
     static async create(sdkParams, logger = new Logger_1.NoopLogger()) {
         const network = sdkParams.network;
         const delay = sdkParams.delay ?? Consts_1.DEFAULT_DELAY;
-        const { testnet, mainnet } = await Promise.resolve().then(() => __importStar(require('@tonappchain/artifacts')));
-        const artifacts = network === Struct_1.Network.TESTNET ? testnet : mainnet;
+        const { dev, testnet, mainnet } = await Promise.resolve().then(() => __importStar(require('../../artifacts')));
+        let artifacts;
+        switch (network) {
+            case Struct_1.Network.MAINNET:
+                artifacts = mainnet;
+                break;
+            case Struct_1.Network.TESTNET:
+                artifacts = testnet;
+                break;
+            case Struct_1.Network.DEV:
+                artifacts = dev;
+                break;
+            default:
+                throw new Error(`Unsupported network: ${network}`);
+        }
         const config = await Configuration_1.Configuration.create(network, artifacts, sdkParams.TONParams, sdkParams.TACParams, sdkParams.customLiteSequencerEndpoints, delay);
         const operationTracker = new OperationTracker_1.OperationTracker(network, config.liteSequencerEndpoints);
         const simulator = new Simulator_1.Simulator(config, operationTracker, logger);
@@ -71,9 +83,6 @@ 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);
@@ -153,14 +162,14 @@ class TacSdk {
         return ft.getUserBalanceExtended(userAddress);
     }
     async getJettonData(itemAddress) {
-        return assets_1.FT.getJettonData(this.config.TONParams.contractOpener, itemAddress);
+        return assets_1.FT.getJettonData(this.config, itemAddress);
     }
     async getFT(address) {
         return await assets_1.FT.fromAddress(this.config, address);
     }
     // NFT methods
     async getNFTItemData(itemAddress) {
-        return assets_1.NFT.getItemData(this.config.TONParams.contractOpener, itemAddress);
+        return assets_1.NFT.getItemData(this.config, itemAddress);
     }
     async getNFT(args) {
         if ('addressType' in args && args.addressType === Struct_1.NFTAddressType.ITEM) {

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

@@ -29,3 +29,6 @@ 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[]>;
+export declare function getAddressString(cell?: Cell): string;
+export declare function getNumber(len: number, cell?: Cell): number;
+export declare function getString(cell?: Cell): string;

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

@@ -16,6 +16,9 @@ exports.sha256toBigInt = sha256toBigInt;
 exports.mapAssetsToTonAssets = mapAssetsToTonAssets;
 exports.normalizeAsset = normalizeAsset;
 exports.normalizeAssets = normalizeAssets;
+exports.getAddressString = getAddressString;
+exports.getNumber = getNumber;
+exports.getString = getString;
 const ton_1 = require("@ton/ton");
 const ethers_1 = require("ethers");
 const ton_crypto_1 = require("ton-crypto");
@@ -200,6 +203,8 @@ async function aggregateTokens(assets) {
     const uniqueAssetsMap = new Map();
     let ton;
     for await (const asset of assets ?? []) {
+        if (asset.rawAmount === 0n)
+            continue;
         if (asset.type !== Struct_1.AssetType.FT)
             continue;
         if (!asset.address) {
@@ -254,15 +259,18 @@ async function normalizeAsset(config, input) {
         };
         return await assets_1.AssetFactory.from(config, args);
     }
-    if ('rawAmount' in input || 'amount' in input) {
+    try {
         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 rawAmount = 'rawAmount' in input ? input.rawAmount : undefined;
+        const amount = 'amount' in input ? input.amount : 0;
+        return rawAmount ? asset.withRawAmount(rawAmount) : asset.withAmount(amount);
+    }
+    catch (e) {
+        console.warn('Failed to normalize FT asset', e);
     }
     const itemArgs = {
         address,
@@ -280,3 +288,12 @@ async function normalizeAssets(config, assets) {
     }
     return normalized;
 }
+function getAddressString(cell) {
+    return cell?.beginParse().loadAddress().toString({ bounceable: true, testOnly: false }) ?? '';
+}
+function getNumber(len, cell) {
+    return cell?.beginParse().loadUint(len) ?? 0;
+}
+function getString(cell) {
+    return cell?.beginParse().loadStringTail() ?? '';
+}

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

@@ -1,6 +1,6 @@
 import { Cell } from '@ton/ton';
-import { mainnet, testnet } from '@tonappchain/artifacts';
 import { AbstractProvider, ethers } from 'ethers';
+import { CrossChainLayerTAC, SettingsTAC, TacSAFactoryTAC, TokenUtilsTAC } from '../../artifacts';
 import { ContractOpener } from '../interfaces';
 import { CurrencyType, ExecutionStagesByOperationId, Network, OperationIdsByShardsKey, OperationType, StatusInfosByOperationId, SuggestedTVMExecutorFee, TACSimulationResult } from './Struct';
 export type ShardMessage = {
@@ -35,10 +35,10 @@ export type InternalTONParams = {
 };
 export type InternalTACParams = {
     provider: AbstractProvider;
-    crossChainLayer: testnet.tac.wrappers.CrossChainLayerTAC | mainnet.tac.wrappers.CrossChainLayerTAC;
-    settings: testnet.tac.wrappers.SettingsTAC | mainnet.tac.wrappers.SettingsTAC;
-    tokenUtils: testnet.tac.wrappers.TokenUtilsTAC | mainnet.tac.wrappers.TokenUtilsTAC;
-    smartAccountFactory: testnet.tac.wrappers.TacSAFactoryTAC | mainnet.tac.wrappers.TacSAFactoryTAC;
+    crossChainLayer: CrossChainLayerTAC;
+    settings: SettingsTAC;
+    tokenUtils: TokenUtilsTAC;
+    smartAccountFactory: TacSAFactoryTAC;
     trustedTACExecutors: string[];
     trustedTONExecutors: string[];
     abiCoder: ethers.AbiCoder;

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

@@ -1,8 +1,9 @@
-import { Address, Cell, OpenedContract } from '@ton/ton';
-import { AbstractProvider, Addressable, Interface, InterfaceAbi } from 'ethers';
+import { SandboxContract } from '@ton/sandbox';
+import { OpenedContract } from '@ton/ton';
+import { AbstractProvider, Addressable } from 'ethers';
+import { JettonMinter, JettonMinterData } from '../../artifacts';
 import type { FT, NFT } from '../assets';
 import type { Asset, ContractOpener, ILogger } from '../interfaces';
-import { JettonMaster, JettonMasterData } from '../wrappers/JettonMaster';
 export type ContractState = {
     balance: bigint;
     state: 'active' | 'uninitialized' | 'frozen';
@@ -16,7 +17,8 @@ export declare enum SimplifiedStatuses {
 }
 export declare enum Network {
     TESTNET = "testnet",
-    MAINNET = "mainnet"
+    MAINNET = "mainnet",
+    DEV = "dev"
 }
 export declare enum BlockchainType {
     TAC = "TAC",
@@ -43,14 +45,6 @@ export type TACParams = {
      * Address of TAC settings contract. Use only for tests.
      */
     settingsAddress?: string | Addressable;
-    /**
-     * Address of multicall contract. Use only for tests.
-     */
-    multicallAddress?: string | Addressable;
-    /**
-     * ABI of multicall contract. Use only for tests.
-     */
-    multicallABI?: Interface | InterfaceAbi;
 };
 export type TONParams = {
     /**
@@ -322,18 +316,6 @@ export type AssetLike = Asset | FT | NFT | {
 export type CrosschainTxWithAssetLike = Omit<CrosschainTx, 'assets'> & {
     assets?: AssetLike[];
 };
-export type NFTItemData = {
-    init: boolean;
-    index: number;
-    collectionAddress: Address;
-    ownerAddress: Address | null;
-    content: Cell | null;
-};
-export type NFTCollectionData = {
-    nextIndex: number;
-    content: Cell;
-    adminAddress: Address;
-};
 export interface WaitOptions<T = unknown, TContext = unknown> {
     /**
      * Timeout in milliseconds
@@ -416,7 +398,7 @@ export type GetTVMExecutorFeeParams = {
 };
 export type FTOriginAndData = {
     origin: Origin;
-    jettonMinter: OpenedContract<JettonMaster>;
+    jettonMinter: OpenedContract<JettonMinter> | SandboxContract<JettonMinter>;
     evmAddress?: string;
-    jettonData?: JettonMasterData;
+    jettonData?: JettonMinterData;
 };

package/dist/{structs → src/structs}/Struct.js

@@ -12,6 +12,7 @@ var Network;
 (function (Network) {
     Network["TESTNET"] = "testnet";
     Network["MAINNET"] = "mainnet";
+    Network["DEV"] = "dev";
 })(Network || (exports.Network = Network = {}));
 var BlockchainType;
 (function (BlockchainType) {

package/package.json

@@ -1,15 +1,33 @@
 {
   "name": "@tonappchain/sdk",
-  "version": "0.7.0-rc17",
+  "version": "0.7.0-rc19",
   "repository": "https://github.com/TacBuild/tac-sdk.git",
   "author": "TAC. <developers@tac>",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/src/index.d.ts",
+      "require": "./dist/src/index.js",
+      "import": "./dist/src/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "rm -rf dist && tsc --declaration",
+    "prebuild": "git submodule update --init --recursive --remote",
+    "build": "rm -rf dist && yarn build:artifacts && tsc --declaration",
+    "build:artifacts:tac:dev": "cd artifacts/dev/l2-evm && npm i && npx hardhat compile && rsync -avh --delete ./artifacts ./scripts ./typechain-types ../tac/internal/",
+    "build:artifacts:ton:dev": "cd artifacts/dev/l1_tvm_ton && npm i && npm run compile:ts && npm run build:all && rsync -avh --delete ./build ./wrappers ../ton/internal/",
+    "build:artifacts:tac:testnet": "cd artifacts/testnet/l2-evm && npm i && npx hardhat compile && rsync -avh --delete ./artifacts ./scripts ./typechain-types ../tac/internal/",
+    "build:artifacts:ton:testnet": "cd artifacts/testnet/l1_tvm_ton && npm i && npm run compile:ts && npm run build:all && rsync -avh --delete ./build ./wrappers ../ton/internal/",
+    "build:artifacts:tac:mainnet": "cd artifacts/mainnet/l2-evm && npm i && npx hardhat compile && rsync -avh --delete ./artifacts ./scripts ./typechain-types ../tac/internal/",
+    "build:artifacts:ton:mainnet": "cd artifacts/mainnet/l1_tvm_ton && npm i && npm run compile:ts && npm run build:all && rsync -avh --delete ./build ./wrappers ../ton/internal/",
+    "build:artifacts:ton:all": "yarn build:artifacts:ton:dev && yarn build:artifacts:ton:testnet && yarn build:artifacts:ton:mainnet",
+    "build:artifacts:tac:all": "yarn build:artifacts:tac:dev && yarn build:artifacts:tac:testnet && yarn build:artifacts:tac:mainnet",
+    "build:artifacts": "yarn prebuild && yarn build:artifacts:ton:all && yarn build:artifacts:tac:all",
     "test": "jest --verbose --runInBand",
     "release": "yarn build && yarn release-it --npm.yarn1",
     "lint": "eslint .",
@@ -20,8 +38,6 @@
     "@aws-crypto/sha256-js": "^5.2.0",
     "@orbs-network/ton-access": "^2.3.3",
     "@ton/ton": "15.1.0",
-    "@tonappchain/agnostic-sdk": "0.0.9",
-    "@tonappchain/artifacts": "0.0.19-smart-accounts-7",
     "@tonappchain/ton-lite-client": "3.0.6",
     "@tonconnect/ui": "^2.0.11",
     "bn.js": "^5.2.1",

package/dist/wrappers/JettonMaster.d.ts

@@ -1,24 +0,0 @@
-import { Address, Cell, Contract, ContractProvider } from '@ton/ton';
-import type { JettonExtendedMetadata } from './ContentUtils';
-export type JettonMasterInitData = {
-    evmTokenAddress: string;
-    crossChainLayerAddress: Address;
-    code: Cell;
-    walletCode: Cell;
-};
-export type JettonMasterData = {
-    totalSupply: bigint;
-    mintable: boolean;
-    adminAddress: string;
-    content: JettonExtendedMetadata;
-    jettonWalletCode: Cell;
-};
-export declare class JettonMaster implements Contract {
-    static createFromAddress(address: Address): JettonMaster;
-    static createFromConfig(config: JettonMasterInitData, workchain?: number): JettonMaster;
-    readonly address: Address;
-    constructor(address: Address);
-    getWalletAddress(provider: ContractProvider, owner: string): Promise<string>;
-    getJettonData(provider: ContractProvider): Promise<JettonMasterData>;
-    getEVMAddress(provider: ContractProvider): Promise<string>;
-}

package/dist/wrappers/JettonMaster.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JettonMaster = void 0;
-const ton_1 = require("@ton/ton");
-const ContentUtils_1 = require("./ContentUtils");
-class JettonMaster {
-    static createFromAddress(address) {
-        return new JettonMaster(address);
-    }
-    static createFromConfig(config, workchain = 0) {
-        const data = (0, ton_1.beginCell)()
-            .storeCoins(0)
-            .storeAddress(config.crossChainLayerAddress)
-            .storeAddress(null)
-            .storeRef((0, ton_1.beginCell)().endCell())
-            .storeRef(config.walletCode)
-            .storeStringTail(config.evmTokenAddress)
-            .endCell();
-        return JettonMaster.createFromAddress((0, ton_1.contractAddress)(workchain, { data, code: config.code }));
-    }
-    constructor(address) {
-        this.address = address;
-    }
-    async getWalletAddress(provider, owner) {
-        const res = await provider.get('get_wallet_address', [
-            {
-                type: 'slice',
-                cell: (0, ton_1.beginCell)().storeAddress(ton_1.Address.parse(owner)).endCell(),
-            },
-        ]);
-        return res.stack.readAddress().toString();
-    }
-    async getJettonData(provider) {
-        const result = await provider.get('get_jetton_data', []);
-        const totalSupply = result.stack.readBigNumber();
-        const mintable = result.stack.readBoolean();
-        const adminAddress = result.stack.readAddress().toString();
-        const content = await (0, ContentUtils_1.readJettonMetadata)(result.stack.readCell());
-        const jettonWalletCode = result.stack.readCell();
-        return {
-            totalSupply,
-            mintable,
-            adminAddress,
-            content,
-            jettonWalletCode,
-        };
-    }
-    async getEVMAddress(provider) {
-        const result = await provider.get('get_evm_token_address', []);
-        return result.stack.readString();
-    }
-}
-exports.JettonMaster = JettonMaster;