Handle exception when processing fund transaction. Add logs for when …

…updating svp state

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

@@ -1023,41 +1023,44 @@ protected void updateSvpState(Transaction rskTx) {
             return;
         }
 
-        Keccak256 rskTxHash = rskTx.getHash();
         // if the proposed federation exists and the validation period ended,
         // we can conclude that the svp failed
         Federation proposedFederation = proposedFederationOpt.get();
         if (!validationPeriodIsOngoing(proposedFederation)) {
+            logger.info(
+                "[updateSvpState] Proposed federation validation failed at block {}. SVP failure will be processed",
+                rskExecutionBlock.getNumber()
+            );
             processSVPFailure(proposedFederation);
             return;
         }
 
+        Keccak256 rskTxHash = rskTx.getHash();
         // if the fund tx signed is present, then the fund transaction change was registered,
         // meaning we can create the spend tx.
         Optional<BtcTransaction> svpFundTxSigned = provider.getSvpFundTxSigned();
         if (svpFundTxSigned.isPresent()) {
+            logger.info(
+                "[updateSvpState] Fund tx signed was found, so spend tx creation will be processed."
+            );
             processSvpSpendTransactionUnsigned(rskTxHash, proposedFederation, svpFundTxSigned.get());
             return;
         }
 
         // if the unsigned fund tx hash is not present, meaning we can proceed with the fund tx creation
         Optional<Sha256Hash> svpFundTxHashUnsigned = provider.getSvpFundTxHashUnsigned();
         if (svpFundTxHashUnsigned.isEmpty()) {
-            try {
-                processSvpFundTransactionUnsigned(rskTxHash, proposedFederation);
-            } catch (Exception e) {
-                logger.error("[updateSvpState] Error processing svp fund transaction unsigned. Error message: {}", e.getMessage());
-            }
+            logger.info(
+                "[updateSvpState] Fund tx hash unsigned was not found, so fund tx creation will be processed."
+            );
+            processSvpFundTransactionUnsigned(rskTxHash, proposedFederation);
         }
     }
 
     private void processSVPFailure(Federation proposedFederation) {
         eventLogger.logCommitFederationFailure(rskExecutionBlock, proposedFederation);
-        logger.warn(
-            "[processSVPFailure] Proposed federation validation failed at block {}, so federation election will be allowed again.",
-            rskExecutionBlock.getNumber()
-        );
 
+        logger.info("[processSVPFailure] Federation election will be allowed again.");
         allowFederationElectionAgain();
     }
 
@@ -1079,13 +1082,24 @@ private boolean validationPeriodIsOngoing(Federation proposedFederation) {
         return rskExecutionBlock.getNumber() <= validationPeriodEndBlock;
     }
 
-    private void processSvpFundTransactionUnsigned(Keccak256 rskTxHash, Federation proposedFederation) throws IOException, InsufficientMoneyException {
+    private void processSvpFundTransactionUnsigned(Keccak256 rskTxHash, Federation proposedFederation) {
         Coin spendableValueFromProposedFederation = bridgeConstants.getSpendableValueFromProposedFederation();
-        BtcTransaction svpFundTransactionUnsigned = createSvpFundTransaction(proposedFederation, spendableValueFromProposedFederation);
-
-        provider.setSvpFundTxHashUnsigned(svpFundTransactionUnsigned.getHash());
-        PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = provider.getPegoutsWaitingForConfirmations();
-        settleReleaseRequest(pegoutsWaitingForConfirmations, svpFundTransactionUnsigned, rskTxHash, spendableValueFromProposedFederation);
+        try {
+            BtcTransaction svpFundTransactionUnsigned = createSvpFundTransaction(proposedFederation, spendableValueFromProposedFederation);
+            provider.setSvpFundTxHashUnsigned(svpFundTransactionUnsigned.getHash());
+            PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = provider.getPegoutsWaitingForConfirmations();
+            settleReleaseRequest(pegoutsWaitingForConfirmations, svpFundTransactionUnsigned, rskTxHash, spendableValueFromProposedFederation);
+        } catch (InsufficientMoneyException e) {
+            logger.error(
+                "[processSvpFundTransactionUnsigned] Insufficient funds for creating the fund transaction. Error message: {}",
+                e.getMessage()
+            );
+        } catch (IOException e) {
+            logger.error(
+                "[processSvpFundTransactionUnsigned] IOException getting the pegouts waiting for confirmations. Error message: {}",
+                e.getMessage()
+            );
+        }
     }
 
     private BtcTransaction createSvpFundTransaction(Federation proposedFederation, Coin spendableValueFromProposedFederation) throws InsufficientMoneyException {