OffRamp commit wrappers and tests (#83)

* add handler for SetOCR3BaseConfig

* add transmit calls on the OffRamp

* add ccip/OffRamp.ts tes

* check that offRamp handles setOCR3Base message

* fix broken ccipRouter test

* handle setOCR3Config on functino on contract

* refactor: move examples under test/ folder on contracts

* fmt

* fmt

* use real feeQuoter

* fmt

* fix compilation bugs

* fix compilation error

* fmt

* set commit and exec configs on offramp

* init offramp ts wrappers

* remove RMN and get commit message to be handled

* refactor: assertLog, test offRamp emits CCIPCommitReportAccepted

* fix merge error

* define commit test with message

* add wrappers to set sourceChainConfig

* add updateSourceChainConfig, fix errors, tests pass

* format

* use strincCrc32

* use stringCrc32 on ocr logs

* delete unused feeQuoter mock

* Update contracts/wrappers/ccip/Logs.ts

Co-authored-by: Copilot <[email protected]>

* test commit report fails when chain not enabled

* fix deserialize merkleRoots

* fmt

* use CommitReport instead of Cell<CommitReport>

* fmt

* remove unnecesary workchain attribute on init

* remove noop line from previous debugging

* rename LogTypes to CombinedLogTypes

* fmt

* test commit report with two roots

* fmt

* fix wrong path to utils

* fix broken path in offramp tests

---------

Co-authored-by: Copilot <[email protected]>

Author: vicentevieytes

contracts/contracts/ccip/offramp.tolk

@@ -12,7 +12,7 @@ struct Storage {
     deployer: cell; // Deployable compiled code
     merkleRootCode: cell; // make sure to use a library cell offchain to save space
     feeQuoter: address;
-    ocr3Base: OCR3Base
+    ocr3Base: Cell<OCR3Base>
 
     // static config
     chainSelector: uint64;
@@ -26,7 +26,7 @@ struct Storage {
 }
 
 struct SourceChainConfig {
-    router: address;
+    router: CrossChainAddress;
     isEnabled: bool;
     minSeqNr: uint64;
     isRMNVerificationDisabled: bool;
@@ -60,13 +60,12 @@ struct ExecutionStateChanged {
     state: uint8;
 }
 
-// TODO: use sha256("CommitReportAccepted")
-const CCIP_COMMIT_REPORT_ACCEPTED_TOPIC: int = 0x99; // for easier indexing
+// crc32("CCIPCommitReportAccepted")
+const CCIP_COMMIT_REPORT_ACCEPTED_TOPIC: int = stringCrc32("CCIPCommitReportAccepted");
 
 struct CommitReportAccepted {
     priceUpdates: Cell<PriceUpdates>?;
-    blessedMerkleRoots: cell;
-    unblessedMerkleRoots: cell;
+    merkleRoots: cell // vec<MerkleRoots>
 }
 
 struct SkippedReportExecution {
@@ -84,17 +83,15 @@ struct ExecutionReport {
 // Matches the EVM struct
 struct CommitReport {
     priceUpdates: Cell<PriceUpdates>?; // Price updates for the fee_quoter
-    blessedMerkleRoots: cell; // vec<MerkleRoot> Merkle roots that have been blessed by RMN
-    unblessedMerkleRoots: cell; // vec<MerkleRoot> Merkle roots that don't require RMN blessing
-    rmnSignatures: cell; //vec<bytes32>  The signatures for the blessed merkle roots
+    merkleRoots: cell; // vec<MerkleRoot> Merkle roots 
 }
 
 struct (0x00000001) Commit {
     queryId: uint64;
     // TODO: could just store as one slice since context is fixed size
     reportContext: ReportContext;
     report: CommitReport;
-    signatures: cell;
+    signatures: cell; //vec<SignatureEd25519>
 }
 
 struct (0x00000002) Execute {
@@ -104,14 +101,23 @@ struct (0x00000002) Execute {
     report: ExecutionReport;
 }
 
-type Msg = Commit | Execute | OCR3Base_SetOCR3Config;
+struct (0x00000003) UpdateSourceChainConfig {
+    queryId: uint64;
+    sourceChainSelector: uint64;
+    config: SourceChainConfig
+}
+
+type Msg = Commit | Execute | UpdateSourceChainConfig | OCR3Base_SetOCR3Config;
 
 fun onInternalMessage(in:InMessage) {
     val msg = lazy Msg.fromSlice(in.body);
     match (msg) {
-        Commit => { commit(msg, in.senderAddress) }
+        Commit => { 
+            commit(msg, in.senderAddress) 
+        }
         Execute => { _execute(msg, in.senderAddress) }
         OCR3Base_SetOCR3Config => { _setOCR3Config(msg, in.senderAddress)}
+        UpdateSourceChainConfig => {_updateSourceChainConfig(msg, in.senderAddress)}
         else => {
             // ignore empty messages, "wrong opcode" for others
             assert (in.body.isEmpty()) throw 0xFFFF
@@ -122,7 +128,11 @@ fun onInternalMessage(in:InMessage) {
 fun _setOCR3Config(msg: OCR3Base_SetOCR3Config, sender: address) {
             var st = lazy Storage.load();
             st.ownable.requireOwner(sender);
-            st.ocr3Base.setOcr3Config(msg);
+
+            var ocr3Base = st.ocr3Base.load();
+            ocr3Base.setOcr3Config(msg);
+
+            st.ocr3Base = ocr3Base.toCell();
             st.store();
 }
 
@@ -135,9 +145,8 @@ fun getMerkleRootID(merkleRoot: uint256): builder {
 }
 
 fun commit(msg: Commit, sender: address) {
-    var st = lazy Storage.load();
+    var st = Storage.load();
 
-    // TODO: verify RMN signatures on blessed roots
     val report = msg.report;
 
     // update token/gas prices if any
@@ -154,15 +163,15 @@ fun commit(msg: Commit, sender: address) {
     }
 
     // TODO: assert cells are well-formed
-    var roots = Iterator<MerkleRoot>.new(report.unblessedMerkleRoots);
-    // TODO: also iterate over blessed roots
+    var roots = Iterator<MerkleRoot>.new(report.merkleRoots);
 
     while (!roots.empty()) {
         val root = roots.next();
 
         // validate lane not cursed
 
         val sourceChainConfig = st.sourceChainConfigs.mustGet(root.sourceChainSelector, ERROR_SOURCE_CHAIN_NOT_ENABLED);
+
         assert(sourceChainConfig.isEnabled,ERROR_SOURCE_CHAIN_NOT_ENABLED);
 
         // validate against sourceChainConfig etc
@@ -196,11 +205,12 @@ fun commit(msg: Commit, sender: address) {
                 }
             },
         });
+
         initMsg.send(SEND_MODE_REGULAR);
     }
 
     // Verifies signatures and emits Transmitted event
-    st.ocr3Base.transmit(
+    st.ocr3Base.load().transmit(
         sender,
         OCR_PLUGIN_TYPE_COMMIT,
         msg.reportContext,
@@ -210,9 +220,8 @@ fun commit(msg: Commit, sender: address) {
 
     emit(CCIP_COMMIT_REPORT_ACCEPTED_TOPIC, CommitReportAccepted {
         priceUpdates: report.priceUpdates,
-        blessedMerkleRoots: report.blessedMerkleRoots,
-        unblessedMerkleRoots: report.unblessedMerkleRoots,
-    })
+        merkleRoots: report.merkleRoots,
+    });
 }
 
 fun _execute(msg: Execute, sender: address) {
@@ -295,7 +304,7 @@ fun _execute(msg: Execute, sender: address) {
 
     // TODO: how do we handle incrementing the nonce? since execution is async this might take a while
 
-    st.ocr3Base.transmit(
+    st.ocr3Base.load().transmit(
         sender,
         OCR_PLUGIN_TYPE_EXECUTE,
         msg.reportContext,
@@ -304,6 +313,14 @@ fun _execute(msg: Execute, sender: address) {
     );
 }
 
+//todo: should be chainConfigs and take an array
+fun _updateSourceChainConfig(msg: UpdateSourceChainConfig, sender: address) {
+    var st = lazy Storage.load();
+    st.ownable.requireOwner(sender);
+    st.sourceChainConfigs.set(msg.sourceChainSelector, msg.config);
+    st.store();
+}
+
 // TODO: handle signals from MerkleRoot (release tokens, execute)
 // maybe send these straight to router if router can validate address == deployable(offrampAddress, MerkleRoot, id)
 // the payload would need the id & chainSelector so we can calculate/validate offrampAddress & that the merkle root is allowed to send for that ID

contracts/contracts/ccip/onramp.tolk

@@ -5,7 +5,7 @@ import "../lib/upgrades/type_and_version.tolk";
 import "../lib/utils.tolk";
 import "@stdlib/tvm-dicts";
 
-const CCIP_MESSAGE_SENT_TOPIC: int = 0xa45d293c; // crc32("CCIPMessageSent")
+const CCIP_MESSAGE_SENT_TOPIC: int = stringCrc32("CCIPMessageSent"); 
 
 struct CCIPMessageSent {
     destChainSelector: uint64; // NOTE: both these values are already part of message, is it even important to have?

contracts/contracts/ccip/types.tolk

@@ -42,8 +42,8 @@ struct Any2TVMRampMessage {
     sender: Cell<CrossChainAddress>;
     data: cell;
     receiver: address;
-    gasLimit: coins;
-    tokenAmounts: cell; // vec<Any2TONTokenTransfer>
+    //gasLimit: coins;
+    tokenAmounts: cell?; // vec<Any2TVMTokenTransfer>
     // maybe mark these amounts as slice remaining then parse them by hand to avoid requiring this to be a map<> at send time?
 }
 
@@ -84,14 +84,14 @@ fun Any2TVMRampMessage.generateMessageId(self, metadataHash: uint256): uint256 {
             .storeUint(self.header.messageId, 256)
             .storeAddress(self.receiver)
             .storeUint(self.header.sequenceNumber, 64)
-            .storeCoins(self.gasLimit)
+            //.storeCoins(self.gasLimit)
             .storeUint(self.header.nonce, 64)
             .endCell()
         )
         // message
         .storeRef(self.sender)
         .storeRef(self.data)
-        .storeRef(self.tokenAmounts)
+        .storeMaybeRef(self.tokenAmounts)
         .endCell()
         .hash()
 }

contracts/contracts/lib/ocr/multi_ocr3_base.tolk

@@ -3,10 +3,11 @@ import "./exit_codes.tolk";
 import "./../utils.tolk";
 
 
-//sha256("OCR3Base_ConfigSet")
-const OCR3BASE_CONFIG_SET_TOPIC: int = 0x252df30dc755a76605aaa7d3a9988e2a50c42f58fbb18d267e5455b1b05c3019;
-//sha256("OCR3Base_Transmitted")
-const OCR3BASE_TRANSMITTED: int = 0x5e5c7df897e863d72f9277ec7832d0794aebac23abe5cfbd11079f20fd96c851;
+//crc32("OCR3Base_ConfigSet")
+const OCR3BASE_CONFIG_SET_TOPIC: int = stringCrc32("OCR3Base_ConfigSet");
+
+//crc32("OCR3Base_Transmitted")
+const OCR3BASE_TRANSMITTED: int = stringCrc32("OCR3Base_Transmitted");
 
 /// @notice Event, triggers a new run of the offchain reporting protocol.
 /// @param ocrPluginType OCR plugin type for which the config was set.