chore: bump Tact to 1.6.6 and add formatting to CI (#135)

Author: Kaladin13

.github/workflows/ci.yml

@@ -46,6 +46,9 @@ jobs:
       - name: Build
         run: yarn build
 
+      - name: Run Tact formatter
+        run: yarn tact-fmt --check ./src
+
       - name: Type check
         run: yarn tsc --noEmit
 

.husky/pre-push

@@ -4,3 +4,4 @@
 yarn lint:es
 yarn spell
 yarn fmt:check
+yarn tact-fmt --check ./src

package.json

@@ -4,7 +4,7 @@
         "build": "yarn build:base && yarn build:governance",
         "build:base": "tact --config ./tact.config.json --project Jetton",
         "build:governance": "tact --config ./tact.config.json --project Governance",
-        "lint": "yarn misti ./tact.config.json",
+        "lint": "tact-fmt --check ./src && yarn misti ./tact.config.json",
         "lint:es": "eslint .",
         "lint:fix": "eslint . --fix",
         "test": "yarn test:base && yarn test:governance",
@@ -16,6 +16,7 @@
         "verify-deployment": "jest src/e2e-tests/verify-deployment.spec.ts",
         "fmt": "yarn prettier -l -w .",
         "fmt:check": "yarn prettier --check .",
+        "fmt:tact": "tact-fmt --write ./src",
         "spell": "cspell \"**/*.{ts,js,json,md,yml,tact}\"",
         "spell:check": "cspell --no-progress \"**/*.{ts,js,json,md,yml}\"",
         "bench": "yarn build && cross-env PRINT_TABLE=true ts-node ./src/benchmarks/benchmarks.ts",
@@ -27,9 +28,9 @@
     },
     "dependencies": {
         "@aws-crypto/sha256-js": "^5.2.0",
-        "@nowarp/misti": "^0.7.1",
+        "@nowarp/misti": "^0.8.1",
         "@orbs-network/ton-access": "^2.3.3",
-        "@tact-lang/compiler": "^1.6.5",
+        "@tact-lang/compiler": "^1.6.6",
         "@tact-lang/ton-jest": "^0.0.4",
         "@ton/core": "^0.60.1",
         "@ton/crypto": "^3.2.0",

src/benchmarks/results_gas.json

@@ -115,14 +115,14 @@
             "label": "Optimized checkEitherForwardPayload",
             "pr": "https://github.com/tact-lang/jetton/pull/124",
             "gas": {
-                "transfer": "34179",
+                "transfer": "33953",
                 "mint": "18520",
-                "burn": "12862",
+                "burn": "12749",
                 "discovery": "6015",
                 "reportBalance": "4308",
                 "claimWallet": "3984"
             },
-            "summary": "79868"
+            "summary": "79529"
         }
     ]
 }

src/contracts/base/jetton-minter.tact

@@ -135,7 +135,6 @@ contract JettonMinter(
     }
 }
 
-
 inline fun getJettonWalletInit(address: Address): StateInit {
     return initOf JettonWallet(address, myAddress(), 0);
 }

src/contracts/base/jetton-wallet.tact

@@ -104,7 +104,7 @@ contract JettonWallet(
     }
 
     receive(msg: JettonBurn) {
-        // we can skip forceBasechain here because with other checks in place it's not possible 
+        // we can skip forceBasechain here because with other checks in place it's not possible
         // to acquire jettons outside of basechain, so amount check is enough
         require(sender() == self.owner, "Incorrect sender");
 

src/contracts/governance/constants.tact

@@ -3,6 +3,6 @@ const MyWorkchain: Bool = false;
 
 // This is enough for 1 year of storage
 // And more than 8 years more until freeze
-const minTonsForStorage: Int = ton("0.01"); 
+const minTonsForStorage: Int = ton("0.01");
 const gasForTransfer: Int = 10200;
-const gasForBurn: Int = 7500;
+const gasForBurn: Int = 7500;

src/contracts/governance/jetton-minter.tact

@@ -32,11 +32,12 @@ contract GovernanceJettonMinter(
 
         let fwdCount = 1 + sign(msg.masterMsg.forwardTonAmount);
         let ctx = context();
-        require(ctx.value >
+        require(
+            ctx.value >
             msg.masterMsg.forwardTonAmount +
             fwdCount * ctx.readForwardFee() +
             (2 * getComputeFee(gasForTransfer, false) + minTonsForStorage),
-            "Insufficient amount of TON attached"
+            "Insufficient amount of TON attached",
         );
 
         self.totalSupply += msg.masterMsg.amount;
@@ -109,14 +110,15 @@ contract GovernanceJettonMinter(
 
             let ctx = context();
             let fwdCount = 1 + sign(msgToSend.forwardTonAmount);
-            require(ctx.value >
+            require(
+                ctx.value >
                 msgToSend.forwardTonAmount +
                 fwdCount * ctx.readForwardFee() +
                 (2 * getComputeFee(gasForTransfer, false) + minTonsForStorage),
-                "Insufficient amount of TON attached"
+                "Insufficient amount of TON attached",
             );
 
-            deploy(DeployParameters{
+            deploy(DeployParameters {
                 bounce: false,
                 value: msg.tonAmount,
                 mode: SendPayGasSeparately | SendBounceIfActionFail,
@@ -128,22 +130,23 @@ contract GovernanceJettonMinter(
             JettonBurn.fromSlice(masterMsgSlice);
 
             let ctx = context();
-            require(ctx.value > (ctx.readForwardFee() + 2 * getComputeFee(gasForBurn, false)), 
-            "Insufficient amount of TON attached");
-            
-            deploy(DeployParameters{
+            require(
+                ctx.value > (ctx.readForwardFee() + 2 * getComputeFee(gasForBurn, false)),
+                "Insufficient amount of TON attached",
+            );
+
+            deploy(DeployParameters {
                 bounce: false,
                 value: msg.tonAmount,
                 mode: SendPayGasSeparately | SendBounceIfActionFail,
                 body: msg.masterMsg,
                 init: getJettonWalletInit(msg.toAddress),
             });
-
         } else if (op == SetStatusOpcode) { // SetStatus opcode
             // It is needed to validate the message
             SetStatus.fromSlice(masterMsgSlice);
 
-            deploy(DeployParameters{
+            deploy(DeployParameters {
                 bounce: false,
                 value: msg.tonAmount,
                 mode: SendPayGasSeparately | SendBounceIfActionFail,
@@ -210,4 +213,3 @@ asm fun setData(newData: Cell) {
 asm fun setCode(newCode: Cell) {
     SETCODE
 }
-

src/contracts/governance/jetton-wallet.tact

@@ -24,11 +24,12 @@ contract JettonWalletGovernance(
         let ctx = context();
         let fwdCount = 1 + sign(msg.forwardTonAmount); // msg.forwardTonAmount is coins, so it's non-negative
 
-        require(ctx.value >
+        require(
+            ctx.value >
             msg.forwardTonAmount +
             fwdCount * ctx.readForwardFee() +
             (2 * getComputeFee(gasForTransfer, false) + minTonsForStorage),
-            "Insufficient amount of TON attached"
+            "Insufficient amount of TON attached",
         );
 
         deploy(DeployParameters {

src/contracts/governance/messages.tact

@@ -131,7 +131,6 @@ message(0xcb862902) ChangeMetadataUri {
     metadata: Slice as remaining;
 }
 
-
 // ============== Additional messages ==============
 
 // provide_wallet_balance#7ac8d559 receiver:MsgAddress include_verify_info:Bool = InternalMsgBody