diff --git a/AMS/src/AMS/AMSSetup.cs b/AMS/src/AMS/AMSSetup.cs index 08f8df1..5aa44de 100644 --- a/AMS/src/AMS/AMSSetup.cs +++ b/AMS/src/AMS/AMSSetup.cs @@ -5,8 +5,8 @@ using System.Text; using Blockcore.Consensus.Checkpoints; using Blockcore.P2P; -using NBitcoin; -using NBitcoin.Protocol; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.Protocol; namespace AMS { diff --git a/AMS/src/AMS/Networks/AMSMain.cs b/AMS/src/AMS/Networks/AMSMain.cs index 77dd994..0154500 100644 --- a/AMS/src/AMS/Networks/AMSMain.cs +++ b/AMS/src/AMS/Networks/AMSMain.cs @@ -6,9 +6,9 @@ using Blockcore.Features.MemoryPool.Rules; using AMS.Networks.Policies; using AMS.Networks.Rules; -using NBitcoin; -using NBitcoin.BouncyCastle.Math; -using NBitcoin.DataEncoders; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.BouncyCastle.math; +using Blockcore.NBitcoin.DataEncoders; using Blockcore.Networks; using Blockcore.Consensus.BlockInfo; using Blockcore.Consensus; diff --git a/AMS/src/AMS/Networks/AMSRegTest.cs b/AMS/src/AMS/Networks/AMSRegTest.cs index 7e1434d..20fa91b 100644 --- a/AMS/src/AMS/Networks/AMSRegTest.cs +++ b/AMS/src/AMS/Networks/AMSRegTest.cs @@ -4,9 +4,9 @@ using Blockcore.Consensus; using Blockcore.Consensus.BlockInfo; using Blockcore.Networks; -using NBitcoin; -using NBitcoin.BouncyCastle.Math; -using NBitcoin.DataEncoders; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.BouncyCastle.math; +using Blockcore.NBitcoin.DataEncoders; namespace AMS.Networks { diff --git a/AMS/src/AMS/Networks/AMSTest.cs b/AMS/src/AMS/Networks/AMSTest.cs index f11c86e..ac5332e 100644 --- a/AMS/src/AMS/Networks/AMSTest.cs +++ b/AMS/src/AMS/Networks/AMSTest.cs @@ -4,9 +4,9 @@ using Blockcore.Consensus; using Blockcore.Consensus.BlockInfo; using Blockcore.Networks; -using NBitcoin; -using NBitcoin.BouncyCastle.Math; -using NBitcoin.DataEncoders; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.BouncyCastle.math; +using Blockcore.NBitcoin.DataEncoders; namespace AMS.Networks { diff --git a/AMS/src/AMS/Networks/Deployments/AMSBIP9Deployments.cs b/AMS/src/AMS/Networks/Deployments/AMSBIP9Deployments.cs index 823416d..bb1d31b 100644 --- a/AMS/src/AMS/Networks/Deployments/AMSBIP9Deployments.cs +++ b/AMS/src/AMS/Networks/Deployments/AMSBIP9Deployments.cs @@ -1,7 +1,7 @@ using Blockcore.Base.Deployments; using Blockcore.Consensus.ScriptInfo; using Blockcore.Consensus.TransactionInfo; -using NBitcoin; +using Blockcore.NBitcoin; namespace AMS.Networks.Deployments { diff --git a/AMS/src/AMS/Networks/Networks.cs b/AMS/src/AMS/Networks/Networks.cs index 0b825a8..c3541c8 100644 --- a/AMS/src/AMS/Networks/Networks.cs +++ b/AMS/src/AMS/Networks/Networks.cs @@ -1,5 +1,5 @@ using Blockcore.Networks; -using NBitcoin; +using Blockcore.NBitcoin; namespace AMS.Networks { diff --git a/AMS/src/AMS/Networks/Policies/AMSStandardScriptsRegistry.cs b/AMS/src/AMS/Networks/Policies/AMSStandardScriptsRegistry.cs index ab18c02..564fc09 100644 --- a/AMS/src/AMS/Networks/Policies/AMSStandardScriptsRegistry.cs +++ b/AMS/src/AMS/Networks/Policies/AMSStandardScriptsRegistry.cs @@ -3,8 +3,8 @@ using Blockcore.Consensus.ScriptInfo; using Blockcore.Consensus.TransactionInfo; using Blockcore.Networks; -using NBitcoin; -using NBitcoin.BitcoinCore; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.BitcoinCore; namespace AMS.Networks.Policies { diff --git a/AMS/src/AMS/Networks/Rules/AMSHeaderVersionRule.cs b/AMS/src/AMS/Networks/Rules/AMSHeaderVersionRule.cs index 911a3fb..f62497f 100644 --- a/AMS/src/AMS/Networks/Rules/AMSHeaderVersionRule.cs +++ b/AMS/src/AMS/Networks/Rules/AMSHeaderVersionRule.cs @@ -4,7 +4,7 @@ using Blockcore.Features.Consensus.Rules.CommonRules; using Blockcore.Utilities; using Microsoft.Extensions.Logging; -using NBitcoin; +using Blockcore.NBitcoin; namespace AMS.Networks.Rules { diff --git a/XLR/src/Solaris/Networks/Deployments/SolarisBIP9Deployments.cs b/XLR/src/Solaris/Networks/Deployments/SolarisBIP9Deployments.cs index d1684f0..10e774f 100644 --- a/XLR/src/Solaris/Networks/Deployments/SolarisBIP9Deployments.cs +++ b/XLR/src/Solaris/Networks/Deployments/SolarisBIP9Deployments.cs @@ -1,7 +1,7 @@ using Blockcore.Base.Deployments; using Blockcore.Consensus.ScriptInfo; using Blockcore.Consensus.TransactionInfo; -using NBitcoin; +using Blockcore.NBitcoin; namespace Solaris.Networks.Deployments { diff --git a/XLR/src/Solaris/Networks/Networks.cs b/XLR/src/Solaris/Networks/Networks.cs index 691ea82..b7ea5d6 100644 --- a/XLR/src/Solaris/Networks/Networks.cs +++ b/XLR/src/Solaris/Networks/Networks.cs @@ -1,5 +1,5 @@ using Blockcore.Networks; -using NBitcoin; +using Blockcore.NBitcoin; namespace Solaris.Networks { diff --git a/XLR/src/Solaris/Networks/Policies/SolarisStandardScriptsRegistry.cs b/XLR/src/Solaris/Networks/Policies/SolarisStandardScriptsRegistry.cs index 41f01d5..02d16b0 100644 --- a/XLR/src/Solaris/Networks/Policies/SolarisStandardScriptsRegistry.cs +++ b/XLR/src/Solaris/Networks/Policies/SolarisStandardScriptsRegistry.cs @@ -3,8 +3,8 @@ using Blockcore.Consensus.ScriptInfo; using Blockcore.Consensus.TransactionInfo; using Blockcore.Networks; -using NBitcoin; -using NBitcoin.BitcoinCore; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.BitcoinCore; namespace Solaris.Networks.Policies { diff --git a/XLR/src/Solaris/Networks/Rules/SolarisHeaderVersionRule.cs b/XLR/src/Solaris/Networks/Rules/SolarisHeaderVersionRule.cs index 0258a40..eedfa9e 100644 --- a/XLR/src/Solaris/Networks/Rules/SolarisHeaderVersionRule.cs +++ b/XLR/src/Solaris/Networks/Rules/SolarisHeaderVersionRule.cs @@ -4,7 +4,7 @@ using Blockcore.Features.Consensus.Rules.CommonRules; using Blockcore.Utilities; using Microsoft.Extensions.Logging; -using NBitcoin; +using Blockcore.NBitcoin; namespace Solaris.Networks.Rules { diff --git a/XLR/src/Solaris/Networks/SolarisMain.cs b/XLR/src/Solaris/Networks/SolarisMain.cs index f139064..c95755a 100644 --- a/XLR/src/Solaris/Networks/SolarisMain.cs +++ b/XLR/src/Solaris/Networks/SolarisMain.cs @@ -7,9 +7,9 @@ using Solaris.Networks.Policies; using Solaris.Networks.Deployments; using Solaris.Networks.Rules; -using NBitcoin; -using NBitcoin.BouncyCastle.Math; -using NBitcoin.DataEncoders; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.BouncyCastle.math; +using Blockcore.NBitcoin.DataEncoders; using Blockcore.Consensus.BlockInfo; using Blockcore.Consensus; using Blockcore.Consensus.TransactionInfo; diff --git a/XLR/src/Solaris/Networks/SolarisRegTest.cs b/XLR/src/Solaris/Networks/SolarisRegTest.cs index 310df53..b45db95 100644 --- a/XLR/src/Solaris/Networks/SolarisRegTest.cs +++ b/XLR/src/Solaris/Networks/SolarisRegTest.cs @@ -1,8 +1,8 @@ using System; using Solaris.Networks.Policies; -using NBitcoin; -using NBitcoin.BouncyCastle.Math; -using NBitcoin.DataEncoders; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.BouncyCastle.math; +using Blockcore.NBitcoin.DataEncoders; using Blockcore.Consensus.BlockInfo; using Blockcore.Consensus; using Blockcore.Base.Deployments; @@ -37,7 +37,7 @@ public SolarisRegTest() Genesis = genesisBlock; // Taken from StratisX. - var consensusOptions = new PosConsensusOptions { + var consensusOptions = new PosConsensusOptions { MaxBlockBaseSize = 1_000_000, MaxStandardVersion = 2, MaxStandardTxWeight = 100_000, diff --git a/XLR/src/Solaris/Networks/SolarisTest.cs b/XLR/src/Solaris/Networks/SolarisTest.cs index 65fc5f5..b8352b8 100644 --- a/XLR/src/Solaris/Networks/SolarisTest.cs +++ b/XLR/src/Solaris/Networks/SolarisTest.cs @@ -1,8 +1,8 @@ using System; using Solaris.Networks.Policies; -using NBitcoin; -using NBitcoin.BouncyCastle.Math; -using NBitcoin.DataEncoders; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.BouncyCastle.math; +using Blockcore.NBitcoin.DataEncoders; using Blockcore.Networks; using Blockcore.Consensus.BlockInfo; using Blockcore.Consensus; diff --git a/XLR/src/Solaris/SolarisSetup.cs b/XLR/src/Solaris/SolarisSetup.cs index 7c38a80..c3615e6 100644 --- a/XLR/src/Solaris/SolarisSetup.cs +++ b/XLR/src/Solaris/SolarisSetup.cs @@ -5,8 +5,8 @@ using System.Text; using Blockcore.Consensus.Checkpoints; using Blockcore.P2P; -using NBitcoin; -using NBitcoin.Protocol; +using Blockcore.NBitcoin; +using Blockcore.NBitcoin.Protocol; namespace Solaris {