Merge branch 'main' into fix/gas-and-typo

contracts/kitchen.tact

@@ -14,11 +14,13 @@ contract Kitchen with Deployable {
 
     // Deploy MasterChef for jetton
     receive(msg: BuildJettonMasterChef) {
+        let ctx: Context = context();
+        let sendTon: Int = ctx.value - KITCHEN_FEE;
         let initCode: StateInit = self.calculateJettonMasterChef(msg.owner,msg.seed);
         send(SendParameters{
                 to: contractAddress(initCode),
-                value: 0,
-                mode: SendRemainingValue,
+                value: sendTon,
+                mode: 0,
                 body: SetUpJettonMC{
                     owner: msg.owner,
                     thunderMintWallet: self.owner,
@@ -37,11 +39,13 @@ contract Kitchen with Deployable {
 
     // Deploy MasterChef for TON
     receive(msg: BuildTonMasterChef) {
+        let ctx: Context = context();
+        let sendTon: Int = ctx.value - KITCHEN_FEE;
         let initCode: StateInit = self.calculateTonMasterChef(msg.owner,msg.seed);
         send(SendParameters{
                 to: contractAddress(initCode),
-                value: 0,
-                mode: SendRemainingValue,
+                value: sendTon,
+                mode: 0,
                 body: SetUpTonMC{
                     owner: msg.owner,
                     thunderMintWallet: self.owner,

contracts/messages.tact

@@ -205,7 +205,8 @@ const ACC_PRECISION: Int = pow(10, 20);   // Precision for the accumulated rewar
 const ZERO_ADDRESS: Address = address("0QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACkT");
 const FEE_PERCENT_FOR_DEV: Int = 3;       // 0.3% of the reward will be given to the ThunderMint
 const MIN_GAS_FEE: Int = ton("0.05");     // Minimum gas fee for calling send ton
-const gasConsumption: Int = ton("0.0059");
+const GAS_CONSUMPTION: Int = ton("0.0059");
+const KITCHEN_FEE: Int = ton("0.03");     // Fee for the Kitchen
 
 // ERROR CODES
 const ERROR_POOL_NOT_FOUND: Int = 1002;

contracts/mini_chef.tact

@@ -27,7 +27,7 @@ contract MiniChef with Deployable {
         userInfo.rewardDebt = userInfo.rewardDebt + msg.rewardDebt; 
         self.userInfo.set(msg.lpTokenAddress, userInfo);
         let ctx: Context = context();
-        let sendBackTon: Int = ctx.value - gasConsumption - MIN_GAS_FEE;
+        let sendBackTon: Int = ctx.value - GAS_CONSUMPTION - MIN_GAS_FEE;
         // Send remain Ton to owner
         send(SendParameters{
             to: self.owner,
@@ -50,7 +50,7 @@ contract MiniChef with Deployable {
 
         self.userInfo.set(msg.lpTokenAddress, userInfo);
         let ctx: Context = context();
-        let sendBackTon: Int = ctx.value - gasConsumption;
+        let sendBackTon: Int = ctx.value - GAS_CONSUMPTION;
         send(SendParameters{
             to: self.masterChef,
             value: sendBackTon,
@@ -77,7 +77,7 @@ contract MiniChef with Deployable {
         userInfo.rewardDebt = accumulatedReward;
         self.userInfo.set(msg.lpTokenAddress, userInfo);
         let ctx: Context = context();
-        let sendBackTon: Int = ctx.value - gasConsumption;
+        let sendBackTon: Int = ctx.value - GAS_CONSUMPTION;
         // Send pending reward ammount to MasterChef, and then MasterChef will send it to the user
         send(SendParameters{
             to: self.masterChef,
@@ -103,7 +103,7 @@ contract MiniChef with Deployable {
         let _pendingReward: Int = accumulatedReward - userInfo.rewardDebt;
 
         let ctx: Context = context();
-        let sendBackTon: Int = ctx.value - gasConsumption;
+        let sendBackTon: Int = ctx.value - GAS_CONSUMPTION;
         if (_pendingReward <= 0) {
             userInfo.amount = userInfo.amount - msg.withdrawAmount;
             userInfo.rewardDebt = userInfo.rewardDebt - msg.withdrawAmount * msg.accRewardPerShare / ACC_PRECISION;

contracts/packages/mock/JettonWallet.tact

@@ -63,7 +63,7 @@ trait JettonWallet {
     balance: Int;
     owner: Address;
     jetton_master: Address;
-    virtual const gasConsumption: Int = ton("0.05");
+    virtual const GAS_CONSUMPTION: Int = ton("0.05");
     virtual const minTonsForStorage: Int = ton("0.05");
 
     //********************************************//
@@ -132,7 +132,7 @@ trait JettonWallet {
     virtual inline fun _internal_transfer_estimate_remain_value(ctx: Context, msg: JettonInternalTransfer): Int {
         let tonBalanceBeforeMsg: Int = myBalance() - ctx.value;
         let storage_fee: Int =  self.minTonsForStorage - min(tonBalanceBeforeMsg, self.minTonsForStorage);
-        let remain: Int = ctx.value - (storage_fee + self.gasConsumption);
+        let remain: Int = ctx.value - (storage_fee + self.GAS_CONSUMPTION);
         if (msg.forward_ton_amount > 0) {
             remain = remain - (ctx.readForwardFee() + msg.forward_ton_amount);
         }
@@ -206,7 +206,7 @@ trait JettonWallet {
         if (msg.forward_ton_amount > 0) {
             fwd_count = 2;
         }
-        require(ctx.value > fwd_count * ctx.readForwardFee() + 2 * self.gasConsumption + self.minTonsForStorage, "Not enough funds to transfer");
+        require(ctx.value > fwd_count * ctx.readForwardFee() + 2 * self.GAS_CONSUMPTION + self.minTonsForStorage, "Not enough funds to transfer");
     }
 
     // @dev  _transfer_jetton will transfer jettons to the jetton wallet of the destination address (owner of jetton wallet)

contracts/packages/utils/Estimatable.tact

@@ -1,11 +1,11 @@
 trait Estimatable {
-    virtual const gasConsumption: Int = ton("0.05");
+    virtual const GAS_CONSUMPTION: Int = ton("0.05");
     virtual const minTonsForStorage: Int = ton("0.05");
 
     virtual fun estimate_rest_value(ctx: Context): Int {
         let restValue: Int = ctx.value;
         let tonBalanceBeforeMsg: Int = myBalance() - restValue;
         let storageFee: Int = self.minTonsForStorage - min(tonBalanceBeforeMsg, self.minTonsForStorage);
-        return restValue - (storageFee + self.gasConsumption);
+        return restValue - (storageFee + self.GAS_CONSUMPTION);
     }
 }

contracts/trait_master_chef.tact

@@ -224,7 +224,7 @@ trait MasterChef {
         pool.lpSupply = pool.lpSupply + msg.amount;
         self.totalLpSupply = self.totalLpSupply + msg.amount;
         self.pools.set(ctx.sender, pool);
-        let sendBackTon: Int = ctx.value - gasConsumption;
+        let sendBackTon: Int = ctx.value - GAS_CONSUMPTION;
         // Get the MiniChef init code for the user
         let initCode: StateInit = self._calculateMiniChefInit(msg.sender);
         send(SendParameters{