Vv/offramp message values (#318)

* wip: route through router CCIPReceive

* get offramp to compile

* update wrappers and test Router UpdateOffRamps message

* namespace FeeQuoter_Error

* test flow going through route for CCIPReceive

* fmt

* update router storage

* add updateOfframps operation to deployment sequences

* use router instead of offramp address in receiver bindings

* format

* fmt view/common.go

* bump contract versions

* update receiver code and fix assertion in cs_test

* fix receiver test

* fmt

* fix goimports

* bump version in wrappers

* update router opcodes to use crc32

* bump versions

* fmt typescript

* remove a few unnecesary todos

* remove get prefix from receiver getters

* move MR wrappers to their corresponding file and fix bindings

* fix import in offramp.spec.ts

* fix merkleroot deploy test

* fmt

* move imports

* fix broken offramp test

* add test for tree with 2 leaves

* fmt

* fix unused imports in router

* remove todo and unused dir in router test and contract

* use storeMaybeBuilder

* Fix tests

* Fix deployment/ compilation

* yarn fmt

* fmt

* use Deployable<MerkleRootId> and Deployable<ReceiveExecutorId>

* use id type alias also in Router

* enable gasLimit

* fix compilation errors

* get message hasher compatibility test to pass

* fix golints

* set expected value for hash in ts test, and comment console.log

* fix attempt

* test hardcoding message value to 10

* test adjusting message value amounts

* test increase the value in message from transmitter to 1000000

* test deploying OffRamp with more baseline TON coins

* test setting decimals to 9 on execute codec

* revert testing changes

* bump core version

* add logs to txm and transmitter contract

* rename log

* some cleanup and debug for any2tvm ramp

* fix

* add execute report test

* implement and test manual exec works

* add test that gasOverride is ignored if lower than original gaslimit

* increase the tx amount to 0.1 ton

* hard code gas limit

* revert the hard coded gas limit

* OffRamp flow value checks

* fix merge errors

* debugging exit code 37 when both price updates and root are comitted

* get tests to pass

* fmt

* do not use SEND_MODE_REGULAR where possible

* use SEND_MODE_REGULAR on feeQuoter message

* adjust offchain transmitter values

* increment baseAmount for both reports

* add debug trace to txm loop

* transmit only once

* revert on-chain change to test

* try reverting to previous values in transmitter and contract costs

* fix

* use SEND_MODE_REGULAR again

* use SEND_MODE_REGULAR on notification flow

* use SEND_MODE_REGULAR for validate as well

* add comment

* try using PAY_FEES_SEPARATELY

* increase cost for MerkleRoot_Validate

* increase deployment amount for contracts

* increase amount needed for ReceiveExecutor_Confirm

* reduce ExecuteValidate and Validate costs slightly

* reduce amount sent by transmitter on Execute to 0.085

* use PAY_FEES_SEPARATELY on markState

* refactor: move Costs structs to their corresponding contracts

* remove TODOs and comments

* add comment on pkg/ccip/ocr/transmitter

* remove ActionExitCode from MsgInfo

* use MustAdd instead of Add in contract_transmitter

* fix linter warnings

* noop change to dispatch ci again

* use PAY_FEES_SEPARATELY on receive executor deployment

* fix: SEND_MODE_PAY_...

* Update pkg/txm/txm.go

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Remove newline to pass tests

* deployment revert values

---------

Co-authored-by: Joe Huang <joe.huang@smartcontract.com>
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Nicolas Mouso <nicolasgnr@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 5 people

contracts/contracts/ccip/fee_quoter/contract.tolk

@@ -40,11 +40,20 @@ fun onInternalMessage(in: InMessage) {
             assert(st.allowedPriceUpdaters.exists(in.senderAddress) || st.ownable.owner == in.senderAddress, FeeQuoter_Error.UnauthorizedPriceUpdater);
             updatePrices(mutate st, msg.updates);
             st.store();
+
+            val returnValueResponse = createMessage({
+                bounce: false,
+                value: 0,
+                dest: in.senderAddress,
+                body: createEmptyCell(),
+            });
+            returnValueResponse.send(SEND_MODE_CARRY_ALL_REMAINING_MESSAGE_VALUE);
         }
         FeeQuoter_UpdateFeeTokens => {
             var st = lazy Storage.load();
             st.ownable.requireOwner(in.senderAddress);
             updateFeeTokens(mutate st, msg);
+
             st.store();
         }
         FeeQuoter_UpdateTokenTransferFeeConfigs => {
@@ -206,6 +215,8 @@ fun updatePrices(mutate st: Storage, priceUpdates: PriceUpdates) {
             })
         }
     }
+
+
 }
 
 // apply_premium_multiplier_wei_per_eth_updates??

contracts/contracts/ccip/fee_quoter/messages.tolk

@@ -68,3 +68,9 @@ fun FeeQuoter_Costs.GetValidatedFee(): int {
         + SendExecutor_Costs.MessageValidationFailed()
     );
 }
+
+fun FeeQuoter_Costs.updatePrices() {
+    // when we support token transfers the message value amount will depend on the quantity of supported tokens
+    return ton("0.002");
+}
+

contracts/contracts/ccip/merkle_root/contract.tolk

@@ -12,7 +12,6 @@ import "../../lib/funding/withdrawable"
 // Root is commited on Commit Reports and the existence of this contract is used to validate Execute Reports
 
 const CONTRACT_VERSION = "0.0.9";
-const RESERVE = ton("1"); // TODO: set correct value
 
 fun onInternalMessage(in: InMessage) {
     val msg = lazy MerkleRoot_InMessage.fromSlice(in.body);
@@ -39,8 +38,6 @@ fun _markState(msg: MerkleRoot_MarkState, sender: address) {
     // only offramp owned message is allowed
     assert(sender == st.owner, MerkleRoot_Error.NotOwner);
 
-    // TODO: manually executing an inProgress message if the receiver doesn't correctly ack the message can be problematic
-
     // validate we're transitioning states correctly: success is final
     val previousState= st.getMessageState(msg.seqNum);
     assert(previousState != ExecutionState.Success, MerkleRoot_Error.InvalidState);
@@ -90,7 +87,7 @@ fun _initExecute(msg: MerkleRoot_Validate, sender: address) {
 
     val executeValidated = createMessage({
         bounce: true,
-        value: ton("0.02"),
+        value: 0,
         dest: st.owner,
         body: OffRamp_ExecuteValidated {
             message: message.toCell(),
@@ -100,7 +97,7 @@ fun _initExecute(msg: MerkleRoot_Validate, sender: address) {
             executionState: state,
         }
     });
-    executeValidated.send(SEND_MODE_REGULAR);
+    executeValidated.send(SEND_MODE_CARRY_ALL_REMAINING_MESSAGE_VALUE);
 }
 
 get fun typeAndVersion(): (slice, slice) {

contracts/contracts/ccip/merkle_root/messages.tolk

@@ -1,5 +1,5 @@
 import "../offramp/types"
-import "../receive_executor/types"
+import "../offramp/messages"
 
 type MerkleRoot_InMessage = MerkleRoot_Validate | MerkleRoot_MarkState;
 
@@ -11,7 +11,23 @@ struct (0x038ede91) MerkleRoot_Validate {
     gasOverride: coins?,
 }
 
-struct (0x01234567) MerkleRoot_MarkState {
+//crc32('MerkleRoot_MarkState')
+struct (0x019f4cd2) MerkleRoot_MarkState {
     seqNum: uint64,
     state: ExecutionState
 }
+
+struct MerkleRoot_Costs{}
+
+fun MerkleRoot_Costs.validate(){
+    val baseFee = MERKLE_ROOT_COSTS_VALIDATE_FEE; // validateFees
+    return baseFee + OffRamp_Costs.executeValidated();
+}
+
+fun MerkleRoot_Costs.markState() {
+    return MERKLE_ROOT_COSTS_MARK_STATE_FEE;
+}
+
+const MERKLE_ROOT_COSTS_MARK_STATE_FEE = ton("0.005");
+const MERKLE_ROOT_COSTS_VALIDATE_FEE = ton("0.012");
+

contracts/contracts/ccip/merkle_root/storage.tolk

@@ -24,7 +24,7 @@ fun MerkleRoot_Storage.expectedMessages(self) {
 }
 
 fun MerkleRoot_Storage.setMessageState(mutate self, seqNum: uint64, executionState: ExecutionState) {
-    assert(seqNum >= self.minMsgNr && seqNum <= self.maxMsgNr, MerkleRoot_Error.SeqNumOutOfBounds); // Out of bounds
+    assert(seqNum >= self.minMsgNr && seqNum <= self.maxMsgNr, MerkleRoot_Error.SeqNumOutOfBounds);
     val i = seqNum - self.minMsgNr;
     assert(i < 64, MerkleRoot_Error.SeqNumOutOfBounds);
 
@@ -35,7 +35,7 @@ fun MerkleRoot_Storage.setMessageState(mutate self, seqNum: uint64, executionSta
 }
 
 fun MerkleRoot_Storage.getMessageState(self, seqNum: uint64): ExecutionState {
-    assert(seqNum >= self.minMsgNr && seqNum <= self.maxMsgNr, MerkleRoot_Error.SeqNumOutOfBounds); // Out of bounds
+    assert(seqNum >= self.minMsgNr && seqNum <= self.maxMsgNr, MerkleRoot_Error.SeqNumOutOfBounds);
     val i= seqNum - self.minMsgNr;
     assert(i < 64, MerkleRoot_Error.SeqNumOutOfBounds);