tests: check all combinations of internal, external and bounced receivers for "empty" messages

jest-fast.config.js

@@ -11,7 +11,6 @@ module.exports = {
         "/src/test/e2e-emulated/map*",
         "/src/cli/e2e.spec.ts",
         "/src/ast/fuzz.spec.ts",
-        "/src/test/benchmarks/jetton/jetton.spec.ts",
     ],
     maxWorkers: "8",
 };

src/generator/writers/writeContract.ts

@@ -23,6 +23,7 @@ import {
 import type { ItemOrigin } from "../../imports/source";
 import { resolveFuncTypeFromAbiUnpack } from "./resolveFuncTypeFromAbiUnpack";
 import { getAllocation } from "../../storage/resolveAllocation";
+import { contractErrors } from "../../abi/errors";
 
 const SMALL_CONTRACT_MAX_FIELDS = 5;
 
@@ -393,6 +394,14 @@ export function writeMainContract(
             wCtx.append();
         }
 
+        wCtx.append(";; message opcode reader utility");
+        wCtx.append(
+            `;; Returns 32 bit message opcode, otherwise throws the "Invalid incoming message" exit code`,
+        );
+        wCtx.append(
+            `(slice, int) ~load_opcode(slice s) asm( -> 1 0) "32 LDUQ ${contractErrors.invalidMessage.id} THROWIFNOT";`,
+        );
+
         wCtx.append(`;;`);
         wCtx.append(`;; Routing of a Contract ${contract.name}`);
         wCtx.append(`;;`);

src/generator/writers/writeRouter.ts

@@ -71,7 +71,8 @@ export function writeNonBouncedRouter(
         typeof receivers.fallback !== "undefined" &&
         receivers.binary.length === 0 &&
         receivers.comment.length === 0 &&
-        typeof receivers.commentFallback === "undefined"
+        typeof receivers.commentFallback === "undefined" &&
+        typeof receivers.empty === "undefined"
     ) {
         writeFallbackReceiver(receivers.fallback, contract, "in_msg", wCtx);
         return;
@@ -91,7 +92,7 @@ export function writeNonBouncedRouter(
         typeof receivers.commentFallback === "undefined" &&
         typeof receivers.fallback === "undefined"
     ) {
-        wCtx.append(`var (op, _) = in_msg~load_uint_quiet(32);`);
+        wCtx.append("var op = in_msg~load_opcode();");
 
         writeBinaryReceivers(true);
 
@@ -216,14 +217,17 @@ function writeCommentReceivers(
     ) => {
         const writeFallbackTextReceiverInternal = () => {
             wCtx.append(";; Fallback Text Receiver");
-            const inMsg = msgOpcodeRemoved ? "in_msg" : "in_msg.skip_bits(32)";
-            writeFallbackReceiver(
-                commentFallbackReceiver,
-                contract,
-                inMsg,
-                wCtx,
-            );
-            wCtx.append("return ();");
+            wCtx.inBlock("if (in_msg_length >= 32)", () => {
+                const inMsg = msgOpcodeRemoved
+                    ? "in_msg"
+                    : "in_msg.skip_bits(32)";
+                writeFallbackReceiver(
+                    commentFallbackReceiver,
+                    contract,
+                    inMsg,
+                    wCtx,
+                );
+            });
         };
 
         // We optimize fallback

src/test/benchmarks/__snapshots__/benchmarks.spec.ts.snap

@@ -14,17 +14,17 @@ exports[`benchmarks benchmark codeOf vs myCode(): gas used myCode 1`] = `931n`;
 
 exports[`benchmarks benchmark contractAddressExt: gas used contractAddressExt 1`] = `2589n`;
 
-exports[`benchmarks benchmark deployable trait vs raw deploy: gas used deploy trait 1`] = `4576`;
+exports[`benchmarks benchmark deployable trait vs raw deploy: gas used deploy trait 1`] = `4548`;
 
 exports[`benchmarks benchmark deployable trait vs raw deploy: gas used raw deploy 1`] = `1585`;
 
-exports[`benchmarks benchmark functions: code size 1`] = `184`;
+exports[`benchmarks benchmark functions: code size 1`] = `183`;
 
-exports[`benchmarks benchmark functions: gas used 1`] = `2236`;
+exports[`benchmarks benchmark functions: gas used 1`] = `2208`;
 
 exports[`benchmarks benchmark readFwdFee: code size 1`] = `120`;
 
-exports[`benchmarks benchmark readFwdFee: gas used 1`] = `2058`;
+exports[`benchmarks benchmark readFwdFee: gas used 1`] = `2048`;
 
 exports[`benchmarks benchmark sha256: gas hash string big 1`] = `2562`;
 

src/test/benchmarks/escrow/results.json

@@ -99,6 +99,16 @@
         "approveTon": "9418",
         "cancelTon": "7144"
       }
+    },
+    {
+      "label": "1.5.3 with fixed routing",
+      "pr": "https://github.com/tact-lang/tact/pull/1949",
+      "gas": {
+        "fundingTon": "4988",
+        "changeCode": "5194",
+        "approveTon": "9390",
+        "cancelTon": "7116"
+      }
     }
   ]
 }

src/test/benchmarks/jetton/results.json

@@ -224,6 +224,15 @@
         "burn": "12123",
         "discovery": "7052"
       }
+    },
+    {
+      "label": "1.5.3 with fixed routing",
+      "pr": "https://github.com/tact-lang/tact/pull/1949",
+      "gas": {
+        "transfer": "16036",
+        "burn": "12067",
+        "discovery": "7024"
+      }
     }
   ]
 }