Skip to content

D
destream-blockchain
Commit 71f875bd authored by khvostenko's avatar khvostenko
Browse files
Options

"stratis" substituted with "destream" in code

parent a2ce77fa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 658 additions and 665 deletions
Sources/DeStream.Bitcoin.Cli/Program.cs
View file @ 71f875bd
......@@ -65,7 +65,7 @@ namespace DeStream.Bitcoin.Cli
builder.AppendLine();
builder.AppendLine("Command line arguments:");
builder.AppendLine();
builder.AppendLine("[network-name] Name of the network - e.g. \"stratis\", \"stratismain\", \"stratistest\", \"bitcoinmain\", \"bitcointest\".");
builder.AppendLine("[network-name] Name of the network - e.g. \"destream\", \"destreammain\", \"destreamtest\", \"bitcoinmain\", \"bitcointest\".");
builder.AppendLine("[options] Options for the CLI (optional) - e.g. -help, -rpcuser, see below.");
builder.AppendLine("[command] Name of RPC method or API <controller>/<method>.");
builder.AppendLine("[arguments] Argument by position (RPC) or Name = Value pairs (API) (optional).");
......@@ -79,8 +79,8 @@ namespace DeStream.Bitcoin.Cli
builder.AppendLine();
builder.AppendLine("Examples:");
builder.AppendLine();
builder.AppendLine("dotnet run stratis Wallet/history WalletName=testwallet - Lists all the historical transactions of the wallet called 'testwallet'.");
builder.AppendLine("dotnet run stratis getinfo -rpcuser=stratistestuser -rpcpassword=stratistestpassword -rpcconnect=127.0.0.3 -rpcport=26174 - Displays general information about the DeStream node on the 127.0.0.3:26174, authenticating with the RPC specified user.");
builder.AppendLine("dotnet run destream Wallet/history WalletName=testwallet - Lists all the historical transactions of the wallet called 'testwallet'.");
builder.AppendLine("dotnet run destream getinfo -rpcuser=destreamtestuser -rpcpassword=destreamtestpassword -rpcconnect=127.0.0.3 -rpcport=26174 - Displays general information about the DeStream node on the 127.0.0.3:26174, authenticating with the RPC specified user.");
builder.AppendLine("dotnet run bitcoin getbalance -rpcuser=btctestuser -rpcpassword=btctestpass - Displays the current balance of the opened wallet on the 127.0.0.1:8332 node, authenticating with the RPC specified user.");
Console.WriteLine(builder);
return;
......@@ -90,7 +90,7 @@ namespace DeStream.Bitcoin.Cli
int defaultRestApiPort = 0;
Network network = null;
if (networkName.Contains("stratis"))
if (networkName.Contains("destream"))
{
defaultRestApiPort = 37221;
network = Network.DeStreamMain;
......
Sources/DeStream.Bitcoin.Cli/Properties/launchSettings.json
View file @ 71f875bd
......@@ -2,11 +2,11 @@
"profiles": {
"DeStream.CLI DeStream REST API": {
"commandName": "Project",
"commandLineArgs": "stratis Wallet/files"
"commandLineArgs": "destream Wallet/files"
},
"DeStream.CLI DeStream RPC": {
"commandName": "Project",
"commandLineArgs": "stratis -rpcuser=stratistestuser -rpcpassword=stratistestpass -rpcport=26174 getinfo"
"commandLineArgs": "destream -rpcuser=destreamtestuser -rpcpassword=destreamtestpass -rpcport=26174 getinfo"
},
"DeStream.CLI Bitcoin RPC": {
"commandName": "Project",
......
Sources/DeStream.Bitcoin.Features.Consensus/Checkpoints.cs
View file @ 71f875bd
......@@ -70,7 +70,7 @@ namespace DeStream.Bitcoin.Features.Consensus
public class Checkpoints : ICheckpoints
{
/// <summary>List of selected checkpoints for STRAT mainnet.</summary>
private static Dictionary<int, CheckpointInfo> stratisMainnetCheckpoints = new Dictionary<int, CheckpointInfo>
private static Dictionary<int, CheckpointInfo> destreamMainnetCheckpoints = new Dictionary<int, CheckpointInfo>
{
{ 0, new CheckpointInfo(new uint256("0x0000066e91e46e5a264d42c89e1204963b2ee6be230b443e9159020539d972af"), new uint256("0x0000000000000000000000000000000000000000000000000000000000000000")) },
{ 2, new CheckpointInfo(new uint256("0xbca5936f638181e74a5f1e9999c95b0ce77da48c2688399e72bcc53a00c61eff"), new uint256("0x7d61c139a471821caa6b7635a4636e90afcfe5e195040aecbc1ad7d24924db1e")) }, // Premine
......@@ -92,7 +92,7 @@ namespace DeStream.Bitcoin.Features.Consensus
};
/// <summary>List of selected checkpoints for STRAT testnet.</summary>
private static Dictionary<int, CheckpointInfo> stratisTestnetCheckpoints = new Dictionary<int, CheckpointInfo>
private static Dictionary<int, CheckpointInfo> destreamTestnetCheckpoints = new Dictionary<int, CheckpointInfo>
{
{ 0, new CheckpointInfo(new uint256("0x00000e246d7b73b88c9ab55f2e5e94d9e22d471def3df5ea448f5576b1d156b9"), new uint256("0x0000000000000000000000000000000000000000000000000000000000000000")) },
{ 2, new CheckpointInfo(new uint256("0x56959b1c8498631fb0ca5fe7bd83319dccdc6ac003dccb3171f39f553ecfa2f2"), new uint256("0x13f4c27ca813aefe2d9018077f8efeb3766796b9144fcc4cd51803bf4376ab02")) },
......@@ -147,7 +147,7 @@ namespace DeStream.Bitcoin.Features.Consensus
/// <summary>
/// Initializes a new instance of the object.
/// </summary>
/// <param name="network">Specification of the network the node runs on - regtest/testnet/mainnet/stratis test/main.</param>
/// <param name="network">Specification of the network the node runs on - regtest/testnet/mainnet/destream test/main.</param>
/// <param name="settings">Consensus settings for node - used to see if checkpoints have been disabled or not.</param>
public Checkpoints(Network network, ConsensusSettings settings)
{
......@@ -158,8 +158,8 @@ namespace DeStream.Bitcoin.Features.Consensus
else if (network.Equals(Network.Main)) this.checkpoints = bitcoinMainnetCheckpoints;
else if (network.Equals(Network.TestNet)) this.checkpoints = bitcoinTestnetCheckpoints;
else if (network.Equals(Network.RegTest)) this.checkpoints = new Dictionary<int, CheckpointInfo>();
else if (network.Equals(Network.DeStreamMain)) this.checkpoints = stratisMainnetCheckpoints;
else if (network.Equals(Network.DeStreamTest)) this.checkpoints = stratisTestnetCheckpoints;
else if (network.Equals(Network.DeStreamMain)) this.checkpoints = destreamMainnetCheckpoints;
else if (network.Equals(Network.DeStreamTest)) this.checkpoints = destreamTestnetCheckpoints;
else this.checkpoints = new Dictionary<int, CheckpointInfo>();
}
......
Sources/DeStream.Bitcoin.Features.Dns.Tests/GivenADnsSeedMasterFile.cs
View file @ 71f875bd
......@@ -33,7 +33,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenLoad_AndStreamContainsIPAddressResourceRecord_AndIsIPv4_ThenEntryIsPopulated()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain domain = new Domain("destream.test.com");
IPAddressResourceRecord testResourceRecord = new IPAddressResourceRecord(domain, IPAddress.Parse("192.168.0.1"));
Question question = new Question(domain, RecordType.A);
......@@ -56,7 +56,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenLoad_AndStreamContainsIPAddressResourceRecord_AndIsIPv6_ThenEntryIsPopulated()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain domain = new Domain("destream.test.com");
IPAddressResourceRecord testResourceRecord = new IPAddressResourceRecord(domain, IPAddress.Parse("2001:db8:85a3:0:0:8a2e:370:7334"));
Question question = new Question(domain, RecordType.AAAA);
......@@ -79,8 +79,8 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenLoad_AndStreamContainsCanonicalNameResourceRecord_ThenEntryIsPopulated()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain cNameDomain = new Domain("www.stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain cNameDomain = new Domain("www.destream.test.com");
CanonicalNameResourceRecord testResourceRecord = new CanonicalNameResourceRecord(domain, cNameDomain);
Question question = new Question(domain, RecordType.CNAME);
......@@ -103,8 +103,8 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenLoad_AndStreamContainsMailExchangeResourceRecord_ThenEntryIsPopulated()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain exchangeDomain = new Domain("mail.stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain exchangeDomain = new Domain("mail.destream.test.com");
int preference = 10;
MailExchangeResourceRecord testResourceRecord = new MailExchangeResourceRecord(domain, preference, exchangeDomain);
......@@ -130,7 +130,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenLoad_AndStreamContainsNameServerResourceRecord_ThenEntryIsPopulated()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain nsDomain = new Domain("ns");
NameServerResourceRecord testResourceRecord = new NameServerResourceRecord(domain, nsDomain);
......@@ -155,8 +155,8 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenLoad_AndStreamContainsPointerResourceRecord_ThenEntryIsPopulated()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain nsDomain = new Domain("pointer.stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain nsDomain = new Domain("pointer.destream.test.com");
PointerResourceRecord testResourceRecord = new PointerResourceRecord(domain, nsDomain);
......@@ -180,7 +180,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenLoad_AndStreamContainsStartOfAuthorityResourceRecord_ThenEntryIsPopulated()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain masterDomain = new Domain("master.test.com");
Domain responsibleDomain = new Domain("responsible.test.com");
long serialNumber = 12121212;
......@@ -228,7 +228,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
// Arrange.
using (MemoryStream stream = new MemoryStream())
{
string domainName = "stratis.test.com";
string domainName = "destream.test.com";
DnsSeedMasterFile masterFile = new DnsSeedMasterFile();
IList<IResourceRecord> testResourceRecords = new List<IResourceRecord>()
......@@ -277,7 +277,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenSave_AndMasterListContainsIPAddressResourceRecord_AndIsIPv4_ThenEntryIsSaved()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain domain = new Domain("destream.test.com");
IPAddressResourceRecord testResourceRecord = new IPAddressResourceRecord(domain, IPAddress.Parse("192.168.0.1"));
DnsSeedMasterFile masterFile = new DnsSeedMasterFile();
......@@ -307,7 +307,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenSave_AndMasterListContainsIPAddressResourceRecord_AndIsIPv6_ThenEntryIsSaved()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain domain = new Domain("destream.test.com");
IPAddressResourceRecord testResourceRecord = new IPAddressResourceRecord(domain, IPAddress.Parse("2001:db8:85a3:0:0:8a2e:370:7334"));
DnsSeedMasterFile masterFile = new DnsSeedMasterFile();
......@@ -337,8 +337,8 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenSave_AndMasterListContainsCanonicalNameResourceRecord_ThenEntryIsSaved()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain cNameDomain = new Domain("www.stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain cNameDomain = new Domain("www.destream.test.com");
CanonicalNameResourceRecord testResourceRecord = new CanonicalNameResourceRecord(domain, cNameDomain);
DnsSeedMasterFile masterFile = new DnsSeedMasterFile();
......@@ -368,8 +368,8 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenSave_AndMasterListContainsMailExchangeResourceRecord_ThenEntryIsSaved()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain exchangeDomain = new Domain("mail.stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain exchangeDomain = new Domain("mail.destream.test.com");
int preference = 10;
MailExchangeResourceRecord testResourceRecord = new MailExchangeResourceRecord(domain, preference, exchangeDomain);
......@@ -400,7 +400,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenSave_AndMasterListContainsNameServerResourceRecord_ThenEntryIsSaved()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain nsDomain = new Domain("ns");
NameServerResourceRecord testResourceRecord = new NameServerResourceRecord(domain, nsDomain);
......@@ -431,8 +431,8 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenSave_AndMasterListContainsPointerResourceRecord_ThenEntryIsSaved()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain nsDomain = new Domain("pointer.stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain nsDomain = new Domain("pointer.destream.test.com");
PointerResourceRecord testResourceRecord = new PointerResourceRecord(domain, nsDomain);
DnsSeedMasterFile masterFile = new DnsSeedMasterFile();
......@@ -462,7 +462,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenSave_AndMasterListContainsStartOfAuthorityResourceRecord_ThenEntryIsSaved()
{
// Arrange
Domain domain = new Domain("stratis.test.com");
Domain domain = new Domain("destream.test.com");
Domain masterDomain = new Domain("master.test.com");
Domain responsibleDomain = new Domain("responsible.test.com");
long serialNumber = 12121212;
......@@ -514,7 +514,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
public void WhenSave_AndMasterListContainsEntries_ThenEntriesAreSaved()
{
// Arrange.
string domainName = "stratis.test.com";
string domainName = "destream.test.com";
IList<IResourceRecord> testResourceRecords = new List<IResourceRecord>()
{
......
Sources/DeStream.Bitcoin.Features.Dns.Tests/GivenAWhitelistManager.cs
View file @ 71f875bd
......@@ -86,7 +86,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
IPeerAddressManager peerAddressManager = new Mock<IPeerAddressManager>().Object;
IDnsServer dnsServer = new Mock<IDnsServer>().Object;
DnsSettings dnsSettings = new Mock<DnsSettings>().Object;
dnsSettings.DnsHostName = "stratis.test.com";
dnsSettings.DnsHostName = "destream.test.com";
Action a = () => { new WhitelistManager(dateTimeProvider, loggerFactory, peerAddressManager, dnsServer, null, dnsSettings); };
......@@ -105,7 +105,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
IDnsServer dnsServer = new Mock<IDnsServer>().Object;
NodeSettings nodeSettings = NodeSettings.Default();
DnsSettings dnsSettings = new Mock<DnsSettings>().Object;
dnsSettings.DnsHostName = "stratis.test.com";
dnsSettings.DnsHostName = "destream.test.com";
Action a = () => { new WhitelistManager(dateTimeProvider, loggerFactory, peerAddressManager, dnsServer, null, dnsSettings); };
......@@ -169,7 +169,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
NodeSettings nodeSettings = NodeSettings.Default();
DnsSettings dnsSettings = new Mock<DnsSettings>().Object;
dnsSettings.DnsPeerBlacklistThresholdInSeconds = inactiveTimePeriod;
dnsSettings.DnsHostName = "stratis.test.com";
dnsSettings.DnsHostName = "destream.test.com";
ConnectionManagerSettings connectionSettings = new ConnectionManagerSettings();
connectionSettings.Load(nodeSettings);
......@@ -273,7 +273,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
NodeSettings nodeSettings = new NodeSettings(network, args:args);
DnsSettings dnsSettings = new Mock<DnsSettings>().Object;
dnsSettings.DnsPeerBlacklistThresholdInSeconds = inactiveTimePeriod;
dnsSettings.DnsHostName = "stratis.test.com";
dnsSettings.DnsHostName = "destream.test.com";
dnsSettings.DnsFullNode = false;
ConnectionManagerSettings connectionSettings = new ConnectionManagerSettings();
connectionSettings.Load(nodeSettings);
......@@ -362,7 +362,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
DnsSettings dnsSettings = new Mock<DnsSettings>().Object;
dnsSettings.DnsFullNode = true;
dnsSettings.DnsPeerBlacklistThresholdInSeconds = inactiveTimePeriod;
dnsSettings.DnsHostName = "stratis.test.com";
dnsSettings.DnsHostName = "destream.test.com";
ConnectionManagerSettings connectionSettings = new ConnectionManagerSettings();
connectionSettings.Load(nodeSettings);
......@@ -454,7 +454,7 @@ namespace DeStream.Bitcoin.Features.Dns.Tests
NodeSettings nodeSettings = NodeSettings.Default();
DnsSettings dnsSettings = new Mock<DnsSettings>().Object;
dnsSettings.DnsPeerBlacklistThresholdInSeconds = inactiveTimePeriod;
dnsSettings.DnsHostName = "stratis.test.com";
dnsSettings.DnsHostName = "destream.test.com";
ConnectionManagerSettings connectionSettings = new ConnectionManagerSettings();
connectionSettings.Load(nodeSettings);
......
Sources/DeStream.Bitcoin.Features.Dns/README.md
View file @ 71f875bd
......@@ -12,7 +12,7 @@ To install and run the DNS Server, you need
### Get the repository and its dependencies
```
git clone https://github.com/stratisproject/DeStreamBitcoinFullNode.git
git clone https://github.com/DeStream-dev/destream-blockchain.git
cd DeStreamBitcoinFullNode
git submodule update --init --recursive
```
......@@ -23,25 +23,25 @@ With this node, you can run the DNS Server in isolation or as a DeStream node wi
1. To run a <b>DeStream</b> node <b>only</b> on <b>MainNet</b>, do
```
cd DeStream.DeStreamDnsD
dotnet run -dnslistenport=5399 -dnshostname=dns.stratisplatform.com -dnsnameserver=ns1.dns.stratisplatform.com -dnsmailbox=admin@stratisplatform.com
dotnet run -dnslistenport=5399 -dnshostname=dns.destreamplatform.com -dnsnameserver=ns1.dns.destreamplatform.com -dnsmailbox=admin@destreamplatform.com
```
2. To run a <b>DeStream</b> node and <b>full node</b> on <b>MainNet</b>, do
```
cd DeStream.DeStreamDnsD
dotnet run -dnsfullnode -dnslistenport=5399 -dnshostname=dns.stratisplatform.com -dnsnameserver=ns1.dns.stratisplatform.com -dnsmailbox=admin@stratisplatform.com
dotnet run -dnsfullnode -dnslistenport=5399 -dnshostname=dns.destreamplatform.com -dnsnameserver=ns1.dns.destreamplatform.com -dnsmailbox=admin@destreamplatform.com
```
3. To run a <b>DeStream</b> node <b>only</b> on <b>TestNet</b>, do
```
cd DeStream.DeStreamDnsD
dotnet run -testnet -dnslistenport=5399 -dnshostname=dns.stratisplatform.com -dnsnameserver=ns1.dns.stratisplatform.com -dnsmailbox=admin@stratisplatform.com
dotnet run -testnet -dnslistenport=5399 -dnshostname=dns.destreamplatform.com -dnsnameserver=ns1.dns.destreamplatform.com -dnsmailbox=admin@destreamplatform.com
```
4. To run a <b>DeStream</b> node and <b>full node</b> on <b>TestNet</b>, do
```
cd DeStream.DeStreamDnsD
dotnet run -testnet -dnsfullnode -dnslistenport=5399 -dnshostname=dns.stratisplatform.com -dnsnameserver=ns1.dns.stratisplatform.com -dnsmailbox=admin@stratisplatform.com
dotnet run -testnet -dnsfullnode -dnslistenport=5399 -dnshostname=dns.destreamplatform.com -dnsnameserver=ns1.dns.destreamplatform.com -dnsmailbox=admin@destreamplatform.com
```
### Command-line arguments
......@@ -60,22 +60,22 @@ Given the following settings for the DeStream DNS Server:
| Argument | Value |
| ------------- | --------------------------------- |
| dnslistenport | 53 |
| dnshostname | stratisdns.stratisplatform.com |
| dnsnameserver | ns.stratisdns.stratisplatform.com |
| dnshostname | destreamdns.destreamplatform.com |
| dnsnameserver | ns.destreamdns.destreamplatform.com |
You should have NS and A record in your ISP DNS records for your DNS host domain:
| Type | Hostname | Data |
| -------- | --------------------------------- | --------------------------------- |
| NS | stratisdns.stratisplatform.com | ns.stratisdns.stratisplatform.com |
| A | ns.stratisdns.stratisplatform.com | 192.168.1.2 |
| NS | destreamdns.destreamplatform.com | ns.destreamdns.destreamplatform.com |
| A | ns.destreamdns.destreamplatform.com | 192.168.1.2 |
To verify the DeStream DNS Server is running with these settings run:
```
dig +qr -p 53 stratisdns.stratisplatform.com
dig +qr -p 53 destreamdns.destreamplatform.com
```
or
```
nslookup stratisdns.stratisplatform.com
nslookup destreamdns.destreamplatform.com
```
Sources/DeStream.Bitcoin.Features.LightWallet/LightWalletFixedFeePolicy.cs
View file @ 71f875bd
......@@ -6,9 +6,8 @@ using DeStream.Bitcoin.Features.Wallet.Interfaces;
namespace DeStream.Bitcoin.Features.LightWallet
{
/// <summary>
/// Light wallet fixed fee policy used for stratis network.
/// Light wallet fixed fee policy used for destream network.
/// </summary>
/// <seealso cref="https://github.com/stratisproject/stratisX/blob/master/src/wallet.cpp#L1437">DeStreamX fee calculation.</seealso>
public class LightWalletFixedFeePolicy : IWalletFeePolicy
{
/// <inheritdoc />
......
Sources/DeStream.Bitcoin.Features.Miner/Interfaces/IPosMinting.cs
View file @ 71f875bd
......@@ -39,7 +39,6 @@ namespace DeStream.Bitcoin.Features.Miner.Interfaces
/// <returns>Staking difficulty.</returns>
/// <remarks>
/// The actual idea behind the calculation is a mystery. It was simply ported from
/// <see cref="https://github.com/stratisproject/stratisX/blob/47851b7337f528f52ec20e86dca7dcead8191cf5/src/rpcblockchain.cpp#L16"/>.
/// </remarks>
double GetDifficulty(ChainedBlock block);
......@@ -68,7 +67,6 @@ namespace DeStream.Bitcoin.Features.Miner.Interfaces
/// presented on the network to generate each block.
/// <para>
/// The method was ported from
/// <see cref="https://github.com/stratisproject/stratisX/blob/47851b7337f528f52ec20e86dca7dcead8191cf5/src/rpcblockchain.cpp#L74"/>.
/// </para>
/// </remarks>
double GetNetworkWeight();
......
Sources/DeStream.Bitcoin.Features.Miner/PosMinting.cs
View file @ 71f875bd
......@@ -181,7 +181,6 @@ namespace DeStream.Bitcoin.Features.Miner
/// <summary><c>true</c> if coinstake transaction splits the coin and generates extra UTXO
/// to prevent halting chain; <c>false</c> to disable coinstake splitting.</summary>
/// <remarks>TODO: It should be configurable option, not constant. <see cref="https://github.com/stratisproject/DeStreamBitcoinFullNode/issues/550"/></remarks>
public const bool CoinstakeSplitEnabled = true;
/// <summary> If <see cref="CoinstakeSplitEnabled"/> is set, the coinstake will be split if
......
Sources/DeStream.Bitcoin.Features.Wallet.Tests/WalletControllerTest.cs
View file @ 71f875bd
......@@ -615,7 +615,7 @@ namespace DeStream.Bitcoin.Features.Wallet.Tests
string walletFileExtension = "wallet.json";
string testWalletFileName = Path.ChangeExtension("myWallet", walletFileExtension);
string testWalletPath = Path.Combine(AppContext.BaseDirectory, "stratisnode", testWalletFileName);
string testWalletPath = Path.Combine(AppContext.BaseDirectory, "destreamnode", testWalletFileName);
string folder = Path.GetDirectoryName(testWalletPath);
string[] files = new string[] { testWalletFileName };
mockWalletWrapper.Setup(w => w.GetWalletsFiles()).Returns((folder, files));
......
Sources/DeStream.Bitcoin.Features.Wallet.Tests/WalletTest.cs
View file @ 71f875bd
......@@ -35,9 +35,9 @@ namespace DeStream.Bitcoin.Features.Wallet.Tests
public void GetAllTransactionsByCoinTypeReturnsTransactionsFromWalletByCoinType()
{
var wallet = new Wallet();
var stratisAccountRoot = CreateAccountRootWithHdAccountHavingAddresses("DeStreamAccount", CoinType.DeStream);
var destreamAccountRoot = CreateAccountRootWithHdAccountHavingAddresses("DeStreamAccount", CoinType.DeStream);
var bitcoinAccountRoot = CreateAccountRootWithHdAccountHavingAddresses("BitcoinAccount", CoinType.Bitcoin);
var stratisAccountRoot2 = CreateAccountRootWithHdAccountHavingAddresses("DeStreamAccount2", CoinType.DeStream);
var destreamAccountRoot2 = CreateAccountRootWithHdAccountHavingAddresses("DeStreamAccount2", CoinType.DeStream);
var transaction1 = CreateTransaction(new uint256(1), new Money(15000), 1);
var transaction2 = CreateTransaction(new uint256(2), new Money(91209), 1);
......@@ -46,16 +46,16 @@ namespace DeStream.Bitcoin.Features.Wallet.Tests
var transaction5 = CreateTransaction(new uint256(5), new Money(52387), 1);
var transaction6 = CreateTransaction(new uint256(6), new Money(879873), 1);
stratisAccountRoot.Accounts.ElementAt(0).InternalAddresses.ElementAt(0).Transactions.Add(transaction1);
stratisAccountRoot.Accounts.ElementAt(0).ExternalAddresses.ElementAt(0).Transactions.Add(transaction2);
destreamAccountRoot.Accounts.ElementAt(0).InternalAddresses.ElementAt(0).Transactions.Add(transaction1);
destreamAccountRoot.Accounts.ElementAt(0).ExternalAddresses.ElementAt(0).Transactions.Add(transaction2);
bitcoinAccountRoot.Accounts.ElementAt(0).InternalAddresses.ElementAt(0).Transactions.Add(transaction3);
bitcoinAccountRoot.Accounts.ElementAt(0).ExternalAddresses.ElementAt(0).Transactions.Add(transaction4);
stratisAccountRoot2.Accounts.ElementAt(0).InternalAddresses.ElementAt(0).Transactions.Add(transaction5);
stratisAccountRoot2.Accounts.ElementAt(0).ExternalAddresses.ElementAt(0).Transactions.Add(transaction6);
destreamAccountRoot2.Accounts.ElementAt(0).InternalAddresses.ElementAt(0).Transactions.Add(transaction5);
destreamAccountRoot2.Accounts.ElementAt(0).ExternalAddresses.ElementAt(0).Transactions.Add(transaction6);
wallet.AccountsRoot.Add(stratisAccountRoot);
wallet.AccountsRoot.Add(destreamAccountRoot);
wallet.AccountsRoot.Add(bitcoinAccountRoot);
wallet.AccountsRoot.Add(stratisAccountRoot2);
wallet.AccountsRoot.Add(destreamAccountRoot2);
var result = wallet.GetAllTransactionsByCoinType(CoinType.DeStream).ToList();
......@@ -99,20 +99,20 @@ namespace DeStream.Bitcoin.Features.Wallet.Tests
public void GetAllPubKeysByCoinTypeReturnsPubkeysFromWalletByCoinType()
{
var wallet = new Wallet();
var stratisAccountRoot = CreateAccountRootWithHdAccountHavingAddresses("DeStreamAccount", CoinType.DeStream);
var destreamAccountRoot = CreateAccountRootWithHdAccountHavingAddresses("DeStreamAccount", CoinType.DeStream);
var bitcoinAccountRoot = CreateAccountRootWithHdAccountHavingAddresses("BitcoinAccount", CoinType.Bitcoin);
var stratisAccountRoot2 = CreateAccountRootWithHdAccountHavingAddresses("DeStreamAccount2", CoinType.DeStream);
wallet.AccountsRoot.Add(stratisAccountRoot);
var destreamAccountRoot2 = CreateAccountRootWithHdAccountHavingAddresses("DeStreamAccount2", CoinType.DeStream);
wallet.AccountsRoot.Add(destreamAccountRoot);
wallet.AccountsRoot.Add(bitcoinAccountRoot);
wallet.AccountsRoot.Add(stratisAccountRoot2);
wallet.AccountsRoot.Add(destreamAccountRoot2);
var result = wallet.GetAllPubKeysByCoinType(CoinType.DeStream).ToList();
Assert.Equal(4, result.Count);
Assert.Equal(stratisAccountRoot.Accounts.ElementAt(0).ExternalAddresses.ElementAt(0).ScriptPubKey, result[0]);
Assert.Equal(stratisAccountRoot2.Accounts.ElementAt(0).ExternalAddresses.ElementAt(0).ScriptPubKey, result[1]);
Assert.Equal(stratisAccountRoot.Accounts.ElementAt(0).InternalAddresses.ElementAt(0).ScriptPubKey, result[2]);
Assert.Equal(stratisAccountRoot2.Accounts.ElementAt(0).InternalAddresses.ElementAt(0).ScriptPubKey, result[3]);
Assert.Equal(destreamAccountRoot.Accounts.ElementAt(0).ExternalAddresses.ElementAt(0).ScriptPubKey, result[0]);
Assert.Equal(destreamAccountRoot2.Accounts.ElementAt(0).ExternalAddresses.ElementAt(0).ScriptPubKey, result[1]);
Assert.Equal(destreamAccountRoot.Accounts.ElementAt(0).InternalAddresses.ElementAt(0).ScriptPubKey, result[2]);
Assert.Equal(destreamAccountRoot2.Accounts.ElementAt(0).InternalAddresses.ElementAt(0).ScriptPubKey, result[3]);
}
[Fact]
......
Sources/DeStream.Bitcoin.Features.Wallet/Helpers/SentTransactionItemModelComparer.cs
View file @ 71f875bd
......@@ -12,7 +12,6 @@ namespace DeStream.Bitcoin.Features.Wallet.Helpers
/// This specific comparer has been made to filter out duplicate payment listings in the case of a transaction with multiple inputs.
/// This causes multiple items inside the wallet data that all have the same amount, transaction/spending id and payment details.
/// However not all fields on this model are equal to each other so we only compare the ones we need.
/// See: https://github.com/stratisproject/Breeze/issues/175
/// </remarks>
public class SentTransactionItemModelComparer : IEqualityComparer<TransactionItemModel>
{
......
Sources/DeStream.Bitcoin.IntegrationTests/APITests.cs
View file @ 71f875bd
......@@ -65,7 +65,7 @@ namespace DeStream.Bitcoin.IntegrationTests
try
{
var fullNode = this.apiTestsFixture.stratisPowNode.FullNode;
var fullNode = this.apiTestsFixture.destreamPowNode.FullNode;
var apiURI = fullNode.NodeService<ApiSettings>().ApiUri;
using (client = new HttpClient())
......@@ -91,7 +91,7 @@ namespace DeStream.Bitcoin.IntegrationTests
{
try
{
var fullNode = this.apiTestsFixture.stratisStakeNode.FullNode;
var fullNode = this.apiTestsFixture.destreamStakeNode.FullNode;
var apiURI = fullNode.NodeService<ApiSettings>().ApiUri;
Assert.NotNull(fullNode.NodeService<IPosMinting>(true));
......@@ -134,7 +134,7 @@ namespace DeStream.Bitcoin.IntegrationTests
{
try
{
var fullNode = this.apiTestsFixture.stratisPowNode.FullNode;
var fullNode = this.apiTestsFixture.destreamPowNode.FullNode;
var apiURI = fullNode.NodeService<ApiSettings>().ApiUri;
using (client = new HttpClient())
......@@ -162,7 +162,7 @@ namespace DeStream.Bitcoin.IntegrationTests
{
try
{
var fullNode = this.apiTestsFixture.stratisPowNode.FullNode;
var fullNode = this.apiTestsFixture.destreamPowNode.FullNode;
var apiURI = fullNode.NodeService<ApiSettings>().ApiUri;
using (client = new HttpClient())
......@@ -186,8 +186,8 @@ namespace DeStream.Bitcoin.IntegrationTests
public class ApiTestsFixture : IDisposable
{
public NodeBuilder builder;
public CoreNode stratisPowNode;
public CoreNode stratisStakeNode;
public CoreNode destreamPowNode;
public CoreNode destreamStakeNode;
private bool initialBlockSignature;
public ApiTestsFixture()
......@@ -197,7 +197,7 @@ namespace DeStream.Bitcoin.IntegrationTests
this.builder = NodeBuilder.Create();
this.stratisPowNode = this.builder.CreateDeStreamPowNode(false, fullNodeBuilder =>
this.destreamPowNode = this.builder.CreateDeStreamPowNode(false, fullNodeBuilder =>
{
fullNodeBuilder
.UsePowConsensus()
......@@ -210,17 +210,17 @@ namespace DeStream.Bitcoin.IntegrationTests
});
// start api on different ports
this.stratisPowNode.ConfigParameters.Add("apiuri", "http://localhost:37221");
this.destreamPowNode.ConfigParameters.Add("apiuri", "http://localhost:37221");
this.builder.StartAll();
// Move a wallet file to the right folder and restart the wallet manager to take it into account.
this.InitializeTestWallet(this.stratisPowNode.FullNode.DataFolder.WalletPath);
var walletManager = this.stratisPowNode.FullNode.NodeService<IWalletManager>() as WalletManager;
this.InitializeTestWallet(this.destreamPowNode.FullNode.DataFolder.WalletPath);
var walletManager = this.destreamPowNode.FullNode.NodeService<IWalletManager>() as WalletManager;
walletManager.Start();
Block.BlockSignature = true;
this.stratisStakeNode = this.builder.CreateDeStreamPosNode(false, fullNodeBuilder =>
this.destreamStakeNode = this.builder.CreateDeStreamPosNode(false, fullNodeBuilder =>
{
fullNodeBuilder
.UsePosConsensus()
......@@ -232,7 +232,7 @@ namespace DeStream.Bitcoin.IntegrationTests
.AddRPC();
});
this.stratisStakeNode.ConfigParameters.Add("apiuri", "http://localhost:37222");
this.destreamStakeNode.ConfigParameters.Add("apiuri", "http://localhost:37222");
this.builder.StartAll();
}
......
Sources/DeStream.Bitcoin.IntegrationTests/BlockStore/ProofOfWorkSpendingSpecification.cs
View file @ 71f875bd
......@@ -8,7 +8,7 @@ namespace DeStream.Bitcoin.IntegrationTests.BlockStore
[Fact]
public void Attempt_to_spend_coin_earned_through_proof_of_work_BEFORE_coin_maturity_will_fail()
{
Given(a_sending_and_receiving_stratis_bitcoin_node_and_wallet);
Given(a_sending_and_receiving_destream_bitcoin_node_and_wallet);
And(a_block_is_mined_creating_spendable_coins);
And(more_blocks_mined_to_just_BEFORE_maturity_of_original_block);
When(spending_the_coins_from_original_block);
......@@ -18,7 +18,7 @@ namespace DeStream.Bitcoin.IntegrationTests.BlockStore
[Fact]
public void Attempt_to_spend_coin_earned_through_proof_of_work_AFTER_maturity_will_succeed()
{
Given(a_sending_and_receiving_stratis_bitcoin_node_and_wallet);
Given(a_sending_and_receiving_destream_bitcoin_node_and_wallet);
And(a_block_is_mined_creating_spendable_coins);
And(more_blocks_mined_to_just_AFTER_maturity_of_original_block);
When(spending_the_coins_from_original_block);
......
Sources/DeStream.Bitcoin.IntegrationTests/BlockStore/ProofOfWorkSpendingSpecification_Steps.cs
View file @ 71f875bd
......@@ -40,7 +40,7 @@ namespace DeStream.Bitcoin.IntegrationTests.BlockStore
this.nodeBuilder.Dispose();
}
private void a_sending_and_receiving_stratis_bitcoin_node_and_wallet()
private void a_sending_and_receiving_destream_bitcoin_node_and_wallet()
{
this.sendingDeStreamBitcoinNode = this.nodeBuilder.CreateDeStreamPowNode();
this.receivingDeStreamBitcoinNode = this.nodeBuilder.CreateDeStreamPowNode();
......
Sources/DeStream.Bitcoin.IntegrationTests/CoinViewTests.cs
View file @ 71f875bd
......@@ -172,38 +172,38 @@ namespace DeStream.Bitcoin.IntegrationTests
{
using (NodeBuilder builder = NodeBuilder.Create())
{
var stratisNode = builder.CreateDeStreamPowNode();
var destreamNode = builder.CreateDeStreamPowNode();
var coreNode1 = builder.CreateNode();
var coreNode2 = builder.CreateNode();
builder.StartAll();
//Core1 discovers 10 blocks, sends to stratis
//Core1 discovers 10 blocks, sends to destream
var tip = coreNode1.FindBlock(10).Last();
stratisNode.CreateRPCClient().AddNode(coreNode1.Endpoint, true);
TestHelper.WaitLoop(() => stratisNode.CreateRPCClient().GetBestBlockHash() == coreNode1.CreateRPCClient().GetBestBlockHash());
stratisNode.CreateRPCClient().RemoveNode(coreNode1.Endpoint);
destreamNode.CreateRPCClient().AddNode(coreNode1.Endpoint, true);
TestHelper.WaitLoop(() => destreamNode.CreateRPCClient().GetBestBlockHash() == coreNode1.CreateRPCClient().GetBestBlockHash());
destreamNode.CreateRPCClient().RemoveNode(coreNode1.Endpoint);
//Core2 discovers 20 blocks, sends to stratis
//Core2 discovers 20 blocks, sends to destream
tip = coreNode2.FindBlock(20).Last();
stratisNode.CreateRPCClient().AddNode(coreNode2.Endpoint, true);
TestHelper.WaitLoop(() => stratisNode.CreateRPCClient().GetBestBlockHash() == coreNode2.CreateRPCClient().GetBestBlockHash());
stratisNode.CreateRPCClient().RemoveNode(coreNode2.Endpoint);
((CachedCoinView)stratisNode.FullNode.CoinView()).FlushAsync().Wait();
destreamNode.CreateRPCClient().AddNode(coreNode2.Endpoint, true);
TestHelper.WaitLoop(() => destreamNode.CreateRPCClient().GetBestBlockHash() == coreNode2.CreateRPCClient().GetBestBlockHash());
destreamNode.CreateRPCClient().RemoveNode(coreNode2.Endpoint);
((CachedCoinView)destreamNode.FullNode.CoinView()).FlushAsync().Wait();
//Core1 discovers 30 blocks, sends to stratis
//Core1 discovers 30 blocks, sends to destream
tip = coreNode1.FindBlock(30).Last();
stratisNode.CreateRPCClient().AddNode(coreNode1.Endpoint, true);
TestHelper.WaitLoop(() => stratisNode.CreateRPCClient().GetBestBlockHash() == coreNode1.CreateRPCClient().GetBestBlockHash());
stratisNode.CreateRPCClient().RemoveNode(coreNode1.Endpoint);
destreamNode.CreateRPCClient().AddNode(coreNode1.Endpoint, true);
TestHelper.WaitLoop(() => destreamNode.CreateRPCClient().GetBestBlockHash() == coreNode1.CreateRPCClient().GetBestBlockHash());
destreamNode.CreateRPCClient().RemoveNode(coreNode1.Endpoint);
//Core2 discovers 50 blocks, sends to stratis
//Core2 discovers 50 blocks, sends to destream
tip = coreNode2.FindBlock(50).Last();
stratisNode.CreateRPCClient().AddNode(coreNode2.Endpoint, true);
TestHelper.WaitLoop(() => stratisNode.CreateRPCClient().GetBestBlockHash() == coreNode2.CreateRPCClient().GetBestBlockHash());
stratisNode.CreateRPCClient().RemoveNode(coreNode2.Endpoint);
((CachedCoinView)stratisNode.FullNode.CoinView()).FlushAsync().Wait();
destreamNode.CreateRPCClient().AddNode(coreNode2.Endpoint, true);
TestHelper.WaitLoop(() => destreamNode.CreateRPCClient().GetBestBlockHash() == coreNode2.CreateRPCClient().GetBestBlockHash());
destreamNode.CreateRPCClient().RemoveNode(coreNode2.Endpoint);
((CachedCoinView)destreamNode.FullNode.CoinView()).FlushAsync().Wait();
TestHelper.WaitLoop(() => stratisNode.CreateRPCClient().GetBestBlockHash() == coreNode2.CreateRPCClient().GetBestBlockHash());
TestHelper.WaitLoop(() => destreamNode.CreateRPCClient().GetBestBlockHash() == coreNode2.CreateRPCClient().GetBestBlockHash());
}
}
......
Sources/DeStream.Bitcoin.IntegrationTests/EnvironmentMockUpHelpers/CoreNode.cs
View file @ 71f875bd
......@@ -73,7 +73,7 @@ namespace DeStream.Bitcoin.IntegrationTests.EnvironmentMockUpHelpers
this.networkPeerFactory = new NetworkPeerFactory(network, DateTimeProvider.Default, loggerFactory, new PayloadProvider().DiscoverPayloads(), new SelfEndpointTracker());
}
/// <summary>Get stratis full node if possible.</summary>
/// <summary>Get destream full node if possible.</summary>
public FullNode FullNode
{
get
......
Sources/DeStream.Bitcoin.IntegrationTests/EnvironmentMockUpHelpers/NodeBuilder.cs
View file @ 71f875bd
......@@ -245,7 +245,7 @@ namespace DeStream.Bitcoin.IntegrationTests.EnvironmentMockUpHelpers
public CoreNode CreateDeStreamPosNode(bool start = false, Action<IFullNodeBuilder> callback = null)
{
string child = this.CreateNewEmptyFolder();
var node = new CoreNode(child, new DeStreamBitcoinPosRunner(callback), this, Network.RegTest, configfile: "stratis.conf");
var node = new CoreNode(child, new DeStreamBitcoinPosRunner(callback), this, Network.RegTest, configfile: "destream.conf");
this.Nodes.Add(node);
if (start)
node.Start();
......
Sources/DeStream.Bitcoin.IntegrationTests/EnvironmentMockUpHelpers/NodeRunners.cs
View file @ 71f875bd
......@@ -71,7 +71,7 @@ namespace DeStream.Bitcoin.IntegrationTests.EnvironmentMockUpHelpers
public void Start(string dataDir)
{
NodeSettings nodeSettings = new NodeSettings(Network.DeStreamRegTest, ProtocolVersion.ALT_PROTOCOL_VERSION, args:new string[] { "-conf=stratis.conf", "-datadir=" + dataDir }, loadConfiguration:false);
NodeSettings nodeSettings = new NodeSettings(Network.DeStreamRegTest, ProtocolVersion.ALT_PROTOCOL_VERSION, args:new string[] { "-conf=destream.conf", "-datadir=" + dataDir }, loadConfiguration:false);
var node = BuildFullNode(nodeSettings, this.callback);
......
Sources/DeStream.Bitcoin.IntegrationTests/SegWitTests.cs
View file @ 71f875bd
......@@ -28,7 +28,7 @@ namespace DeStream.Bitcoin.IntegrationTests
coreNode.ConfigParameters.AddOrReplace("printtoconsole", "0");
coreNode.Start();
CoreNode stratisNode = builder.CreateDeStreamPowNode(true, fullNodeBuilder =>
CoreNode destreamNode = builder.CreateDeStreamPowNode(true, fullNodeBuilder =>
{
fullNodeBuilder
.UsePowConsensus()
......@@ -39,15 +39,14 @@ namespace DeStream.Bitcoin.IntegrationTests
.AddRPC();
});
RPCClient stratisNodeRpc = stratisNode.CreateRPCClient();
RPCClient destreamNodeRpc = destreamNode.CreateRPCClient();
RPCClient coreRpc = coreNode.CreateRPCClient();
coreRpc.AddNode(stratisNode.Endpoint, false);
stratisNodeRpc.AddNode(coreNode.Endpoint, false);
coreRpc.AddNode(destreamNode.Endpoint, false);
destreamNodeRpc.AddNode(coreNode.Endpoint, false);
// core (in version 0.15.1) only mines segwit blocks above a certain height on regtest
// future versions of core will change that behaviour so this test may need to be changed in the future
// see issue for more details https://github.com/stratisproject/DeStreamBitcoinFullNode/issues/1028
BIP9DeploymentsParameters prevSegwitDeployment = Network.RegTest.Consensus.BIP9Deployments[BIP9Deployments.Segwit];
Network.RegTest.Consensus.BIP9Deployments[BIP9Deployments.Segwit] = new BIP9DeploymentsParameters(1, 0, DateTime.Now.AddDays(50).ToUnixTimestamp());
......@@ -56,7 +55,7 @@ namespace DeStream.Bitcoin.IntegrationTests
// generate 450 blocks, block 431 will be segwit activated.
coreRpc.Generate(450);
TestHelper.WaitLoop(() => stratisNode.CreateRPCClient().GetBestBlockHash() == coreNode.CreateRPCClient().GetBestBlockHash());
TestHelper.WaitLoop(() => destreamNode.CreateRPCClient().GetBestBlockHash() == coreNode.CreateRPCClient().GetBestBlockHash());
// segwit activation on Bitcoin regtest.
// - On regtest deployment state changes every 144 block, the threshold for activating a rule is 108 blocks.
......@@ -66,11 +65,11 @@ namespace DeStream.Bitcoin.IntegrationTests
// - LockedIn 287 (as segwit should already be signaled in blocks).
// - Active at block 431.
IConsensusLoop consensusLoop = stratisNode.FullNode.NodeService<IConsensusLoop>();
ThresholdState[] segwitDefinedState = consensusLoop.NodeDeployments.BIP9.GetStates(stratisNode.FullNode.Chain.GetBlock(142));
ThresholdState[] segwitStartedState = consensusLoop.NodeDeployments.BIP9.GetStates(stratisNode.FullNode.Chain.GetBlock(143));
ThresholdState[] segwitLockedInState = consensusLoop.NodeDeployments.BIP9.GetStates(stratisNode.FullNode.Chain.GetBlock(287));
ThresholdState[] segwitActiveState = consensusLoop.NodeDeployments.BIP9.GetStates(stratisNode.FullNode.Chain.GetBlock(431));
IConsensusLoop consensusLoop = destreamNode.FullNode.NodeService<IConsensusLoop>();
ThresholdState[] segwitDefinedState = consensusLoop.NodeDeployments.BIP9.GetStates(destreamNode.FullNode.Chain.GetBlock(142));
ThresholdState[] segwitStartedState = consensusLoop.NodeDeployments.BIP9.GetStates(destreamNode.FullNode.Chain.GetBlock(143));
ThresholdState[] segwitLockedInState = consensusLoop.NodeDeployments.BIP9.GetStates(destreamNode.FullNode.Chain.GetBlock(287));
ThresholdState[] segwitActiveState = consensusLoop.NodeDeployments.BIP9.GetStates(destreamNode.FullNode.Chain.GetBlock(431));
// check that segwit is got activated at block 431
Assert.Equal(ThresholdState.Defined, segwitDefinedState.GetValue((int)BIP9Deployments.Segwit));
......@@ -87,8 +86,8 @@ namespace DeStream.Bitcoin.IntegrationTests
private void TestSegwit_MinedOnDeStreamNode_ActivatedOn_CoreNode()
{
// TODO: mine segwit onh a stratis node on the bitcoin network
// write a tests that mines segwit blocks on the stratis node
// TODO: mine segwit onh a destream node on the bitcoin network
// write a tests that mines segwit blocks on the destream node
// and signals them to a core not, then segwit will get activated on core
}
}
......
Sources/DeStream.Bitcoin/Utilities/NetworkExtensions.cs
View file @ 71f875bd
......@@ -27,7 +27,7 @@ namespace DeStream.Bitcoin.Utilities
/// <returns><c>true</c> if the specified network is bitcoin, <c>false</c> otherwise.</returns>
public static bool IsBitcoin(this Network network)
{
return !network.Name.ToLowerInvariant().Contains("stratis");
return !network.Name.ToLowerInvariant().Contains("destream");
}
}
}
Sources/DeStream.BreezeD/Launchers/launch main.bat
View file @ 71f875bd
cd ..
start cmd /k dotnet run
timeout 21
start cmd /k dotnet run stratis
\ No newline at end of file
start cmd /k dotnet run destream
Sources/DeStream.BreezeD/Launchers/launch test.bat
View file @ 71f875bd
cd ..
start cmd /k dotnet run -testnet -debug=all -loglevel=debug
timeout 21
start cmd /k dotnet run stratis -testnet -debug=all -loglevel=debug
\ No newline at end of file
start cmd /k dotnet run destream -testnet -debug=all -loglevel=debug
Sources/DeStream.BreezeD/Program.cs
View file @ 71f875bd
......@@ -26,7 +26,7 @@ namespace DeStream.BreezeD
{
// Get the API uri.
var isTestNet = args.Contains("-testnet");
var isDeStream = args.Contains("stratis");
var isDeStream = args.Contains("destream");
var isDestreamTest = args.Contains("-destreamtest");
var agent = "Breeze";
......
Sources/DeStream.BreezeD/Properties/launchSettings.json
View file @ 71f875bd
......@@ -10,11 +10,11 @@
},
"DeStream Main": {
"commandName": "Project",
"commandLineArgs": "stratis "
"commandLineArgs": "destream "
},
"DeStream Test": {
"commandName": "Project",
"commandLineArgs": "stratis -testnet -debug=all -loglevel=debug"
"commandLineArgs": "destream -testnet -debug=all -loglevel=debug"
}
}
}
\ No newline at end of file
Sources/DeStream.DeStreamDnsD/Properties/launchSettings.json
View file @ 71f875bd
......@@ -5,11 +5,11 @@
},
"DeStream.DeStreamDnsD Test": {
"commandName": "Project",
"commandLineArgs": "-testnet -dnslistenport=5399 -dnshostname=dns.stratisplatform.com -dnsnameserver=ns1.dns.stratisplatform.com -dnsmailbox=admin@stratisplatform.com"
"commandLineArgs": "-testnet -dnslistenport=5399 -dnshostname=dns.destreamplatform.com -dnsnameserver=ns1.dns.destreamplatform.com -dnsmailbox=admin@destreamplatform.com"
},
"DeStream.DeStreamDnsD FullNode Test": {
"commandName": "Project",
"commandLineArgs": "-testnet -dnsfullnode -dnslistenport=5399 -dnshostname=dns.stratisplatform.com -dnsnameserver=ns1.dns.stratisplatform.com -dnsmailbox=admin@stratisplatform.com"
"commandLineArgs": "-testnet -dnsfullnode -dnslistenport=5399 -dnshostname=dns.destreamplatform.com -dnsnameserver=ns1.dns.destreamplatform.com -dnsmailbox=admin@destreamplatform.com"
}
}
}
\ No newline at end of file
Sources/NBitcoin.Tests/NodeBuilderStratis.cs
View file @ 71f875bd
......@@ -13,7 +13,7 @@ using NBitcoin.RPC;
namespace NBitcoin.Tests
{
// Require a stratis node running with the following stratis.conf file
// Require a destream node running with the following destream.conf file
//server=1
//rpcuser=rpcuser
//rpcpassword = rpcpassword
......@@ -111,8 +111,8 @@ namespace NBitcoin.Tests
public void StartAll()
{
if (!Process.GetProcesses().Any(p => p.ProcessName.Contains("stratis")))
throw new NotSupportedException("stratis node is not running");
if (!Process.GetProcesses().Any(p => p.ProcessName.Contains("destream")))
throw new NotSupportedException("destream node is not running");
//Task.WaitAll(Nodes.Where(n => n.State == CoreNodeState.Stopped).Select(n => n.StartAsync()).ToArray());
}
......
Sources/NBitcoin.Tests/pos_ProtocolTests.cs
View file @ 71f875bd
......@@ -14,7 +14,7 @@ namespace NBitcoin.Tests
/*
* TODO: Consider importing to FN.
public static bool noClient = !Process.GetProcesses().Any(p => p.ProcessName.Contains("stratis"));
public static bool noClient = !Process.GetProcesses().Any(p => p.ProcessName.Contains("destream"));
[Fact]
[Trait("UnitTest", "UnitTest")]
......
Sources/NBitcoin.Tests/pos_RPCClientTests.cs
View file @ 71f875bd
......@@ -15,7 +15,7 @@ namespace NBitcoin.Tests
[Trait("RPCClient", "RPCClient")]
public class pos_RPCClientTests
{
public static bool noClient = !Process.GetProcesses().Any(p => p.ProcessName.Contains("stratis"));
public static bool noClient = !Process.GetProcesses().Any(p => p.ProcessName.Contains("destream"));
private const string TestAccount = "NBitcoin.RPCClientTests";
public pos_RPCClientTests()
......
Sources/NBitcoin.Tests/pos_transaction_tests.cs
View file @ 71f875bd
......@@ -2418,7 +2418,7 @@ namespace NBitcoin.Tests
private void tx_valid()
{
// test is disabled for now
// todo: get test data for the stratis blockchain
// todo: get test data for the destream blockchain
// Read tests from test/data/tx_valid.json
// Format is an array of arrays
......@@ -2539,7 +2539,7 @@ namespace NBitcoin.Tests
private void tx_invalid()
{
// test is disabled for now
// todo: get test data for the stratis blockchain
// todo: get test data for the destream blockchain
// Read tests from test/data/tx_valid.json
// Format is an array of arrays
......
Sources/NBitcoin/Network.cs
View file @ 71f875bd
......@@ -282,7 +282,7 @@ namespace NBitcoin
public string Name { get; private set; }
/// <summary> The name of the root folder containing blockchains operating with the same consensus rules (for now, this will be bitcoin or stratis). </summary>
/// <summary> The name of the root folder containing blockchains operating with the same consensus rules (for now, this will be bitcoin or destream). </summary>
public string RootFolderName { get; private set; }
/// <summary> The default name used for the network configuration file. </summary>
......
Sources/NBitcoin/Networks.cs
View file @ 71f875bd
......@@ -45,10 +45,10 @@ namespace NBitcoin
public const string BitcoinDefaultConfigFilename = "bitcoin.conf";
/// <summary> The name of the root folder containing the different DeStream blockchains (DeStreamMain, DeStreamTest, DeStreamRegTest). </summary>
public const string DeStreamRootFolderName = "stratis";
public const string DeStreamRootFolderName = "destream";
/// <summary> The default name used for the DeStream configuration file. </summary>
public const string DeStreamDefaultConfigFilename = "stratis.conf";
public const string DeStreamDefaultConfigFilename = "destream.conf";
public static Network Main => Network.GetNetwork("Main") ?? InitMain();
......@@ -379,10 +379,10 @@ namespace NBitcoin
.AddDNSSeeds(new[]
{
new DNSSeedData("seednode1.stratisplatform.com", "seednode1.stratisplatform.com"),
new DNSSeedData("seednode2.stratis.cloud", "seednode2.stratis.cloud"),
new DNSSeedData("seednode3.stratisplatform.com", "seednode3.stratisplatform.com"),
new DNSSeedData("seednode4.stratis.cloud", "seednode4.stratis.cloud")
new DNSSeedData("seednode1.destreamplatform.com", "seednode1.destreamplatform.com"),
new DNSSeedData("seednode2.destream.cloud", "seednode2.destream.cloud"),
new DNSSeedData("seednode3.destreamplatform.com", "seednode3.destreamplatform.com"),
new DNSSeedData("seednode4.destream.cloud", "seednode4.destream.cloud")
})
.SetBase58Bytes(Base58Type.PUBKEY_ADDRESS, new byte[] { (63) })
......@@ -471,10 +471,10 @@ namespace NBitcoin
.AddDNSSeeds(new[]
{
new DNSSeedData("testnet1.stratisplatform.com", "testnet1.stratisplatform.com"),
new DNSSeedData("testnet2.stratisplatform.com", "testnet2.stratisplatform.com"),
new DNSSeedData("testnet3.stratisplatform.com", "testnet3.stratisplatform.com"),
new DNSSeedData("testnet4.stratisplatform.com", "testnet4.stratisplatform.com")
new DNSSeedData("testnet1.destreamplatform.com", "testnet1.destreamplatform.com"),
new DNSSeedData("testnet2.destreamplatform.com", "testnet2.destreamplatform.com"),
new DNSSeedData("testnet3.destreamplatform.com", "testnet3.destreamplatform.com"),
new DNSSeedData("testnet4.destreamplatform.com", "testnet4.destreamplatform.com")
});
builder.AddSeeds(new[]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment