@ton/blueprint 0.23.0-debugger.2 → 0.24.0

package/CHANGELOG.md

@@ -5,6 +5,31 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.24.0] - 2024-09-16
+
+### Added
+
+- Added support for wallet v5 in the Mnemonic provider
+
+### Changed
+
+- Changed the default API provider to Toncenter v2 (instead of Orbs TON Access). Rate limited requests are automatically retried
+- Updated dependencies
+
+### Removed
+
+- Removed the specialized TonHub connector. Use TON Connect instead
+
+## [0.23.0] - 2024-09-11
+
+### Changed
+
+- Toncenter v2 is now used by default instead of orbs access. Rate limited API requests are automatically retried
+
+### Removed
+
+- Removed `@orbs-network/ton-access` dependency
+
 ## [0.22.0] - 2024-07-08
 
 ### Added

package/README.md

@@ -53,7 +53,7 @@ Blueprint is an all-in-one development environment designed to enhance the proce
 1. Compiling FunC with https://github.com/ton-community/func-js
 2. Compiling Tact with https://github.com/tact-lang/tact
 3. Testing smart contracts with https://github.com/ton-org/sandbox
-4. Deploying smart contracts with [TON Connect 2](https://github.com/ton-connect), [Tonhub wallet](https://tonhub.com/) or a `ton://` deeplink
+4. Deploying smart contracts with [TON Connect 2](https://github.com/ton-connect) or a `ton://` deeplink
 
 ### Requirements
 

package/dist/cli/constants.js

@@ -58,7 +58,7 @@ Flags:
 --custom-version - specifies the API version to use with the custom API. Options: v2 (defualt), v4.
 --custom-key - specifies the API key to use with the custom API, can only be used with API v2.
 --custom-type - specifies the network type to be indicated to scripts. Options: custom (default), mainnet, testnet.
---tonconnect, --tonhub, --deeplink, --mnemonic - specifies the deployer to use when running the script. If not specified on the command line, it will be asked interactively.
+--tonconnect, --deeplink, --mnemonic - specifies the deployer to use when running the script. If not specified on the command line, it will be asked interactively.
 --tonscan, --tonviewer, --toncx, --dton - specifies the network explorer to use when displaying links to the deployed contracts. Default: tonscan.`,
     build: `Usage: blueprint build [contract name] [flags]
 

package/dist/compile/CompilerConfig.d.ts

@@ -16,7 +16,6 @@ export type TactCompilerConfig = {
 export type FuncCompilerConfig = {
     lang?: 'func';
     optLevel?: number;
-    debugInfo?: boolean;
 } & ({
     targets: string[];
     sources?: SourceResolver | SourcesMap;

package/dist/compile/compile.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { SourcesArray, DebugInfo } from '@ton-community/func-js';
+import { SourcesArray } from '@ton-community/func-js';
 import { Cell } from '@ton/core';
 import { TactCompilerConfig } from './CompilerConfig';
 export declare function getCompilablesDirectory(): Promise<string>;
@@ -10,7 +10,6 @@ export type FuncCompileResult = {
     targets: string[];
     snapshot: SourcesArray;
     version: string;
-    debugInfo?: DebugInfo;
 };
 export type TactCompileResult = {
     lang: 'tact';
@@ -22,6 +21,5 @@ export type CompileResult = TactCompileResult | FuncCompileResult;
 export declare function doCompile(name: string, opts?: CompileOpts): Promise<CompileResult>;
 export type CompileOpts = {
     hookUserData?: any;
-    debugInfo?: boolean;
 };
 export declare function compile(name: string, opts?: CompileOpts): Promise<Cell>;

package/dist/compile/compile.js

@@ -70,7 +70,6 @@ async function doCompileFunc(config) {
         targets,
         snapshot: cr.snapshot,
         version: (await (0, func_js_1.compilerVersion)()).funcVersion,
-        debugInfo: cr.debugInfo,
     };
 }
 function findTactBoc(fs) {
@@ -131,14 +130,10 @@ async function doCompileInner(name, config) {
         targets: config.targets,
         sources: config.sources ?? ((path) => (0, fs_1.readFileSync)(path).toString()),
         optLevel: config.optLevel,
-        debugInfo: config.debugInfo,
     });
 }
 async function doCompile(name, opts) {
     const config = await getCompilerConfigForContract(name);
-    if (opts?.debugInfo && config.lang === 'func') {
-        config.debugInfo = true;
-    }
     if (config.preCompileHook !== undefined) {
         await config.preCompileHook({
             userData: opts?.hookUserData,

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { tonDeepLink, sleep } from './utils';
 export { NetworkProvider } from './network/NetworkProvider';
 export { createNetworkProvider } from './network/createNetworkProvider';
-export { compile, CompileOpts, CompileResult, FuncCompileResult, TactCompileResult, doCompile } from './compile/compile';
+export { compile, CompileOpts } from './compile/compile';
 export { CompilerConfig, HookParams } from './compile/CompilerConfig';
 export { UIProvider } from './ui/UIProvider';
 export { Config } from './config/Config';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAll = exports.buildOne = exports.doCompile = exports.compile = exports.createNetworkProvider = exports.sleep = exports.tonDeepLink = void 0;
+exports.buildAll = exports.buildOne = exports.compile = exports.createNetworkProvider = exports.sleep = exports.tonDeepLink = void 0;
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "tonDeepLink", { enumerable: true, get: function () { return utils_1.tonDeepLink; } });
 Object.defineProperty(exports, "sleep", { enumerable: true, get: function () { return utils_1.sleep; } });
@@ -8,7 +8,6 @@ var createNetworkProvider_1 = require("./network/createNetworkProvider");
 Object.defineProperty(exports, "createNetworkProvider", { enumerable: true, get: function () { return createNetworkProvider_1.createNetworkProvider; } });
 var compile_1 = require("./compile/compile");
 Object.defineProperty(exports, "compile", { enumerable: true, get: function () { return compile_1.compile; } });
-Object.defineProperty(exports, "doCompile", { enumerable: true, get: function () { return compile_1.doCompile; } });
 var build_1 = require("./build");
 Object.defineProperty(exports, "buildOne", { enumerable: true, get: function () { return build_1.buildOne; } });
 Object.defineProperty(exports, "buildAll", { enumerable: true, get: function () { return build_1.buildAll; } });

package/dist/network/createNetworkProvider.d.ts

@@ -11,7 +11,6 @@ export declare const argSpec: {
     '--custom-key': StringConstructor;
     '--tonconnect': BooleanConstructor;
     '--deeplink': BooleanConstructor;
-    '--tonhub': BooleanConstructor;
     '--mnemonic': BooleanConstructor;
     '--tonscan': BooleanConstructor;
     '--tonviewer': BooleanConstructor;

package/dist/network/createNetworkProvider.js

@@ -19,15 +19,16 @@ exports.createNetworkProvider = exports.argSpec = void 0;
 const utils_1 = require("../utils");
 const DeeplinkProvider_1 = require("./send/DeeplinkProvider");
 const TonConnectProvider_1 = require("./send/TonConnectProvider");
-const TonHubProvider_1 = require("./send/TonHubProvider");
 const core_1 = require("@ton/core");
 const ton_1 = require("@ton/ton");
-const ton_access_1 = require("@orbs-network/ton-access");
 const FSStorage_1 = require("./storage/FSStorage");
 const path_1 = __importDefault(require("path"));
 const paths_1 = require("../paths");
 const crypto_1 = require("@ton/crypto");
 const MnemonicProvider_1 = require("./send/MnemonicProvider");
+const axios_1 = __importDefault(require("axios"));
+const INITIAL_DELAY = 400;
+const MAX_ATTEMPTS = 4;
 exports.argSpec = {
     '--mainnet': Boolean,
     '--testnet': Boolean,
@@ -37,7 +38,6 @@ exports.argSpec = {
     '--custom-key': String,
     '--tonconnect': Boolean,
     '--deeplink': Boolean,
-    '--tonhub': Boolean,
     '--mnemonic': Boolean,
     '--tonscan': Boolean,
     '--tonviewer': Boolean,
@@ -138,7 +138,7 @@ class NetworkProviderImpl {
             return (await __classPrivateFieldGet(this, _NetworkProviderImpl_tc, "f").getContractState(address)).state === 'active';
         }
     }
-    async waitForDeploy(address, attempts = 10, sleepDuration = 2000) {
+    async waitForDeploy(address, attempts = 20, sleepDuration = 2000) {
         if (attempts <= 0) {
             throw new Error('Attempt number must be positive');
         }
@@ -241,7 +241,6 @@ class NetworkProviderBuilder {
         let deployUsing = (0, utils_1.oneOrZeroOf)({
             tonconnect: this.args['--tonconnect'],
             deeplink: this.args['--deeplink'],
-            tonhub: this.args['--tonhub'],
             mnemonic: this.args['--mnemonic'],
         });
         if (!deployUsing) {
@@ -254,10 +253,6 @@ class NetworkProviderBuilder {
                     name: 'Create a ton:// deep link',
                     value: 'deeplink',
                 },
-                {
-                    name: 'Tonhub wallet',
-                    value: 'tonhub',
-                },
                 {
                     name: 'Mnemonic',
                     value: 'mnemonic',
@@ -275,11 +270,6 @@ class NetworkProviderBuilder {
                     throw new Error('Tonkeeper cannot work with custom network.');
                 provider = new TonConnectProvider_1.TonConnectProvider(new FSStorage_1.FSStorage(storagePath), this.ui);
                 break;
-            case 'tonhub':
-                if (network === 'custom')
-                    throw new Error('TonHub cannot work with custom network.');
-                provider = new TonHubProvider_1.TonHubProvider(network, new FSStorage_1.FSStorage(storagePath), this.ui);
-                break;
             case 'mnemonic':
                 provider = await createMnemonicProvider(client, this.ui);
                 break;
@@ -353,8 +343,30 @@ class NetworkProviderBuilder {
             }
         }
         else {
-            tc = new ton_1.TonClient4({
-                endpoint: await (0, ton_access_1.getHttpV4Endpoint)({ network }),
+            const httpAdapter = async (config) => {
+                let r;
+                let delay = INITIAL_DELAY;
+                let attempts = 0;
+                while (true) {
+                    r = await (0, axios_1.default)({
+                        ...config,
+                        adapter: undefined,
+                        validateStatus: (status) => (status >= 200 && status < 300) || status === 429,
+                    });
+                    if (r.status !== 429) {
+                        return r;
+                    }
+                    await (0, utils_1.sleep)(delay);
+                    delay *= 2;
+                    attempts++;
+                    if (attempts >= MAX_ATTEMPTS) {
+                        throw new Error('Max attempts reached');
+                    }
+                }
+            };
+            tc = new ton_1.TonClient({
+                endpoint: network === 'mainnet' ? 'https://toncenter.com/api/v2/jsonRPC' : 'https://testnet.toncenter.com/api/v2/jsonRPC',
+                httpAdapter,
             });
         }
         const sendProvider = await this.chooseSendProvider(network, tc);

package/dist/network/send/MnemonicProvider.d.ts

@@ -3,7 +3,7 @@ import { TonClient, TonClient4 } from '@ton/ton';
 import { Address, Cell, StateInit } from '@ton/core';
 import { SendProvider } from './SendProvider';
 import { UIProvider } from '../../ui/UIProvider';
-export type WalletVersion = 'v1r1' | 'v1r2' | 'v1r3' | 'v2r1' | 'v2r2' | 'v3r1' | 'v3r2' | 'v4';
+export type WalletVersion = 'v1r1' | 'v1r2' | 'v1r3' | 'v2r1' | 'v2r2' | 'v3r1' | 'v3r2' | 'v4' | 'v5r1';
 export declare class MnemonicProvider implements SendProvider {
     #private;
     constructor(params: {

package/dist/network/send/MnemonicProvider.js

@@ -25,6 +25,7 @@ const wallets = {
     v3r1: ton_1.WalletContractV3R1,
     v3r2: ton_1.WalletContractV3R2,
     v4: ton_1.WalletContractV4,
+    v5r1: ton_1.WalletContractV5R1,
 };
 class MnemonicProvider {
     constructor(params) {
@@ -69,6 +70,7 @@ class MnemonicProvider {
                     },
                 },
             ],
+            sendMode: core_1.SendMode.PAY_GAS_SEPARATELY,
         });
         __classPrivateFieldGet(this, _MnemonicProvider_ui, "f").write('Sent transaction');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ton/blueprint",
-  "version": "0.23.0-debugger.2",
+  "version": "0.24.0",
   "description": "Framework for development of TON smart contracts",
   "main": "dist/index.js",
   "bin": "./dist/cli/cli.js",
@@ -19,9 +19,9 @@
     "format": "prettier --write src"
   },
   "devDependencies": {
-    "@ton/core": "^0.56.0",
-    "@ton/crypto": "^3.2.0",
-    "@ton/ton": "^13.11.0",
+    "@ton/core": "^0.58.1",
+    "@ton/crypto": "^3.3.0",
+    "@ton/ton": "^15.0.0",
     "@types/inquirer": "^8.2.6",
     "@types/node": "^20.2.5",
     "@types/qrcode-terminal": "^0.12.0",
@@ -29,21 +29,19 @@
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
-    "@ton/core": ">=0.56.0",
-    "@ton/crypto": ">=3.2.0",
-    "@ton/ton": ">=13.11.0"
+    "@ton/core": ">=0.58.1",
+    "@ton/crypto": ">=3.3.0",
+    "@ton/ton": ">=15.0.0"
   },
   "dependencies": {
-    "@orbs-network/ton-access": "^2.3.3",
     "@tact-lang/compiler": "^1.4.0",
-    "@ton-community/func-js": "^0.8.0-debuginfo.2",
+    "@ton-community/func-js": "^0.7.0",
     "@tonconnect/sdk": "^2.2.0",
     "arg": "^5.0.2",
     "chalk": "^4.1.0",
     "dotenv": "^16.1.4",
     "inquirer": "^8.2.5",
     "qrcode-terminal": "^0.12.0",
-    "ton-x": "^2.1.0",
     "ts-node": "^10.9.1"
   },
   "packageManager": "yarn@4.3.1"

package/dist/network/send/TonHubProvider.d.ts

@@ -1,16 +0,0 @@
-import { Address, Cell, StateInit } from '@ton/core';
-import { SendProvider } from './SendProvider';
-import { Storage } from '../storage/Storage';
-import { UIProvider } from '../../ui/UIProvider';
-export declare class TonHubProvider implements SendProvider {
-    #private;
-    constructor(network: 'mainnet' | 'testnet', storage: Storage, ui: UIProvider);
-    private getExistingSession;
-    private getSession;
-    connect(): Promise<void>;
-    address(): Address | undefined;
-    sendTransaction(address: Address, amount: bigint, payload?: Cell, stateInit?: StateInit): Promise<{
-        type: "success";
-        response: string;
-    }>;
-}

package/dist/network/send/TonHubProvider.js

@@ -1,110 +0,0 @@
-"use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _TonHubProvider_connector, _TonHubProvider_storage, _TonHubProvider_ui, _TonHubProvider_session;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TonHubProvider = void 0;
-const core_1 = require("@ton/core");
-const ton_x_1 = require("ton-x");
-const qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
-const KEY_NAME = 'tonhub_session';
-class TonHubProvider {
-    constructor(network, storage, ui) {
-        _TonHubProvider_connector.set(this, void 0);
-        _TonHubProvider_storage.set(this, void 0);
-        _TonHubProvider_ui.set(this, void 0);
-        _TonHubProvider_session.set(this, void 0);
-        __classPrivateFieldSet(this, _TonHubProvider_connector, new ton_x_1.TonhubConnector({
-            network,
-        }), "f");
-        __classPrivateFieldSet(this, _TonHubProvider_storage, storage, "f");
-        __classPrivateFieldSet(this, _TonHubProvider_ui, ui, "f");
-    }
-    async getExistingSession() {
-        const sessionString = await __classPrivateFieldGet(this, _TonHubProvider_storage, "f").getItem(KEY_NAME);
-        if (sessionString === null)
-            return undefined;
-        let session = JSON.parse(sessionString);
-        const state = await __classPrivateFieldGet(this, _TonHubProvider_connector, "f").getSessionState(session.id);
-        if (state.state === 'ready') {
-            session = {
-                ...state,
-                id: session.id,
-                seed: session.seed,
-            };
-            await __classPrivateFieldGet(this, _TonHubProvider_storage, "f").setItem(KEY_NAME, JSON.stringify(session));
-            return session;
-        }
-    }
-    async getSession() {
-        const existing = await this.getExistingSession();
-        if (existing !== undefined)
-            return existing;
-        const createdSession = await __classPrivateFieldGet(this, _TonHubProvider_connector, "f").createNewSession({
-            name: 'TON template project',
-            url: 'https://example.com/',
-        });
-        __classPrivateFieldGet(this, _TonHubProvider_ui, "f").setActionPrompt('Connecting to wallet...\n');
-        __classPrivateFieldGet(this, _TonHubProvider_ui, "f").write('\n');
-        qrcode_terminal_1.default.generate(createdSession.link, { small: true }, (qr) => __classPrivateFieldGet(this, _TonHubProvider_ui, "f").write(qr));
-        __classPrivateFieldGet(this, _TonHubProvider_ui, "f").write('\n' + createdSession.link + '\n\n');
-        __classPrivateFieldGet(this, _TonHubProvider_ui, "f").setActionPrompt('Scan the QR code in your wallet or open the link...');
-        const state = await __classPrivateFieldGet(this, _TonHubProvider_connector, "f").awaitSessionReady(createdSession.id, 5 * 60 * 1000);
-        if (state.state === 'ready') {
-            const session = {
-                ...state,
-                id: createdSession.id,
-                seed: createdSession.seed,
-            };
-            await __classPrivateFieldGet(this, _TonHubProvider_storage, "f").setItem(KEY_NAME, JSON.stringify(session));
-            return session;
-        }
-        throw new Error('Could not create new session');
-    }
-    async connect() {
-        __classPrivateFieldSet(this, _TonHubProvider_session, await this.getSession(), "f");
-        __classPrivateFieldGet(this, _TonHubProvider_ui, "f").write(`Connected to wallet at address: ${core_1.Address.parse(__classPrivateFieldGet(this, _TonHubProvider_session, "f").wallet.address).toString()}\n`);
-    }
-    address() {
-        if (!__classPrivateFieldGet(this, _TonHubProvider_session, "f"))
-            return undefined;
-        return core_1.Address.parse(__classPrivateFieldGet(this, _TonHubProvider_session, "f").wallet.address);
-    }
-    async sendTransaction(address, amount, payload, stateInit) {
-        if (!__classPrivateFieldGet(this, _TonHubProvider_session, "f"))
-            throw new Error('TonhubProvider is not connected');
-        const request = {
-            seed: __classPrivateFieldGet(this, _TonHubProvider_session, "f").seed,
-            appPublicKey: __classPrivateFieldGet(this, _TonHubProvider_session, "f").wallet.appPublicKey,
-            to: address.toString(),
-            value: amount.toString(),
-            timeout: 5 * 60 * 1000,
-            payload: payload ? payload.toBoc().toString('base64') : undefined,
-            stateInit: stateInit
-                ? (0, core_1.beginCell)().storeWritable((0, core_1.storeStateInit)(stateInit)).endCell().toBoc().toString('base64')
-                : undefined,
-        };
-        __classPrivateFieldGet(this, _TonHubProvider_ui, "f").setActionPrompt('Sending transaction. Approve it in your wallet...');
-        const response = await __classPrivateFieldGet(this, _TonHubProvider_connector, "f").requestTransaction(request);
-        if (response.type !== 'success') {
-            throw new Error(`Tonhub transaction request was not successful (${response.type})`);
-        }
-        __classPrivateFieldGet(this, _TonHubProvider_ui, "f").clearActionPrompt();
-        __classPrivateFieldGet(this, _TonHubProvider_ui, "f").write('Sent transaction');
-        return response;
-    }
-}
-exports.TonHubProvider = TonHubProvider;
-_TonHubProvider_connector = new WeakMap(), _TonHubProvider_storage = new WeakMap(), _TonHubProvider_ui = new WeakMap(), _TonHubProvider_session = new WeakMap();