Update blocks informing logic by julia-zack · Pull Request #638 · rsksmart/powpeg-node

julia-zack · 2026-07-16T17:42:01Z

No description provided.

github-actions · 2026-07-16T17:42:12Z

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Scanned Files

None

Copilot

Pull request overview

This PR updates the PowPeg node’s “inform BTC headers to the Bridge” flow so that subsequent receiveHeaders calls avoid re-sending headers the Bridge already knows, improving behavior across forks and repeated update cycles.

Changes:

Adjust BtcToRskClient.updateBridgeBtcBlockchain() to skip headers already known by the Bridge (via isBlockHashInformedToBridge) and send only the next missing batch.
Extend test mocks (SimpleFederatorSupport) to track “known” headers via both the registered chain and prior sendReceiveHeaders calls.
Update/extend tests to validate deep-fork behavior and successive update calls that progressively inform the remaining headers.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
src/main/java/co/rsk/federate/BtcToRskClient.java	Adds logic to find the first unknown header and only inform missing headers to the Bridge.
src/test/java/co/rsk/federate/BtcToRskClientTest.java	Updates deep-fork expectations and adds a test covering repeated calls informing headers in batches.
src/test/java/co/rsk/federate/mock/SimpleFederatorSupport.java	Implements `isBlockHashInformedToBridge` in the test support to reflect Bridge-known header behavior.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

marcos-iov · 2026-07-16T19:56:07Z


+        boolean shouldUpdateBridge = federatorBtcBlockchainBestChainHeight > bridgeBtcBlockchainBestChainHeight;
+        if (!shouldUpdateBridge) {
+            return 0;


Maybe log here? "Bridge is already up to date with BTC best chain {}", height

Or even better, move the log from below to before this if

good one, added: 2c360dd

marcos-iov · 2026-07-16T19:59:34Z

+            totalHeadersToSendToBridge.add(currentBlockHeader);
+            currentBlock = bitcoinWrapper.getBlock(currentBlockHeader.getPrevBlockHash());
+        }
+        if (totalHeadersToSendToBridge.isEmpty()) {


I understand this could never happen, it was already checked above. As long as we have a test that covers the case where there are no blocks to inform to the Bridge it's probably safe to remove this.

marcos-iov · 2026-07-16T20:00:49Z

+        // Only send the headers that are not already known to the Bridge
+        int startIndex = findFirstUnknownHeader(totalHeadersToSendToBridge);
+        int totalHeadersToSendToBridgeCount = totalHeadersToSendToBridge.size();
+        if (startIndex == totalHeadersToSendToBridgeCount) {


Same here I believe, or is there a case I'm missing?

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

+            Federation federation = TestUtils.createP2shP2wshErpFederation(MAINNET_BTC_PARAMS, 20);
+            setUpActiveFedClient(federation);
+
+            // the Bridge has maxAmountOfHeadersToSend headers informed past the common ancestor,
+            // meaning we have chainHeight - lastInformedHeader = 130 headers to inform.
+            markHeadersAsInformed(1, lastInformedHeader);
+            int firstCallFirstHeaderToSend = lastInformedHeader + 1;
+            markHeadersAsNotInformed(firstCallFirstHeaderToSend, chainHeight);
+


Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

julia-zack · 2026-07-17T15:01:07Z

+            private CoinbaseInformation getCoinbaseInformation(Sha256Hash blockHash) throws IOException {
+                return btcToRskActiveFedClientFileStorage.read(MAINNET_PARAMS).getData().getCoinbaseInformationMap().get(blockHash);
+            }
+


just moved from below

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

+                // the Bridge has maxAmountOfHeadersToSend headers informed past the common ancestor,
+                // meaning we have chainHeight - lastInformedHeader = 130 headers to inform.
+                markHeadersAsInformed(1, lastInformedHeader);
+                int firstCallFirstHeaderToSend = lastInformedHeader + 1;
+                markHeadersAsNotInformed(firstCallFirstHeaderToSend, chainHeight);
+


Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

+                int chainHeight = 230;
+                int maxAmountOfHeadersToSend = 100; // builder default
+                int lastInformedHeader = 100;


Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

+
+                // setup fed best chain
+                int chainHeight = 230;
+                int maxAmountOfHeadersToSend = 100; // builder default


sonarqubecloud · 2026-07-17T17:00:38Z

Quality Gate passed

Issues
39 New issues
0 Accepted issues

Measures
0 Security Hotspots
85.0% Coverage on New Code
0.3% Duplication on New Code

See analysis details on SonarQube Cloud

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (1)

src/main/java/co/rsk/federate/BtcToRskClient.java:448

amountOfHeadersToSend is read directly from config with no validation. If it is configured as 0 (or negative), to becomes from, resulting in an empty headersToSendToBridge list. That leads to calling sendReceiveHeaders with an empty array (which dereferences headers[0] in FederatorSupport.sendReceiveHeaders) and also throws here when logging headersToSendToBridge.get(0)/get(size-1).

        int to = Math.min(from + amountOfHeadersToSend, totalHeadersToSendToBridge.size());
        List<Block> headersToSendToBridge = totalHeadersToSendToBridge.subList(from, to);
        federatorSupport.sendReceiveHeaders(headersToSendToBridge.toArray(new Block[]{}));

julia-zack force-pushed the update-blocks-informing-logic branch from 6c30c3d to 83aba1d Compare July 16, 2026 17:43

julia-zack requested a review from Copilot July 16, 2026 17:45

Copilot started reviewing on behalf of julia-zack July 16, 2026 17:46

View session

Copilot AI reviewed Jul 16, 2026

View reviewed changes

Comment thread src/main/java/co/rsk/federate/BtcToRskClient.java Resolved

Comment thread src/test/java/co/rsk/federate/BtcToRskClientTest.java Resolved

julia-zack force-pushed the update-blocks-informing-logic branch from 83aba1d to fcde92e Compare July 16, 2026 19:18

julia-zack changed the base branch from VETIVER-9.0.3-rc to master July 16, 2026 19:19

julia-zack changed the base branch from master to headers-informing-logic-integration July 16, 2026 19:25

julia-zack marked this pull request as ready for review July 16, 2026 19:25

julia-zack requested a review from a team as a code owner July 16, 2026 19:25

Copilot AI review requested due to automatic review settings July 16, 2026 19:25

Copilot started reviewing on behalf of julia-zack July 16, 2026 19:26

View session

Copilot AI reviewed Jul 16, 2026

View reviewed changes

Comment thread src/main/java/co/rsk/federate/BtcToRskClient.java Resolved

Comment thread src/test/java/co/rsk/federate/BtcToRskClientTest.java Resolved

Copilot AI review requested due to automatic review settings July 16, 2026 19:35

julia-zack force-pushed the update-blocks-informing-logic branch from 62ae86c to a20b483 Compare July 16, 2026 19:35

Copilot started reviewing on behalf of julia-zack July 16, 2026 19:35

View session

Copilot AI reviewed Jul 16, 2026

View reviewed changes

Comment thread src/test/java/co/rsk/federate/BtcToRskClientTest.java Resolved

Comment thread src/test/java/co/rsk/federate/BtcToRskClientTest.java Resolved

marcos-iov reviewed Jul 16, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings July 16, 2026 21:44

Copilot started reviewing on behalf of julia-zack July 16, 2026 21:44

View session

Copilot AI reviewed Jul 16, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings July 17, 2026 14:46

julia-zack force-pushed the update-blocks-informing-logic branch from 2c360dd to 8c9b243 Compare July 17, 2026 14:46

julia-zack changed the base branch from headers-informing-logic-integration to cleanup-update-bridge-tests July 17, 2026 14:46

Copilot started reviewing on behalf of julia-zack July 17, 2026 14:46

View session

Copilot AI reviewed Jul 17, 2026

View reviewed changes

Comment thread src/main/java/co/rsk/federate/BtcToRskClient.java Resolved

Comment thread src/test/java/co/rsk/federate/BtcToRskClientTest.java Resolved

Copilot AI review requested due to automatic review settings July 17, 2026 14:58

julia-zack force-pushed the update-blocks-informing-logic branch from 8c9b243 to c3db5d0 Compare July 17, 2026 14:58

Copilot started reviewing on behalf of julia-zack July 17, 2026 14:59

View session

julia-zack commented Jul 17, 2026

View reviewed changes

Copilot AI reviewed Jul 17, 2026

View reviewed changes

Comment thread src/main/java/co/rsk/federate/BtcToRskClient.java Resolved

Copilot AI review requested due to automatic review settings July 17, 2026 16:02

julia-zack force-pushed the update-blocks-informing-logic branch from 1f41c29 to b1d8ae7 Compare July 17, 2026 16:02

Copilot started reviewing on behalf of julia-zack July 17, 2026 16:03

View session

julia-zack force-pushed the update-blocks-informing-logic branch from b1d8ae7 to 2f008dd Compare July 17, 2026 16:05

Copilot AI reviewed Jul 17, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings July 17, 2026 16:06

Copilot started reviewing on behalf of julia-zack July 17, 2026 16:07

View session

Copilot AI reviewed Jul 17, 2026

View reviewed changes

Comment thread src/test/java/co/rsk/federate/BtcToRskClientTest.java Outdated

Comment on lines +3909 to +3911

int chainHeight = 230;

int maxAmountOfHeadersToSend = 100; // builder default

int lastInformedHeader = 100;

Copilot AI review requested due to automatic review settings July 17, 2026 16:55

Copilot started reviewing on behalf of julia-zack July 17, 2026 16:56

View session

Copilot AI reviewed Jul 17, 2026

View reviewed changes

Comment thread src/test/java/co/rsk/federate/BtcToRskClientTest.java Outdated

// setup fed best chain

int chainHeight = 230;

int maxAmountOfHeadersToSend = 100; // builder default

marcos-iov approved these changes Jul 21, 2026

View reviewed changes

marcos-iov and others added 6 commits July 21, 2026 11:25

Only inform the Bridge of blocks that are not yet registered

ec591c4

Add test recreating long fork scenario

f665832

Cleanup updateBridgeBtcBlockchain to improve readability

f96d62a

Use ArrayList instead of LinkedList for headers to send to bridge

bca8b6c

Improve log

e8f87f5

Remove redundant checks when no headers to send

20e0c7d

Copilot AI review requested due to automatic review settings July 21, 2026 14:27

marcos-iov force-pushed the update-blocks-informing-logic branch 2 times, most recently from 757e8d9 to 20e0c7d Compare July 21, 2026 14:27

Copilot started reviewing on behalf of marcos-iov July 21, 2026 14:27

View session

marcos-iov approved these changes Jul 21, 2026

View reviewed changes

marcos-iov merged commit 014bcf4 into cleanup-update-bridge-tests Jul 21, 2026
5 checks passed

marcos-iov deleted the update-blocks-informing-logic branch July 21, 2026 14:29

Copilot AI reviewed Jul 21, 2026

View reviewed changes

julia-zack restored the update-blocks-informing-logic branch July 22, 2026 18:15

julia-zack deleted the update-blocks-informing-logic branch July 22, 2026 22:16

Conversation

julia-zack commented Jul 16, 2026

Uh oh!

github-actions Bot commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Dependency Review

Scanned Files

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

marcos-iov Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

marcos-iov Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

julia-zack Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

marcos-iov Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

marcos-iov Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

julia-zack Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

sonarqubecloud Bot commented Jul 17, 2026

Quality Gate passed

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

github-actions Bot commented Jul 16, 2026 •

edited

Loading