consider empty cell as null priceupdates (#462)

* consider empty cell as null priceupdates

* refactor a bit and test

* Update contracts/contracts/ccip/offramp/contract.tolk

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

---------

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

Author: vicentevieytes

contracts/contracts/ccip/offramp/contract.tolk

@@ -34,7 +34,7 @@ fun onInternalMessage(in:InMessage) {
     match(msg) {
         // Sender must be OCR transmitter
         OffRamp_Commit => {
-            onCommit(msg, in.senderAddress, in.valueCoins)
+           onCommit(msg, in.senderAddress, in.valueCoins)
         }
         // Sender must be OCR transmitter
         OffRamp_Execute => {
@@ -428,31 +428,37 @@ fun onCommit(msg: OffRamp_Commit, sender: address, value: coins) {
         initMsg.send(SEND_MODE_REGULAR);
     }
 
-    // update token/gas prices if any
+    // Update token/gas prices if there are any updates.
+    // Don't send the UpdatePrices message if both tokenPriceUpdates and gasPriceUpdates are empty.
+
     if (report.priceUpdates != null) {
-        // extract OCR sequence number from report context (matches EVM implementation)
-        val ocrSequenceNumber = msg.reportContext.sequenceBytes;
-
-        // check for price staleness based on the OCR sequence number
-        if (st.latestPriceSequenceNumber < ocrSequenceNumber) {
-            // if prices are not stale, update the latest sequence number
-            st.latestPriceSequenceNumber = ocrSequenceNumber;
-
-            // and update the prices in the fee quoter
-
-            val updatePricesMsg = createMessage({
-                bounce: true,
-                value: FeeQuoter_Costs.updatePrices(),
-                dest: st.feeQuoter,
-                body: FeeQuoter_UpdatePrices {
-                    updates: report.priceUpdates!.load(),
-                    sendExcessesTo: sender,
-                }
-            });
-            updatePricesMsg.send(SEND_MODE_PAY_FEES_SEPARATELY);
+        val priceUpdates = report.priceUpdates!.load();
+
+        // Ignore price updates if both are empty
+        if (!(priceUpdates.tokenPriceUpdates.empty() && priceUpdates.gasPriceUpdates.empty())) {
+            // extract OCR sequence number from report context (matches EVM implementation)
+            val ocrSequenceNumber = msg.reportContext.sequenceBytes;
+
+            // check for price staleness based on the OCR sequence number
+            if (st.latestPriceSequenceNumber < ocrSequenceNumber) {
+                // if prices are not stale, update the latest sequence number
+                st.latestPriceSequenceNumber = ocrSequenceNumber;
+
+                // and update the prices in the fee quoter
+
+                val updatePricesMsg = createMessage({
+                    bounce: true,
+                    value: FeeQuoter_Costs.updatePrices(),
+                    dest: st.feeQuoter,
+                    body: FeeQuoter_UpdatePrices {
+                        updates: report.priceUpdates!.load(),
+                        sendExcessesTo: sender,
+                    }
+                });
+                updatePricesMsg.send(SEND_MODE_PAY_FEES_SEPARATELY);
+            }
         }
     }
-
     // store updated state (latestPriceSequenceNumber and sourceChainConfigs)
     st.store();
 
@@ -464,7 +470,6 @@ fun onCommit(msg: OffRamp_Commit, sender: address, value: coins) {
         report.toCell(),
         msg.signatures
     );
-
     emit(
         TOPIC_COMMIT_REPORT_ACCEPTED,
         CommitReportAccepted { merkleRoot: root, priceUpdates: report.priceUpdates }

contracts/tests/ccip/OffRamp.spec.ts

@@ -2486,6 +2486,55 @@ describe('OffRamp - Unit Tests', () => {
     expect(expectedSourceChainConfigs.sort()).toEqual(result.sort())
   })
 
+  it('price updates are not sent to feequoter if they are empty', async () => {
+    await setupOCRConfig()
+    const priceUpdates: PriceUpdates = {
+      tokenPriceUpdates: [],
+      gasPriceUpdates: [],
+    }
+    const result = await commitReport([], toNano('0.5'), 0x01, priceUpdates)
+    expect(result.transactions).not.toHaveTransaction({
+      from: offRamp.address,
+      to: feeQuoter.address,
+    })
+
+    //should send update if only one of the updates is non-empty
+    const priceUpdates2: PriceUpdates = {
+      tokenPriceUpdates: [
+        {
+          sourceToken: generateMockTonAddress(),
+          usdPerToken: 12345678n,
+        },
+      ],
+      gasPriceUpdates: [],
+    }
+
+    const result2 = await commitReport([], toNano('0.5'), 0x02, priceUpdates2)
+    expect(result2.transactions).toHaveTransaction({
+      from: offRamp.address,
+      to: feeQuoter.address,
+    })
+
+    //test with other combination
+    const priceUpdates3: PriceUpdates = {
+      tokenPriceUpdates: [],
+      gasPriceUpdates: [
+        {
+          destChainSelector: CHAINSEL_EVM_TEST_90000001,
+          executionGasPrice: 1n,
+          dataAvailabilityGasPrice: 1n,
+        },
+      ],
+    }
+
+    const result3 = await commitReport([], toNano('0.5'), 0x03, priceUpdates3)
+    expect(result3.transactions).toHaveTransaction({
+      from: offRamp.address,
+      to: feeQuoter.address,
+      success: true,
+    })
+  })
+
   afterAll(async () => {
     if (process.env['COVERAGE'] === 'true') {
       const testSuitePrefix = 'offramp_suite'