smartcontractkit
diff --git a/‎.github/workflows/ccip-integration-test.yml‎
Lines changed: 6 additions & 0 deletions b/‎.github/workflows/ccip-integration-test.yml‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎cmd/chainlink-ton/lock.nix‎
Lines changed: 1 addition & 1 deletion b/‎cmd/chainlink-ton/lock.nix‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎contracts/contracts/ccip/fee_quoter.tolk‎
Lines changed: 34 additions & 27 deletions b/‎contracts/contracts/ccip/fee_quoter.tolk‎
Lines changed: 34 additions & 27 deletions
diff --git a/‎contracts/contracts/ccip/offramp.tolk‎
Lines changed: 72 additions & 32 deletions b/‎contracts/contracts/ccip/offramp.tolk‎
Lines changed: 72 additions & 32 deletions
diff --git a/‎contracts/contracts/ccip/types.tolk‎
Lines changed: 9 additions & 4 deletions b/‎contracts/contracts/ccip/types.tolk‎
Lines changed: 9 additions & 4 deletions
diff --git a/‎contracts/contracts/lib/ocr/multi_ocr3_base.tolk‎
Lines changed: 4 additions & 4 deletions b/‎contracts/contracts/lib/ocr/multi_ocr3_base.tolk‎
Lines changed: 4 additions & 4 deletions
@@ -111,8 +111,14 @@ jobs:
           ref: ${{ steps.read_core_ref.outputs.CORE_REF }}
           path: chainlink
 
+      - name: Build contracts
+        run: | 
+          cd contracts
+          nix develop .#contracts -c yarn && yarn build
+
       - name: Setup Environment and Run Tests
         run: |
+          export CCIP_CONTRACTS_TON_VERSION="local"
           nix develop .#ccip-e2e -c scripts/e2e/setup-env.sh --core-dir "${GITHUB_WORKSPACE}/chainlink"
           nix develop .#ccip-e2e -c scripts/e2e/run-test.sh --core-dir "${GITHUB_WORKSPACE}/chainlink" --test-command "${{ matrix.type.cmd }}"
 
 
@@ -1,5 +1,5 @@
 # Notice: `pkgs.lib.fakeHash` can be used as a placeholder,
 #   but `nix-lock-tidy` will only replace actual hashes.
 {pkgs}: {
-  chainlink-ton = "sha256-NuuQpPz2aKbO430qgRaQ0ksRY4rWpdisCr9vmgcbQcc=";
+  chainlink-ton = "sha256-NVVBA3iQKCeJbm9r1ndPoD+SH2lZxhY1SiM5S0ElkAw=";
 }
@@ -58,7 +58,7 @@ struct DestChainConfig {
 type Msg = UpdatePrices
     | UpdateFeeTokens
     | UpdateTokenTransferFeeConfigs
-    | UpdateDestChainConfig
+    | FeeQuoterUpdateDestChainConfigs
     | GetValidatedFee<cell>; // marked as cell since we never attempt to load the metadata
 
 fun onInternalMessage(in: InMessage) {
@@ -82,10 +82,10 @@ fun onInternalMessage(in: InMessage) {
             updateTokenTransferFeeConfigs(mutate st, msg);
             st.store();
         }
-        UpdateDestChainConfig => {
+        FeeQuoterUpdateDestChainConfigs => {
             var st = lazy Storage.load();
             st.ownable.requireOwner(in.senderAddress);
-            updateDestChainConfig(mutate st, msg); // TODO: pass in st.destChainConfigs instead
+            updateDestChainConfigs(mutate st, msg.updates); // TODO: pass in st.destChainConfigs instead
             st.store();
         }
         GetValidatedFee<cell> => { getValidatedFee(msg, in.senderAddress) }
@@ -139,22 +139,28 @@ fun updateTokenTransferFeeConfigs(mutate st: Storage, msg: UpdateTokenTransferFe
 }
 
 // TODO: allow providing an array of these msgs to feeQuoter
-fun updateDestChainConfig(mutate st: Storage, msg: UpdateDestChainConfig) {
-    val (maybeDestChainConfig, exists) = st.destChainConfigs.get(msg.destChainSelector);
-    if (exists) {
-        var destChainConfig = maybeDestChainConfig!;
-        destChainConfig.config = msg.destChainConfig;
-        st.destChainConfigs.replace(msg.destChainSelector, destChainConfig);
-    } else {
-        st.destChainConfigs.set(msg.destChainSelector, DestChainConfig {
-            config: msg.destChainConfig,
-            usdPerUnitGas: GasPrice {
-                executionGasPrice: 0,
-                dataAvailabilityGasPrice: 0,
-                timestamp: 0,
-            }.toCell(),
-            tokenTransferFeeConfigs: Map<TokenTransferFeeConfig>.new()
-        })
+fun updateDestChainConfigs(mutate st: Storage, updates: cell) {
+    var iter = Iterator<FeeQuoterUpdateDestChainConfig>.new(updates);
+
+    while (!iter.empty()) {
+        val update = iter.next();
+        // create or update entries
+        val (maybeDestChainConfig, exists) = st.destChainConfigs.get(update.destChainSelector);
+        if (exists) {
+            var destChainConfig = maybeDestChainConfig!;
+            destChainConfig.config = update.destChainConfig;
+            st.destChainConfigs.replace(update.destChainSelector, destChainConfig);
+        } else {
+            st.destChainConfigs.set(update.destChainSelector, DestChainConfig {
+                config: update.destChainConfig,
+                usdPerUnitGas: GasPrice {
+                    executionGasPrice: 0,
+                    dataAvailabilityGasPrice: 0,
+                    timestamp: 0,
+                }.toCell(),
+                tokenTransferFeeConfigs: Map<TokenTransferFeeConfig>.new()
+            })
+        }
     }
 }
 
@@ -358,21 +364,22 @@ get fun tokenPrice(token: address): TimestampedPrice {
 // vec<TimestampedPrice>
 get fun tokenPrices(tokens: tuple): tuple {
     val st = lazy Storage.load();
-    
-    var list: tuple? = null;
-
-    // TODO: are we able to get dynamic tuple inputs in getters?
+    var list: tuple = createEmptyTuple();
     var iter = TupleIterator<address>.new(tokens);
 
     while(!iter.empty()) {
         val token = iter.next();
-        list = listPrepend(token, list);
+        // NOTE: Need to skip missing items as nil entries rather than fail the query
+        val (maybePrice, _exists) = st.usdPerToken.get(token);
+        list.push(maybePrice.toCell());
     }
-    return list!;
+    return list;
 }
 
-get fun destinationChainGasPrice(destChainSelector: uint64) {
-    
+get fun destinationChainGasPrice(destChainSelector: uint64): cell {
+    val st = lazy Storage.load();
+    val config = st.destChainConfigs.mustGet(destChainSelector, ERROR_UNKNOWN_DEST_CHAIN_SELECTOR);
+    return config.usdPerUnitGas
 }
 
 get fun tokenAndGasPrices(token: address, destChainSelector: uint64) {
 
@@ -1,11 +1,11 @@
-import "types.tolk";
-import "../lib/access/ownable_2step.tolk";
-import "../lib/upgrades/type_and_version.tolk";
+import "types.tolk"
+import "../deployable/types.tolk"
+import "../lib/access/ownable_2step.tolk"
 import "../lib/crypto/merkle_multi_proof.tolk"
-import "../deployable/types.tolk";
-import "../lib/utils.tolk";
-import "../lib/ocr/multi_ocr3_base";
-import "../lib/ocr/types";
+import "../lib/ocr/multi_ocr3_base"
+import "../lib/ocr/types"
+import "../lib/upgrades/type_and_version.tolk"
+import "../lib/utils.tolk"
 
 struct Storage {
     id: uint32;
@@ -27,6 +27,20 @@ struct Storage {
     latestPriceSequenceNumber: uint64;
 }
 
+struct Config {
+    // -- Static config
+    chainSelector: uint64
+    // gasForCallExactCheck
+    // rmnRemote
+    // nonceManager
+    // tokenAdminRegistry
+    // -- Dynamic config
+    feeQuoter: address
+    permissionlessExecutionThresholdSeconds: uint32
+    // isRMNVerificationDisabled
+    // messageInterceptor
+}
+
 struct SourceChainConfig {
     router: address;
     isEnabled: bool;
@@ -68,11 +82,11 @@ struct AlreadyAttempted {
     sequenceNumber: uint64;
 }
 
-const CCIP_COMMIT_REPORT_ACCEPTED_TOPIC: int = stringCrc32("CCIPCommitReportAccepted");
+const CCIP_COMMIT_REPORT_ACCEPTED_TOPIC: int = stringCrc32("CommitReportAccepted");
 
 struct CommitReportAccepted {
+    merkleRoot: MerkleRoot? // vec<MerkleRoots>
     priceUpdates: Cell<PriceUpdates>?;
-    merkleRoots: cell // vec<MerkleRoots>
 }
 
 struct SkippedReportExecution {
@@ -231,11 +245,9 @@ fun _ccipReceiveConfirm(msg: OffRamp_CCIPReceiveConfirm, sender: address) {
 
 // TODO: handle signals from MerkleRoot for releaseTokens
 // maybe send these and MerkleRoot_Execute straight to router
-
 // the payload would need the id & chainSelector so we can calculate/validate offrampAddress & that the merkle root is allowed to send for that ID
 // NOTE: this assumes router has a well known, static address. So two stage deployment: put up router, then compile the addr into contracts
 // (or init contract state with that router addr? probably what solana does)
-
 //TODO: This function should relay to the router or the message should be received directly by the router
 fun _dispatchValidated(msg: OffRamp_DispatchValidated, sender: address) {
             val st = Storage.load();
@@ -317,18 +329,21 @@ fun _commit(msg: OffRamp_Commit, sender: address) {
     }
 
     var roots = Iterator<MerkleRoot>.new(report.merkleRoots);
-
+    val priceUpdatesOnlyReport = roots.empty();
     while (!roots.empty()) {
         val root = roots.next();
 
         // validate lane not cursed
 
-        val sourceChainConfig = st.sourceChainConfigs.mustGet(root.sourceChainSelector, ERROR_SOURCE_CHAIN_NOT_ENABLED);
+        var sourceChainConfig = st.sourceChainConfigs.mustGet(root.sourceChainSelector, ERROR_SOURCE_CHAIN_NOT_ENABLED);
 
-        assert(sourceChainConfig.isEnabled,ERROR_SOURCE_CHAIN_NOT_ENABLED);
+        assert(sourceChainConfig.isEnabled, ERROR_SOURCE_CHAIN_NOT_ENABLED);
 
         // validate against sourceChainConfig etc
+
         // increment seqNr
+        sourceChainConfig.minSeqNr += 1;
+        st.sourceChainConfigs.replace(root.sourceChainSelector, sourceChainConfig);
 
         val rootId = getMerkleRootID(root.merkleRoot);
         // initialize MerkleRoot subcontract
@@ -371,11 +386,14 @@ fun _commit(msg: OffRamp_Commit, sender: address) {
         msg.signatures
     );
 
-    emit(CCIP_COMMIT_REPORT_ACCEPTED_TOPIC, CommitReportAccepted {
-        priceUpdates: report.priceUpdates,
-        merkleRoots: report.merkleRoots,
-    });
-
+    var root: MerkleRoot? = null;
+    if (!priceUpdatesOnlyReport) {
+        root = MerkleRoot.fromCell(report.merkleRoots);
+    }
+    emit(
+        CCIP_COMMIT_REPORT_ACCEPTED_TOPIC,
+        CommitReportAccepted { merkleRoot: root, priceUpdates: report.priceUpdates }
+    );
 }
 
 fun _execute(msg: OffRamp_Execute, sender: address) {
@@ -452,11 +470,29 @@ fun _execute(msg: OffRamp_Execute, sender: address) {
 fun _updateSourceChainConfig(msg: OffRamp_UpdateSourceChainConfig, sender: address) {
     var st = lazy Storage.load();
     st.ownable.requireOwner(sender);
-    st.sourceChainConfigs.set(msg.sourceChainSelector, msg.config);
+    var config: SourceChainConfig;
+    var (existingConfig, exists) = st.sourceChainConfigs.get(msg.sourceChainSelector);
+    if (!exists) {
+        config = SourceChainConfig {
+            router: msg.config.router,
+            isEnabled: msg.config.isEnabled,
+            minSeqNr: 1,
+            isRMNVerificationDisabled: true, // RMN verification is always disabled
+            onRamp: msg.config.onRamp,
+        };
+    } else {
+        // OnRamp updates should only happen due to a misconfiguration.
+        // If an OnRamp is misconfigured, no reports should have been
+        // committed and no messages should have been executed.        
+        config = existingConfig!;
+        assert(config.minSeqNr == 1 || config.onRamp.bitsEqual(msg.config.onRamp)) throw ERROR_INVALID_ON_RAMP_UPDATE;
+        config.isEnabled = msg.config.isEnabled;
+        config.onRamp = msg.config.onRamp;
+    }
+    st.sourceChainConfigs.set(msg.sourceChainSelector, config);
     st.store();
 }
 
-
 @pure @inline
 fun getMerkleRootID(merkleRoot: uint256): builder {
     var cs = beginCell().storeUint(merkleRoot, 256).endCell().beginParse();
@@ -467,26 +503,30 @@ fun getMerkleRootID(merkleRoot: uint256): builder {
 // get fun executionState() {
 //     // TODO: node will need to directly look at MerkleRoot subcontracts
 // }
-
 // get fun merkleRoot() {
 //     // TODO: node will need to directly look at MerkleRoot subcontracts
 // }
-
-get fun latestPriceSequenceNumber() {
-    
-}
-
-get fun staticConfig() {
-    // chainSelector, gasForCallExactCheck?, rmnRemote, nonceManager, tokenAdminRegistry
+get fun latestPriceSequenceNumber(): uint64 {
+    var st = lazy Storage.load();
+    return st.latestPriceSequenceNumber
 }
 
-
 fun setDynamicConfig() {
 
 }
 
-get fun dynamicConfig() {
-    // TODO: combine get staticConfig and dynamicConfig into get config
+get fun ocr3Config(): OCR3Base {
+    var st = lazy Storage.load();
+    return st.ocr3Base.load();
+}
+
+get fun config(): Config {
+    val st = lazy Storage.load();
+    return {
+        chainSelector: st.chainSelector,
+        feeQuoter: st.feeQuoter,
+        permissionlessExecutionThresholdSeconds: st.permissionlessExecutionThresholdSeconds,
+    }
 }
 
 get fun sourceChainConfig(sourceChainSelector: uint64): SourceChainConfig {
 
@@ -42,7 +42,7 @@ struct Any2TVMRampMessage {
     sender: Cell<CrossChainAddress>;
     data: cell;
     receiver: address;
-    //gasLimit: coins;
+    // 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?
 }
@@ -92,7 +92,7 @@ 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()
         )
@@ -198,7 +198,7 @@ struct WithdrawFeeTokens {}
 
 struct TimestampedPrice {
     value: uint224;
-    timestamp: uint64;
+    timestamp: uint64; // TODO: size down to uint32, was a mistake when porting
 }
 
 struct PriceUpdates {
@@ -284,11 +284,15 @@ struct UpdateTokenTransferFeeConfig {
     remove: cell; // vector<address>
 } 
 
-struct (0x20000004) UpdateDestChainConfig {
+struct FeeQuoterUpdateDestChainConfig {
     destChainSelector: uint64;
     destChainConfig: FeeQuoterDestChainConfig;
 }
 
+struct (0x20000004) FeeQuoterUpdateDestChainConfigs {
+    updates: cell; // vec<FeeQuoterUpdateDestChainConfig>
+}
+
 struct (0x20000005) GetValidatedFee<C> {
     msg: Cell<CCIPSend>;
     metadata: Cell<C>,
@@ -396,3 +400,4 @@ const ERROR_UNAUTHORIZED: int = 265;
 const ERROR_SOURCE_CHAIN_NOT_ENABLED: int = 266;
 const ERROR_EMPTY_EXECUTION_REPORT:int = 267;
 const ERROR_DISPATCH_NOT_FROM_MERKLE_ROOT: int = 268;
+const ERROR_INVALID_ON_RAMP_UPDATE: int = 269;
@@ -53,11 +53,11 @@ struct (0x2B78359F) OCR3Base_SetOCR3Config {
 
 struct OCR3Base {
 	chainId: uint8; //TODO :Is this even necessary?
-	commit: Cell<Config>?;
-	execute: Cell<Config>?;
+	commit: Cell<OCRConfig>?;
+	execute: Cell<OCRConfig>?;
 }
 
-fun OCR3Base.getConfig(self, ocrPluginType: uint16): Config? {
+fun OCR3Base.getConfig(self, ocrPluginType: uint16): OCRConfig? {
 	if (ocrPluginType == OCR_PLUGIN_TYPE_COMMIT) {
 		if (self.commit == null) {
 			return null;
@@ -190,7 +190,7 @@ fun OCR3Base.verifySignature(
 
 		val (signerIndex, authorized) = signers.get(signer);
 		assert(authorized, ERROR_UNAUTHORIZED_SIGNER);
-		assert(isSignatureValid(hashedReport,signature.toCell().beginParse(), signer),	ERROR_INVALID_SIGNATURE);
+		assert(isSignatureValid(hashedReport,signature.toCell().beginParse().skipBits(256), signer), ERROR_INVALID_SIGNATURE);
 
 		assert(!seen.has(signerIndex!), ERROR_NON_UNIQUE_SIGNATURES);
 		seen.set(signerIndex!);
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	# Notice: `pkgs.lib.fakeHash` can be used as a placeholder,
`2`	`2`	# but `nix-lock-tidy` will only replace actual hashes.
`3`	`3`	`{pkgs}: {`
`4`		`- chainlink-ton = "sha256-NuuQpPz2aKbO430qgRaQ0ksRY4rWpdisCr9vmgcbQcc=";`
	`4`	`+ chainlink-ton = "sha256-NVVBA3iQKCeJbm9r1ndPoD+SH2lZxhY1SiM5S0ElkAw=";`
`5`	`5`	`}`