@tonappchain/sdk 0.6.4 → 0.6.5-smart-accounts-1

package/dist/sdk/Utils.d.ts

@@ -1,7 +1,7 @@
 import { Address, Cell } from '@ton/ton';
 import { AbiCoder } from 'ethers';
-import { EvmProxyMsg, FeeParams, TransactionLinker, ValidExecutors } from '../structs/Struct';
 import { RandomNumberByTimestamp } from '../structs/InternalStruct';
+import { EvmProxyMsg, FeeParams, TransactionLinker, ValidExecutors, WaitOptions } from '../structs/Struct';
 export declare const sleep: (ms: number) => Promise<unknown>;
 export declare function generateRandomNumber(interval: number): number;
 export declare function generateRandomNumberByTimestamp(): RandomNumberByTimestamp;
@@ -15,5 +15,7 @@ export declare function calculateEVMTokenAddress(abiCoder: AbiCoder, tokenUtilsA
 export declare const convertKeysToCamelCase: <T>(data: T) => T;
 export declare const calculateRawAmount: (amount: number, decimals: number) => bigint;
 export declare const calculateAmount: (rawAmount: bigint, decimals: number) => number;
-export declare const toCamelCaseTransformer: (data: any) => any;
+export declare const toCamelCaseTransformer: (data: string) => any;
 export declare const generateFeeData: (feeParams?: FeeParams) => Cell | undefined;
+export declare function waitUntilSuccess<T, A extends unknown[]>(options: WaitOptions<T> | undefined, operation: (...args: A) => Promise<T>, ...args: A): Promise<T>;
+export declare function formatObjectForLogging(obj: unknown): string;

package/dist/sdk/Utils.js

@@ -10,6 +10,8 @@ exports.generateTransactionLinker = generateTransactionLinker;
 exports.validateTVMAddress = validateTVMAddress;
 exports.validateEVMAddress = validateEVMAddress;
 exports.calculateEVMTokenAddress = calculateEVMTokenAddress;
+exports.waitUntilSuccess = waitUntilSuccess;
+exports.formatObjectForLogging = formatObjectForLogging;
 const ton_1 = require("@ton/ton");
 const ethers_1 = require("ethers");
 const errors_1 = require("../errors");
@@ -128,7 +130,7 @@ const toCamelCaseTransformer = (data) => {
 exports.toCamelCaseTransformer = toCamelCaseTransformer;
 const generateFeeData = (feeParams) => {
     if (feeParams) {
-        let feeDataBuilder = (0, ton_1.beginCell)()
+        const feeDataBuilder = (0, ton_1.beginCell)()
             .storeBit(feeParams.isRoundTrip)
             .storeCoins(feeParams.protocolFee)
             .storeCoins(feeParams.evmExecutorFee);
@@ -142,3 +144,46 @@ const generateFeeData = (feeParams) => {
     }
 };
 exports.generateFeeData = generateFeeData;
+async function waitUntilSuccess(options = {}, operation, ...args) {
+    const timeout = options.timeout ?? 300000;
+    const maxAttempts = options.maxAttempts ?? 30;
+    const delay = options.delay ?? 10000;
+    const successCheck = options.successCheck;
+    const log = options.log ?? (() => { });
+    log(`Starting wait for success with timeout=${timeout}ms, maxAttempts=${maxAttempts}, delay=${delay}ms`);
+    const startTime = Date.now();
+    let attempt = 1;
+    while (true) {
+        const currentTime = Date.now();
+        const elapsedTime = currentTime - startTime;
+        try {
+            const result = await operation(...args);
+            if (!result) {
+                throw new Error(`Empty result`);
+            }
+            log(`Result: ${formatObjectForLogging(result)}`);
+            if (successCheck && !successCheck(result)) {
+                throw new Error(`Result is not successful`);
+            }
+            log(`Attempt ${attempt} successful`);
+            return result;
+        }
+        catch (error) {
+            if (elapsedTime >= timeout) {
+                log(`Timeout after ${elapsedTime}ms`);
+                throw error;
+            }
+            if (attempt >= maxAttempts) {
+                log(`Max attempts (${maxAttempts}) reached`);
+                throw error;
+            }
+            log(`Error on attempt ${attempt}: ${error}`);
+            log(`Waiting ${delay}ms before next attempt`);
+            await (0, exports.sleep)(delay);
+            attempt++;
+        }
+    }
+}
+function formatObjectForLogging(obj) {
+    return JSON.stringify(obj, (key, value) => typeof value === 'bigint' ? value.toString() : value);
+}

package/dist/structs/InternalStruct.d.ts

@@ -60,8 +60,9 @@ export type InternalTONParams = {
 export type InternalTACParams = {
     provider: AbstractProvider;
     crossChainLayer: testnet.tac.wrappers.CrossChainLayerTAC | mainnet.tac.wrappers.CrossChainLayerTAC;
-    settings: testnet.tac.wrappers.SettingsTAC | testnet.tac.wrappers.SettingsTAC;
+    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;
     trustedTACExecutors: string[];
     trustedTONExecutors: string[];
     abiCoder: ethers.AbiCoder;

package/dist/structs/Struct.d.ts

@@ -1,13 +1,14 @@
 import { SandboxContract } from '@ton/sandbox';
 import type { Address, Cell, Contract, OpenedContract } from '@ton/ton';
 import { AbstractProvider, Addressable, Interface, InterfaceAbi } from 'ethers';
+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 {
@@ -97,6 +98,10 @@ export type SDKParams = {
      * URLs of lite sequencers
      */
     customLiteSequencerEndpoints?: string[];
+    /**
+     * Debug flag
+     */
+    debug?: boolean;
 };
 export declare enum AssetType {
     NFT = "NFT",
@@ -173,6 +178,9 @@ export type TransactionLinker = {
     timestamp: number;
     sendTransactionResult?: unknown;
 };
+export type TransactionLinkerWithOperationId = TransactionLinker & {
+    operationId?: string;
+};
 export type TACSimulationRequest = {
     tacCallParams: {
         arguments: string;
@@ -180,6 +188,7 @@ export type TACSimulationRequest = {
         target: string;
     };
     evmValidExecutors: string[];
+    tvmValidExecutors: string[];
     extraData: string;
     shardsKey: string;
     tonAssets: {
@@ -335,3 +344,30 @@ 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;
+    /**
+     * Function to log debug messages
+     */
+    log?: (message: string) => void;
+    /**
+     * 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;

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.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,8 @@ var TokenSymbol;
     TokenSymbol["TAC_SYMBOL"] = "TAC";
     TokenSymbol["TON_SYMBOL"] = "TON";
 })(TokenSymbol || (exports.TokenSymbol = TokenSymbol = {}));
+exports.defaultWaitOptions = {
+    timeout: 300000,
+    maxAttempts: 30,
+    delay: 10000,
+};

package/dist/wrappers/ContentUtils.js

@@ -72,7 +72,7 @@ function readSnakeContent(slice, isFirst) {
     }
     let remainingBytes = Buffer.from('');
     if (slice.remainingBits != 0) {
-        remainingBytes = slice.loadBuffer(slice.remainingBits / 8);
+        remainingBytes = Buffer.from(slice.loadBuffer(slice.remainingBits / 8));
     }
     if (slice.remainingRefs != 0) {
         const newCell = slice.loadRef();

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.6.5-smart-accounts-1",
   "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-smart-accounts-4",
     "@tonappchain/ton-lite-client": "3.0.6",
     "@tonconnect/ui": "^2.0.11",
     "bn.js": "^5.2.1",
@@ -39,6 +39,7 @@
     "@ton/test-utils": "^0.5.0",
     "@types/bn.js": "^5.1.6",
     "@types/jest": "^29.5.14",
+    "@types/mocha": "^10.0.10",
     "eslint": "^9.21.0",
     "eslint-config-prettier": "^10.0.2",
     "eslint-plugin-simple-import-sort": "^12.1.1",