Merge pull request #2529 from rsksmart/chainwork-fix

Chainwork fix
rsksmart · Jul 4, 2024 · 19c80a0 · 19c80a0
2 parents 59cd40b + b867dd8
commit 19c80a0
Show file tree

Hide file tree

Showing 17 changed files with 347 additions and 5 deletions.
diff --git a/rskj-core/build.gradle b/rskj-core/build.gradle
@@ -123,7 +123,7 @@ ext {
             jaxwsRtVer             : '2.3.5',
             picocliVer             : '4.6.3',
 
-            bitcoinjThinVer: '0.14.4-rsk-14',
+            bitcoinjThinVer: '0.14.4-rsk-15-SNAPSHOT',
             rskjNativeVer: '1.3.0',
     ]
 

diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
@@ -212,6 +212,11 @@ public void receiveHeaders(BtcBlock[] headers) throws IOException, BlockStoreExc
         this.ensureBtcBlockChain();
         for (BtcBlock header : headers) {
             try {
+                StoredBlock previousBlock = btcBlockStore.get(header.getPrevBlockHash());
+                if (cannotProcessNextBlock(previousBlock)) {
+                    logger.warn("[receiveHeaders] Header {} has too much work to be processed", header.getHash());
+                    break;
+                }
                 btcBlockChain.add(header);
             } catch (Exception e) {
                 // If we try to add an orphan header bitcoinj throws an exception
@@ -253,6 +258,11 @@ public Integer receiveHeader(BtcBlock header) throws IOException, BlockStoreExce
             return RECEIVE_HEADER_BLOCK_TOO_OLD;
         }
 
+        if (cannotProcessNextBlock(previousBlock)) {
+            logger.warn("[receiveHeader] Header {} has too much work to be processed", header.getHash());
+            return RECEIVE_HEADER_UNEXPECTED_EXCEPTION;
+        }
+
         try {
             btcBlockChain.add(header);
         } catch (Exception e) {
@@ -265,6 +275,15 @@ public Integer receiveHeader(BtcBlock header) throws IOException, BlockStoreExce
         return 0;
     }
 
+    private boolean cannotProcessNextBlock(StoredBlock previousBlock) {
+        int nextBlockHeight = previousBlock.getHeight() + 1;
+        boolean networkIsMainnet = btcContext.getParams().equals(NetworkParameters.fromID(NetworkParameters.ID_MAINNET));
+
+        return nextBlockHeight >= bridgeConstants.getBlockWithTooMuchChainWorkHeight()
+            && networkIsMainnet
+            && !activations.isActive(ConsensusRule.RSKIP434);
+    }
+
     /**
      * Get the wallet for the currently active federation
      * @return A BTC wallet for the currently active federation

diff --git a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeConstants.java b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeConstants.java
@@ -87,6 +87,7 @@ public abstract class BridgeConstants {
 
     protected int btcHeightWhenPegoutTxIndexActivates;
     protected int pegoutTxIndexGracePeriodInBtcBlocks;
+    protected int blockWithTooMuchChainWorkHeight;
 
     public NetworkParameters getBtcParams() {
         return NetworkParameters.fromID(btcParamsString);
@@ -197,4 +198,6 @@ public int getBtcHeightWhenPegoutTxIndexActivates() {
     public int getPegoutTxIndexGracePeriodInBtcBlocks() {
         return pegoutTxIndexGracePeriodInBtcBlocks;
     }
+
+    public int getBlockWithTooMuchChainWorkHeight() { return blockWithTooMuchChainWorkHeight; }
 }
diff --git a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeMainNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeMainNetConstants.java
@@ -124,6 +124,8 @@ private BridgeMainNetConstants() {
 
         btcHeightWhenPegoutTxIndexActivates = 837_589; // Estimated date Wed, 03 Apr 2024 15:00:00 GMT. 832,430 was the block number at time of calculation
         pegoutTxIndexGracePeriodInBtcBlocks = 4_320; // 30 days in BTC blocks (considering 1 block every 10 minutes)
+
+        blockWithTooMuchChainWorkHeight = 849_138;
     }
 
     public static BridgeMainNetConstants getInstance() {

diff --git a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeRegTestConstants.java b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeRegTestConstants.java
@@ -144,6 +144,8 @@ public BridgeRegTestConstants(List<BtcECKey> federationPublicKeys) {
 
         btcHeightWhenPegoutTxIndexActivates = 250;
         pegoutTxIndexGracePeriodInBtcBlocks = 100;
+
+        blockWithTooMuchChainWorkHeight = Integer.MAX_VALUE;
     }
 
     public static BridgeRegTestConstants getInstance() {

diff --git a/rskj-core/src/main/java/co/rsk/peg/constants/BridgeTestNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/constants/BridgeTestNetConstants.java
@@ -143,6 +143,8 @@ public class BridgeTestNetConstants extends BridgeConstants {
 
         btcHeightWhenPegoutTxIndexActivates = 2_589_553; // Estimated date Wed, 20 Mar 2024 15:00:00 GMT. 2,579,823 was the block number at time of calculation
         pegoutTxIndexGracePeriodInBtcBlocks = 1_440; // 10 days in BTC blocks (considering 1 block every 10 minutes)
+
+        blockWithTooMuchChainWorkHeight = Integer.MAX_VALUE;
     }
 
     public static BridgeTestNetConstants getInstance() {

diff --git a/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/ConsensusRule.java b/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/ConsensusRule.java
@@ -94,6 +94,7 @@ public enum ConsensusRule {
     RSKIP415("rskip415"),
     RSKIP417("rskip417"),
     RSKIP428("rskip428"),
+    RSKIP434("rskip434")
     ;
 
     private String configKey;

diff --git a/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/NetworkUpgrade.java b/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/NetworkUpgrade.java
@@ -32,6 +32,7 @@ public enum NetworkUpgrade {
     HOP401("hop401"),
     FINGERROOT500("fingerroot500"),
     ARROWHEAD600("arrowhead600"),
+    ARROWHEAD631("arrowhead631"),
     LOVELL700("lovell700");
 
     private String name;

diff --git a/rskj-core/src/main/resources/config/main.conf b/rskj-core/src/main/resources/config/main.conf
@@ -13,6 +13,7 @@ blockchain.config {
         hop401 = 4976300,
         fingerroot500 = 5468000,
         arrowhead600 = 6223700,
+        arrowhead631 = -1,
         lovell700 = -1
     }
 }

diff --git a/rskj-core/src/main/resources/config/regtest.conf b/rskj-core/src/main/resources/config/regtest.conf
@@ -13,6 +13,7 @@ blockchain.config {
         hop401 = 0,
         fingerroot500 = 0,
         arrowhead600 = 0,
+        arrowhead631 = -1,
         lovell700 = 0
     },
     consensusRules = {

diff --git a/rskj-core/src/main/resources/config/testnet.conf b/rskj-core/src/main/resources/config/testnet.conf
@@ -13,6 +13,7 @@ blockchain.config {
         hop401 = 3362200,
         fingerroot500 = 4015800,
         arrowhead600 = 4927100,
+        arrowhead631 = -1,
         lovell700 = -1
     },
     consensusRules = {

diff --git a/rskj-core/src/main/resources/expected.conf b/rskj-core/src/main/resources/expected.conf
@@ -16,6 +16,7 @@ blockchain = {
             hop401 = <height>
             fingerroot500 = <height>
             arrowhead600 = <height>
+            arrowhead631 = <height>
             lovell700 = <height>
         }
         consensusRules = {
@@ -94,6 +95,7 @@ blockchain = {
              rskip415 = <hardforkName>
              rskip417 = <hardforkName>
              rskip428 = <hardforkName>
+             rskip434 = <hardforkName>
          }
     }
     gc = {

diff --git a/rskj-core/src/main/resources/reference.conf b/rskj-core/src/main/resources/reference.conf
@@ -80,6 +80,7 @@ blockchain = {
             rskip415 = arrowhead600
             rskip417 = arrowhead600
             rskip428 = lovell700
+            rskip434 = arrowhead631
         }
     }
     gc = {