Merge latest PRs into 1.4.0.7

src/FederationSetup/FederationSetup.csproj

@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <Version>1.5.0.0</Version>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>1.4.0.7</Version>
     <Authors>Stratis Group Ltd.</Authors>    
   </PropertyGroup>
 

src/FodyNlogAdapter/FodyNlogAdapter.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>FodyNlogAdapter</AssemblyName>
-    <Version>1.4.0.7</Version>
+    <Version>1.5.0.0</Version>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <Authors>Stratis Group Ltd.</Authors>
     <PackageId>Stratis.Utils.FodyNlogAdapter</PackageId>

src/NBitcoin.Tests/ChainTests.cs

@@ -31,7 +31,7 @@ public void CanSaveChain()
             ChainedHeader fork = this.AppendBlock(chain);
             this.AppendBlock(chain);
 
-            var chain2 = new ChainIndexer(this.network).Load(chain.ToBytes());
+            ChainIndexer chain2 = new ChainIndexer(this.network).Load(chain.ToBytes());
             Assert.True(chain.Tip.HashBlock == chain2.Tip.HashBlock);
         }
 
@@ -149,7 +149,7 @@ public void CanBuildChain()
         [Trait("UnitTest", "UnitTest")]
         public void CanCalculateDifficulty()
         {
-            var main = new ChainIndexer(this.network).Load(this.LoadMainChain());
+            ChainIndexer main = new ChainIndexer(this.network).Load(this.LoadMainChain());
             // The state of the line separators may be affected by copy operations - so do an environment independent line split...
             string[] histories = File.ReadAllText(TestDataLocations.GetFileFromDataFolder("targethistory.csv")).Split(new string[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries);
 
@@ -161,7 +161,7 @@ public void CanCalculateDifficulty()
                 BlockHeader block = main.GetHeader(height).Header;
 
                 Assert.Equal(expectedTarget, block.Bits);
-                Target target = main.GetHeader(height).GetWorkRequired(network);
+                Target target = main.GetHeader(height).GetWorkRequired(this.network);
                 Assert.Equal(expectedTarget, target);
             }
         }
@@ -170,7 +170,7 @@ public void CanCalculateDifficulty()
         [Trait("UnitTest", "UnitTest")]
         public void CanValidateChain()
         {
-            var main = new ChainIndexer(this.network).Load(this.LoadMainChain());
+            ChainIndexer main = new ChainIndexer(this.network).Load(this.LoadMainChain());
             foreach (ChainedHeader h in main.EnumerateToTip(main.Genesis))
             {
                 Assert.True(h.Validate(this.network));
@@ -340,7 +340,7 @@ private ChainIndexer CreateChain(BlockHeader genesis, int height)
         {
             var chain = new ChainIndexer(this.network);
 
-            var chainedHeaderPrev = chain.Tip;
+            ChainedHeader chainedHeaderPrev = chain.Tip;
 
             for (int i = 0; i < height; i++)
             {

src/NBitcoin.Tests/NetworkTests.cs

@@ -79,7 +79,7 @@ public void ReadMagicByteWithFirstByteDuplicated()
         [Trait("UnitTest", "UnitTest")]
         public void BitcoinMainnetIsInitializedCorrectly()
         {
-            Assert.Equal(17, this.networkMain.Checkpoints.Count);
+            Assert.Equal(18, this.networkMain.Checkpoints.Count);
             Assert.Equal(6, this.networkMain.DNSSeeds.Count);
             Assert.Equal(512, this.networkMain.SeedNodes.Count);
 
@@ -143,7 +143,7 @@ public void BitcoinMainnetIsInitializedCorrectly()
             Assert.Equal(Utils.UnixTimeToDateTime(1510704000), this.networkMain.Consensus.BIP9Deployments[BitcoinBIP9Deployments.Segwit].Timeout);
             Assert.Equal(0, this.networkMain.Consensus.CoinType);
             Assert.False(this.networkMain.Consensus.IsProofOfStake);
-            Assert.Equal(new uint256("0x0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee"), this.networkMain.Consensus.DefaultAssumeValid);
+            Assert.Equal(new uint256("0x00000000000000000003e1d91b245eb32787afb10afe49b61621375361221c38"), this.networkMain.Consensus.DefaultAssumeValid);
             Assert.Equal(100, this.networkMain.Consensus.CoinbaseMaturity);
             Assert.Equal(0, this.networkMain.Consensus.PremineReward);
             Assert.Equal(0, this.networkMain.Consensus.PremineHeight);
@@ -163,7 +163,7 @@ public void BitcoinTestnetIsInitializedCorrectly()
         {
             Network network = KnownNetworks.TestNet;
 
-            Assert.Equal(13, network.Checkpoints.Count);
+            Assert.Equal(14, network.Checkpoints.Count);
             Assert.Equal(3, network.DNSSeeds.Count);
             Assert.Empty(network.SeedNodes);
 
@@ -224,7 +224,7 @@ public void BitcoinTestnetIsInitializedCorrectly()
             Assert.Equal(Utils.UnixTimeToDateTime(1493596800), network.Consensus.BIP9Deployments[BitcoinBIP9Deployments.Segwit].Timeout);
             Assert.Equal(1, network.Consensus.CoinType);
             Assert.False(network.Consensus.IsProofOfStake);
-            Assert.Equal(new uint256("0x0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75"), network.Consensus.DefaultAssumeValid);
+            Assert.Equal(new uint256("000000000000075566fba6ca27a2e4c8b33c7763f8a5f917b231b0d88c743af8"), network.Consensus.DefaultAssumeValid);
             Assert.Equal(100, network.Consensus.CoinbaseMaturity);
             Assert.Equal(0, network.Consensus.PremineReward);
             Assert.Equal(0, network.Consensus.PremineHeight);

src/NBitcoin/ConsensusOptions.cs

@@ -4,7 +4,6 @@ namespace NBitcoin
 {
     /// <summary>
     /// An extension to <see cref="Consensus"/> to enable additional options to the consensus data.
-    /// TODO: Make immutable.
     /// </summary>
     public class ConsensusOptions
     {
@@ -14,16 +13,16 @@ public class ConsensusOptions
         public const int SerializeTransactionNoWitness = 0x40000000;
 
         /// <summary>Maximum size for a block in bytes.</summary>
-        public uint MaxBlockBaseSize { get; set; }
+        public uint MaxBlockBaseSize { get; protected set; }
 
         /// <summary>The maximum allowed weight for a block, see BIP 141 (network rule)</summary>
-        public uint MaxBlockWeight { get; set; }
+        public uint MaxBlockWeight { get; protected set; }
 
         /// <summary>The maximum allowed size for a serialized block, in bytes (only for buffer size limits). </summary>
-        public uint MaxBlockSerializedSize { get; set; }
+        public uint MaxBlockSerializedSize { get; protected set; }
 
         /// <summary>Scale of witness vs other transaction data. e.g. if set to 4, then witnesses have 1/4 the weight per byte of other transaction data. </summary>
-        public int WitnessScaleFactor { get; set; }
+        public int WitnessScaleFactor { get; protected set; }
 
         /// <summary>
         /// Changing the default transaction version requires a two step process:
@@ -33,16 +32,16 @@ public class ConsensusOptions
         /// <see cref="MaxStandardVersion"/> will be equal.</item>
         /// </list>
         /// </summary>
-        public int MaxStandardVersion { get; set; }
+        public int MaxStandardVersion { get; protected set; }
 
         /// <summary>The maximum weight for transactions we're willing to relay/mine.</summary>
-        public int MaxStandardTxWeight { get; set; }
+        public int MaxStandardTxWeight { get; protected set; }
 
         /// <summary>The maximum allowed number of signature check operations in a block (network rule).</summary>
-        public int MaxBlockSigopsCost { get; set; }
+        public int MaxBlockSigopsCost { get; protected set; }
 
         /// <summary>The maximum number of sigops we're willing to relay/mine in a single tx.</summary>
-        public int MaxStandardTxSigopsCost { get; set; }
+        public int MaxStandardTxSigopsCost { get; protected set; }
 
         /// <summary>Block Height at which the node should enforce the use of <see cref="EnforcedMinProtocolVersion"/>.
         /// Can be set to zero to indicate that the minimum supported protocol version will not change depending on the block height.</summary>

src/NBitcoin/PubKey.cs

@@ -174,17 +174,26 @@ public bool Verify(uint256 hash, byte[] sig)
             return Verify(hash, ECDSASignature.FromDER(sig));
         }
 
+        private string hexStr = null;
+
         public string ToHex()
         {
-            return Encoders.Hex.EncodeData(this.vch);
+            this.hexStr ??= Encoders.Hex.EncodeData(this.vch);
+
+            return this.hexStr;
         }
 
         #region IBitcoinSerializable Members
 
         public void ReadWrite(BitcoinStream stream)
         {
             stream.ReadWrite(ref this.vch);
-            if(!stream.Serializing) this._ECKey = new ECKey(this.vch, false);
+
+            if (!stream.Serializing)
+            {
+                this._ECKey = new ECKey(this.vch, false);
+                this.hexStr = null;
+            }
         }
 
         #endregion
@@ -345,18 +354,33 @@ public PubKey Derivate(byte[] cc, uint nChild, out byte[] ccChild)
 
         public override bool Equals(object obj)
         {
-            var item = obj as PubKey;
-            if(item == null)
+            return obj != null && Equals(obj as PubKey);
+        }
+
+        public bool Equals(PubKey other)
+        {
+            if ((object)other == null)
+                return false;
+
+            if (other.vch.Length != this.vch.Length)
                 return false;
-            return ToHex().Equals(item.ToHex());
+
+            for (int i = 0; i < other.vch.Length; i++)
+                if (other.vch[i] != this.vch[i])
+                    return false;
+
+            return true;
         }
+
         public static bool operator ==(PubKey a, PubKey b)
         {
-            if(ReferenceEquals(a, b))
+            if (ReferenceEquals(a, b))
                 return true;
-            if(((object)a == null) || ((object)b == null))
+
+            if (((object)a == null) != ((object)b == null))
                 return false;
-            return a.ToHex() == b.ToHex();
+
+            return a.Equals(b);
         }
 
         public static bool operator !=(PubKey a, PubKey b)
@@ -366,17 +390,19 @@ public override bool Equals(object obj)
 
         public override int GetHashCode()
         {
-            return ToHex().GetHashCode();
+            return (((((this.vch[1] << 8) + this.vch[2]) << 8) + this.vch[3]) << 8) + this.vch[4];
         }
 
         public PubKey UncoverSender(Key ephem, PubKey scan)
         {
             return Uncover(ephem, scan);
         }
+
         public PubKey UncoverReceiver(Key scan, PubKey ephem)
         {
             return Uncover(scan, ephem);
         }
+
         public PubKey Uncover(Key priv, PubKey pub)
         {
             X9ECParameters curve = ECKey.Secp256k1;

src/NBitcoin/Script.cs

@@ -1021,7 +1021,7 @@ public TxDestination GetDestination(Network network)
             ScriptId scriptHashParams = PayToScriptHashTemplate.Instance.ExtractScriptPubKeyParameters(this);
             if (scriptHashParams != null)
                 return scriptHashParams;
-            TxDestination wit = PayToWitTemplate.Instance.ExtractScriptPubKeyParameters(network, this);
+            TxDestination wit = PayToWitTemplate.Instance.ExtractScriptPubKeyParameters(this);
             return wit;
         }
 

src/NBitcoin/ScriptEvaluationContext.cs

@@ -463,7 +463,7 @@ public bool VerifyScript(Script scriptSig, Script scriptPubKey, TransactionCheck
 
             if((this.ScriptVerify & ScriptVerify.Witness) != 0)
             {
-                WitProgramParameters wit = PayToWitTemplate.Instance.ExtractScriptPubKeyParameters2(this.Network, scriptPubKey);
+                WitProgramParameters wit = PayToWitTemplate.Instance.ExtractScriptPubKeyParameters2(scriptPubKey);
                 if(wit != null)
                 {
                     hadWitness = true;
@@ -508,7 +508,7 @@ public bool VerifyScript(Script scriptSig, Script scriptPubKey, TransactionCheck
                 // P2SH witness program
                 if((this.ScriptVerify & ScriptVerify.Witness) != 0)
                 {
-                    WitProgramParameters wit = PayToWitTemplate.Instance.ExtractScriptPubKeyParameters2(this.Network, redeem);
+                    WitProgramParameters wit = PayToWitTemplate.Instance.ExtractScriptPubKeyParameters2(redeem);
                     if(wit != null)
                     {
                         hadWitness = true;

src/NBitcoin/StandardScriptTemplate.cs

@@ -1142,7 +1142,7 @@ public static bool ValidSegwitVersion(byte version)
             return version == 0 || ((byte)OpcodeType.OP_1 <= version && version <= (byte)OpcodeType.OP_16);
         }
 
-        public TxDestination ExtractScriptPubKeyParameters(Network network, Script scriptPubKey)
+        public TxDestination ExtractScriptPubKeyParameters(Script scriptPubKey)
         {
             if(!CheckScriptPubKey(scriptPubKey))
                 return null;
@@ -1158,7 +1158,7 @@ public TxDestination ExtractScriptPubKeyParameters(Network network, Script scrip
             }
             return null;
         }
-        public WitProgramParameters ExtractScriptPubKeyParameters2(Network network, Script scriptPubKey)
+        public WitProgramParameters ExtractScriptPubKeyParameters2(Script scriptPubKey)
         {
             if(!CheckScriptPubKey(scriptPubKey))
                 return null;

src/Stratis.Bitcoin.Cli/Stratis.Bitcoin.Cli.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>1.4.0.7</Version>
+    <Version>1.5.0.0</Version>
     <Authors>Stratis Group Ltd.</Authors>
     <Company>Stratis Group Ltd.</Company>
     <Product />

src/Stratis.Bitcoin.Features.Api/ApiFeature.cs

@@ -7,6 +7,7 @@
 using NBitcoin;
 using Stratis.Bitcoin.Builder;
 using Stratis.Bitcoin.Builder.Feature;
+using Stratis.Bitcoin.Configuration.Settings;
 
 namespace Stratis.Bitcoin.Features.Api
 {
@@ -83,7 +84,7 @@ public override Task InitializeAsync()
         /// <param name="network">The network to extract values from.</param>
         public static void PrintHelp(Network network)
         {
-            ApiSettings.PrintHelp(network);
+            BaseSettings.PrintHelp(typeof(ApiSettings), network);
         }
 
         /// <summary>
@@ -93,7 +94,7 @@ public static void PrintHelp(Network network)
         /// <param name="network">The network to base the defaults off.</param>
         public static void BuildDefaultConfigurationFile(StringBuilder builder, Network network)
         {
-            ApiSettings.BuildDefaultConfigurationFile(builder, network);
+            BaseSettings.BuildDefaultConfigurationFile(typeof(ApiSettings), builder, network);
         }
 
         /// <inheritdoc />