Fix node builders

Sources/Stratis.Bitcoin.Features.Consensus/DeStreamFullNodeBuilderConsensusExtension.cs

@@ -34,6 +34,7 @@ namespace Stratis.Bitcoin.Features.Consensus
                     {
                         services.AddSingleton<ConsensusOptions, ConsensusOptions>();
                         services.AddSingleton<DeStreamDBreezeCoinView>();
+                        services.AddSingleton<DBreezeCoinView>(p => p.GetService<DeStreamDBreezeCoinView>());
                         services.AddSingleton<ICoinView, CachedCoinView>();
                         services.AddSingleton<ConsensusController>();
                         services.AddSingleton<IConsensusRuleEngine, DeStreamPowConsensusRuleEngine>();
@@ -59,6 +60,7 @@ namespace Stratis.Bitcoin.Features.Consensus
                     .FeatureServices(services =>
                     {
                         services.AddSingleton<DeStreamDBreezeCoinView>();
+                        services.AddSingleton<DBreezeCoinView>(p => p.GetService<DeStreamDBreezeCoinView>());
                         services.AddSingleton<ICoinView, CachedCoinView>();
                         services.AddSingleton<StakeChainStore>().AddSingleton<IStakeChain, StakeChainStore>(provider => provider.GetService<StakeChainStore>());
                         services.AddSingleton<IStakeValidator, StakeValidator>();

Sources/Stratis.Bitcoin.Features.MemoryPool/DeStreamFullNodeBuilderMemoryPoolExtension.cs

@@ -35,11 +35,12 @@ namespace Stratis.Bitcoin.Features.MemoryPool
                         services.AddSingleton<BlockPolicyEstimator>();
                         services.AddSingleton<IMempoolValidator, DeStreamMempoolValidator>();
                         services.AddSingleton<MempoolOrphans>();
-                        services.AddSingleton<MempoolManager, DeStreamMempoolManager>();
-                        services.AddSingleton<IPooledTransaction, DeStreamMempoolManager>();
-                        services.AddSingleton<IPooledGetUnspentTransaction, DeStreamMempoolManager>();
+                        services.AddSingleton<MempoolManager, DeStreamMempoolManager>()
+                            .AddSingleton<IPooledTransaction, MempoolManager>(provider => provider.GetService<DeStreamMempoolManager>())
+                            .AddSingleton<IPooledGetUnspentTransaction, MempoolManager>(provider => provider.GetService<DeStreamMempoolManager>());
                         services.AddSingleton<MempoolBehavior>();
                         services.AddSingleton<MempoolSignaled>();
+                        services.AddSingleton<BlocksDisconnectedSignaled>();
                         services.AddSingleton<IMempoolPersistence, MempoolPersistence>();
                         services.AddSingleton<MempoolController>();
                         services.AddSingleton<MempoolSettings>();

Sources/Stratis.Bitcoin.Features.Wallet/DeStreamFullNodeBuilderWalletExtension.cs

 using Microsoft.Extensions.DependencyInjection;
+using NBitcoin.Policy;
 using Stratis.Bitcoin.Builder;
 using Stratis.Bitcoin.Configuration.Logging;
+using Stratis.Bitcoin.Consensus;
 using Stratis.Bitcoin.Features.BlockStore;
 using Stratis.Bitcoin.Features.MemoryPool;
 using Stratis.Bitcoin.Features.RPC;
 using Stratis.Bitcoin.Features.Wallet.Broadcasting;
 using Stratis.Bitcoin.Features.Wallet.Controllers;
 using Stratis.Bitcoin.Features.Wallet.Interfaces;
+using Stratis.Bitcoin.Interfaces;
 
 namespace Stratis.Bitcoin.Features.Wallet
 {
@@ -39,6 +42,9 @@ namespace Stratis.Bitcoin.Features.Wallet
                         services.AddSingleton<IBroadcasterManager, FullNodeBroadcasterManager>();
                         services.AddSingleton<BroadcasterBehavior>();
                         services.AddSingleton<WalletSettings>();
+                        services.AddSingleton<IScriptAddressReader>(new ScriptAddressReader());
+                        services.AddSingleton<StandardTransactionPolicy>();
+                        services.AddSingleton<IAddressBookManager, AddressBookManager>();
                     });
             });