Merge pull request #524 from rsksmart/powpeg-refactors-integration

Powpeg refactors integration

Author: marcos-iov

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

@@ -29,8 +29,6 @@
 import co.rsk.federate.bitcoin.BitcoinWrapperImpl;
 import co.rsk.federate.bitcoin.Kit;
 import co.rsk.federate.btcreleaseclient.BtcReleaseClient;
-import co.rsk.federate.btcreleaseclient.BtcReleaseClientStorageAccessor;
-import co.rsk.federate.btcreleaseclient.BtcReleaseClientStorageSynchronizer;
 import co.rsk.federate.config.PowpegNodeSystemProperties;
 import co.rsk.federate.signing.config.SignerConfig;
 import co.rsk.federate.signing.config.SignerType;
@@ -69,10 +67,6 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-/**
- * Created by mario on 31/03/17.
- */
-
 public class FedNodeRunner implements NodeRunner {
     private static final Logger logger = LoggerFactory.getLogger(FedNodeRunner.class);
     private final BtcToRskClient btcToRskClientActive;
@@ -320,10 +314,8 @@ private void startFederate() throws Exception {
                 hsmBookkeepingService.start();
             }
             federateLogger.log();
-            BtcReleaseClientStorageAccessor btcReleaseClientStorageAccessor = new BtcReleaseClientStorageAccessor(config);
             btcReleaseClient.setup(
                 signer,
-                config.getActivationConfig(),
                 new SignerMessageBuilderFactory(
                     fedNodeContext.getReceiptStore()
                 ),
@@ -336,14 +328,6 @@ private void startFederate() throws Exception {
                         fedNodeContext.getBlockStore(),
                         hsmBookkeepingClient
                     )
-                ),
-                btcReleaseClientStorageAccessor,
-                new BtcReleaseClientStorageSynchronizer(
-                    fedNodeContext.getBlockStore(),
-                    fedNodeContext.getReceiptStore(),
-                    fedNodeContext.getNodeBlockProcessor(),
-                    btcReleaseClientStorageAccessor,
-                    config.getBtcReleaseClientInitializationMaxDepth()
                 )
             );
 

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

@@ -19,7 +19,6 @@
 
 import static co.rsk.peg.federation.FederationChangeResponseCode.FEDERATION_NON_EXISTENT;
 import static co.rsk.peg.federation.FederationMember.KeyType;
-import static org.ethereum.config.blockchain.upgrades.ConsensusRule.*;
 
 import co.rsk.bitcoinj.core.Address;
 import co.rsk.bitcoinj.core.BtcECKey;
@@ -64,31 +63,22 @@ public FederationProviderFromFederatorSupport(
     public Federation getActiveFederation() {
         List<FederationMember> members = new ArrayList<>();
         int federationSize = federatorSupport.getFederationSize();
-        boolean useTypedPublicKeyGetter = federatorSupport.getConfigForBestBlock().isActive(RSKIP123);
         for (int i = 0; i < federationSize; i++) {
-            // Select method depending on network configuration for best block
-            FederationMember member;
-            if (useTypedPublicKeyGetter) {
-                BtcECKey btcKey = BtcECKey.fromPublicOnly(federatorSupport.getFederatorPublicKeyOfType(i, FederationMember.KeyType.BTC).getPubKey());
-                ECKey rskKey = federatorSupport.getFederatorPublicKeyOfType(i, FederationMember.KeyType.RSK);
-                ECKey mstKey = federatorSupport.getFederatorPublicKeyOfType(i, FederationMember.KeyType.MST);
-
-                member = new FederationMember(btcKey, rskKey, mstKey);
-            } else {
-                // Before the fork, all of BTC, RSK and MST keys are the same
-                BtcECKey btcKey = federatorSupport.getFederatorPublicKey(i);
-                ECKey rskMstKey = ECKey.fromPublicOnly(btcKey.getPubKey());
-                member = new FederationMember(btcKey, rskMstKey, rskMstKey);
-            }
+            BtcECKey btcKey = BtcECKey.fromPublicOnly(federatorSupport.getFederatorPublicKeyOfType(i, FederationMember.KeyType.BTC).getPubKey());
+            ECKey rskKey = federatorSupport.getFederatorPublicKeyOfType(i, FederationMember.KeyType.RSK);
+            ECKey mstKey = federatorSupport.getFederatorPublicKeyOfType(i, FederationMember.KeyType.MST);
 
+            FederationMember member = new FederationMember(btcKey, rskKey, mstKey);
             members.add(member);
         }
         Instant creationTime = federatorSupport.getFederationCreationTime();
         long creationBlockNumber = federatorSupport.getFederationCreationBlockNumber();
         NetworkParameters btcParams = federatorSupport.getBtcParams();
         FederationArgs federationArgs = new FederationArgs(members, creationTime, creationBlockNumber, btcParams);
 
-        return getExpectedFederation(federationArgs, getActiveFederationAddress());
+        Address activeFederationAddress = getActiveFederationAddress();
+        logger.debug("[getActiveFederation] Attempting to get active federation with address {}", activeFederationAddress);
+        return buildFederation(federationArgs, activeFederationAddress);
     }
 
     @Override
@@ -105,25 +95,13 @@ public Optional<Federation> getRetiringFederation() {
         }
 
         Address retiringFederationAddress = getRetiringFederationAddress().orElseThrow(IllegalStateException::new);
-        boolean useTypedPublicKeyGetter = federatorSupport.getConfigForBestBlock().isActive(RSKIP123);
         List<FederationMember> members = new ArrayList<>();
         for (int i = 0; i < federationSize; i++) {
-            // Select method depending on network configuration for best block
-            FederationMember member;
-            if (useTypedPublicKeyGetter) {
-                BtcECKey btcKey = BtcECKey.fromPublicOnly(federatorSupport.getRetiringFederatorPublicKeyOfType(i, FederationMember.KeyType.BTC).getPubKey());
-                ECKey rskKey = federatorSupport.getRetiringFederatorPublicKeyOfType(i, FederationMember.KeyType.RSK);
-                ECKey mstKey = federatorSupport.getRetiringFederatorPublicKeyOfType(i, FederationMember.KeyType.MST);
-
-                member = new FederationMember(btcKey, rskKey, mstKey);
-            } else {
-                // Before the fork, all of BTC, RSK and MST keys are the same
-                BtcECKey btcKey = federatorSupport.getRetiringFederatorPublicKey(i);
-                ECKey rskMstKey = ECKey.fromPublicOnly(btcKey.getPubKey());
-
-                member = new FederationMember(btcKey, rskMstKey, rskMstKey);
-            }
+            BtcECKey btcKey = BtcECKey.fromPublicOnly(federatorSupport.getRetiringFederatorPublicKeyOfType(i, FederationMember.KeyType.BTC).getPubKey());
+            ECKey rskKey = federatorSupport.getRetiringFederatorPublicKeyOfType(i, FederationMember.KeyType.RSK);
+            ECKey mstKey = federatorSupport.getRetiringFederatorPublicKeyOfType(i, FederationMember.KeyType.MST);
 
+            FederationMember member = new FederationMember(btcKey, rskKey, mstKey);
             members.add(member);
         }
 
@@ -132,7 +110,8 @@ public Optional<Federation> getRetiringFederation() {
         NetworkParameters btcParams = federatorSupport.getBtcParams();
         FederationArgs federationArgs = new FederationArgs(members, creationTime, creationBlockNumber, btcParams);
 
-        Federation retiringFederation = getExpectedFederation(federationArgs, retiringFederationAddress);
+        logger.debug("[getRetiringFederation] Attempting to get retiring federation with address {}", retiringFederationAddress);
+        Federation retiringFederation = buildFederation(federationArgs, retiringFederationAddress);
         return Optional.of(retiringFederation);
     }
 
@@ -143,10 +122,6 @@ public Optional<Address> getRetiringFederationAddress() {
 
     @Override
     public Optional<Federation> getProposedFederation() {
-        if (!federatorSupport.getConfigForBestBlock().isActive(RSKIP419)) {
-            return Optional.empty();
-        }
-
         int federationSize = federatorSupport.getProposedFederationSize()
             .orElse(FEDERATION_NON_EXISTENT.getCode());
         if (federationSize == FEDERATION_NON_EXISTENT.getCode()) {
@@ -175,68 +150,61 @@ public Optional<Federation> getProposedFederation() {
             federatorSupport.getBtcParams()
         );
 
-        Federation proposedFederation = buildProposedFederation(federationArgs);
-        return Optional.of(proposedFederation);
-    }
-
-    private Federation buildProposedFederation(FederationArgs federationArgs) {
-        if (!federatorSupport.getConfigForBestBlock().isActive(RSKIP305)) {
-            return FederationFactory.buildP2shErpFederation(
-                federationArgs,
-                federationConstants.getErpFedPubKeysList(),
-                federationConstants.getErpFedActivationDelay());
-        }
-
-        return FederationFactory.buildP2shP2wshErpFederation(
+        Federation proposedFederation = FederationFactory.buildP2shP2wshErpFederation(
             federationArgs,
             federationConstants.getErpFedPubKeysList(),
             federationConstants.getErpFedActivationDelay());
+        return Optional.of(proposedFederation);
     }
 
     @Override
     public Optional<Address> getProposedFederationAddress() {
         return Optional.of(federatorSupport)
-            .filter(fedSupport -> fedSupport.getConfigForBestBlock().isActive(RSKIP419))
             .flatMap(FederatorSupport::getProposedFederationAddress);
     }
 
-    private Federation getExpectedFederation(FederationArgs federationArgs, Address expectedFederationAddress) {
-        logger.debug("[getExpectedFederation] Going to get expected federation with address {}", expectedFederationAddress);
+    private Federation buildFederation(FederationArgs federationArgs, Address expectedFederationAddress) {
+        return tryBuildingStandardMultiSigFederation(federationArgs, expectedFederationAddress)
+            .or(() -> tryBuildingP2shP2wshErpFederation(federationArgs,
+                expectedFederationAddress))
+            .orElseThrow(() ->
+                new IllegalStateException(
+                    String.format(
+                        "Cannot determine federation type for federation with address %s. Tried: standard multiSig, and P2SH-P2WSH ERP federations.",
+                        expectedFederationAddress
+                    )
+                )
+            );
+    }
 
+    private Optional<Federation> tryBuildingStandardMultiSigFederation(FederationArgs federationArgs, Address expectedFederationAddress) {
         Federation standardMultiSigFederation = FederationFactory.buildStandardMultiSigFederation(federationArgs);
-        if (standardMultiSigFederation.getAddress().equals(expectedFederationAddress)) {
-            logger.debug("[getExpectedFederation] Expected federation is a standard multiSig one.");
-            return standardMultiSigFederation;
+        if (!standardMultiSigFederation.getAddress().equals(expectedFederationAddress)) {
+            logger.debug("[tryBuildingStandardMultiSigFederation] Expected federation is not a standard multiSig one.");
+            return Optional.empty();
         }
 
-        logger.debug("[getExpectedFederation] Expected federation is not a standard multiSig one.");
-        List<BtcECKey> erpPubKeys = federationConstants.getErpFedPubKeysList();
-        long activationDelay = federationConstants.getErpFedActivationDelay();
+        logger.debug("[tryBuildingStandardMultiSigFederation] Expected federation is a standard multiSig one.");
+        return Optional.of(standardMultiSigFederation);
+    }
 
+    private Optional<Federation> tryBuildingP2shP2wshErpFederation(FederationArgs federationArgs, Address expectedFederationAddress) {
+        ErpFederation p2shP2wshErpFederation;
         try {
-            ErpFederation p2shErpFederation =
-            FederationFactory.buildP2shErpFederation(federationArgs, erpPubKeys, activationDelay);
-
-            if (p2shErpFederation.getAddress().equals(expectedFederationAddress)) {
-                logger.debug("[getExpectedFederation] Expected federation is a p2sh erp one.");
-                return p2shErpFederation;
-            }
+            p2shP2wshErpFederation = FederationFactory.buildP2shP2wshErpFederation(
+                federationArgs, federationConstants.getErpFedPubKeysList(),
+                federationConstants.getErpFedActivationDelay());
         } catch (ErpFederationCreationException | ScriptCreationException e) {
-            logger.debug("[getExpectedFederation] Expected federation is not a p2sh erp one.", e);
+            logger.debug("[tryBuildingP2shP2wshErpFederation] Failed to build p2sh-p2wsh erp federation.", e);
+            return Optional.empty();
         }
 
-        try {
-            ErpFederation p2shP2wshErpFederation =
-                FederationFactory.buildP2shP2wshErpFederation(federationArgs, erpPubKeys, activationDelay);
-
-            if (p2shP2wshErpFederation.getAddress().equals(expectedFederationAddress)) {
-                logger.debug("[getExpectedFederation] Expected federation is a p2sh-p2wsh erp one.");
-                return p2shP2wshErpFederation;
-            }
-        } catch (ErpFederationCreationException | ScriptCreationException e) {
-            logger.error("[getExpectedFederation] Expected federation is not a p2sh-p2wsh erp one.", e);
+        if (!p2shP2wshErpFederation.getAddress().equals(expectedFederationAddress)) {
+            logger.debug("[tryBuildingP2shP2wshErpFederation] Expected federation is not a p2sh-p2wsh erp one.");
+            return Optional.empty();
         }
 
-        throw new IllegalStateException("[getExpectedFederation] Cannot get expected federation.");
+        logger.debug("[tryBuildingP2shP2wshErpFederation] Expected federation is a p2sh-p2wsh erp one.");
+        return Optional.of(p2shP2wshErpFederation);
     }
 }