@ton/blueprint 0.23.0 → 0.25.0

package/CHANGELOG.md

@@ -5,6 +5,27 @@ 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.25.0] - 2024-11-02
+
+### Added
+
+- Support for Tolk, "next-generation FunC", a new language for writing smart contracts in TON. [Tolk overview](https://docs.ton.org/develop/tolk/overview)
+
+## [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

package/README.md

@@ -39,7 +39,7 @@ npm create ton@latest
 
 ## Overview
 
-Blueprint is an all-in-one development environment designed to enhance the process of creating, testing, and deploying smart contracts on TON blockchain using [FunC](https://docs.ton.org/develop/func/overview) and [Tact](https://docs.tact-lang.org/) languages
+Blueprint is an all-in-one development environment designed to enhance the process of creating, testing, and deploying smart contracts on TON blockchain using [FunC](https://docs.ton.org/develop/func/overview), [Tolk](https://docs.ton.org/develop/tolk/overview), and [Tact](https://docs.tact-lang.org/) languages.
 
 ### Core features
 
@@ -51,15 +51,16 @@ Blueprint is an all-in-one development environment designed to enhance the proce
 ### Tech stack
 
 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
+2. Compiling Tolk with https://github.com/ton-blockchain/tolk-js
+3. Compiling Tact with https://github.com/tact-lang/tact
+4. Testing smart contracts with https://github.com/ton-org/sandbox
+5. Deploying smart contracts with [TON Connect 2](https://github.com/ton-connect) or a `ton://` deeplink
 
 ### Requirements
 
 * [Node.js](https://nodejs.org) with a recent version like v18. Version can be verified with `node -v`
 * IDE with TON support:
-  * [Visual Studio Code](https://code.visualstudio.com/) with the [FunC plugin](https://marketplace.visualstudio.com/items?itemName=tonwhales.func-vscode)
+  * [Visual Studio Code](https://code.visualstudio.com/) with the [FunC plugin](https://marketplace.visualstudio.com/items?itemName=tonwhales.func-vscode) or [Tolk plugin](https://marketplace.visualstudio.com/items?itemName=ton-core.tolk-vscode)
   * [IntelliJ IDEA](https://www.jetbrains.com/idea/) with the [TON Development plugin](https://plugins.jetbrains.com/plugin/23382-ton)
 
 ## Features overview
@@ -71,7 +72,7 @@ Blueprint is an all-in-one development environment designed to enhance the proce
 
 ### Directory structure
 
-* `contracts/` - Source code in [FunC](https://docs.ton.org/develop/func/overview) or [Tact](https://tact-lang.org/) for all smart contracts and their imports
+* `contracts/` - Source code for all smart contracts and their imports
 * `wrappers/` - TypeScript interface classes for all contracts (implementing `Contract` from [@ton/core](https://www.npmjs.com/package/@ton/core))
   * include message [de]serialization primitives, getter wrappers and compilation functions
   * used by the test suite and client code to interact with the contracts from TypeScript
@@ -131,7 +132,7 @@ Before developing, make sure that your current working directory is located in t
 ### Creating contracts
 
 1. Run interactive:    `npx blueprint create`   or   `yarn blueprint create`
-2. Non-interactive: &nbsp; `npx/yarn blueprint create <CONTRACT> --type <TYPE>` (type can be `func-empty`, `func-counter`, `tact-empty`, `tact-counter`)
+2. Non-interactive: &nbsp; `npx/yarn blueprint create <CONTRACT> --type <TYPE>` (type can be `func-empty`, `tolk-empty`, `tact-empty`, `func-counter`, `tolk-counter`, `tact-counter`)
    * Example: `yarn blueprint create MyNewContract --type func-empty`
 
 ### Writing contract code
@@ -141,8 +142,12 @@ Before developing, make sure that your current working directory is located in t
 2. Implement shared FunC imports (if breaking code to multiple files) in `contracts/imports/*.fc`
 3. Implement wrapper TypeScript class in `wrappers/<CONTRACT>.ts` to encode messages and decode getters
 
+#### Tolk
+1. Implement the contract in `contracts/<CONTRACT>.tolk`; if you wish, split into multiple files
+2. Implement wrapper TypeScript class in `wrappers/<CONTRACT>.ts` to encode messages and decode getters
+
 #### Tact
-1. Implement tact contract in `contracts/<CONTRACT>.tact`
+1. Implement the contract in `contracts/<CONTRACT>.tact`
 2. Wrappers will be automatically generated in `build/<CONTRACT>/tact_<CONTRACT>.ts`
 
 ### Testing contracts

package/dist/cli/constants.js

@@ -7,13 +7,21 @@ exports.templateTypes = [
         value: 'func-empty',
     },
     {
-        name: 'A simple counter contract (FunC)',
-        value: 'func-counter',
+        name: 'An empty contract (Tolk)',
+        value: 'tolk-empty',
     },
     {
         name: 'An empty contract (TACT)',
         value: 'tact-empty',
     },
+    {
+        name: 'A simple counter contract (FunC)',
+        value: 'func-counter',
+    },
+    {
+        name: 'A simple counter contract (Tolk)',
+        value: 'tolk-counter',
+    },
     {
         name: 'A simple counter contract (TACT)',
         value: 'tact-counter',
@@ -58,7 +66,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/cli/create.d.ts

@@ -1,6 +1,2 @@
 import { Runner } from './Runner';
-export declare const templateTypes: {
-    name: string;
-    value: string;
-}[];
 export declare const create: Runner;

package/dist/cli/create.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = exports.templateTypes = void 0;
+exports.create = void 0;
 const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
 const template_1 = require("../template");
@@ -47,24 +47,6 @@ async function createFiles(templatePath, realPath, replaces) {
         }
     }
 }
-exports.templateTypes = [
-    {
-        name: 'An empty contract (FunC)',
-        value: 'func-empty',
-    },
-    {
-        name: 'A simple counter contract (FunC)',
-        value: 'func-counter',
-    },
-    {
-        name: 'An empty contract (TACT)',
-        value: 'tact-empty',
-    },
-    {
-        name: 'A simple counter contract (TACT)',
-        value: 'tact-counter',
-    },
-];
 const create = async (args, ui) => {
     const localArgs = (0, arg_1.default)({
         '--type': String,
@@ -81,7 +63,7 @@ const create = async (args, ui) => {
         throw new Error(`Cannot create a contract with an empty name`);
     if (name.toLowerCase() === 'contract' || !/^[A-Z][a-zA-Z0-9]*$/.test(name))
         throw new Error(`Cannot create a contract with the name '${name}'`);
-    const which = (await (0, utils_1.selectOption)(exports.templateTypes, {
+    const which = (await (0, utils_1.selectOption)(constants_1.templateTypes, {
         ui,
         msg: 'What type of contract do you want to create?',
         hint: localArgs['--type'],
@@ -92,7 +74,7 @@ const create = async (args, ui) => {
         name,
         loweredName: name.substring(0, 1).toLowerCase() + name.substring(1),
         snakeName,
-        contractPath: 'contracts/' + snakeName + '.' + (lang === 'func' ? 'fc' : 'tact'),
+        contractPath: 'contracts/' + snakeName + '.' + (lang === 'func' ? 'fc' : (lang === 'tolk' ? 'tolk' : 'tact')),
     };
     const config = await (0, utils_2.getConfig)();
     const commonPath = config?.separateCompilables ? 'common' : 'not-separated-common';

package/dist/compile/CompilerConfig.d.ts

@@ -23,4 +23,11 @@ export type FuncCompilerConfig = {
     targets?: string[];
     sources: SourcesArray;
 });
-export type CompilerConfig = (TactCompilerConfig | FuncCompilerConfig) & CommonCompilerConfig;
+export type TolkCompilerConfig = {
+    lang: 'tolk';
+    entrypoint: string;
+    optimizationLevel?: number;
+    withStackComments?: boolean;
+    experimentalOptions?: string;
+};
+export type CompilerConfig = (TactCompilerConfig | FuncCompilerConfig | TolkCompilerConfig) & CommonCompilerConfig;

package/dist/compile/compile.d.ts

@@ -1,14 +1,24 @@
 /// <reference types="node" />
-import { SourcesArray } from '@ton-community/func-js';
 import { Cell } from '@ton/core';
 import { TactCompilerConfig } from './CompilerConfig';
 export declare function getCompilablesDirectory(): Promise<string>;
 export declare const COMPILE_END = ".compile.ts";
+export type SourceSnapshot = {
+    filename: string;
+    content: string;
+};
+export type TolkCompileResult = {
+    lang: 'tolk';
+    stderr: string;
+    code: Cell;
+    snapshot: SourceSnapshot[];
+    version: string;
+};
 export type FuncCompileResult = {
     lang: 'func';
     code: Cell;
     targets: string[];
-    snapshot: SourcesArray;
+    snapshot: SourceSnapshot[];
     version: string;
 };
 export type TactCompileResult = {
@@ -17,7 +27,7 @@ export type TactCompileResult = {
     code: Cell;
     options?: TactCompilerConfig['options'];
 };
-export type CompileResult = TactCompileResult | FuncCompileResult;
+export type CompileResult = TactCompileResult | FuncCompileResult | TolkCompileResult;
 export declare function doCompile(name: string, opts?: CompileOpts): Promise<CompileResult>;
 export type CompileOpts = {
     hookUserData?: any;

package/dist/compile/compile.js

@@ -35,6 +35,7 @@ const paths_1 = require("../paths");
 const Tact = __importStar(require("@tact-lang/compiler"));
 const OverwritableVirtualFileSystem_1 = require("./OverwritableVirtualFileSystem");
 const utils_1 = require("../config/utils");
+const tolk_js_1 = require("@ton/tolk-js");
 async function getCompilablesDirectory() {
     const config = await (0, utils_1.getConfig)();
     if (config?.separateCompilables) {
@@ -53,6 +54,22 @@ async function getCompilerConfigForContract(name) {
     }
     return mod.compile;
 }
+async function doCompileTolk(config) {
+    const res = await (0, tolk_js_1.runTolkCompiler)(config);
+    if (res.status === 'error') {
+        throw new Error(res.message);
+    }
+    return {
+        lang: 'tolk',
+        stderr: res.stderr,
+        code: core_1.Cell.fromBase64(res.codeBoc64),
+        snapshot: res.sourcesSnapshot.map((e) => ({
+            filename: e.filename,
+            content: e.contents,
+        })),
+        version: await (0, tolk_js_1.getTolkCompilerVersion)(),
+    };
+}
 async function doCompileFunc(config) {
     const cr = await (0, func_js_1.compileFunc)(config);
     if (cr.status === 'error')
@@ -126,6 +143,15 @@ async function doCompileInner(name, config) {
     if (config.lang === 'tact') {
         return await doCompileTact(config, name);
     }
+    if (config.lang === 'tolk') {
+        return await doCompileTolk({
+            entrypointFileName: config.entrypoint,
+            fsReadCallback: (path) => (0, fs_1.readFileSync)(path).toString(),
+            optimizationLevel: config.optimizationLevel,
+            withStackComments: config.withStackComments,
+            experimentalOptions: config.experimentalOptions,
+        });
+    }
     return await doCompileFunc({
         targets: config.targets,
         sources: config.sources ?? ((path) => (0, fs_1.readFileSync)(path).toString()),

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 } from './compile/compile';
+export { compile, CompileOpts, SourceSnapshot, TolkCompileResult, FuncCompileResult, TactCompileResult, CompileResult } from './compile/compile';
 export { CompilerConfig, HookParams } from './compile/CompilerConfig';
 export { UIProvider } from './ui/UIProvider';
 export { Config } from './config/Config';

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,7 +19,6 @@ 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 FSStorage_1 = require("./storage/FSStorage");
@@ -39,7 +38,6 @@ exports.argSpec = {
     '--custom-key': String,
     '--tonconnect': Boolean,
     '--deeplink': Boolean,
-    '--tonhub': Boolean,
     '--mnemonic': Boolean,
     '--tonscan': Boolean,
     '--tonviewer': Boolean,
@@ -140,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');
         }
@@ -243,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) {
@@ -256,10 +253,6 @@ class NetworkProviderBuilder {
                     name: 'Create a ton:// deep link',
                     value: 'deeplink',
                 },
-                {
-                    name: 'Tonhub wallet',
-                    value: 'tonhub',
-                },
                 {
                     name: 'Mnemonic',
                     value: 'mnemonic',
@@ -277,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;
@@ -355,29 +343,30 @@ class NetworkProviderBuilder {
             }
         }
         else {
-            tc = new ton_1.TonClient({
-                endpoint: network === 'mainnet' ? 'https://toncenter.com/api/v2/jsonRPC' : 'https://testnet.toncenter.com/api/v2/jsonRPC',
-                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');
-                        }
+            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');
     }