block-core · DavidGershony · May 16, 2025 · May 2, 2025 · May 2, 2025 · May 2, 2025
diff --git a/src/Angor.Test/WalletOperationsTest.cs b/src/Angor.Test/WalletOperationsTest.cs
@@ -174,7 +174,12 @@ public void AddInputsAndSignTransaction()
         var investorPrivateKey = _derivationOperations.DeriveInvestorPrivateKey(words, projectInfo.FounderKey);
 
         var investmentTransaction = _investorTransactionActions.CreateInvestmentTransaction(projectInfo, investorKey, Money.Coins(investmentAmount).Satoshi);
-        var signedInvestmentTransaction = _sut.AddInputsAndSignTransaction(accountInfo.GetNextReceiveAddress(), investmentTransaction, words, accountInfo, 3000);
+
+        var signedInvestmentTransaction1 = _sut.AddInputsAndSignTransaction(accountInfo.GetNextReceiveAddress(), investmentTransaction, words, accountInfo, 3000);
+
+        var psbt = _sut.CreatePsbtForTransaction(investmentTransaction, accountInfo, 3000);
+        var signedInvestmentTransaction = _sut.SignPsbt(psbt, words);
+
         var strippedInvestmentTransaction = network.CreateTransaction(signedInvestmentTransaction.Transaction.ToHex());
         strippedInvestmentTransaction.Inputs.ForEach(f => f.WitScript = Blockcore.Consensus.TransactionInfo.WitScript.Empty);
         Assert.Equal(signedInvestmentTransaction.Transaction.GetHash(), strippedInvestmentTransaction.GetHash());

diff --git a/src/Angor/Client/Pages/Invest.razor b/src/Angor/Client/Pages/Invest.razor
@@ -30,7 +30,7 @@
 @inject IRelayService _RelayService;
 @inject IWalletUIService _walletUIService
 @inject IIndexerService _IndexerService
-
+@inject IFeatureFlagService _featureFlagService
 @inject INetworkService _networkService
 @inject NostrConversionHelper NostrHelper
 @inject IInvestorTransactionActions _InvestorTransactionActions;
@@ -814,7 +814,17 @@ else
 
             unSignedTransaction = _InvestorTransactionActions.CreateInvestmentTransaction(project.ProjectInfo, InvestorPubKey, Money.Coins(Investment.InvestmentAmountBtc).Satoshi);
 
-            signedTransaction = _WalletOperations.AddInputsAndSignTransaction(accountBalanceInfo.AccountInfo.GetNextChangeReceiveAddress(), unSignedTransaction, words, accountBalanceInfo.AccountInfo, feeData.SelectedFeeEstimation.FeeRate);
+            if (_featureFlagService.IsFeatureHWSupportEnabled())
+            {
+                var psbt = _WalletOperations.CreatePsbtForTransaction(unSignedTransaction, accountBalanceInfo.AccountInfo, feeData.SelectedFeeEstimation.FeeRate);
+
+                signedTransaction = _WalletOperations.SignPsbt(psbt, words);    
+            }
+            else
+            {
+                signedTransaction = _WalletOperations.AddInputsAndSignTransaction(accountBalanceInfo.AccountInfo.GetNextChangeReceiveAddress(), 
+                    unSignedTransaction, words, accountBalanceInfo.AccountInfo, feeData.SelectedFeeEstimation.FeeRate);
+            }
 
             showCreateModal = true;
         }
@@ -851,12 +861,22 @@ else
             }
 
             var accountInfo = storage.GetAccountInfo(network.Name);
-            signedTransaction = _WalletOperations.AddInputsAndSignTransaction(
-                accountInfo.GetNextChangeReceiveAddress(),
-                unSignedTransaction,
-                await passwordComponent.GetWalletAsync(),
-                accountInfo,
-                feeData.SelectedFeeEstimation.FeeRate);
+
+            if (_featureFlagService.IsFeatureHWSupportEnabled())
+            {
+                var psbt = _WalletOperations.CreatePsbtForTransaction(unSignedTransaction, accountInfo, feeData.SelectedFeeEstimation.FeeRate);
+
+                signedTransaction = _WalletOperations.SignPsbt(psbt, await passwordComponent.GetWalletAsync());
+            }
+            else
+            {
+                signedTransaction = _WalletOperations.AddInputsAndSignTransaction(
+                    accountInfo.GetNextChangeReceiveAddress(),
+                    unSignedTransaction,
+                    await passwordComponent.GetWalletAsync(),
+                    accountInfo,
+                    feeData.SelectedFeeEstimation.FeeRate);
+            }
 
             StateHasChanged();
         }

diff --git a/src/Angor/Shared/IWalletOperations.cs b/src/Angor/Shared/IWalletOperations.cs
@@ -8,6 +8,10 @@ namespace Angor.Shared;
 public interface IWalletOperations
 {
     string GenerateWalletWords();
+
+    PsbtData CreatePsbtForTransaction(Transaction transaction, AccountInfo accountInfo, long feeRate, string? changeAddress = null);
+    TransactionInfo SignPsbt(PsbtData psbtData, WalletWords walletWords);
+
     Task<OperationResult<Transaction>> SendAmountToAddress(WalletWords walletWords, SendInfo sendInfo);
     AccountInfo BuildAccountInfoForWalletWords(WalletWords walletWords);
     Task UpdateDataForExistingAddressesAsync(AccountInfo accountInfo);

diff --git a/src/Angor/Shared/Models/AccountInfo.cs b/src/Angor/Shared/Models/AccountInfo.cs
@@ -3,6 +3,7 @@ namespace Angor.Shared.Models;
 public class AccountInfo
 {
     public string ExtPubKey { get; set; }
+    public string RootExtPubKey { get; set; }
     public string Path { get; set; }
     public int LastFetchIndex { get; set; }
     public int LastFetchChangeIndex { get; set; }

diff --git a/src/Angor/Shared/Models/PsbtData.cs b/src/Angor/Shared/Models/PsbtData.cs
@@ -0,0 +1,8 @@
+using Blockcore.Consensus.TransactionInfo;
+
+namespace Angor.Shared.Models;
+
+public class PsbtData
+{
+    public string PsbtHex { get; set; }
+}
diff --git a/src/Angor/Shared/WalletOperations.cs b/src/Angor/Shared/WalletOperations.cs
@@ -35,7 +35,88 @@ public string GenerateWalletWords()
         string walletWords = mnemonic.ToString();
         return walletWords;
     }
-
+
+    public PsbtData CreatePsbtForTransaction(Transaction transaction, AccountInfo accountInfo, long feeRate, string? changeAddress = null)
+    {
+        if (string.IsNullOrEmpty(accountInfo.RootExtPubKey))
+        {
+            throw new ApplicationException("The Root ExtPubKey is missing");
+        }
+
+        Network network = _networkConfiguration.GetNetwork();
+        var nbitcoinNetwork = NetworkMapper.Map(network);
+
+        changeAddress = changeAddress ?? accountInfo.GetNextChangeReceiveAddress();
+
+        var utxoDataWithPaths = FindOutputsForTransaction((long)transaction.Outputs.Sum(_ => _.Value), accountInfo);
+        var coins = utxoDataWithPaths.Select(u => new Coin(uint256.Parse(u.UtxoData.outpoint.transactionId), (uint)u.UtxoData.outpoint.outputIndex, Money.Satoshis(u.UtxoData.value), Script.FromHex(u.UtxoData.scriptHex))).ToList();
+
+        if (!coins.Any())
+            throw new ApplicationException("No coins found to fund the transaction.");
+
+        var builder = new TransactionBuilder(network)
+            .AddCoins(coins)
+            .SetChange(BitcoinAddress.Create(changeAddress, network))
+            .ContinueToBuild(transaction) // Add the predefined outputs
+            .SendEstimatedFees(new FeeRate(Money.Satoshis(feeRate)))
+            .CoverTheRest(); // Ensure enough input value covers outputs + fee, adjusting change if needed
+
+        var unsignedTx = builder.BuildTransaction(false);
+
+        var psbt = NBitcoin.PSBT.FromTransaction(NBitcoin.Transaction.Parse(unsignedTx.ToHex(), nbitcoinNetwork), nbitcoinNetwork);
+
+        NBitcoin.ExtPubKey accountExtPubKey = NBitcoin.ExtPubKey.Parse(accountInfo.RootExtPubKey, nbitcoinNetwork);
+
+        for (int i = 0; i < unsignedTx.Inputs.Count; i++)
+        {
+            var input = unsignedTx.Inputs[i];
+            var utxoInfo = utxoDataWithPaths.FirstOrDefault(u => u.UtxoData.outpoint.ToString() == input.PrevOut.ToString());
+
+            if (utxoInfo == null)
+                throw new InvalidOperationException($"Could not find UTXO information for input {input.PrevOut}");
+
+            psbt.Inputs[i].WitnessUtxo = new NBitcoin.TxOut(NBitcoin.Money.Satoshis(utxoInfo.UtxoData.value), NBitcoin.Script.FromHex(utxoInfo.UtxoData.scriptHex));
+
+            var keyPath = new NBitcoin.KeyPath(utxoInfo.HdPath);
+            var rootedKeyPath = new NBitcoin.RootedKeyPath(accountExtPubKey, keyPath);
+
+            var pubKey = _hdOperations.GeneratePublicKey(ExtPubKey.Parse(accountInfo.ExtPubKey, network), (int)keyPath.Indexes[4], keyPath.Indexes[3] == 1);
+            var path = _hdOperations.CreateHdPath(Purpose, network.Consensus.CoinType, AccountIndex, keyPath.Indexes[3] == 1, (int)keyPath.Indexes[4]);
+
+            if (path != utxoInfo.HdPath)
+                throw new InvalidOperationException($"Path does not match {path} {utxoInfo.HdPath}");
+
+            psbt.Inputs[i].HDKeyPaths.Add(new NBitcoin.PubKey(pubKey.ToBytes()), rootedKeyPath);
+        }
+
+        return new PsbtData { PsbtHex = psbt.ToHex() };
+    }
+
+    public TransactionInfo SignPsbt(PsbtData psbtData, WalletWords walletWords)
+    {
+        Network network = _networkConfiguration.GetNetwork();
+        var nbitcoinNetwork = NetworkMapper.Map(network);
+
+        var psbt = NBitcoin.PSBT.Parse(psbtData.PsbtHex, nbitcoinNetwork);
+
+        ExtKey extendedKey = _hdOperations.GetExtendedKey(walletWords.Words, walletWords.Passphrase);
+
+        var nbitcoinExtendedKey = NBitcoin.ExtKey.CreateFromBytes(extendedKey.ToBytes(network.Consensus.ConsensusFactory));
+
+        psbt.SignAll(NBitcoin.ScriptPubKeyType.Segwit, nbitcoinExtendedKey); 
+
+        if (!psbt.TryFinalize(out IList<NBitcoin.PSBTError>? errors))
+        {
+            throw new NBitcoin.PSBTException(errors);
+        }
+
+        NBitcoin.Transaction signedTransaction = psbt.ExtractTransaction();
+
+        NBitcoin.Money fee = psbt.GetFee();
+
+        return new TransactionInfo { Transaction = network.CreateTransaction(signedTransaction.ToHex()), TransactionFee = fee.Satoshi };
+    }
+
     public TransactionInfo AddInputsAndSignTransaction(string changeAddress, Transaction transaction,
         WalletWords walletWords, AccountInfo accountInfo, long feeRate)
     {
@@ -329,6 +410,7 @@ public AccountInfo BuildAccountInfoForWalletWords(WalletWords walletWords)
         ExtPubKey accountExtPubKeyTostore =
             _hdOperations.GetExtendedPublicKey(privateKey, extendedKey.ChainCode, accountHdPath);
 
+        accountInfo.RootExtPubKey = extendedKey.Neuter().ToString(network);
         accountInfo.ExtPubKey = accountExtPubKeyTostore.ToString(network);
         accountInfo.Path = accountHdPath;