Add 32 byte chainwork support

rskj-core/build.gradle

@@ -273,7 +273,7 @@ ext {
             jaxwsRtVer             : '2.3.5',
             picocliVer             : '4.6.3',
 
-            bitcoinjThinVer: '0.14.4-rsk-16',
+            bitcoinjThinVer: '0.14.4-rsk-17-SNAPSHOT',
             rskjNativeVer: '1.3.0',
     ]
 

rskj-core/src/main/java/co/rsk/peg/RepositoryBtcBlockStoreWithCache.java

@@ -18,6 +18,9 @@
 
 package co.rsk.peg;
 
+import static co.rsk.bitcoinj.core.StoredBlock.deserializeCompactLegacy;
+import static co.rsk.bitcoinj.core.StoredBlock.deserializeCompactV2;
+
 import co.rsk.bitcoinj.core.BtcBlock;
 import co.rsk.bitcoinj.core.NetworkParameters;
 import co.rsk.bitcoinj.core.Sha256Hash;
@@ -307,17 +310,36 @@
     }
 
     private byte[] storedBlockToByteArray(StoredBlock block) {
-        ByteBuffer byteBuffer = ByteBuffer.allocate(128);
-        block.serializeCompact(byteBuffer);
+        ByteBuffer byteBuffer = serializeBlock(block);
         byte[] ba = new byte[byteBuffer.position()];
         byteBuffer.flip();
         byteBuffer.get(ba);
         return ba;
     }
 
+    private ByteBuffer serializeBlock(StoredBlock block) {
+        if (shouldUseLegacy12ByteChainworkFormat()) {
+            ByteBuffer byteBuffer = ByteBuffer.allocate(StoredBlock.COMPACT_SERIALIZED_SIZE_LEGACY);
+            block.serializeCompactLegacy(byteBuffer);
+            return byteBuffer;
+        }
+
+        ByteBuffer byteBuffer = ByteBuffer.allocate(StoredBlock.COMPACT_SERIALIZED_SIZE_V2);
+        block.serializeCompactV2(byteBuffer);
+        return byteBuffer;
+    }
+
+    private boolean shouldUseLegacy12ByteChainworkFormat() {
+        return !activations.isActive(ConsensusRule.RSKIP454);
+    }
+
     private StoredBlock byteArrayToStoredBlock(byte[] ba) {
         ByteBuffer byteBuffer = ByteBuffer.wrap(ba);
-        return StoredBlock.deserializeCompact(btcNetworkParams, byteBuffer);
+        if (ba.length == StoredBlock.COMPACT_SERIALIZED_SIZE_LEGACY) {
+            return deserializeCompactLegacy(btcNetworkParams, byteBuffer);
+        }
+
+        return deserializeCompactV2(btcNetworkParams, byteBuffer);
     }
 
     private void checkIfInitialized() {

rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/ConsensusRule.java

@@ -98,7 +98,8 @@ public enum ConsensusRule {
     RSKIP427("rskip427"),
     RSKIP428("rskip428"),
     RSKIP434("rskip434"),
-    RSKIP438("rskip438")
+    RSKIP438("rskip438"),
+    RSKIP454("rskip454"),
     ;
 
     private final String configKey;

rskj-core/src/main/resources/expected.conf

@@ -100,6 +100,7 @@ blockchain = {
              rskip428 = <hardforkName>
              rskip434 = <hardforkName>
              rskip438 = <hardforkName>
+             rskip454 = <hardforkName>
         }
     }
     gc = {

rskj-core/src/main/resources/reference.conf

@@ -85,6 +85,7 @@ blockchain = {
             rskip428 = lovell700
             rskip434 = arrowhead631
             rskip438 = lovell700
+            rskip454 = lovell700
         }
     }
     gc = {