@tonappchain/sdk 0.6.4 → 0.7.0-rc6

package/dist/structs/Struct.d.ts

@@ -1,13 +1,15 @@
 import { SandboxContract } from '@ton/sandbox';
 import type { Address, Cell, Contract, OpenedContract } from '@ton/ton';
-import { AbstractProvider, Addressable, Interface, InterfaceAbi } from 'ethers';
+import { AbstractProvider, Addressable } from 'ethers';
+import { ILogger } from './Services';
+export type ContractState = {
+    balance: bigint;
+    state: 'active' | 'uninitialized' | 'frozen';
+    code: Buffer | null;
+};
 export interface ContractOpener {
     open<T extends Contract>(src: T): OpenedContract<T> | SandboxContract<T>;
-    getContractState(address: Address): Promise<{
-        balance: bigint;
-        state: 'active' | 'uninitialized' | 'frozen';
-        code: Buffer | null;
-    }>;
+    getContractState(address: Address): Promise<ContractState>;
     closeConnections?: () => unknown;
 }
 export declare enum SimplifiedStatuses {
@@ -41,30 +43,6 @@ export type TACParams = {
      * Address of TAC settings contract. Use only for tests.
      */
     settingsAddress?: string | Addressable;
-    /**
-     * ABI of TAC settings contract. Use only for tests.
-     */
-    settingsABI?: Interface | InterfaceAbi;
-    /**
-     * ABI of TAC CCL contract. Use only for tests.
-     */
-    crossChainLayerABI?: Interface | InterfaceAbi;
-    /**
-     * ABI of TAC CrossChainLayerToken contract. Use only for tests.
-     */
-    crossChainLayerTokenABI?: Interface | InterfaceAbi;
-    /**
-     * bytecode of TAC CrossChainLayerToken contract. Use only for tests.
-     */
-    crossChainLayerTokenBytecode?: string;
-    /**
-     * ABI of TAC CrossChainLayerNFT contract. Use only for tests.
-     */
-    crossChainLayerNFTABI?: Interface | InterfaceAbi;
-    /**
-     * bytecode of TAC CrossChainLayerNFT contract. Use only for tests.
-     */
-    crossChainLayerNFTBytecode?: string;
 };
 export type TONParams = {
     /**
@@ -106,52 +84,6 @@ export declare enum NFTAddressType {
     ITEM = "ITEM",
     COLLECTION = "COLLECTION"
 }
-export type WithAddressFT = {
-    type: AssetType.FT;
-    /**
-     * Address of TAC or TON token.
-     * Empty if sending native TON coin.
-     */
-    address?: string;
-};
-export type WithAddressNFTItem = {
-    type: AssetType.NFT;
-    /**
-     * Address NFT item token.
-     */
-    address: string;
-};
-export type WithAddressNFTCollectionItem = {
-    type: AssetType.NFT;
-    /**
-     * Address NFT collection.
-     */
-    collectionAddress: string;
-    /**
-     * Index of NFT item in collection.
-     */
-    itemIndex: bigint;
-};
-export type WithAddressNFT = WithAddressNFTItem | WithAddressNFTCollectionItem;
-export type WithAddress = WithAddressFT | WithAddressNFT;
-export type RawAssetBridgingData<NFTFormatRequired extends WithAddressNFT = WithAddressNFTItem> = {
-    /** Raw format, e.g. 12340000000 (=12.34 tokens if decimals is 9) */
-    rawAmount: bigint;
-} & (WithAddressFT | NFTFormatRequired);
-export type UserFriendlyAssetBridgingData = {
-    /**
-     * User friendly format, e.g. 12.34 tokens
-     * Specified value will be converted automatically to raw format: 12.34 * (10^decimals).
-     * No decimals should be specified.
-     */
-    amount: number;
-    /**
-     * Decimals may be specified manually.
-     * Otherwise, SDK tries to extract them from chain.
-     */
-    decimals?: number;
-} & WithAddress;
-export type AssetBridgingData = RawAssetBridgingData | UserFriendlyAssetBridgingData;
 export type UserWalletBalanceExtended = {
     exists: true;
     amount: number;
@@ -165,6 +97,7 @@ export type EvmProxyMsg = {
     methodName?: string;
     encodedParameters?: string;
     gasLimit?: bigint;
+    [key: string]: unknown;
 };
 export type TransactionLinker = {
     caller: string;
@@ -173,6 +106,9 @@ export type TransactionLinker = {
     timestamp: number;
     sendTransactionResult?: unknown;
 };
+export type TransactionLinkerWithOperationId = TransactionLinker & {
+    operationId?: string;
+};
 export type TACSimulationRequest = {
     tacCallParams: {
         arguments: string;
@@ -180,6 +116,7 @@ export type TACSimulationRequest = {
         target: string;
     };
     evmValidExecutors: string[];
+    tvmValidExecutors: string[];
     extraData: string;
     shardsKey: string;
     tonAssets: {
@@ -237,14 +174,38 @@ export type GeneralFeeInfo = {
     executorFee: string;
     tokenFeeSymbol: TokenSymbol;
 };
+export type AdditionalFeeInfo = {
+    attachedProtocolFee: string;
+    tokenFeeSymbol: TokenSymbol;
+};
 export type FeeInfo = {
+    additionalFeeInfo: AdditionalFeeInfo;
     tac: GeneralFeeInfo;
     ton: GeneralFeeInfo;
 };
+export type AssetMovement = {
+    assetType: AssetType;
+    tvmAddress: string;
+    evmAddress: string;
+    amount: string;
+    tokenId: string | null;
+};
+export type TransactionHash = {
+    hash: string;
+    blockchainType: BlockchainType;
+};
+export type AssetMovementInfo = {
+    caller: InitialCallerInfo;
+    target: InitialCallerInfo;
+    transactionHash: TransactionHash;
+    assetMovements: AssetMovement[];
+};
 export type MetaInfo = {
     initialCaller: InitialCallerInfo;
     validExecutors: ValidExecutors;
     feeInfo: FeeInfo;
+    sentAssets: AssetMovementInfo;
+    receivedAssets: AssetMovementInfo;
 };
 export type ExecutionStages = {
     operationType: OperationType;
@@ -311,7 +272,7 @@ export type FeeParams = {
     tvmExecutorFee: bigint;
 };
 export type CrossChainTransactionOptions = {
-    forceSend?: boolean;
+    allowSimulationError?: boolean;
     isRoundTrip?: boolean;
     protocolFee?: bigint;
     evmValidExecutors?: string[];
@@ -321,11 +282,11 @@ export type CrossChainTransactionOptions = {
 };
 export type ExecutionFeeEstimationResult = {
     feeParams: FeeParams;
-    simulation: TACSimulationResult;
+    simulation?: TACSimulationResult;
 };
 export type CrosschainTx = {
     evmProxyMsg: EvmProxyMsg;
-    assets?: AssetBridgingData[];
+    assets?: Asset[];
     options?: CrossChainTransactionOptions;
 };
 export type NFTItemData = {
@@ -335,3 +296,61 @@ export type NFTItemData = {
     ownerAddress: Address | null;
     content: Cell | null;
 };
+export interface WaitOptions<T = unknown> {
+    /**
+     * Timeout in milliseconds
+     * @default 300000 (5 minutes)
+     */
+    timeout?: number;
+    /**
+     * Maximum number of attempts
+     * @default 30
+     */
+    maxAttempts?: number;
+    /**
+     * Delay between attempts in milliseconds
+     * @default 10000 (10 seconds)
+     */
+    delay?: number;
+    /**
+     * Logger
+     */
+    logger?: ILogger;
+    /**
+     * Function to check if the result is successful
+     * If not provided, any non-error result is considered successful
+     */
+    successCheck?: (result: T) => boolean;
+}
+export declare const defaultWaitOptions: WaitOptions;
+export interface Asset {
+    address: string;
+    type: AssetType;
+    rawAmount: bigint;
+    clone: Asset;
+    withAmount(amount: {
+        rawAmount: bigint;
+    } | {
+        amount: number;
+    }): Promise<Asset>;
+    addAmount(amount: {
+        rawAmount: bigint;
+    } | {
+        amount: number;
+    }): Promise<Asset>;
+    getEVMAddress(): Promise<string>;
+    getTVMAddress(): Promise<string>;
+    generatePayload(params: {
+        excessReceiver: string;
+        evmData: Cell;
+        crossChainTonAmount?: bigint;
+        forwardFeeTonAmount?: bigint;
+        feeParams?: FeeParams;
+    }): Promise<Cell>;
+    checkCanBeTransferedBy(userAddress: string): Promise<void>;
+    getBalanceOf(userAddress: string): Promise<bigint>;
+}
+export declare enum Origin {
+    TON = "TON",
+    TAC = "TAC"
+}

package/dist/structs/Struct.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TokenSymbol = exports.StageName = exports.NFTAddressType = exports.AssetType = exports.OperationType = exports.BlockchainType = exports.Network = exports.SimplifiedStatuses = void 0;
+exports.Origin = exports.defaultWaitOptions = exports.TokenSymbol = exports.StageName = exports.NFTAddressType = exports.AssetType = exports.OperationType = exports.BlockchainType = exports.Network = exports.SimplifiedStatuses = void 0;
 var SimplifiedStatuses;
 (function (SimplifiedStatuses) {
     SimplifiedStatuses["PENDING"] = "PENDING";
@@ -51,3 +51,13 @@ var TokenSymbol;
     TokenSymbol["TAC_SYMBOL"] = "TAC";
     TokenSymbol["TON_SYMBOL"] = "TON";
 })(TokenSymbol || (exports.TokenSymbol = TokenSymbol = {}));
+exports.defaultWaitOptions = {
+    timeout: 300000,
+    maxAttempts: 30,
+    delay: 10000,
+};
+var Origin;
+(function (Origin) {
+    Origin["TON"] = "TON";
+    Origin["TAC"] = "TAC";
+})(Origin || (exports.Origin = Origin = {}));

package/dist/wrappers/HighloadQueryId.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HighloadQueryId = void 0;
 const BIT_NUMBER_SIZE = 10n; // 10 bit
-const SHIFT_SIZE = 13n; // 13 bit
 const MAX_BIT_NUMBER = 1022n;
 const MAX_SHIFT = 8191n; // 2^13 = 8192
 class HighloadQueryId {

package/dist/wrappers/HighloadWalletV3.d.ts

@@ -1,6 +1,6 @@
 import { Address, Cell, ContractProvider, MessageRelaxed, OutAction, OutActionSendMsg, SendMode } from '@ton/ton';
-import { HighloadQueryId } from './HighloadQueryId';
 import { WalletInstance } from '../sender';
+import { HighloadQueryId } from './HighloadQueryId';
 export declare enum OP {
     InternalTransfer = 2923619748
 }
@@ -24,7 +24,7 @@ export declare class HighloadWalletV3 implements WalletInstance {
         code: Cell;
         data: Cell;
     } | undefined);
-    getSeqno(_: ContractProvider): Promise<number>;
+    getSeqno(): Promise<number>;
     sendTransfer(provider: ContractProvider, args: {
         seqno?: number;
         secretKey: Buffer;
@@ -35,6 +35,7 @@ export declare class HighloadWalletV3 implements WalletInstance {
         createdAt?: number;
     }): Promise<void>;
     static create(config: HighloadWalletV3Config, code?: Cell, workchain?: number): HighloadWalletV3;
+    static generateCreatedAt(): number;
     sendExternalMessage(provider: ContractProvider, secretKey: Buffer, opts: {
         message: MessageRelaxed | Cell;
         mode: number;

package/dist/wrappers/HighloadWalletV3.js

@@ -27,7 +27,7 @@ class HighloadWalletV3 {
         this.address = address;
         this.init = init;
     }
-    async getSeqno(_) {
+    async getSeqno() {
         return 0; // will not be used
     }
     async sendTransfer(provider, args) {
@@ -50,6 +50,9 @@ class HighloadWalletV3 {
         const init = { code, data };
         return new HighloadWalletV3((0, ton_1.contractAddress)(workchain, init), init);
     }
+    static generateCreatedAt() {
+        return Math.floor(Date.now() / 1000) - 40; // -40 is used to pass check created_at <= now() in smart contract for sure
+    }
     async sendExternalMessage(provider, secretKey, opts) {
         let messageCell;
         if (opts.message instanceof ton_1.Cell) {
@@ -73,7 +76,7 @@ class HighloadWalletV3 {
     }
     async sendBatch(provider, secretKey, messages, subwallet, timeout, createdAt, value = 0n) {
         if (createdAt == undefined) {
-            createdAt = Math.floor(Date.now() / 1000) - 40; // -40 is used to pass check created_at <= now() in smart contract for sure
+            createdAt = HighloadWalletV3.generateCreatedAt();
         }
         const queryId = this.getQueryIdFromCreatedAt(createdAt);
         return await this.sendExternalMessage(provider, secretKey, {

package/dist/wrappers/JettonWallet.d.ts

@@ -1,4 +1,4 @@
-import type { Contract, ContractProvider, Sender } from '@ton/ton';
+import { Contract, ContractProvider, Sender } from '@ton/ton';
 import { Address, Cell } from '@ton/ton';
 export type JettonWalletData = {
     balance: bigint;
@@ -8,7 +8,8 @@ export type JettonWalletData = {
 };
 export declare enum JettonWalletOpCodes {
     burn = 1499400124,
-    transfer = 260734629
+    transfer = 260734629,
+    internalTransfer = 395134233
 }
 export declare function jettonWalletConfigToCell(config: JettonWalletData): Cell;
 export declare class JettonWallet implements Contract {
@@ -42,6 +43,14 @@ export declare class JettonWallet implements Contract {
         forwardTonAmount?: bigint;
         forwardPayload?: Cell | null;
     }): Promise<void>;
+    sendReceive(provider: ContractProvider, via: Sender, value: bigint, opts: {
+        queryId?: number;
+        jettonAmount: number;
+        fromOwnerAddress?: string;
+        responseAddress?: string;
+        forwardTonAmount?: number;
+        forwardPayload?: Cell;
+    }): Promise<void>;
     getWalletData(provider: ContractProvider): Promise<JettonWalletData>;
     getJettonBalance(provider: ContractProvider): Promise<bigint>;
 }

package/dist/wrappers/JettonWallet.js

@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JettonWallet = exports.JettonWalletOpCodes = void 0;
 exports.jettonWalletConfigToCell = jettonWalletConfigToCell;
 const ton_1 = require("@ton/ton");
+const ton_2 = require("@ton/ton");
 var JettonWalletOpCodes;
 (function (JettonWalletOpCodes) {
     JettonWalletOpCodes[JettonWalletOpCodes["burn"] = 1499400124] = "burn";
     JettonWalletOpCodes[JettonWalletOpCodes["transfer"] = 260734629] = "transfer";
+    JettonWalletOpCodes[JettonWalletOpCodes["internalTransfer"] = 395134233] = "internalTransfer";
 })(JettonWalletOpCodes || (exports.JettonWalletOpCodes = JettonWalletOpCodes = {}));
 function jettonWalletConfigToCell(config) {
-    return (0, ton_1.beginCell)()
+    return (0, ton_2.beginCell)()
         .storeCoins(config.balance)
-        .storeAddress(ton_1.Address.parse(config.ownerAddress))
-        .storeAddress(ton_1.Address.parse(config.jettonMasterAddress))
+        .storeAddress(ton_2.Address.parse(config.ownerAddress))
+        .storeAddress(ton_2.Address.parse(config.jettonMasterAddress))
         .endCell();
 }
 class JettonWallet {
@@ -26,16 +28,16 @@ class JettonWallet {
     static createFromConfig(config, code, workchain = 0) {
         const data = jettonWalletConfigToCell(config);
         const init = { code, data };
-        return new JettonWallet((0, ton_1.contractAddress)(workchain, init), init);
+        return new JettonWallet((0, ton_2.contractAddress)(workchain, init), init);
     }
     static burnMessage(jettonAmount, receiverAddress, crossChainTonAmount, feeData, crossChainPayload, queryId) {
-        const body = (0, ton_1.beginCell)()
+        const body = (0, ton_2.beginCell)()
             .storeUint(JettonWalletOpCodes.burn, 32)
             .storeUint(queryId || 0, 64)
             .storeCoins(jettonAmount)
-            .storeAddress(receiverAddress ? ton_1.Address.parse(receiverAddress) : null);
+            .storeAddress(receiverAddress ? ton_2.Address.parse(receiverAddress) : null);
         if (crossChainTonAmount || crossChainPayload) {
-            body.storeMaybeRef((0, ton_1.beginCell)()
+            body.storeMaybeRef((0, ton_2.beginCell)()
                 .storeCoins(crossChainTonAmount ?? 0n)
                 .storeMaybeRef(feeData)
                 .storeMaybeRef(crossChainPayload)
@@ -50,20 +52,20 @@ class JettonWallet {
         const body = JettonWallet.burnMessage(opts.jettonAmount, opts.receiverAddress, opts.crossChainTonAmount, opts.feeData, opts.crossChainPayload, opts.queryId);
         await provider.internal(via, {
             value,
-            sendMode: ton_1.SendMode.PAY_GAS_SEPARATELY,
+            sendMode: ton_2.SendMode.PAY_GAS_SEPARATELY,
             body: body,
         });
     }
     static transferMessage(jettonAmount, to, responseAddress, forwardTonAmount, crossChainTonAmount, feeData, crossChainPayload, queryId) {
-        return (0, ton_1.beginCell)()
+        return (0, ton_2.beginCell)()
             .storeUint(JettonWalletOpCodes.transfer, 32)
             .storeUint(queryId ?? 0, 64)
             .storeCoins(jettonAmount)
-            .storeAddress(ton_1.Address.parse(to))
-            .storeAddress(responseAddress ? ton_1.Address.parse(responseAddress) : null)
+            .storeAddress(ton_2.Address.parse(to))
+            .storeAddress(responseAddress ? ton_2.Address.parse(responseAddress) : null)
             .storeMaybeRef(null)
-            .storeCoins((forwardTonAmount || 0n))
-            .storeMaybeRef((0, ton_1.beginCell)()
+            .storeCoins(forwardTonAmount || 0n)
+            .storeMaybeRef((0, ton_2.beginCell)()
             .storeCoins(crossChainTonAmount ?? 0n)
             .storeMaybeRef(feeData)
             .storeMaybeRef(crossChainPayload)
@@ -73,19 +75,34 @@ class JettonWallet {
     async sendTransfer(provider, via, value, opts) {
         await provider.internal(via, {
             value,
-            sendMode: ton_1.SendMode.PAY_GAS_SEPARATELY,
-            body: (0, ton_1.beginCell)()
+            sendMode: ton_2.SendMode.PAY_GAS_SEPARATELY,
+            body: (0, ton_2.beginCell)()
                 .storeUint(JettonWalletOpCodes.transfer, 32)
                 .storeUint(opts.queryId || 0, 64)
                 .storeCoins(opts.jettonAmount)
-                .storeAddress(ton_1.Address.parse(opts.toOwnerAddress))
-                .storeAddress(opts.responseAddress ? ton_1.Address.parse(opts.responseAddress) : null)
+                .storeAddress(ton_2.Address.parse(opts.toOwnerAddress))
+                .storeAddress(opts.responseAddress ? ton_2.Address.parse(opts.responseAddress) : null)
                 .storeMaybeRef(opts.customPayload)
                 .storeCoins(opts.forwardTonAmount ?? 0n)
                 .storeMaybeRef(opts.forwardPayload)
                 .endCell(),
         });
     }
+    async sendReceive(provider, via, value, opts) {
+        await provider.internal(via, {
+            value,
+            sendMode: ton_2.SendMode.PAY_GAS_SEPARATELY,
+            body: (0, ton_2.beginCell)()
+                .storeUint(JettonWalletOpCodes.internalTransfer, 32)
+                .storeUint(opts.queryId || 0, 64)
+                .storeCoins((0, ton_1.toNano)(opts.jettonAmount.toFixed(9)))
+                .storeAddress(opts.fromOwnerAddress ? ton_2.Address.parse(opts.fromOwnerAddress) : null)
+                .storeAddress(opts.responseAddress ? ton_2.Address.parse(opts.responseAddress) : null)
+                .storeCoins(opts.forwardTonAmount || 0)
+                .storeMaybeRef(opts.forwardPayload)
+                .endCell(),
+        });
+    }
     async getWalletData(provider) {
         const result = await provider.get('get_wallet_data', []);
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonappchain/sdk",
-  "version": "0.6.4",
+  "version": "0.7.0-rc6",
   "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.18",
+    "@tonappchain/artifacts": "0.0.19-mainnet-rc2",
     "@tonappchain/ton-lite-client": "3.0.6",
     "@tonconnect/ui": "^2.0.11",
     "bn.js": "^5.2.1",
@@ -64,4 +64,4 @@
     }
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
-}
+}