move AngorScripts.CreateStage to ITaprootScriptBuilder

block-core · Nov 14, 2023 · 0049090 · 0049090
1 parent fc4f258
commit 0049090
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 15 deletions.
diff --git a/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs b/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs
@@ -79,7 +79,7 @@ public InvestmentIntegrationsTests()
                     new ProjectScriptsBuilder(_derivationOperations),
                     new InvestmentScriptBuilder(new SeederScriptTreeBuilder())),
                 new InvestmentTransactionBuilder(_networkConfiguration.Object,
-                    new ProjectScriptsBuilder(_derivationOperations), new InvestmentScriptBuilder(new SeederScriptTreeBuilder())),
+                    new ProjectScriptsBuilder(_derivationOperations), new InvestmentScriptBuilder(new SeederScriptTreeBuilder()), new TaprootScriptBuilder()),
                 new TaprootScriptBuilder(), _networkConfiguration.Object);
 
             _investorTransactionActions = new InvestorTransactionActions(new NullLogger<InvestorTransactionActions>(),
@@ -90,7 +90,7 @@ public InvestmentIntegrationsTests()
                     new InvestmentScriptBuilder(new SeederScriptTreeBuilder())),
                 new InvestmentTransactionBuilder(_networkConfiguration.Object,
                     new ProjectScriptsBuilder(_derivationOperations),
-                    new InvestmentScriptBuilder(new SeederScriptTreeBuilder())),
+                    new InvestmentScriptBuilder(new SeederScriptTreeBuilder()), new TaprootScriptBuilder()),
                 new TaprootScriptBuilder(), _networkConfiguration.Object);
 
             _founderTransactionActions = new FounderTransactionActions(new NullLogger<FounderTransactionActions>(), _networkConfiguration.Object,

diff --git a/src/Angor.Test/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilderTest.cs b/src/Angor.Test/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilderTest.cs
@@ -25,7 +25,8 @@ public InvestmentTransactionBuilderTest()
 
         _sut = new InvestmentTransactionBuilder(_networkConfiguration.Object,
             _projectScriptsBuilder.Object,
-            _investmentScriptBuilder.Object);
+            _investmentScriptBuilder.Object,
+            new TaprootScriptBuilder());
     }
 
     private Script GivenTheAngorFeeScript(ProjectInfo projectInvestmentInfo)

diff --git a/src/Angor.Test/WalletOperationsTest.cs b/src/Angor.Test/WalletOperationsTest.cs
@@ -45,7 +45,7 @@ public WalletOperationsTest()
             new InvestmentScriptBuilder(new SeederScriptTreeBuilder()),
             new ProjectScriptsBuilder(_derivationOperations),
             new SpendingTransactionBuilder(_networkConfiguration.Object, new ProjectScriptsBuilder(_derivationOperations), new InvestmentScriptBuilder(new SeederScriptTreeBuilder())),
-            new InvestmentTransactionBuilder(_networkConfiguration.Object, new ProjectScriptsBuilder(_derivationOperations), new InvestmentScriptBuilder(new SeederScriptTreeBuilder())),
+            new InvestmentTransactionBuilder(_networkConfiguration.Object, new ProjectScriptsBuilder(_derivationOperations), new InvestmentScriptBuilder(new SeederScriptTreeBuilder()), new TaprootScriptBuilder()),
             new TaprootScriptBuilder(),
             _networkConfiguration.Object);
 

diff --git a/src/Angor/Client/Program.cs b/src/Angor/Client/Program.cs
@@ -31,7 +31,6 @@
 builder.Services.AddScoped<IClipboardService, ClipboardService>();
 builder.Services.AddScoped<IDerivationOperations, DerivationOperations>();
 builder.Services.AddScoped<NavMenuState>();
-builder.Services.AddScoped<InvestmentOperations>();
 
 builder.Services.AddScoped<IIndexerService, IndexerService>();
 builder.Services.AddScoped<IRelayService, RelayService>();

diff --git a/src/Angor/Shared/Protocol/FounderContext.cs → src/Angor/Shared/Models/FounderContext.cs b/src/Angor/Shared/Protocol/FounderContext.cs → src/Angor/Shared/Models/FounderContext.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Angor.Shared.Models;
+namespace Angor.Shared.Models;
 
 /// <summary>
 /// Contains all the requisite information for a founder.
@@ -11,4 +9,4 @@ public class FounderContext
     public ProjectSeeders ProjectSeeders { get; set; }
     public string ChangeAddress { get; set; }
     public List<string> InvestmentTrasnactionsHex { get; set; } = new ();
-}
+}
diff --git a/src/Angor/Shared/Protocol/InvestorContext.cs → src/Angor/Shared/Models/InvestorContext.cs b/src/Angor/Shared/Protocol/InvestorContext.cs → src/Angor/Shared/Models/InvestorContext.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Angor.Shared.Models;
+namespace Angor.Shared.Models;
 
 /// <summary>
 /// Contains all the requisite information for an investor to formulate an investment transaction.
@@ -21,4 +19,4 @@ public class InvestorContext
     // ==============================================
 
     public string ChangeAddress { get; set; }
-}
+}
diff --git a/src/Angor/Shared/ProtocolNew/Scripts/ITaprootScriptBuilder.cs b/src/Angor/Shared/ProtocolNew/Scripts/ITaprootScriptBuilder.cs
@@ -6,6 +6,8 @@ namespace Angor.Shared.ProtocolNew.Scripts;
 
 public interface ITaprootScriptBuilder
 {
+    Script CreateStage(Blockcore.Networks.Network network, ProjectScripts scripts);
+
     public Script CreateControlBlock(ProjectScripts scripts, Expression<Func<ProjectScripts, Script>> func);
 
     (Script controlBlock, Script execute, Script[] secrets) CreateControlSeederSecrets(ProjectScripts scripts, int threshold,

diff --git a/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs b/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs
@@ -11,6 +11,15 @@ namespace Angor.Shared.ProtocolNew.Scripts;
 
 public class TaprootScriptBuilder : ITaprootScriptBuilder
 {
+    public Script CreateStage(Blockcore.Networks.Network network, ProjectScripts scripts)
+    {
+        var treeInfo = BuildTaprootSpendInfo(scripts);
+
+        var address = treeInfo.OutputPubKey.GetAddress(NetworkMapper.Map(network));
+
+        return new Script(address.ScriptPubKey.ToBytes());
+    }
+
     public Script CreateControlBlock(ProjectScripts scripts, Expression<Func<ProjectScripts,Script>> scriptSelector)
     {
         var treeInfo = BuildTaprootSpendInfo(scripts);

diff --git a/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs b/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs
@@ -13,13 +13,15 @@ public class InvestmentTransactionBuilder : IInvestmentTransactionBuilder
     private readonly INetworkConfiguration _networkConfiguration;
     private readonly IProjectScriptsBuilder _projectScriptsBuilder;
     private readonly IInvestmentScriptBuilder _investmentScriptBuilder;
+    private readonly ITaprootScriptBuilder _taprootScriptBuilder;
 
     public InvestmentTransactionBuilder(INetworkConfiguration networkConfiguration, IProjectScriptsBuilder projectScriptsBuilder, 
-        IInvestmentScriptBuilder investmentScriptBuilder)
+        IInvestmentScriptBuilder investmentScriptBuilder, ITaprootScriptBuilder taprootScriptBuilder)
     {
         _networkConfiguration = networkConfiguration;
         _projectScriptsBuilder = projectScriptsBuilder;
         _investmentScriptBuilder = investmentScriptBuilder;
+        _taprootScriptBuilder = taprootScriptBuilder;
     }
 
     public Transaction BuildInvestmentTransaction(ProjectInfo projectInfo, Script opReturnScript, 
@@ -37,7 +39,7 @@ public Transaction BuildInvestmentTransaction(ProjectInfo projectInfo, Script op
         var investorInfoOutput = new TxOut(new Money(0), opReturnScript);
         investmentTransaction.AddOutput(investorInfoOutput);
 
-        var stagesScripts = projectScripts.Select(_ => AngorScripts.CreateStage(network, _)); //TODO replace angor scripts
+        var stagesScripts = projectScripts.Select(_ => _taprootScriptBuilder.CreateStage(network, _));
 
         var stagesOutputs = stagesScripts.Select((_, i) =>
             new TxOut(new Money(Convert.ToInt64(totalInvestmentAmount * (projectInfo.Stages[i].AmountToRelease / 100))),