Merge branch 'main' into tact-template-yaml

Author: verytactical

dev-docs/CHANGELOG.md

@@ -47,6 +47,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Better error message for `extend function without parameters` error: PR [#1624](https://github.com/tact-lang/tact/pull/1624)
 - Don't generate `lazy_deployment_completed` by default: PR [#1717](https://github.com/tact-lang/tact/pull/1717)
 - Optimized `emptyCell()` and `emptySlice()` functions: PR [#1696](https://github.com/tact-lang/tact/pull/1696)
+- Rearrange parameters of some asm methods in order described in `AsmShuffle`: PR [#1702](https://github.com/tact-lang/tact/pull/1702)
+- Error message for invalid type for function argument now shows expected type: PR [#1738](https://github.com/tact-lang/tact/pull/1738)
 
 ### Fixed
 
@@ -85,13 +87,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support overriding constants and methods of BaseTrait: PR [#1591](https://github.com/tact-lang/tact/pull/1591)
 - Forbid traits inherit implicitly from BaseTrait: PR [#1591](https://github.com/tact-lang/tact/pull/1591)
 - Forbid the `override` modifier for constants without the corresponding super-constant: PR [#1591](https://github.com/tact-lang/tact/pull/1591)
+- Remove "remainder" from error messages: PR [#1699](https://github.com/tact-lang/tact/pull/1699)
 
 ### Docs
 
 - Added the `description` property to the frontmatter of the each page for better SEO: PR [#916](https://github.com/tact-lang/tact/pull/916)
 - Added Google Analytics tags per every page: PR [#921](https://github.com/tact-lang/tact/pull/921)
 - Added Ston.fi cookbook: PR [#956](https://github.com/tact-lang/tact/pull/956)
-- Added NFTs cookbook: PR [#958](https://github.com/tact-lang/tact/pull/958)
+- Added NFTs cookbook: PR [#958](https://github.com/tact-lang/tact/pull/958), PR [#1747](https://github.com/tact-lang/tact/pull/1747)
 - Added security best practices: PR [#1070](https://github.com/tact-lang/tact/pull/1070)
 - Added automatic links to Web IDE from all code blocks: PR [#994](https://github.com/tact-lang/tact/pull/994)
 - Added initial semi-automated Chinese translation of the documentation: PR [#942](https://github.com/tact-lang/tact/pull/942)

docs/src/content/docs/cookbook/nfts.mdx

@@ -11,8 +11,9 @@ Notification message of assigned NFT ownership has the following structure:
 
 ```tact
 message(0x05138d91) NFTOwnershipAssigned {
-    previousOwner: Address;
-    forwardPayload: Slice as remaining;
+    queryId: Int as uint64;
+    previousOwner:Address;
+    forwardPayload:Slice as remaining;
 }
 ```
 
@@ -32,8 +33,9 @@ Validation can be done in two ways:
 import "@stdlib/deploy";
 
 message(0x05138d91) NFTOwnershipAssigned {
-    previousOwner: Address;
-    forwardPayload: Slice as remaining;
+    queryId: Int as uint64;
+    previousOwner:Address;
+    forwardPayload:Slice as remaining;
 }
 
 contract SingleNft with Deployable {
@@ -57,8 +59,9 @@ contract SingleNft with Deployable {
 import "@stdlib/deploy";
 
 message(0x05138d91) NFTOwnershipAssigned {
-    previousOwner: Address;
-    forwardPayload: Slice as remaining;
+    queryId: Int as uint64;
+    previousOwner:Address;
+    forwardPayload:Slice as remaining;
 }
 
 struct NFTItemInitData {

docs/src/content/docs/zh-cn/book/cells.mdx

@@ -55,7 +55,7 @@ description: Cells、Builders 和 Slices 是 TON 区块链的底层单元
 
 标准 [`Cell{:tact}`](#cells) 表示法是 [tvm.pdf](https://docs.ton.org/tvm.pdf) 中首次描述的 cells 通用序列化格式。 它的算法以八进制（字节）序列表示cell，首先将称为描述符的第一个 $2$ 字节序列化：
 
-- _引用描述符_（Refs descriptor）根据以下公式计算：$r + 8 _ k + 32 _ l$，其中 $r$ 是 cell 中包含的引用数量（介于 $0$ 和 $4$ 之间），$k$ 是 cell 类型的标志（$0$ 表示[普通](#cells-kinds)，$1$ 表示[特殊](#cells-kinds)），$l$ 是 
+- _引用描述符_（Refs descriptor）根据以下公式计算：$r + 8 _ k + 32 _ l$，其中 $r$ 是 cell 中包含的引用数量（介于 $0$ 和 $4$ 之间），$k$ 是 cell 类型的标志（$0$ 表示[普通](#cells-kinds)，$1$ 表示[特殊](#cells-kinds)），$l$ 是
   cell 的[层级](#cells-levels)（介于 $0$ 和 $3$ 之间）。
 - _位描述符_（Bits descriptor）根据以下公式计算：$\lfloor\frac{b}{8}\rfloor + \lceil\frac{b}{8}\rceil$，其中 $b$ 是 cell 中的位数（介于 $0$ 和 $1023$ 之间）。
 

src/ast/ast.ts

@@ -269,7 +269,6 @@ export type AstStatementCondition = {
     readonly condition: AstExpression;
     readonly trueStatements: readonly AstStatement[];
     readonly falseStatements: readonly AstStatement[] | null;
-    readonly elseif: AstStatementCondition | null;
     readonly id: number;
     readonly loc: SrcInfo;
 };

src/ast/clone.ts

@@ -43,7 +43,6 @@ export function cloneNode<T extends AstNode>(
                 falseStatements: src.falseStatements
                     ? src.falseStatements.map(recurse)
                     : null,
-                elseif: src.elseif ? recurse(src.elseif) : null,
             });
         } else if (src.kind === "statement_block") {
             return cloneNode({

src/ast/compare.ts

@@ -400,19 +400,16 @@ export class AstComparator {
                     condition: cond1,
                     trueStatements: true1,
                     falseStatements: false1,
-                    elseif: condElseIf1,
                 } = node1 as A.AstStatementCondition;
                 const {
                     condition: cond2,
                     trueStatements: true2,
                     falseStatements: false2,
-                    elseif: condElseIf2,
                 } = node2 as A.AstStatementCondition;
                 return (
                     this.compare(cond1, cond2) &&
                     this.compareArray(true1, true2) &&
-                    this.compareNullableArray(false1, false2) &&
-                    this.compareNullableNodes(condElseIf1, condElseIf2)
+                    this.compareNullableArray(false1, false2)
                 );
             }
 

src/ast/getAstSchema.ts

@@ -333,19 +333,17 @@ export const getAstSchema = (
                 expression,
                 loc: toSrcInfo(loc),
             }),
-        Condition: (
+        StatementCondition: (
             condition: A.AstExpression,
             trueStatements: A.AstStatement[],
             falseStatements: A.AstStatement[] | null,
-            elseif: A.AstStatementCondition | null,
             loc: Loc,
         ): A.AstStatementCondition =>
             createNode<A.AstStatementCondition>({
                 kind: "statement_condition",
                 condition,
                 trueStatements,
                 falseStatements,
-                elseif,
                 loc: toSrcInfo(loc),
             }),
         StatementWhile: (

src/ast/hash.ts

@@ -90,10 +90,7 @@ export class AstHasher {
                 const falseStatementsHash = node.falseStatements
                     ? this.hashStatements(node.falseStatements)
                     : "null";
-                const elseifHash = node.elseif
-                    ? this.hash(node.elseif)
-                    : "null";
-                return `${node.kind}|${this.hash(node.condition)}|${trueStatementsHash}|${falseStatementsHash}|${elseifHash}`;
+                return `${node.kind}|${this.hash(node.condition)}|${trueStatementsHash}|${falseStatementsHash}`;
             }
             case "statement_while":
                 return `${node.kind}|${this.hash(node.condition)}|${this.hashStatements(node.statements)}`;

src/ast/iterators.ts

@@ -203,7 +203,6 @@ export function traverseAndCheck(
                     traverseAndCheck(e, callback);
                 });
             }
-            if (node.elseif) traverseAndCheck(node.elseif, callback);
             break;
         case "statement_while":
         case "statement_until":

src/ast/rename.ts

@@ -373,11 +373,6 @@ export class AstRenamer {
                     falseStatements: stmt.falseStatements
                         ? this.renameStatements(stmt.falseStatements)
                         : null,
-                    elseif: stmt.elseif
-                        ? (this.renameStatement(
-                              stmt.elseif,
-                          ) as A.AstStatementCondition)
-                        : null,
                 };
             case "statement_while":
             case "statement_until":

src/cli/tact/index.ts

@@ -1,7 +1,5 @@
-import { readFileSync } from "fs";
-import { basename, dirname, join, normalize, resolve } from "path";
-import { execFileSync } from "child_process";
-import { z, ZodError } from "zod";
+import { basename, dirname, normalize, resolve } from "path";
+import { ZodError } from "zod";
 import { createNodeFileSystem } from "../../vfs/createNodeFileSystem";
 import { createVirtualFileSystem } from "../../vfs/createVirtualFileSystem";
 import { parseAndEvalExpression } from "../../optimizer/interpreter";
@@ -18,6 +16,7 @@ import { build } from "../../pipeline/build";
 import { TactErrorCollection } from "../../error/errors";
 import files from "../../stdlib/stdlib";
 import { cwd } from "process";
+import { getVersion, showCommit } from "../version";
 
 export const main = async () => {
     const Log = CliLogger();
@@ -46,7 +45,7 @@ const processArgs = async (Errors: CliErrors, argv: string[]) => {
 
         await parseArgs(Errors, Args);
     } else {
-        showHelp();
+        await showHelp();
     }
 };
 
@@ -64,7 +63,7 @@ const ArgSchema = (Parser: ArgParser) => {
         .add(Parser.immediate).end;
 };
 
-const showHelp = () => {
+const showHelp = async () => {
     console.log(`Usage
 $ tact [...flags] (--config CONFIG | FILE)
 
@@ -81,7 +80,7 @@ Flags
 
 Examples
   $ tact --version
-  ${getVersion()}
+  ${await getVersion()}
 
 Learn more about Tact:        https://docs.tact-lang.org
 Join Telegram group:          https://t.me/tactlang
@@ -92,22 +91,23 @@ type Args = ArgConsumer<GetParserResult<ReturnType<typeof ArgSchema>>>;
 
 const parseArgs = async (Errors: CliErrors, Args: Args) => {
     if (Args.single("help")) {
-        if (noUnknownParams(Errors, Args)) {
-            showHelp();
+        if (await noUnknownParams(Errors, Args)) {
+            await showHelp();
         }
         return;
     }
 
     if (Args.single("version")) {
-        if (noUnknownParams(Errors, Args)) {
-            showVersion();
+        if (await noUnknownParams(Errors, Args)) {
+            console.log(await getVersion());
+            showCommit();
         }
         return;
     }
 
     const expression = Args.single("eval");
     if (expression) {
-        if (noUnknownParams(Errors, Args)) {
+        if (await noUnknownParams(Errors, Args)) {
             evaluate(expression);
         }
         return;
@@ -146,8 +146,8 @@ const parseArgs = async (Errors: CliErrors, Args: Args) => {
         return;
     }
 
-    if (noUnknownParams(Errors, Args)) {
-        showHelp();
+    if (await noUnknownParams(Errors, Args)) {
+        await showHelp();
     }
 };
 
@@ -228,7 +228,7 @@ const compile = async (
 
     const stdlib = createVirtualFileSystem("@stdlib", files);
 
-    if (noUnknownParams(Errors, Args)) {
+    if (await noUnknownParams(Errors, Args)) {
         // TODO: all flags on the cli should take precedence over flags in the config
         // Make a nice model for it instead of the current mess
         // Consider making overwrites right here or something.
@@ -306,7 +306,10 @@ const setConfigOptions = (config: Config, options: ExtraOptions): void => {
     }
 };
 
-const noUnknownParams = (Errors: CliErrors, Args: Args): boolean => {
+const noUnknownParams = async (
+    Errors: CliErrors,
+    Args: Args,
+): Promise<boolean> => {
     const leftoverArgs = Args.leftover();
 
     if (leftoverArgs.length === 0) {
@@ -316,25 +319,10 @@ const noUnknownParams = (Errors: CliErrors, Args: Args): boolean => {
     for (const argument of leftoverArgs) {
         Errors.unexpectedArgument(argument);
     }
-    showHelp();
+    await showHelp();
     return false;
 };
 
-const showVersion = () => {
-    console.log(getVersion());
-    // if working inside a git repository
-    // also print the current git commit hash
-    try {
-        const gitCommit = execFileSync("git", ["rev-parse", "HEAD"], {
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-        }).trim();
-        console.log(`git commit: ${gitCommit}`);
-    } finally {
-        process.exit(0);
-    }
-};
-
 const evaluate = (expression: string) => {
     const result = parseAndEvalExpression(expression);
     switch (result.kind) {
@@ -348,17 +336,3 @@ const evaluate = (expression: string) => {
         }
     }
 };
-
-const getVersion = () => {
-    const packageSchema = z.object({
-        version: z.string(),
-    });
-
-    const packageJsonPath = join(__dirname, "..", "..", "..", "package.json");
-
-    const pkg = packageSchema.parse(
-        JSON.parse(readFileSync(packageJsonPath, "utf-8")),
-    );
-
-    return pkg.version;
-};

src/cli/unboc/index.ts

@@ -1,10 +1,10 @@
-import { execFileSync } from "child_process";
 import { readFileSync } from "fs";
 import { decompileAll } from "@tact-lang/opcode";
 import { ArgConsumer } from "../arg-consumer";
 import { ArgParser, GetParserResult } from "../arg-parser";
 import { CliLogger } from "../logger";
 import { UnbocErrors } from "./error-schema";
+import { showCommit } from "../version";
 
 const unbocVersion = "0.0.1";
 
@@ -72,7 +72,8 @@ const parseArgs = (Errors: UnbocErrors, Args: Args) => {
 
     if (Args.single("version")) {
         if (noUnknownParams(Errors, Args)) {
-            showVersion();
+            console.log(unbocVersion);
+            showCommit();
         }
         return;
     }
@@ -103,18 +104,3 @@ const noUnknownParams = (Errors: UnbocErrors, Args: Args): boolean => {
     showHelp();
     return false;
 };
-
-const showVersion = () => {
-    console.log(unbocVersion);
-    // if working inside a git repository
-    // also print the current git commit hash
-    try {
-        const gitCommit = execFileSync("git", ["rev-parse", "HEAD"], {
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-        }).trim();
-        console.log(`git commit: ${gitCommit}`);
-    } finally {
-        process.exit(0);
-    }
-};

src/cli/version.ts

@@ -0,0 +1,39 @@
+import { join } from "path";
+import { execFileSync } from "child_process";
+import { z } from "zod";
+import { readFile } from "fs/promises";
+
+const rootPath = join(__dirname, "..", "..");
+
+export function showCommit() {
+    // if working inside a git repository
+    // also print the current git commit hash
+    try {
+        const gitCommit = execFileSync(
+            "git",
+            [`--git-dir=${join(rootPath, ".git")}`, "rev-parse", "HEAD"],
+            {
+                encoding: "utf8",
+                stdio: ["ignore", "pipe", "ignore"],
+                cwd: rootPath,
+            },
+        ).trim();
+        console.log(`git commit: ${gitCommit}`);
+    } finally {
+        process.exit(0);
+    }
+}
+
+export async function getVersion() {
+    const packageSchema = z.object({
+        version: z.string(),
+    });
+
+    const packageJsonPath = join(rootPath, "package.json");
+
+    const pkg = packageSchema.parse(
+        JSON.parse(await readFile(packageJsonPath, "utf-8")),
+    );
+
+    return pkg.version;
+}