Fixes (#533)

stratisproject · Apr 26, 2021 · 320b92a · 320b92a
1 parent e59d807
commit 320b92a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Stratis.Bitcoin.Features.BlockStore/Controllers/BlockStoreController.cs b/src/Stratis.Bitcoin.Features.BlockStore/Controllers/BlockStoreController.cs
@@ -147,7 +147,7 @@ public IActionResult GetBlock([FromQuery] SearchByHashRequest query)
                 if (this.network.Consensus.IsProofOfStake)
                 {
                     var posBlock = block as PosBlock;
-                    
+
                     blockModel.PosBlockSignature = posBlock.BlockSignature.ToHex(this.network);
                     blockModel.PosBlockTrust = new Target(chainedHeader.GetBlockTarget()).ToUInt256().ToString();
                     blockModel.PosChainTrust = chainedHeader.ChainWork.ToString(); // this should be similar to ChainWork
@@ -158,7 +158,7 @@ public IActionResult GetBlock([FromQuery] SearchByHashRequest query)
 
                         blockModel.PosModifierv2 = blockStake?.StakeModifierV2.ToString();
                         blockModel.PosFlags = blockStake?.Flags == BlockFlag.BLOCK_PROOF_OF_STAKE ? "proof-of-stake" : "proof-of-work";
-                        blockModel.PosHashProof = blockStake?.HashProof.ToString();
+                        blockModel.PosHashProof = blockStake?.HashProof?.ToString();
                     }
                 }
 

diff --git a/src/Stratis.Bitcoin/Builder/FullNodeFeatureExecutor.cs b/src/Stratis.Bitcoin/Builder/FullNodeFeatureExecutor.cs
@@ -161,10 +161,10 @@ private void LogAndAddException(IFullNodeFeature feature, bool disposing, List<E
             exceptions.Add(exception);
 
             var messageText = disposing ? "disposing" : "starting";
-            var exceptionText = $"An error occurred {messageText} full node feature '{feature.GetType().Name}': '{exception}'";
+            var exceptionText = "An error occurred {0} full node feature '{1}' : '{2}'";
 
-            this.logger.Error(exceptionText);
-            this.signals.Publish(new FullNodeEvent() { Message = exceptionText, State = FullNodeState.Failed.ToString() });
+            this.logger.Error(exceptionText, messageText, feature.GetType().Name, exception);
+            this.signals.Publish(new FullNodeEvent() { Message = string.Format(exceptionText, messageText, feature.GetType().Name, exception.Message), State = FullNodeState.Failed.ToString() });
         }
     }
 }