Adding multisig wallet

src/Features/Blockcore.Features.ColdStaking/ColdStakingFeature.cs

@@ -164,15 +164,15 @@ private void AddComponentStats(StringBuilder benchLog)
                 {
                     // Get all the accounts, including the ones used for cold staking.
                     // TODO: change GetAccounts to accept a filter.
-                    foreach (HdAccount account in this.coldStakingManager.GetAccounts(walletName))
+                    foreach (IHdAccount account in this.coldStakingManager.GetAccounts(walletName))
                     {
                         AccountBalance accountBalance = this.coldStakingManager.GetBalances(walletName, account.Name).Single();
                         benchLog.AppendLine(($"{walletName}/{account.Name}" + ",").PadRight(LoggingConfiguration.ColumnLength + 20)
                                        + (" Confirmed balance: " + accountBalance.AmountConfirmed.ToString()).PadRight(LoggingConfiguration.ColumnLength + 20)
                                        + " Unconfirmed balance: " + accountBalance.AmountUnconfirmed.ToString());
                     }
 
-                    HdAccount coldStakingAccount = this.coldStakingManager.GetColdStakingAccount(this.coldStakingManager.GetWallet(walletName), true);
+                    IHdAccount coldStakingAccount = this.coldStakingManager.GetColdStakingAccount(this.coldStakingManager.GetWallet(walletName), true);
                     if (coldStakingAccount != null)
                     {
                         AccountBalance accountBalance = this.coldStakingManager.GetBalances(walletName, coldStakingAccount.Name).Single();
@@ -181,7 +181,7 @@ private void AddComponentStats(StringBuilder benchLog)
                                             + " Unconfirmed balance: " + accountBalance.AmountUnconfirmed.ToString());
                     }
 
-                    HdAccount hotStakingAccount = this.coldStakingManager.GetColdStakingAccount(this.coldStakingManager.GetWallet(walletName), false);
+                    IHdAccount hotStakingAccount = this.coldStakingManager.GetColdStakingAccount(this.coldStakingManager.GetWallet(walletName), false);
                     if (hotStakingAccount != null)
                     {
                         AccountBalance accountBalance = this.coldStakingManager.GetBalances(walletName, hotStakingAccount.Name).Single();

src/Features/Blockcore.Features.ColdStaking/ColdStakingManager.cs

@@ -183,10 +183,10 @@ public GetColdStakingInfoResponse GetColdStakingInfo(string walletName)
         /// <param name="wallet">The wallet where we wish to create the account.</param>
         /// <param name="isColdWalletAccount">Indicates whether we need the cold wallet account (versus the hot wallet account).</param>
         /// <returns>The cold staking account or <c>null</c> if the account does not exist.</returns>
-        public HdAccount GetColdStakingAccount(Wallet.Types.Wallet wallet, bool isColdWalletAccount)
+        public IHdAccount GetColdStakingAccount(Wallet.Types.Wallet wallet, bool isColdWalletAccount)
         {
             var coinType = wallet.Network.Consensus.CoinType;
-            HdAccount account = wallet.GetAccount(isColdWalletAccount ? ColdWalletAccountName : HotWalletAccountName);
+            IHdAccount account = wallet.GetAccount(isColdWalletAccount ? ColdWalletAccountName : HotWalletAccountName);
             if (account == null)
             {
                 this.logger.LogTrace("(-)[ACCOUNT_DOES_NOT_EXIST]:null");
@@ -213,11 +213,11 @@ public HdAccount GetColdStakingAccount(Wallet.Types.Wallet wallet, bool isColdWa
         /// <param name="isColdWalletAccount">Indicates whether we need the cold wallet account (versus the hot wallet account).</param>
         /// <param name="walletPassword">The wallet password which will be used to create the account.</param>
         /// <returns>The new or existing cold staking account.</returns>
-        public HdAccount GetOrCreateColdStakingAccount(string walletName, bool isColdWalletAccount, string walletPassword)
+        public IHdAccount GetOrCreateColdStakingAccount(string walletName, bool isColdWalletAccount, string walletPassword)
         {
             Wallet.Types.Wallet wallet = this.GetWalletByName(walletName);
 
-            HdAccount account = this.GetColdStakingAccount(wallet, isColdWalletAccount);
+            IHdAccount account = this.GetColdStakingAccount(wallet, isColdWalletAccount);
             if (account != null)
             {
                 this.logger.LogTrace("(-)[ACCOUNT_ALREADY_EXIST]:'{0}'", account.Name);
@@ -279,7 +279,7 @@ internal HdAddress GetFirstUnusedColdStakingAddress(string walletName, bool isCo
             Guard.NotNull(walletName, nameof(walletName));
 
             Wallet.Types.Wallet wallet = this.GetWalletByName(walletName);
-            HdAccount account = this.GetColdStakingAccount(wallet, isColdWalletAddress);
+            IHdAccount account = this.GetColdStakingAccount(wallet, isColdWalletAddress);
             if (account == null)
             {
                 this.logger.LogTrace("(-)[ACCOUNT_DOES_NOT_EXIST]:null");
@@ -340,8 +340,8 @@ internal Transaction GetColdStakingSetupTransaction(IWalletTransactionHandler wa
             Wallet.Types.Wallet wallet = this.GetWalletByName(walletName);
 
             // Get/create the cold staking accounts.
-            HdAccount coldAccount = this.GetOrCreateColdStakingAccount(walletName, true, walletPassword);
-            HdAccount hotAccount = this.GetOrCreateColdStakingAccount(walletName, false, walletPassword);
+            IHdAccount coldAccount = this.GetOrCreateColdStakingAccount(walletName, true, walletPassword);
+            IHdAccount hotAccount = this.GetOrCreateColdStakingAccount(walletName, false, walletPassword);
 
             HdAddress coldAddress = coldAccount?.ExternalAddresses.FirstOrDefault(s => s.Address == coldWalletAddress || s.Bech32Address == coldWalletAddress);
             HdAddress hotAddress = hotAccount?.ExternalAddresses.FirstOrDefault(s => s.Address == hotWalletAddress || s.Bech32Address == hotWalletAddress);
@@ -474,7 +474,7 @@ internal Transaction GetColdStakingWithdrawalTransaction(IWalletTransactionHandl
             Wallet.Types.Wallet wallet = this.GetWalletByName(walletName);
 
             // Get the cold staking account.
-            HdAccount coldAccount = this.GetColdStakingAccount(wallet, true);
+            IHdAccount coldAccount = this.GetColdStakingAccount(wallet, true);
             if (coldAccount == null)
             {
                 this.logger.LogTrace("(-)[COLDSTAKE_ACCOUNT_DOES_NOT_EXIST]");
@@ -488,7 +488,7 @@ internal Transaction GetColdStakingWithdrawalTransaction(IWalletTransactionHandl
                 throw new WalletException("You can't send the money to a cold staking cold wallet account.");
             }
 
-            HdAccount hotAccount = this.GetColdStakingAccount(wallet, false);
+            IHdAccount hotAccount = this.GetColdStakingAccount(wallet, false);
             if (hotAccount != null && hotAccount.ExternalAddresses.Concat(hotAccount.InternalAddresses).Any(s => s.Address == receivingAddress || s.Bech32Address == receivingAddress))
             {
                 this.logger.LogTrace("(-)[COLDSTAKE_INVALID_HOT_WALLET_ADDRESS_USAGE]");
@@ -599,7 +599,7 @@ public IEnumerable<UnspentOutputReference> GetSpendableTransactionsInColdWallet(
         /// </summary>
         /// <param name="script">The script (possibly a cold staking script) to check.</param>
         /// <param name="accountFilter">The account filter.</param>
-        public override void TransactionFoundInternal(Wallet.Types.Wallet wallet, Script script, Func<HdAccount, bool> accountFilter = null)
+        public override void TransactionFoundInternal(Wallet.Types.Wallet wallet, Script script, Func<IHdAccount, bool> accountFilter = null)
         {
             if (ColdStakingScriptTemplate.Instance.ExtractScriptPubKeyParameters(script, out KeyId hotPubKeyHash, out KeyId coldPubKeyHash))
             {

src/Features/Blockcore.Features.Miner/Api/Controllers/MiningController.cs

@@ -145,7 +145,7 @@ internal WalletAccountReference GetAccount()
                 throw new Exception(noWalletMessage);
             }
 
-            HdAccount account = this.walletManager.GetAccounts(walletName).FirstOrDefault();
+            IHdAccount account = this.walletManager.GetAccounts(walletName).FirstOrDefault();
             if (account == null)
             {
                 this.logger.LogError(ExceptionOccurredMessage, noAccountMessage);

src/Features/Blockcore.Features.Miner/Api/Controllers/MiningRPCController.cs

@@ -106,7 +106,7 @@ private WalletAccountReference GetAccount()
             if (walletName == null)
                 throw new RPCServerException(RPCErrorCode.RPC_INVALID_REQUEST, "No wallet found");
 
-            HdAccount account = this.walletManager.GetAccounts(walletName).FirstOrDefault();
+            IHdAccount account = this.walletManager.GetAccounts(walletName).FirstOrDefault();
             if (account == null)
                 throw new RPCServerException(RPCErrorCode.RPC_INVALID_REQUEST, "No account found on wallet");
 

src/Features/Blockcore.Features.PoA/PoAMiner.cs

@@ -310,7 +310,7 @@ private Script GetScriptPubKeyFromWallet()
             if (walletName == null)
                 return null;
 
-            HdAccount account = this.walletManager.GetAccounts(walletName).FirstOrDefault();
+            IHdAccount account = this.walletManager.GetAccounts(walletName).FirstOrDefault();
 
             if (account == null)
                 return null;

src/Features/Blockcore.Features.RPC/RPCMiddleware.cs

@@ -84,7 +84,7 @@ public async Task InvokeAsync(HttpContext httpContext)
                     throw new NotImplementedException("The request is not supported.");
                 }
 
-                httpContext.Response.ContentType = ContentType;
+                httpContext.Response.ContentType = this.ContentType;
 
                 // Write the response body.
                 using (StreamWriter streamWriter = new StreamWriter(httpContext.Response.Body, Encoding.Default, 1024, true))
@@ -134,44 +134,44 @@ private async Task HandleRpcInvokeExceptionAsync(HttpContext httpContext, Except
             if (ex is ArgumentException || ex is FormatException)
             {
                 JObject response = CreateError(RPCErrorCode.RPC_MISC_ERROR, "Argument error: " + ex.Message);
-                httpContext.Response.ContentType = ContentType;
+                httpContext.Response.ContentType = this.ContentType;
                 await httpContext.Response.WriteAsync(response.ToString(Formatting.Indented));
             }
             else if (ex is BlockNotFoundException)
             {
                 JObject response = CreateError(RPCErrorCode.RPC_INVALID_REQUEST, "Argument error: " + ex.Message);
-                httpContext.Response.ContentType = ContentType;
+                httpContext.Response.ContentType = this.ContentType;
                 await httpContext.Response.WriteAsync(response.ToString(Formatting.Indented));
             }
             else if (ex is ConfigurationException)
             {
                 JObject response = CreateError(RPCErrorCode.RPC_INTERNAL_ERROR, ex.Message);
-                httpContext.Response.ContentType = ContentType;
+                httpContext.Response.ContentType = this.ContentType;
                 await httpContext.Response.WriteAsync(response.ToString(Formatting.Indented));
             }
             else if (ex is RPCServerException)
             {
                 var rpcEx = (RPCServerException)ex;
                 JObject response = CreateError(rpcEx.ErrorCode, ex.Message);
-                httpContext.Response.ContentType = ContentType;
+                httpContext.Response.ContentType = this.ContentType;
                 await httpContext.Response.WriteAsync(response.ToString(Formatting.Indented));
             }
             else if (httpContext.Response?.StatusCode == 404)
             {
                 JObject response = CreateError(RPCErrorCode.RPC_METHOD_NOT_FOUND, "Method not found");
-                httpContext.Response.ContentType = ContentType;
+                httpContext.Response.ContentType = this.ContentType;
                 await httpContext.Response.WriteAsync(response.ToString(Formatting.Indented));
             }
             else if (this.IsDependencyFailure(ex))
             {
                 JObject response = CreateError(RPCErrorCode.RPC_METHOD_NOT_FOUND, ex.Message);
-                httpContext.Response.ContentType = ContentType;
+                httpContext.Response.ContentType = this.ContentType;
                 await httpContext.Response.WriteAsync(response.ToString(Formatting.Indented));
             }
             else if (httpContext.Response?.StatusCode == 500 || ex != null)
             {
                 JObject response = CreateError(RPCErrorCode.RPC_INTERNAL_ERROR, "Internal error");
-                httpContext.Response.ContentType = ContentType;
+                httpContext.Response.ContentType = this.ContentType;
                 this.logger.LogError(new EventId(0), ex, "Internal error while calling RPC Method");
                 await httpContext.Response.WriteAsync(response.ToString(Formatting.Indented));
             }

src/Features/Blockcore.Features.Wallet/Api/Controllers/WalletController.cs

@@ -719,7 +719,7 @@ public IActionResult BuildTransaction([FromBody] BuildTransactionRequest request
                 if (!string.IsNullOrWhiteSpace(request.ChangeAddress))
                 {
                     Types.Wallet wallet = this.walletManager.GetWallet(request.WalletName);
-                    HdAccount account = wallet.GetAccount(request.AccountName);
+                    IHdAccount account = wallet.GetAccount(request.AccountName);
                     if (account == null)
                     {
                         return ErrorHelpers.BuildErrorResponse(HttpStatusCode.BadRequest, "Account not found.", $"No account with the name '{request.AccountName}' could be found in wallet {wallet.Name}.");
@@ -952,7 +952,7 @@ public IActionResult CreateNewAccount([FromBody] GetUnusedAccountModel request)
 
             try
             {
-                HdAccount result = this.walletManager.GetUnusedAccount(request.WalletName, request.Password);
+                IHdAccount result = this.walletManager.GetUnusedAccount(request.WalletName, request.Password);
                 return this.Json(result.Name);
             }
             catch (CannotAddAccountToXpubKeyWalletException e)
@@ -986,7 +986,7 @@ public IActionResult ListAccounts([FromQuery] ListAccountsModel request)
 
             try
             {
-                IEnumerable<HdAccount> result = this.walletManager.GetAccounts(request.WalletName);
+                IEnumerable<IHdAccount> result = this.walletManager.GetAccounts(request.WalletName);
                 return this.Json(result.Select(a => a.Name));
             }
             catch (Exception e)
@@ -1081,7 +1081,7 @@ public IActionResult GetAllAddresses([FromQuery] GetAllAddressesModel request)
             try
             {
                 Types.Wallet wallet = this.walletManager.GetWallet(request.WalletName);
-                HdAccount account = wallet.GetAccount(request.AccountName);
+                IHdAccount account = wallet.GetAccount(request.AccountName);
                 if (account == null)
                     throw new WalletException($"No account with the name '{request.AccountName}' could be found.");
 
@@ -1436,7 +1436,7 @@ public IActionResult DistributeUtxos([FromBody] DistributeUtxosRequest request)
                 var walletReference = new WalletAccountReference(request.WalletName, request.AccountName);
 
                 Types.Wallet wallet = this.walletManager.GetWallet(request.WalletName);
-                HdAccount account = wallet.GetAccount(request.AccountName);
+                IHdAccount account = wallet.GetAccount(request.AccountName);
 
                 var addresses = new List<HdAddress>();
 

src/Features/Blockcore.Features.Wallet/Api/Controllers/WalletRPCController.cs

@@ -9,6 +9,7 @@
 using Blockcore.Consensus.ScriptInfo;
 using Blockcore.Consensus.TransactionInfo;
 using Blockcore.Controllers;
+using Blockcore.Controllers.Models;
 using Blockcore.Features.BlockStore;
 using Blockcore.Features.RPC;
 using Blockcore.Features.RPC.Exceptions;
@@ -23,7 +24,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using NBitcoin;
+using NBitcoin.Policy;
 using Newtonsoft.Json;
+using Script = Blockcore.Consensus.ScriptInfo.Script;
 
 namespace Blockcore.Features.Wallet.Api.Controllers
 {
@@ -150,7 +153,7 @@ public async Task<uint256> SendToAddressAsync(BitcoinAddress address, decimal am
                 throw new RPCServerException(RPCErrorCode.RPC_WALLET_ERROR, exception.Message);
             }
         }
-
+        
         /// <summary>
         /// Broadcasts a raw transaction from hex to local node and network.
         /// </summary>
@@ -340,7 +343,7 @@ public GetTransactionModel GetTransaction(string txid)
 
             WalletAccountReference accountReference = this.GetWalletAccountReference();
             Types.Wallet wallet = this.walletManager.GetWalletByName(accountReference.WalletName);
-            HdAccount account = this.walletManager.GetAccounts(accountReference.WalletName).Single(a => a.Name == accountReference.AccountName);
+            IHdAccount account = this.walletManager.GetAccounts(accountReference.WalletName).Single(a => a.Name == accountReference.AccountName);
 
             // Get the transaction from the wallet by looking into received and send transactions.
             List<HdAddress> addresses = account.GetCombinedAddresses().ToList();
@@ -901,7 +904,7 @@ private WalletAccountReference GetWalletAccountReference()
                 throw new RPCServerException(RPCErrorCode.RPC_INVALID_REQUEST, "No wallet found");
             }
 
-            HdAccount account = this.walletManager.GetAccounts(walletName).First();
+            IHdAccount account = this.walletManager.GetAccounts(walletName).First();
             return new WalletAccountReference(walletName, account.Name);
         }
     }

src/Features/Blockcore.Features.Wallet/Interfaces/IAccountRoot.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using Blockcore.Features.Wallet.Database;
+using Blockcore.Networks;
+using NBitcoin;
+
+namespace Blockcore.Features.Wallet.Interfaces
+{
+    public interface IAccountRoot
+    {
+        ICollection<IHdAccount> Accounts { get; set; }
+        int? CoinType { get; set; }
+        uint256 LastBlockSyncedHash { get; set; }
+        int? LastBlockSyncedHeight { get; set; }
+
+        IHdAccount AddNewAccount(ExtPubKey accountExtPubKey, int accountIndex, Network network, DateTimeOffset accountCreationTime);
+        IHdAccount AddNewAccount(string password, string encryptedSeed, byte[] chainCode, Network network, DateTimeOffset accountCreationTime, int? accountIndex = null, string accountName = null);
+        IHdAccount CreateAccount(string password, string encryptedSeed, byte[] chainCode, Network network, DateTimeOffset accountCreationTime, int newAccountIndex, string newAccountName = null);
+        IHdAccount GetAccountByName(string accountName);
+        IHdAccount GetFirstUnusedAccount(IWalletStore walletStore);
+    }
+}

src/Features/Blockcore.Features.Wallet/Interfaces/IHdAccount.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using Blockcore.Features.Wallet.Database;
+using Blockcore.Features.Wallet.Types;
+using Blockcore.Networks;
+using NBitcoin;
+
+namespace Blockcore.Features.Wallet.Interfaces
+{
+    public interface IHdAccount
+    {
+        DateTimeOffset CreationTime { get; set; }
+        string ExtendedPubKey { get; set; }
+        ICollection<HdAddress> ExternalAddresses { get; set; }
+        string HdPath { get; set; }
+        int Index { get; set; }
+        ICollection<HdAddress> InternalAddresses { get; set; }
+        string Name { get; set; }
+
+        IEnumerable<HdAddress> CreateAddresses(Network network, int addressesQuantity, bool isChange = false);
+        (Money ConfirmedAmount, Money UnConfirmedAmount) GetBalances(IWalletStore walletStore, bool excludeColdStakeUtxo);
+        int GetCoinType();
+        IEnumerable<HdAddress> GetCombinedAddresses();
+        HdAddress GetFirstUnusedChangeAddress(IWalletStore walletStore);
+        HdAddress GetFirstUnusedReceivingAddress(IWalletStore walletStore);
+        HdAddress GetLastUsedAddress(IWalletStore walletStore, bool isChange);
+        IEnumerable<UnspentOutputReference> GetSpendableTransactions(IWalletStore walletStore, int currentChainHeight, long coinbaseMaturity, int confirmations = 0);
+        bool IsNormalAccount();
+    }
+}