@ton/blueprint 0.16.0 → 0.18.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.18.0] - 2024-03-13
+
+### Changed
+
+- Changed `@tact-lang/compiler` dependency to be `^1.2.0` instead of `^1.1.5`
+- Updated the Tact counter template to use the new `+=` operator from Tact v1.2.0
+
+## [0.17.0] - 2024-03-01
+
+This release contains a breaking change.
+
+### Changed
+
+- Blueprint no longer automatically adds `jsonRPC` to custom v2 endpoints
+
+### Added
+
+- Added `set` command which can currently set func version (run `blueprint set func`)
+- Added `open` and `getTransactions` to `WrappedContractProvider`
+- Added cell hash to build artifacts
+
 ## [0.16.0] - 2024-02-15
 
 ### Added
@@ -223,4 +244,4 @@ This release contains a breaking change.
 
 ### Fixed
 
-- File selection (compilation files in `build` and scripts in `run`) now accepts CLI argument hints in any case
+- File selection (compilation files in `build` and scripts in `run`) now accepts CLI argument hints in any case

package/README.md

@@ -151,6 +151,11 @@ export const config: Config = {
 };
 ```
 
+The above config parameters are equivalent to the arguments in the following command:
+```bash
+npx blueprint run --custom https://toncenter.com/api/v2/ --custom-version v2 --custom-type mainnet --custom-key YOUR_API_KEY
+```
+
 Properties of the `network` object have the same semantics as the `--custom` flags with respective names (see `blueprint help run`).
 
 ## Contributors

package/dist/build.js

@@ -28,13 +28,17 @@ async function buildOne(contract, ui) {
             }
         }
         const cell = result.code;
+        const rHash = cell.hash();
+        const res = {
+            hash: rHash.toString('hex'),
+            hashBase64: rHash.toString('base64'),
+            hex: cell.toBoc().toString('hex')
+        };
         ui?.clearActionPrompt();
-        ui?.write('\n✅ Compiled successfully! Cell BOC hex result:\n\n');
-        ui?.write(cell.toBoc().toString('hex'));
+        ui?.write('\n✅ Compiled successfully! Cell BOC result:\n\n');
+        ui?.write(JSON.stringify(res, null, 2));
         await promises_1.default.mkdir(paths_1.BUILD_DIR, { recursive: true });
-        await promises_1.default.writeFile(buildArtifactPath, JSON.stringify({
-            hex: cell.toBoc().toString('hex'),
-        }));
+        await promises_1.default.writeFile(buildArtifactPath, JSON.stringify(res));
         ui?.write(`\n✅ Wrote compilation artifact to ${path_1.default.relative(process.cwd(), buildArtifactPath)}`);
     }
     catch (e) {

package/dist/cli/cli.js

@@ -34,6 +34,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const create_1 = require("./create");
 const run_1 = require("./run");
 const build_1 = require("./build");
+const set_1 = require("./set");
 const test_1 = require("./test");
 const verify_1 = require("./verify");
 const convert_1 = require("./convert");
@@ -45,6 +46,7 @@ const runners = {
     create: create_1.create,
     run: run_1.run,
     build: build_1.build,
+    set: set_1.set,
     test: test_1.test,
     help: help_1.help,
     verify: verify_1.verify,

package/dist/cli/help.js

@@ -13,6 +13,7 @@ List of available commands:
 - create
 - run
 - build
+- custom
 - help
 - test
 - verify
@@ -49,6 +50,9 @@ If contract name is not specified on the command line, the buildable contracts (
 
 Flags:
 --all - builds all buildable contracts instead of just one.`,
+    set: `Usage: blueprint set <key> [value]
+Available keys:
+- func - overrides @ton-community/func-js-bin version, effectively setting the func version. The required version may be passed as the value, otherwise available versions will be displayed.`,
     test: `Usage: blueprint test
 
 Just runs \`npm test\`, which by default runs \`jest\`.`,

package/dist/cli/set.d.ts

@@ -0,0 +1,2 @@
+import { Runner } from './Runner';
+export declare const set: Runner;

package/dist/cli/set.js

@@ -0,0 +1,104 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.set = void 0;
+const promises_1 = require("fs/promises");
+const node_child_process_1 = require("node:child_process");
+const path_1 = __importDefault(require("path"));
+const getVersions = (pkg, ui) => {
+    return new Promise((resolve, reject) => {
+        (0, node_child_process_1.exec)(`npm view ${pkg} versions --json`, (error, stdout, stderr) => {
+            if (stderr) {
+                ui.write(stderr);
+            }
+            if (stdout) {
+                if (error === null) {
+                    try {
+                        const resJson = JSON.parse(stdout);
+                        if (Array.isArray(resJson)) {
+                            resolve(resJson);
+                        }
+                        else {
+                            reject(new TypeError("Expect json array on stdout, but got:\n" + stdout));
+                        }
+                    }
+                    catch (e) {
+                        reject(e);
+                    }
+                    return;
+                }
+                else {
+                    ui.write(stdout);
+                }
+            }
+            if (error) {
+                ui.write("Failed to get func-js-bin package versions!");
+                reject(error);
+            }
+        });
+    });
+};
+const install = (cmd, ui) => {
+    return new Promise((resolve, reject) => {
+        (0, node_child_process_1.exec)(cmd, (error, stdout, stderr) => {
+            if (stderr) {
+                ui.write(stderr);
+            }
+            if (stdout) {
+                ui.write(stdout);
+            }
+            if (error) {
+                reject(error);
+                return;
+            }
+            resolve();
+        });
+    });
+};
+const set = async (args, ui) => {
+    if (args._.length < 2) {
+        throw new Error('Please pass a key');
+    }
+    switch (args._[1]) {
+        case 'func': {
+            const pkg = '@ton-community/func-js-bin';
+            const funcVersions = await getVersions(pkg, ui);
+            let version = args._.length > 2 ? args._[2] : '';
+            if (!funcVersions.includes(version)) {
+                version = await ui.choose('Choose FunC version', funcVersions, (s) => s);
+            }
+            const packagePath = path_1.default.join(process.cwd(), 'package.json');
+            const packageContents = (await (0, promises_1.readFile)(packagePath)).toString('utf-8');
+            const parsedPackage = JSON.parse(packageContents);
+            const packageManager = await ui.choose('Choose your package manager', ['npm', 'yarn', 'pnpm', 'other'], (s) => s);
+            if (packageManager === 'other') {
+                ui.write(`Please find out how to override @ton-community/func-js-bin version to ${version} using your package manager, do that, and then install the packages`);
+                return;
+            }
+            const overrideKey = packageManager === 'yarn' ? 'resolutions' : 'overrides';
+            parsedPackage[overrideKey] = {
+                ...parsedPackage[overrideKey],
+                [pkg]: version,
+            };
+            ui.write('Updating package.json...');
+            await (0, promises_1.writeFile)(packagePath, JSON.stringify(parsedPackage, null, 4));
+            const installCmd = packageManager === 'yarn' ? 'yarn' : `${packageManager} i`;
+            try {
+                ui.write('Installing dependencies...');
+                await install(installCmd, ui);
+            }
+            catch (e) {
+                ui.write('Failed to install dependencies, rolling back package.json');
+                await (0, promises_1.writeFile)(packagePath, packageContents);
+                throw e;
+            }
+            break;
+        }
+        default: {
+            throw new Error('Unknown key: ' + args._[1]);
+        }
+    }
+};
+exports.set = set;

package/dist/network/createNetworkProvider.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _SendProviderSender_provider, _WrappedContractProvider_address, _WrappedContractProvider_provider, _WrappedContractProvider_init, _NetworkProviderImpl_tc, _NetworkProviderImpl_sender, _NetworkProviderImpl_network, _NetworkProviderImpl_explorer, _NetworkProviderImpl_ui;
+var _SendProviderSender_provider, _WrappedContractProvider_address, _WrappedContractProvider_provider, _WrappedContractProvider_init, _WrappedContractProvider_factory, _NetworkProviderImpl_tc, _NetworkProviderImpl_sender, _NetworkProviderImpl_network, _NetworkProviderImpl_explorer, _NetworkProviderImpl_ui;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNetworkProvider = exports.argSpec = void 0;
 const utils_1 = require("../utils");
@@ -63,13 +63,15 @@ class SendProviderSender {
 }
 _SendProviderSender_provider = new WeakMap();
 class WrappedContractProvider {
-    constructor(address, provider, init) {
+    constructor(address, factory, init) {
         _WrappedContractProvider_address.set(this, void 0);
         _WrappedContractProvider_provider.set(this, void 0);
         _WrappedContractProvider_init.set(this, void 0);
+        _WrappedContractProvider_factory.set(this, void 0);
         __classPrivateFieldSet(this, _WrappedContractProvider_address, address, "f");
-        __classPrivateFieldSet(this, _WrappedContractProvider_provider, provider, "f");
+        __classPrivateFieldSet(this, _WrappedContractProvider_provider, factory({ address, init }), "f");
         __classPrivateFieldSet(this, _WrappedContractProvider_init, init, "f");
+        __classPrivateFieldSet(this, _WrappedContractProvider_factory, factory, "f");
     }
     async getState() {
         return await __classPrivateFieldGet(this, _WrappedContractProvider_provider, "f").getState();
@@ -91,8 +93,14 @@ class WrappedContractProvider {
             body: typeof args.body === 'string' ? (0, core_1.comment)(args.body) : args.body,
         });
     }
+    open(contract) {
+        return (0, core_1.openContract)(contract, (params) => new WrappedContractProvider(params.address, __classPrivateFieldGet(this, _WrappedContractProvider_factory, "f"), params.init));
+    }
+    getTransactions(address, lt, hash, limit) {
+        return __classPrivateFieldGet(this, _WrappedContractProvider_provider, "f").getTransactions(address, lt, hash, limit);
+    }
 }
-_WrappedContractProvider_address = new WeakMap(), _WrappedContractProvider_provider = new WeakMap(), _WrappedContractProvider_init = new WeakMap();
+_WrappedContractProvider_address = new WeakMap(), _WrappedContractProvider_provider = new WeakMap(), _WrappedContractProvider_init = new WeakMap(), _WrappedContractProvider_factory = new WeakMap();
 class NetworkProviderImpl {
     constructor(tc, sender, network, explorer, ui) {
         _NetworkProviderImpl_tc.set(this, void 0);
@@ -119,12 +127,8 @@ class NetworkProviderImpl {
         return __classPrivateFieldGet(this, _NetworkProviderImpl_tc, "f");
     }
     provider(address, init) {
-        if (__classPrivateFieldGet(this, _NetworkProviderImpl_tc, "f") instanceof ton_1.TonClient4) {
-            return new WrappedContractProvider(address, __classPrivateFieldGet(this, _NetworkProviderImpl_tc, "f").provider(address, init ? { code: init.code ?? new core_1.Cell(), data: init.data ?? new core_1.Cell() } : undefined), init);
-        }
-        else {
-            return new WrappedContractProvider(address, __classPrivateFieldGet(this, _NetworkProviderImpl_tc, "f").provider(address, { code: init?.code ?? new core_1.Cell(), data: init?.data ?? new core_1.Cell() }), init);
-        }
+        const factory = (params) => __classPrivateFieldGet(this, _NetworkProviderImpl_tc, "f").provider(params.address, params.init);
+        return new WrappedContractProvider(address, factory, init);
     }
     async isContractDeployed(address) {
         if (__classPrivateFieldGet(this, _NetworkProviderImpl_tc, "f") instanceof ton_1.TonClient4) {
@@ -176,7 +180,7 @@ class NetworkProviderImpl {
         await this.waitForDeploy(contract.address, waitAttempts);
     }
     open(contract) {
-        return (0, core_1.openContract)(contract, (params) => this.provider(params.address, params.init ?? undefined));
+        return (0, core_1.openContract)(contract, (params) => this.provider(params.address, params.init ?? null));
     }
     ui() {
         return __classPrivateFieldGet(this, _NetworkProviderImpl_ui, "f");
@@ -322,7 +326,7 @@ class NetworkProviderBuilder {
             }
             if (configNetwork.version === undefined || configNetwork.version === 'v2') {
                 tc = new ton_1.TonClient({
-                    endpoint: configNetwork.endpoint + 'jsonRPC',
+                    endpoint: configNetwork.endpoint,
                     apiKey: configNetwork.key,
                 });
             }

package/dist/templates/tact/counter/contracts/contract.tact.template

@@ -16,7 +16,7 @@ contract {{name}} with Deployable {
     }
 
     receive(msg: Add) {
-        self.counter = (self.counter + msg.amount);
+        self.counter += msg.amount;
     }
 
     get fun counter(): Int {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ton/blueprint",
-  "version": "0.16.0",
+  "version": "0.18.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.49.2",
+    "@ton/core": "^0.56.0",
     "@ton/crypto": "^3.2.0",
-    "@ton/ton": "^13.5.1",
+    "@ton/ton": "^13.11.0",
     "@types/inquirer": "^8.2.6",
     "@types/node": "^20.2.5",
     "@types/qrcode-terminal": "^0.12.0",
@@ -29,13 +29,13 @@
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
-    "@ton/core": ">=0.49.2",
+    "@ton/core": ">=0.56.0",
     "@ton/crypto": ">=3.2.0",
-    "@ton/ton": ">=13.4.1"
+    "@ton/ton": ">=13.11.0"
   },
   "dependencies": {
     "@orbs-network/ton-access": "^2.3.3",
-    "@tact-lang/compiler": "^1.1.5",
+    "@tact-lang/compiler": "^1.2.0",
     "@ton-community/func-js": "^0.6.3",
     "@tonconnect/sdk": "^2.1.3",
     "arg": "^5.0.2",