feat[stdlib]: define constants for reserve modes (#173)

tact-lang · Mar 25, 2024 · e0a3288 · e0a3288
1 parent cd34466
commit e0a3288
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/examples/payouts.tact b/examples/payouts.tact
@@ -29,7 +29,7 @@ contract Beacon with Ownable {
         require(ctx.sender == self.master, "Invalid sender");
 
         // Reserve funds
-        nativeReserve(ton("0.1"), 0);
+        nativeReserve(ton("0.1"), ReserveExact);
 
         // Send response
         if (self.completed) {

diff --git a/examples/rugpull.tact b/examples/rugpull.tact
@@ -67,7 +67,7 @@ contract RugPull with OwnableTransferable, Stoppable {
     receive("withdraw") {
         self.requireOwner();
         if (!self.rugpulled) {
-            nativeReserve(self.balance, 0);
+            nativeReserve(self.balance, ReserveExact);
         }
         send(SendParameters{value: 0, to: self.owner, mode: SendRemainingBalance });
     }

diff --git a/src/imports/stdlib.ts b/src/imports/stdlib.ts
@@ -116,11 +116,12 @@ files['std/base.tact'] =
     'Y2sgc3RvcmFnZSBpZiBuZWVkZWQKICAgICAgICBpZiAoc2VsZi5zdG9yYWdlUmVzZXJ2ZSA+IDApIHsgLy8gT3B0aW1pemVkIGluIGNvbXBpbGUtdGltZQogICAgICAg' +
     'ICAgICBsZXQgY3R4OiBDb250ZXh0ID0gY29udGV4dCgpOwogICAgICAgICAgICBsZXQgYmFsYW5jZTogSW50ID0gbXlCYWxhbmNlKCk7CiAgICAgICAgICAgIGxldCBi' +
     'YWxhbmNlQmVmb3JlTWVzc2FnZTogSW50ID0gYmFsYW5jZSAtIGN0eC52YWx1ZTsKICAgICAgICAgICAgaWYgKGJhbGFuY2VCZWZvcmVNZXNzYWdlIDwgc2VsZi5zdG9y' +
-    'YWdlUmVzZXJ2ZSkgewogICAgICAgICAgICAgICAgbmF0aXZlUmVzZXJ2ZShzZWxmLnN0b3JhZ2VSZXNlcnZlLCAwKTsKICAgICAgICAgICAgICAgIHNlbmQoU2VuZFBh' +
-    'cmFtZXRlcnN7Ym91bmNlOiBib3VuY2UsIHRvOiB0bywgdmFsdWU6IDAsIG1vZGU6IFNlbmRSZW1haW5pbmdCYWxhbmNlICsgU2VuZElnbm9yZUVycm9ycywgYm9keTog' +
-    'Ym9keSwgY29kZTogY29kZSwgZGF0YTogZGF0YSB9KTsKICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgfQogICAgICAgIH0KCiAgICAgICAgLy8gSnVz' +
-    'dCBzZW5kIHdpdGggcmVtYWluaW5nIGJhbGFuY2UKICAgICAgICBzZW5kKFNlbmRQYXJhbWV0ZXJze2JvdW5jZTogYm91bmNlLCB0bzogdG8sIHZhbHVlOiAwLCBtb2Rl' +
-    'OiBTZW5kUmVtYWluaW5nVmFsdWUgKyBTZW5kSWdub3JlRXJyb3JzLCBib2R5OiBib2R5LCBjb2RlOiBjb2RlLCBkYXRhOiBkYXRhIH0pOwogICAgfQp9';
+    'YWdlUmVzZXJ2ZSkgewogICAgICAgICAgICAgICAgbmF0aXZlUmVzZXJ2ZShzZWxmLnN0b3JhZ2VSZXNlcnZlLCBSZXNlcnZlRXhhY3QpOwogICAgICAgICAgICAgICAg' +
+    'c2VuZChTZW5kUGFyYW1ldGVyc3tib3VuY2U6IGJvdW5jZSwgdG86IHRvLCB2YWx1ZTogMCwgbW9kZTogU2VuZFJlbWFpbmluZ0JhbGFuY2UgKyBTZW5kSWdub3JlRXJy' +
+    'b3JzLCBib2R5OiBib2R5LCBjb2RlOiBjb2RlLCBkYXRhOiBkYXRhIH0pOwogICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICB9CiAgICAgICAgfQoKICAg' +
+    'ICAgICAvLyBKdXN0IHNlbmQgd2l0aCByZW1haW5pbmcgYmFsYW5jZQogICAgICAgIHNlbmQoU2VuZFBhcmFtZXRlcnN7Ym91bmNlOiBib3VuY2UsIHRvOiB0bywgdmFs' +
+    'dWU6IDAsIG1vZGU6IFNlbmRSZW1haW5pbmdWYWx1ZSArIFNlbmRJZ25vcmVFcnJvcnMsIGJvZHk6IGJvZHksIGNvZGU6IGNvZGUsIGRhdGE6IGRhdGEgfSk7CiAgICB9' +
+    'Cn0=';
 files['std/cells.tact'] =
     'Ly8KLy8gQnVpbGRlcgovLwoKQG5hbWUoYmVnaW5fY2VsbCkKbmF0aXZlIGJlZ2luQ2VsbCgpOiBCdWlsZGVyOwoKQG5hbWUoc3RvcmVfaW50KQpleHRlbmRzIG5hdGl2' +
     'ZSBzdG9yZUludChzZWxmOiBCdWlsZGVyLCB2YWx1ZTogSW50LCBiaXRzOiBJbnQpOiBCdWlsZGVyOwoKQG5hbWUoc3RvcmVfdWludCkKZXh0ZW5kcyBuYXRpdmUgc3Rv' +
@@ -190,7 +191,9 @@ files['std/primitives.tact'] =
     'cHJpbWl0aXZlIEludDsKcHJpbWl0aXZlIEJvb2w7CnByaW1pdGl2ZSBCdWlsZGVyOwpwcmltaXRpdmUgU2xpY2U7CnByaW1pdGl2ZSBDZWxsOwpwcmltaXRpdmUgQWRk' +
     'cmVzczsKcHJpbWl0aXZlIFN0cmluZzsKcHJpbWl0aXZlIFN0cmluZ0J1aWxkZXI7';
 files['std/reserve.tact'] =
-    'QG5hbWUocmF3X3Jlc2VydmUpCm5hdGl2ZSBuYXRpdmVSZXNlcnZlKGFtb3VudDogSW50LCBtb2RlOiBJbnQpOw==';
+    'QG5hbWUocmF3X3Jlc2VydmUpCm5hdGl2ZSBuYXRpdmVSZXNlcnZlKGFtb3VudDogSW50LCBtb2RlOiBJbnQpOwoKY29uc3QgUmVzZXJ2ZUV4YWN0OiBJbnQgPSAwOwpj' +
+    'b25zdCBSZXNlcnZlQWxsRXhjZXB0OiBJbnQgPSAxOwpjb25zdCBSZXNlcnZlQXRNb3N0OiBJbnQgPSAyOwpjb25zdCBSZXNlcnZlQWRkT3JpZ2luYWxCYWxhbmNlOiBJ' +
+    'bnQgPSA0Owpjb25zdCBSZXNlcnZlSW52ZXJ0U2lnbjogSW50ID0gODsKY29uc3QgUmVzZXJ2ZUJvdW5jZUlmQWN0aW9uRmFpbDogSW50ID0gMTY7';
 files['std/send.tact'] =
     'QG5hbWUoc2VuZF9yYXdfbWVzc2FnZSkKbmF0aXZlIG5hdGl2ZVNlbmRNZXNzYWdlKGNlbGw6IENlbGwsIG1vZGU6IEludCk7Cgpjb25zdCBTZW5kUmVtYWluaW5nQmFs' +
     'YW5jZTogSW50ID0gMTI4Owpjb25zdCBTZW5kUmVtYWluaW5nVmFsdWU6IEludCA9IDY0Owpjb25zdCBTZW5kSWdub3JlRXJyb3JzOiBJbnQgPSAyOwpjb25zdCBTZW5k' +

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

diff --git a/stdlib/std/reserve.tact b/stdlib/std/reserve.tact
@@ -1,2 +1,9 @@
 @name(raw_reserve)
-native nativeReserve(amount: Int, mode: Int);
+native nativeReserve(amount: Int, mode: Int);
+
+const ReserveExact: Int = 0;
+const ReserveAllExcept: Int = 1;
+const ReserveAtMost: Int = 2;
+const ReserveAddOriginalBalance: Int = 4;
+const ReserveInvertSign: Int = 8;
+const ReserveBounceIfActionFail: Int = 16;