Merge branch 'master' into fingerroot5300-master-merge

Author: marcos-iov

build.gradle

@@ -73,7 +73,7 @@ ext {
     junitVersion = '5.8.1'
     junitSuiteVersion = '1.9.0'
     mockitoVersion = '4.6.1'
-    rskjcoreVersion = '5.3.0-FINGERROOT'
+    rskjcoreVersion = '5.4.0-SNAPSHOT'
 }
 
 dependencies {

gradle/verification-metadata.xml

@@ -1509,12 +1509,12 @@
             <sha256 value="5b626a99e5734ba8d0c0c8c3fc6258afa0624f4ce61ae1192247d03c57463ded" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.rocksdb" name="rocksdbjni" version="6.27.3">
-         <artifact name="rocksdbjni-6.27.3.jar">
-            <sha256 value="a1ce1d0f64e978e490a29ea3ad757372266739d89baa2e153b16e4231eae659d" origin="Generated by Gradle"/>
+      <component group="org.rocksdb" name="rocksdbjni" version="7.10.2">
+         <artifact name="rocksdbjni-7.10.2.jar">
+            <sha256 value="613b6a84a61b74d9b83778697f25ce5b1e159bd517a3b05ee408ae0738f547aa" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="rocksdbjni-6.27.3.pom">
-            <sha256 value="42a868e107aeff1f15ec3e65e993c615ba87db736b8591a5b256cac4cbc2a3fc" origin="Generated by Gradle"/>
+         <artifact name="rocksdbjni-7.10.2.pom">
+            <sha256 value="edf496e83b697dbfb7d127a6c58f5951d4777b933ff8db252fbe8567f50206c1" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.slf4j" name="log4j-over-slf4j" version="1.7.36">

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

@@ -12,6 +12,7 @@
 import co.rsk.panic.PanicProcessor;
 import co.rsk.peg.BridgeUtils;
 import co.rsk.peg.Federation;
+import co.rsk.peg.FederationMember;
 import co.rsk.peg.PeginInformation;
 import co.rsk.peg.btcLockSender.BtcLockSender.TxSenderAddressType;
 import co.rsk.peg.pegininstructions.PeginInstructionsException;
@@ -115,25 +116,52 @@ public synchronized void setup(
  }
 
     public void start(Federation federation) {
-        logger.info("Starting for Federation {}", federation.getAddress().toString());
+        logger.info("[start] Starting for Federation {}", federation.getAddress());
         this.federation = federation;
-        if (federation.isMember(federatorSupport.getFederationMember())) {
-            logger.info("Watching federation {} since I belong to it", federation.getAddress().toString());
-            bitcoinWrapper.addFederationListener(federation, this);
-            int federatorIndex = federation.getBtcPublicKeyIndex(federatorSupport.getFederationMember().getBtcPublicKey());
-            TurnScheduler scheduler = new TurnScheduler(
-                    bridgeConstants.getUpdateBridgeExecutionPeriod(),
-                    federation.getSize()
-            );
-            long now = Clock.systemUTC().instant().toEpochMilli();
+        FederationMember federator = federatorSupport.getFederationMember();
+        boolean isMember = federation.isMember(federator);
 
-            if (isUpdateBridgeTimerEnabled) {
-                updateBridgeTimer = Executors.newSingleThreadScheduledExecutor();
-                updateBridgeTimer.scheduleAtFixedRate(this::updateBridge, scheduler.getDelay(now, federatorIndex), scheduler.getInterval(), TimeUnit.MILLISECONDS);
-            }
-            else {
-                logger.info("updateBridgeTimer is disabled");
-            }
+        if (!isMember) {
+            logger.info("[start] member {} is no part of the federation {} ",
+                federator.getBtcPublicKey(),
+                federation.getAddress());
+            return;
+        }
+
+        logger.info("[start] {} is member of the federation {}",
+            federator.getBtcPublicKey(), federation.getAddress());
+        logger.info("[start] Watching federation {} since I belong to it",
+            federation.getAddress());
+        bitcoinWrapper.addFederationListener(federation, this);
+        Optional<Integer> federatorIndex = federation.getBtcPublicKeyIndex(
+            federatorSupport.getFederationMember().getBtcPublicKey()
+        );
+        if (!federatorIndex.isPresent()) {
+            String message = String.format(
+                "Federator %s is a member of the federation %s but could not find the btcPublicKeyIndex",
+                federator,
+                federation.getAddress()
+            );
+            logger.error("[start] {}", message);
+            throw new IllegalStateException(message);
+        }
+        TurnScheduler scheduler = new TurnScheduler(
+                bridgeConstants.getUpdateBridgeExecutionPeriod(),
+                federation.getSize()
+        );
+        long now = Clock.systemUTC().instant().toEpochMilli();
+
+        if (isUpdateBridgeTimerEnabled) {
+            updateBridgeTimer = Executors.newSingleThreadScheduledExecutor();
+            updateBridgeTimer.scheduleAtFixedRate(
+                this::updateBridge,
+                scheduler.getDelay(now, federatorIndex.get()),
+                scheduler.getInterval(),
+                TimeUnit.MILLISECONDS
+            );
+        }
+        else {
+            logger.info("[start] updateBridgeTimer is disabled");
         }
     }
 

src/main/java/co/rsk/federate/FederationProviderFromFederatorSupport.java

@@ -21,10 +21,11 @@
 import co.rsk.bitcoinj.core.Address;
 import co.rsk.bitcoinj.core.BtcECKey;
 import co.rsk.config.BridgeConstants;
-import co.rsk.peg.ErpFederation;
 import co.rsk.peg.Federation;
-import co.rsk.peg.FederationMember;
+import co.rsk.peg.StandardMultisigFederation;
+import co.rsk.peg.LegacyErpFederation;
 import co.rsk.peg.P2shErpFederation;
+import co.rsk.peg.FederationMember;
 import org.ethereum.crypto.ECKey;
 
 import java.time.Instant;
@@ -76,7 +77,7 @@ public Federation getActiveFederation() {
         Instant creationTime = federatorSupport.getFederationCreationTime();
         long creationBlockNumber = federatorSupport.getFederationCreationBlockNumber();
 
-        Federation initialFederation = new Federation(
+        Federation initialFederation = new StandardMultisigFederation(
             members,
             creationTime,
             creationBlockNumber,
@@ -126,7 +127,7 @@ public Optional<Federation> getRetiringFederation() {
         Instant creationTime = federatorSupport.getRetiringFederationCreationTime();
         long creationBlockNumber = federatorSupport.getRetiringFederationCreationBlockNumber();
 
-        Federation initialFederation = new Federation(
+        Federation initialFederation = new StandardMultisigFederation(
             members,
             creationTime,
             creationBlockNumber,
@@ -159,7 +160,7 @@ private Federation getExpectedFederation(Federation initialFederation, Address e
         }
 
         // If addresses do not match build an ERP federation
-        Federation erpFederation = new ErpFederation(
+        Federation erpFederation = new LegacyErpFederation(
             initialFederation.getMembers(),
             initialFederation.getCreationTime(),
             initialFederation.getCreationBlockNumber(),

src/main/java/co/rsk/federate/btcreleaseclient/BtcReleaseClient.java

@@ -33,6 +33,7 @@
 import co.rsk.peg.BridgeEvents;
 import co.rsk.peg.BridgeUtils;
 import co.rsk.peg.Federation;
+import co.rsk.peg.ErpFederation;
 import co.rsk.peg.StateForFederator;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -351,7 +352,7 @@ protected void validateTxCanBeSigned(BtcTransaction btcTx) throws FederatorAlrea
                 observedFederations.stream()
                         .forEach(f -> logger.trace("[validateTxCanBeSigned] federation p2sh redeem script {}", f.getRedeemScript()));
                 List<Federation> spendingFedFilter = observedFederations.stream()
-                        .filter(f -> f.getStandardRedeemScript().equals(standardRedeemScript)).collect(Collectors.toList());
+                        .filter(f -> (f instanceof ErpFederation ? ((ErpFederation) f).getStandardRedeemScript() : f.getRedeemScript()).equals(standardRedeemScript)).collect(Collectors.toList());
                 logger.debug("[validateTxCanBeSigned] spendingFedFilter size {}", spendingFedFilter.size());
                 if (spendingFedFilter.isEmpty()) {
                     String message = String.format(
@@ -463,7 +464,7 @@ protected Federation getSpendingFederation(BtcTransaction btcTx) {
         Script redeemScript = extractStandardRedeemScript(getRedeemScriptFromInput(firstInput));
 
         List<Federation> spendingFedFilter = observedFederations.stream()
-                .filter(f -> f.getStandardRedeemScript().equals(redeemScript)).collect(Collectors.toList());
+                .filter(f -> (f instanceof ErpFederation ? ((ErpFederation) f).getStandardRedeemScript() : f.getRedeemScript()).equals(redeemScript)).collect(Collectors.toList());
 
         return spendingFedFilter.get(0);
     }

src/main/resources/version.properties

@@ -1,2 +1,2 @@
-versionNumber='5.3.0.0'
-modifier="FINGERROOT"
+versionNumber='5.4.0.0'
+modifier="SNAPSHOT"

src/test/java/co/rsk/federate/BtcToRskClientTest.java

@@ -6,6 +6,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyInt;
@@ -39,6 +40,7 @@
 import co.rsk.net.NodeBlockProcessor;
 import co.rsk.peg.BridgeUtils;
 import co.rsk.peg.Federation;
+import co.rsk.peg.FederationMember;
 import co.rsk.peg.btcLockSender.BtcLockSender;
 import co.rsk.peg.btcLockSender.BtcLockSender.TxSenderAddressType;
 import co.rsk.peg.btcLockSender.BtcLockSenderProvider;
@@ -47,6 +49,7 @@
 import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
 import com.google.common.collect.Lists;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -75,6 +78,7 @@
 import org.bitcoinj.store.BlockStoreException;
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.config.blockchain.upgrades.ConsensusRule;
+import org.ethereum.crypto.HashUtil;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.spongycastle.util.encoders.Hex;
@@ -89,6 +93,7 @@ class BtcToRskClientTest {
     private ActivationConfig activationConfig;
     private BridgeConstants bridgeRegTestConstants;
     private Federation genesisFederation;
+    private FederationMember fakeMember;
     private BtcToRskClientBuilder btcToRskClientBuilder;
 
     @BeforeEach
@@ -99,9 +104,50 @@ void setup() throws PeginInstructionsException, IOException {
 
         bridgeRegTestConstants = BridgeRegTestConstants.getInstance();
         genesisFederation = bridgeRegTestConstants.getGenesisFederation();
+        fakeMember = FederationMember.getFederationMemberFromKey(
+            BtcECKey.fromPrivate(
+                HashUtil.keccak256("00".getBytes(StandardCharsets.UTF_8))
+            )
+        );
         btcToRskClientBuilder = new BtcToRskClientBuilder();
     }
 
+    @Test
+    void start_withExistingFederationMember_doesntThrowError() throws Exception {
+        BitcoinWrapper bw = new SimpleBitcoinWrapper();
+        SimpleFederatorSupport fh = new SimpleFederatorSupport();
+
+        FederationMember fedMember = genesisFederation.getMembers().get(0);
+        fh.setMember(fedMember);
+        BtcToRskClient client = createClientWithMocks(bw, fh);
+        assertDoesNotThrow(() -> client.start(genesisFederation));
+    }
+
+    @Test
+    void start_withNoFederationMember_doesntThrowError() throws Exception {
+        BitcoinWrapper bw = new SimpleBitcoinWrapper();
+        SimpleFederatorSupport fh = new SimpleFederatorSupport();
+
+        fh.setMember(fakeMember);
+        BtcToRskClient client = createClientWithMocks(bw, fh);
+        assertDoesNotThrow(() -> client.start(genesisFederation));
+    }
+
+    @Test
+    void start_withFederationMember_withoutMemberPkIndex_throwsError() throws Exception {
+        BitcoinWrapper bw = new SimpleBitcoinWrapper();
+        SimpleFederatorSupport fh = new SimpleFederatorSupport();
+        Federation federation = mock(Federation.class);
+        FederationMember fedMember = genesisFederation.getMembers().get(0);
+
+        fh.setMember(fedMember);
+        when(federation.isMember(fedMember)).thenReturn(true);
+        when(federation.getBtcPublicKeyIndex(any())).thenReturn(Optional.empty());
+
+        BtcToRskClient client = createClientWithMocksCustomFederation(bw, fh, federation);
+        assertThrows(IllegalStateException.class, () -> client.start(federation));
+    }
+
     @Test
     void getNoTransactions() {
         BtcToRskClient client = new BtcToRskClient();
@@ -148,6 +194,25 @@ private BtcToRskClient createClientWithMocks(
             .build();
     }
 
+    private BtcToRskClient createClientWithMocksCustomFederation(
+        BitcoinWrapper bitcoinWrapper,
+        FederatorSupport federatorSupport,
+        Federation federation) throws Exception {
+
+        BtcLockSenderProvider btcLockSenderProvider = mockBtcLockSenderProvider(TxSenderAddressType.P2PKH);
+        int amountOfHeadersToSend = 100;
+
+        return btcToRskClientBuilder
+            .withActivationConfig(activationConfig)
+            .withBitcoinWrapper(bitcoinWrapper)
+            .withFederatorSupport(federatorSupport)
+            .withBridgeConstants(bridgeRegTestConstants)
+            .withBtcLockSenderProvider(btcLockSenderProvider)
+            .withFederation(federation)
+            .withAmountOfHeadersToSend(amountOfHeadersToSend)
+            .build();
+    }
+
     private BtcToRskClient createClientWithMocksCustomStorageFiles(
         BitcoinWrapper bw,
         FederatorSupport fs,
@@ -446,8 +511,11 @@ void onBlock_including_segwit_tx_registers_coinbase() throws Exception {
         ActivationConfig mockedActivationConfig = mock(ActivationConfig.class);
         when(mockedActivationConfig.isActive(eq(ConsensusRule.RSKIP143), anyLong())).thenReturn(true);
 
+        FederatorSupport federatorSupport = mock(FederatorSupport.class);
+        when(federatorSupport.getFederationMember()).thenReturn(fakeMember);
+
         BtcToRskClient client = spy(buildWithFactoryAndSetup(
-            mock(FederatorSupport.class),
+            federatorSupport,
             mock(NodeBlockProcessor.class),
             mockedActivationConfig,
             mock(BitcoinWrapperImpl.class),
@@ -1683,6 +1751,8 @@ void updateTransaction_with_release_before_rskip143() throws Exception {
         bitcoinWrapper.setBlocks(blocks);
 
         SimpleFederatorSupport federatorSupport = new SimpleFederatorSupport();
+        // set a fake member to federatorSupport to recreate a not-null runner
+        federatorSupport.setMember(fakeMember);
 
         BtcToRskClient client = buildWithFactoryAndSetup(
             federatorSupport,
@@ -2164,8 +2234,11 @@ void updateBridgeBtcCoinbaseTransactions_when_coinbase_map_has_readyToBeInformed
         BtcToRskClientFileStorage btcToRskClientFileStorageMock = mock(BtcToRskClientFileStorage.class);
         when(btcToRskClientFileStorageMock.read(any())).thenReturn(new BtcToRskClientFileReadResult(true, btcToRskClientFileData));
 
+        FederatorSupport federatorSupport = mock(FederatorSupport.class);
+        when(federatorSupport.getFederationMember()).thenReturn(fakeMember);
+
         BtcToRskClient client = buildWithFactoryAndSetup(
-            mock(FederatorSupport.class),
+            federatorSupport,
             mock(NodeBlockProcessor.class),
             activations,
             mock(BitcoinWrapperImpl.class),
@@ -2201,6 +2274,7 @@ void updateBridgeBtcCoinbaseTransactions_when_coinbase_map_has_readyToBeInformed
         FederatorSupport federatorSupport = mock(FederatorSupport.class);
         // mocking that the coinbase was already informed
         when(federatorSupport.hasBlockCoinbaseInformed(any())).thenReturn(true);
+        when(federatorSupport.getFederationMember()).thenReturn(fakeMember);
 
         BtcToRskClient client = buildWithFactoryAndSetup(
             federatorSupport,
@@ -2243,6 +2317,7 @@ void updateBridgeBtcCoinbaseTransactions_when_coinbase_map_has_readyToBeInformed
         FederatorSupport federatorSupport = mock(FederatorSupport.class);
         // Mocking the Bridge to indicate the coinbase was not informed, and then it was
         when(federatorSupport.hasBlockCoinbaseInformed(any())).thenReturn(false, true);
+        when(federatorSupport.getFederationMember()).thenReturn(fakeMember);
 
         BtcToRskClient client = buildWithFactoryAndSetup(
             federatorSupport,
@@ -2288,6 +2363,7 @@ void updateBridgeBtcCoinbaseTransactions_not_removing_from_storage_until_confirm
         FederatorSupport federatorSupport = mock(FederatorSupport.class);
         // mocking that the coinbase was not informed
         when(federatorSupport.hasBlockCoinbaseInformed(any())).thenReturn(false);
+        when(federatorSupport.getFederationMember()).thenReturn(fakeMember);
 
         BtcToRskClient client = buildWithFactoryAndSetup(
             federatorSupport,
@@ -2328,6 +2404,7 @@ void updateBridge_when_does_not_hasBetterBlockToSync_updates_headers_coinbase_tr
 
         FederatorSupport federatorSupport = mock(FederatorSupport.class);
         when(federatorSupport.getBtcBestBlockChainHeight()).thenReturn(1);
+        when(federatorSupport.getFederationMember()).thenReturn(fakeMember);
 
         BitcoinWrapper bitcoinWrapper = mock(BitcoinWrapper.class);
         when(bitcoinWrapper.getBestChainHeight()).thenReturn(1);
@@ -2366,6 +2443,7 @@ void updateBridgeBtcTransactions_tx_with_witness_already_informed() throws Excep
         when(federatorSupport.getBtcBestBlockChainHeight()).thenReturn(1);
         when(federatorSupport.isBtcTxHashAlreadyProcessed(peginTx.getTxId())).thenReturn(true);
         when(federatorSupport.getBtcTxHashProcessedHeight(peginTx.getTxId())).thenReturn(1L);
+        when(federatorSupport.getFederationMember()).thenReturn(fakeMember);
 
         BitcoinWrapper bitcoinWrapper = mock(BitcoinWrapper.class);
         when(bitcoinWrapper.getBestChainHeight()).thenReturn(1);