Merge branch 'main' into upgrade-deps

tact-lang · Apr 22, 2024 · 022c9d3 · 022c9d3
2 parents ef6fb42 + d993edf
commit 022c9d3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `newAddress` function now evaluates to a constant value if possible: PR [#237](https://github.com/tact-lang/tact/pull/237)
 - The `dump()` and `dumpStack()` functions now print the file path, line number, and column number in addition to the data: PR [#271](https://github.com/tact-lang/tact/pull/271).
 - `pow` function is now in the standard library, allowing its use at runtime. If constant arguments are used, the result is evaluated at compile-time: PR [#267](https://github.com/tact-lang/tact/pull/267)
+- Use `|` instead of `+` for send mode flags because the bitwise OR operation is idempotent and hence safer: PR [#274](https://github.com/tact-lang/tact/pull/274)
 - Bumped the versions of `@ton/core` and `ohm-js` to most recent ones: PR [#276](https://github.com/tact-lang/tact/pull/276)
 
 ### Fixed

diff --git a/examples/multisig.tact b/examples/multisig.tact
@@ -55,7 +55,7 @@ contract MultisigSigner {
             send(SendParameters{
                 value: 0, 
                 to: self.master, 
-                mode: SendRemainingBalance + SendIgnoreErrors, 
+                mode: SendRemainingBalance | SendIgnoreErrors,
                 bounce: false, 
                 body: Signed{ request: self.request }.toCell()
             });
@@ -95,7 +95,7 @@ contract Multisig {
         send(SendParameters{
             value: 0, 
             to: opAddress, 
-            mode: SendRemainingValue + SendIgnoreErrors, 
+            mode: SendRemainingValue | SendIgnoreErrors,
             bounce: true,
             code: opInit.code,
             data: opInit.data

diff --git a/examples/payouts.tact b/examples/payouts.tact
@@ -79,7 +79,7 @@ contract Payouts with OwnableTransferable {
         send(SendParameters{
             to: address, 
             value: 0, 
-            mode: SendRemainingValue + SendIgnoreErrors, 
+            mode: SendRemainingValue | SendIgnoreErrors,
             bounce: true, 
             body: CanPayout{amount: amount}.toCell()
         });
@@ -102,15 +102,15 @@ contract Payouts with OwnableTransferable {
             send(SendParameters{
                 to: msg.address, 
                 value: msg.amount, 
-                mode: SendRemainingValue + SendIgnoreErrors, 
+                mode: SendRemainingValue | SendIgnoreErrors,
                 bounce: false, 
                 body: "Success".asComment()
             });
         } else {
             send(SendParameters{
                 to: msg.address, 
                 value: 0, 
-                mode: SendRemainingValue + SendIgnoreErrors, 
+                mode: SendRemainingValue | SendIgnoreErrors,
                 bounce: false, 
                 body: "Already paid".asComment()
             });

diff --git a/src/imports/stdlib.ts b/src/imports/stdlib.ts
@@ -117,10 +117,10 @@ files['std/base.tact'] =
     'ICAgICBsZXQgY3R4OiBDb250ZXh0ID0gY29udGV4dCgpOwogICAgICAgICAgICBsZXQgYmFsYW5jZTogSW50ID0gbXlCYWxhbmNlKCk7CiAgICAgICAgICAgIGxldCBi' +
     'YWxhbmNlQmVmb3JlTWVzc2FnZTogSW50ID0gYmFsYW5jZSAtIGN0eC52YWx1ZTsKICAgICAgICAgICAgaWYgKGJhbGFuY2VCZWZvcmVNZXNzYWdlIDwgc2VsZi5zdG9y' +
     'YWdlUmVzZXJ2ZSkgewogICAgICAgICAgICAgICAgbmF0aXZlUmVzZXJ2ZShzZWxmLnN0b3JhZ2VSZXNlcnZlLCBSZXNlcnZlRXhhY3QpOwogICAgICAgICAgICAgICAg' +
-    'c2VuZChTZW5kUGFyYW1ldGVyc3tib3VuY2U6IGJvdW5jZSwgdG86IHRvLCB2YWx1ZTogMCwgbW9kZTogU2VuZFJlbWFpbmluZ0JhbGFuY2UgKyBTZW5kSWdub3JlRXJy' +
+    'c2VuZChTZW5kUGFyYW1ldGVyc3tib3VuY2U6IGJvdW5jZSwgdG86IHRvLCB2YWx1ZTogMCwgbW9kZTogU2VuZFJlbWFpbmluZ0JhbGFuY2UgfCBTZW5kSWdub3JlRXJy' +
     'b3JzLCBib2R5OiBib2R5LCBjb2RlOiBjb2RlLCBkYXRhOiBkYXRhIH0pOwogICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICB9CiAgICAgICAgfQoKICAg' +
     'ICAgICAvLyBKdXN0IHNlbmQgd2l0aCByZW1haW5pbmcgYmFsYW5jZQogICAgICAgIHNlbmQoU2VuZFBhcmFtZXRlcnN7Ym91bmNlOiBib3VuY2UsIHRvOiB0bywgdmFs' +
-    'dWU6IDAsIG1vZGU6IFNlbmRSZW1haW5pbmdWYWx1ZSArIFNlbmRJZ25vcmVFcnJvcnMsIGJvZHk6IGJvZHksIGNvZGU6IGNvZGUsIGRhdGE6IGRhdGEgfSk7CiAgICB9' +
+    'dWU6IDAsIG1vZGU6IFNlbmRSZW1haW5pbmdWYWx1ZSB8IFNlbmRJZ25vcmVFcnJvcnMsIGJvZHk6IGJvZHksIGNvZGU6IGNvZGUsIGRhdGE6IGRhdGEgfSk7CiAgICB9' +
     'Cn0=';
 files['std/cells.tact'] =
     'Ly8KLy8gQnVpbGRlcgovLwoKQG5hbWUoYmVnaW5fY2VsbCkKbmF0aXZlIGJlZ2luQ2VsbCgpOiBCdWlsZGVyOwoKQG5hbWUoc3RvcmVfaW50KQpleHRlbmRzIG5hdGl2' +

diff --git a/src/test/bugs/issue43.tact b/src/test/bugs/issue43.tact
@@ -71,7 +71,7 @@ trait Jetton with Ownable {
                 to: msg.response_destination!!, 
                 value: 0,
                 bounce: false,
-                mode: SendRemainingValue + SendIgnoreErrors,
+                mode: SendRemainingValue | SendIgnoreErrors,
                 body: TokenExcesses{
                     queryId: msg.queryId
                 }.toCell()

diff --git a/src/test/features/deep-sequence.tact b/src/test/features/deep-sequence.tact
@@ -10,7 +10,7 @@ contract A {
         send(SendParameters{
             value: 0, 
             to: address, 
-            mode: SendRemainingValue + SendIgnoreErrors, 
+            mode: SendRemainingValue | SendIgnoreErrors,
             bounce: true,
             code: init.code,
             data: init.data,
@@ -35,7 +35,7 @@ contract B {
         send(SendParameters{
             value: 0, 
             to: address, 
-            mode: SendRemainingValue + SendIgnoreErrors, 
+            mode: SendRemainingValue | SendIgnoreErrors,
             bounce: true,
             code: init.code,
             data: init.data,
@@ -60,7 +60,7 @@ contract C {
         send(SendParameters{
             value: 0, 
             to: address, 
-            mode: SendRemainingValue + SendIgnoreErrors, 
+            mode: SendRemainingValue | SendIgnoreErrors,
             bounce: true,
             code: init.code,
             data: init.data,

diff --git a/stdlib/std/base.tact b/stdlib/std/base.tact
@@ -26,12 +26,12 @@ trait BaseTrait {
             let balanceBeforeMessage: Int = balance - ctx.value;
             if (balanceBeforeMessage < self.storageReserve) {
                 nativeReserve(self.storageReserve, ReserveExact);
-                send(SendParameters{bounce: bounce, to: to, value: 0, mode: SendRemainingBalance + SendIgnoreErrors, body: body, code: code, data: data });
+                send(SendParameters{bounce: bounce, to: to, value: 0, mode: SendRemainingBalance | SendIgnoreErrors, body: body, code: code, data: data });
                 return;
             }
         }
 
         // Just send with remaining balance
-        send(SendParameters{bounce: bounce, to: to, value: 0, mode: SendRemainingValue + SendIgnoreErrors, body: body, code: code, data: data });
+        send(SendParameters{bounce: bounce, to: to, value: 0, mode: SendRemainingValue | SendIgnoreErrors, body: body, code: code, data: data });
     }
 }