diff --git a/src/Blockcore.sln b/src/Blockcore.sln
index bf14e8314..fcce13714 100644
--- a/src/Blockcore.sln
+++ b/src/Blockcore.sln
@@ -61,12 +61,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.ColdStak
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Diagnostic", "Features\Blockcore.Features.Diagnostic\Blockcore.Features.Diagnostic.csproj", "{53209209-7239-4FEB-BE8D-B2DF6145BBDA}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StratisD", "Networks\Stratis\Stratisd\StratisD.csproj", "{B69D6038-8731-4DF3-9D93-3045C77CBDE6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BitcoinD", "Networks\Bitcoin\Bitcoind\BitcoinD.csproj", "{221FF9A3-4BE5-44CB-91C8-885EFE06CB2E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StratisDnsD", "Networks\Stratis\StratisDns\StratisDnsD.csproj", "{E485E0CA-5B6B-4741-89DF-AC3509678923}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Global", "Global", "{0C6FDCCE-6D75-441F-86FA-2AD177196BF8}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
@@ -75,39 +69,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Global", "Global", "{0C6FDC
test.runsettings = test.runsettings
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Bitcoin", "Networks\Bitcoin\Blockcore.Networks.Bitcoin\Blockcore.Networks.Bitcoin.csproj", "{7EE5025D-FA5E-484B-84C0-6B9C08D01CDD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Bitcoin", "Networks\Blockcore.Networks.Bitcoin\Blockcore.Networks.Bitcoin.csproj", "{7EE5025D-FA5E-484B-84C0-6B9C08D01CDD}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Stratis", "Networks\Stratis\Blockcore.Networks.Stratis\Blockcore.Networks.Stratis.csproj", "{285B19FD-B9A9-43CE-88B7-0F234568F2D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Stratis", "Networks\Blockcore.Networks.Stratis\Blockcore.Networks.Stratis.csproj", "{285B19FD-B9A9-43CE-88B7-0F234568F2D0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Networks", "Networks", "{3B56C02B-4468-4268-B797-851562789FCC}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bitcoin", "Bitcoin", "{78DF115B-2471-41C3-8D9C-360720855CF5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stratis", "Stratis", "{0F6F0DC5-EC62-465B-8FC7-F24449CD7359}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bitcoin.Cli", "Networks\Bitcoin\Bitcoin.Cli\Bitcoin.Cli.csproj", "{F163E8AD-41F2-42ED-BF37-BE5DD5F53C03}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bitcoin.Cli", "Networks\Bitcoin.Cli\Bitcoin.Cli.csproj", "{F163E8AD-41F2-42ED-BF37-BE5DD5F53C03}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Benchmark", "External\Blockcore.Benchmark\Blockcore.Benchmark.csproj", "{03BE8A1E-81C4-4022-86C6-2FA8938C6208}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xds", "Xds", "{CA67EA16-00D7-4082-9467-9218D6D3A8C4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Xds", "Networks\Xds\Blockcore.Networks.Xds\Blockcore.Networks.Xds.csproj", "{B563D67F-BB87-4907-82B8-DD0476A7CDE6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XdsD", "Networks\Xds\Xdsd\XdsD.csproj", "{26F7E924-3087-4AC7-A637-423F89297BA2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Xds", "Networks\Blockcore.Networks.Xds\Blockcore.Networks.Xds.csproj", "{B563D67F-BB87-4907-82B8-DD0476A7CDE6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.IntegrationTests.Common", "Tests\Blockcore.IntegrationTests.Common\Blockcore.IntegrationTests.Common.csproj", "{49E82618-F55D-430B-8815-A16CF811CE85}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "City", "City", "{3AD23CD3-51A4-4DFE-9501-55963B54519A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.City", "Networks\City\City\Blockcore.Networks.City.csproj", "{C4D5381C-53D0-419A-A32B-70E38C5A42A4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.City", "Networks\Blockcore.Networks.City\Blockcore.Networks.City.csproj", "{C4D5381C-53D0-419A-A32B-70E38C5A42A4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "City.Node", "Networks\City\City.Node\City.Node.csproj", "{363B09A7-BA71-4BC2-ABCA-B47065C374E5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "x42", "x42", "{88A9A633-DA22-412B-A04C-2A3405D3E2C8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "x42.Networks", "Networks\x42\x42\x42.Networks.csproj", "{36CE71D7-812A-40D7-96B7-8220E8E86643}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "x42.Node", "Networks\x42\x42.Node\x42.Node.csproj", "{8E17F166-F15A-42F7-9407-06CE2A4AA0AF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.x42", "Networks\Blockcore.Networks.x42\Blockcore.Networks.x42.csproj", "{36CE71D7-812A-40D7-96B7-8220E8E86643}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Node", "Node", "{8820C3A5-74B4-45AB-B80C-2495DFBA4A2B}"
EndProject
@@ -121,21 +99,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.WalletWa
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.WalletWatchOnly.Tests", "Tests\Blockcore.Features.WalletWatchOnly.Tests\Blockcore.Features.WalletWatchOnly.Tests.csproj", "{53DA5042-1325-48A0-815A-C586590EC2EB}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rutanio", "Rutanio", "{50759380-AF62-11EA-BC6D-7563ABA8C5CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rutanio.Node", "Networks\Rutanio\Rutanio.Node\Rutanio.Node.csproj", "{EECEF785-EC8C-4037-9BF9-1DACABDE0E3D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rutanio", "Networks\Rutanio\Rutanio\Rutanio.csproj", "{271E03B3-5DD6-4A16-A54A-1E72AF9B4902}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenExo", "Networks\OpenExo\OpenExo\OpenExo.csproj", "{4F3C67B3-D96D-46A6-9BBC-19EB0A1A8712}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenExo", "OpenExo", "{4B0889C8-78BE-41C2-BB7B-7E82B3B83753}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Rutanio", "Networks\Blockcore.Networks.Rutanio\Blockcore.Networks.Rutanio.csproj", "{271E03B3-5DD6-4A16-A54A-1E72AF9B4902}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenExo.Node", "Networks\OpenExo\OpenExo.Node\OpenExo.Node.csproj", "{AAB36899-879B-4098-9060-E69240AB7150}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.OpenExo", "Networks\Blockcore.Networks.OpenExo\Blockcore.Networks.OpenExo.csproj", "{4F3C67B3-D96D-46A6-9BBC-19EB0A1A8712}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Persistence", "Persistence", "{64694A14-97E0-4CBC-8032-754F9353B2DD}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blockcore.Features.BlockStore.Persistence.LevelDb", "Features\Persistence\Blockcore.Features.BlockStore.Persistence.LevelDb\Blockcore.Features.BlockStore.Persistence.LevelDb.csproj", "{AB9A2812-610D-4061-BE71-784AB39FE415}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.BlockStore.Persistence.LevelDb", "Features\Persistence\Blockcore.Features.BlockStore.Persistence.LevelDb\Blockcore.Features.BlockStore.Persistence.LevelDb.csproj", "{AB9A2812-610D-4061-BE71-784AB39FE415}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Consensus.Persistence.LevelDb", "Features\Persistence\Blockcore.Features.Consensus.Persistence.LevelDb\Blockcore.Features.Consensus.Persistence.LevelDb.csproj", "{E4C7723E-F2D1-41A3-A22A-3D5CB3AE6D6C}"
EndProject
@@ -155,9 +125,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.BlockSto
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Consensus.Persistence.RocksDb", "Features\Persistence\Blockcore.Features.Consensus.Persistence.RocksDb\Blockcore.Features.Consensus.Persistence.RocksDb.csproj", "{BC0A50DF-0816-4613-B6B1-D1FEC384DFAE}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blockcore.Features.Persistence.Rocksdb.CorePackage", "Features\Persistence\Blockcore.Features.Persistence.Rocksdb.CorePackage\Blockcore.Features.Persistence.Rocksdb.CorePackage.csproj", "{8098D7F8-8B2F-451C-8DCB-90597B768F96}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Persistence.Rocksdb.CorePackage", "Features\Persistence\Blockcore.Features.Persistence.Rocksdb.CorePackage\Blockcore.Features.Persistence.Rocksdb.CorePackage.csproj", "{8098D7F8-8B2F-451C-8DCB-90597B768F96}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blockcore.Features.Persistence.LevelDb.CorePackage", "Features\Persistence\Blockcore.Features.Persistence.LevelDb.CorePackage\Blockcore.Features.Persistence.LevelDb.CorePackage.csproj", "{4275AF0C-587B-4C9D-A100-0F2DD1702674}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Persistence.LevelDb.CorePackage", "Features\Persistence\Blockcore.Features.Persistence.LevelDb.CorePackage\Blockcore.Features.Persistence.LevelDb.CorePackage.csproj", "{4275AF0C-587B-4C9D-A100-0F2DD1702674}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -269,18 +239,6 @@ Global
{53209209-7239-4FEB-BE8D-B2DF6145BBDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53209209-7239-4FEB-BE8D-B2DF6145BBDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53209209-7239-4FEB-BE8D-B2DF6145BBDA}.Release|Any CPU.Build.0 = Release|Any CPU
- {B69D6038-8731-4DF3-9D93-3045C77CBDE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B69D6038-8731-4DF3-9D93-3045C77CBDE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B69D6038-8731-4DF3-9D93-3045C77CBDE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B69D6038-8731-4DF3-9D93-3045C77CBDE6}.Release|Any CPU.Build.0 = Release|Any CPU
- {221FF9A3-4BE5-44CB-91C8-885EFE06CB2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {221FF9A3-4BE5-44CB-91C8-885EFE06CB2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {221FF9A3-4BE5-44CB-91C8-885EFE06CB2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {221FF9A3-4BE5-44CB-91C8-885EFE06CB2E}.Release|Any CPU.Build.0 = Release|Any CPU
- {E485E0CA-5B6B-4741-89DF-AC3509678923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E485E0CA-5B6B-4741-89DF-AC3509678923}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E485E0CA-5B6B-4741-89DF-AC3509678923}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E485E0CA-5B6B-4741-89DF-AC3509678923}.Release|Any CPU.Build.0 = Release|Any CPU
{7EE5025D-FA5E-484B-84C0-6B9C08D01CDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7EE5025D-FA5E-484B-84C0-6B9C08D01CDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7EE5025D-FA5E-484B-84C0-6B9C08D01CDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -301,10 +259,6 @@ Global
{B563D67F-BB87-4907-82B8-DD0476A7CDE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B563D67F-BB87-4907-82B8-DD0476A7CDE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B563D67F-BB87-4907-82B8-DD0476A7CDE6}.Release|Any CPU.Build.0 = Release|Any CPU
- {26F7E924-3087-4AC7-A637-423F89297BA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {26F7E924-3087-4AC7-A637-423F89297BA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {26F7E924-3087-4AC7-A637-423F89297BA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {26F7E924-3087-4AC7-A637-423F89297BA2}.Release|Any CPU.Build.0 = Release|Any CPU
{49E82618-F55D-430B-8815-A16CF811CE85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{49E82618-F55D-430B-8815-A16CF811CE85}.Debug|Any CPU.Build.0 = Debug|Any CPU
{49E82618-F55D-430B-8815-A16CF811CE85}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -313,18 +267,10 @@ Global
{C4D5381C-53D0-419A-A32B-70E38C5A42A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4D5381C-53D0-419A-A32B-70E38C5A42A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4D5381C-53D0-419A-A32B-70E38C5A42A4}.Release|Any CPU.Build.0 = Release|Any CPU
- {363B09A7-BA71-4BC2-ABCA-B47065C374E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {363B09A7-BA71-4BC2-ABCA-B47065C374E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {363B09A7-BA71-4BC2-ABCA-B47065C374E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {363B09A7-BA71-4BC2-ABCA-B47065C374E5}.Release|Any CPU.Build.0 = Release|Any CPU
{36CE71D7-812A-40D7-96B7-8220E8E86643}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36CE71D7-812A-40D7-96B7-8220E8E86643}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36CE71D7-812A-40D7-96B7-8220E8E86643}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36CE71D7-812A-40D7-96B7-8220E8E86643}.Release|Any CPU.Build.0 = Release|Any CPU
- {8E17F166-F15A-42F7-9407-06CE2A4AA0AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8E17F166-F15A-42F7-9407-06CE2A4AA0AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8E17F166-F15A-42F7-9407-06CE2A4AA0AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8E17F166-F15A-42F7-9407-06CE2A4AA0AF}.Release|Any CPU.Build.0 = Release|Any CPU
{D0A183FE-C913-4F8F-92EC-BD4502745140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0A183FE-C913-4F8F-92EC-BD4502745140}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0A183FE-C913-4F8F-92EC-BD4502745140}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -345,10 +291,6 @@ Global
{53DA5042-1325-48A0-815A-C586590EC2EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53DA5042-1325-48A0-815A-C586590EC2EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53DA5042-1325-48A0-815A-C586590EC2EB}.Release|Any CPU.Build.0 = Release|Any CPU
- {EECEF785-EC8C-4037-9BF9-1DACABDE0E3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EECEF785-EC8C-4037-9BF9-1DACABDE0E3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EECEF785-EC8C-4037-9BF9-1DACABDE0E3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EECEF785-EC8C-4037-9BF9-1DACABDE0E3D}.Release|Any CPU.Build.0 = Release|Any CPU
{271E03B3-5DD6-4A16-A54A-1E72AF9B4902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{271E03B3-5DD6-4A16-A54A-1E72AF9B4902}.Debug|Any CPU.Build.0 = Debug|Any CPU
{271E03B3-5DD6-4A16-A54A-1E72AF9B4902}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -357,10 +299,6 @@ Global
{4F3C67B3-D96D-46A6-9BBC-19EB0A1A8712}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F3C67B3-D96D-46A6-9BBC-19EB0A1A8712}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F3C67B3-D96D-46A6-9BBC-19EB0A1A8712}.Release|Any CPU.Build.0 = Release|Any CPU
- {AAB36899-879B-4098-9060-E69240AB7150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AAB36899-879B-4098-9060-E69240AB7150}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AAB36899-879B-4098-9060-E69240AB7150}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AAB36899-879B-4098-9060-E69240AB7150}.Release|Any CPU.Build.0 = Release|Any CPU
{AB9A2812-610D-4061-BE71-784AB39FE415}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB9A2812-610D-4061-BE71-784AB39FE415}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB9A2812-610D-4061-BE71-784AB39FE415}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -431,36 +369,21 @@ Global
{072C5F7C-4B75-46C9-A54D-774DA77ED1D1} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
{0FE19EFE-98D7-4243-A8CC-30BCFFFC4499} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
{53209209-7239-4FEB-BE8D-B2DF6145BBDA} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
- {B69D6038-8731-4DF3-9D93-3045C77CBDE6} = {0F6F0DC5-EC62-465B-8FC7-F24449CD7359}
- {221FF9A3-4BE5-44CB-91C8-885EFE06CB2E} = {78DF115B-2471-41C3-8D9C-360720855CF5}
- {E485E0CA-5B6B-4741-89DF-AC3509678923} = {0F6F0DC5-EC62-465B-8FC7-F24449CD7359}
- {7EE5025D-FA5E-484B-84C0-6B9C08D01CDD} = {78DF115B-2471-41C3-8D9C-360720855CF5}
- {285B19FD-B9A9-43CE-88B7-0F234568F2D0} = {0F6F0DC5-EC62-465B-8FC7-F24449CD7359}
- {78DF115B-2471-41C3-8D9C-360720855CF5} = {3B56C02B-4468-4268-B797-851562789FCC}
- {0F6F0DC5-EC62-465B-8FC7-F24449CD7359} = {3B56C02B-4468-4268-B797-851562789FCC}
- {F163E8AD-41F2-42ED-BF37-BE5DD5F53C03} = {78DF115B-2471-41C3-8D9C-360720855CF5}
+ {7EE5025D-FA5E-484B-84C0-6B9C08D01CDD} = {3B56C02B-4468-4268-B797-851562789FCC}
+ {285B19FD-B9A9-43CE-88B7-0F234568F2D0} = {3B56C02B-4468-4268-B797-851562789FCC}
+ {F163E8AD-41F2-42ED-BF37-BE5DD5F53C03} = {3B56C02B-4468-4268-B797-851562789FCC}
{03BE8A1E-81C4-4022-86C6-2FA8938C6208} = {1B9A916F-DDAC-4675-B424-EDEDC1A58231}
- {CA67EA16-00D7-4082-9467-9218D6D3A8C4} = {3B56C02B-4468-4268-B797-851562789FCC}
- {B563D67F-BB87-4907-82B8-DD0476A7CDE6} = {CA67EA16-00D7-4082-9467-9218D6D3A8C4}
- {26F7E924-3087-4AC7-A637-423F89297BA2} = {CA67EA16-00D7-4082-9467-9218D6D3A8C4}
+ {B563D67F-BB87-4907-82B8-DD0476A7CDE6} = {3B56C02B-4468-4268-B797-851562789FCC}
{49E82618-F55D-430B-8815-A16CF811CE85} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
- {3AD23CD3-51A4-4DFE-9501-55963B54519A} = {3B56C02B-4468-4268-B797-851562789FCC}
- {C4D5381C-53D0-419A-A32B-70E38C5A42A4} = {3AD23CD3-51A4-4DFE-9501-55963B54519A}
- {363B09A7-BA71-4BC2-ABCA-B47065C374E5} = {3AD23CD3-51A4-4DFE-9501-55963B54519A}
- {88A9A633-DA22-412B-A04C-2A3405D3E2C8} = {3B56C02B-4468-4268-B797-851562789FCC}
- {36CE71D7-812A-40D7-96B7-8220E8E86643} = {88A9A633-DA22-412B-A04C-2A3405D3E2C8}
- {8E17F166-F15A-42F7-9407-06CE2A4AA0AF} = {88A9A633-DA22-412B-A04C-2A3405D3E2C8}
+ {C4D5381C-53D0-419A-A32B-70E38C5A42A4} = {3B56C02B-4468-4268-B797-851562789FCC}
+ {36CE71D7-812A-40D7-96B7-8220E8E86643} = {3B56C02B-4468-4268-B797-851562789FCC}
{D0A183FE-C913-4F8F-92EC-BD4502745140} = {8820C3A5-74B4-45AB-B80C-2495DFBA4A2B}
{B3D4208F-797A-4893-BC33-BAB77508DFEE} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
{EADB5247-F704-4B87-8B0E-606730B8517A} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
{F64554A3-EC9A-4DBF-9AD6-25C78176C74E} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
{53DA5042-1325-48A0-815A-C586590EC2EB} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
- {50759380-AF62-11EA-BC6D-7563ABA8C5CA} = {3B56C02B-4468-4268-B797-851562789FCC}
- {EECEF785-EC8C-4037-9BF9-1DACABDE0E3D} = {50759380-AF62-11EA-BC6D-7563ABA8C5CA}
- {271E03B3-5DD6-4A16-A54A-1E72AF9B4902} = {50759380-AF62-11EA-BC6D-7563ABA8C5CA}
- {4F3C67B3-D96D-46A6-9BBC-19EB0A1A8712} = {4B0889C8-78BE-41C2-BB7B-7E82B3B83753}
- {4B0889C8-78BE-41C2-BB7B-7E82B3B83753} = {3B56C02B-4468-4268-B797-851562789FCC}
- {AAB36899-879B-4098-9060-E69240AB7150} = {4B0889C8-78BE-41C2-BB7B-7E82B3B83753}
+ {271E03B3-5DD6-4A16-A54A-1E72AF9B4902} = {3B56C02B-4468-4268-B797-851562789FCC}
+ {4F3C67B3-D96D-46A6-9BBC-19EB0A1A8712} = {3B56C02B-4468-4268-B797-851562789FCC}
{64694A14-97E0-4CBC-8032-754F9353B2DD} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
{AB9A2812-610D-4061-BE71-784AB39FE415} = {640B1C2A-2346-40E6-9755-87B7EB2B3428}
{E4C7723E-F2D1-41A3-A22A-3D5CB3AE6D6C} = {640B1C2A-2346-40E6-9755-87B7EB2B3428}
diff --git a/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj b/src/Networks/Bitcoin.Cli/Bitcoin.Cli.csproj
similarity index 57%
rename from src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj
rename to src/Networks/Bitcoin.Cli/Bitcoin.Cli.csproj
index 1f7ae08fb..e50c4657a 100644
--- a/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj
+++ b/src/Networks/Bitcoin.Cli/Bitcoin.Cli.csproj
@@ -11,8 +11,8 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/Networks/Bitcoin/Bitcoin.Cli/Program.cs b/src/Networks/Bitcoin.Cli/Program.cs
similarity index 100%
rename from src/Networks/Bitcoin/Bitcoin.Cli/Program.cs
rename to src/Networks/Bitcoin.Cli/Program.cs
diff --git a/src/Networks/Bitcoin/Bitcoin.Cli/Properties/launchSettings.json b/src/Networks/Bitcoin.Cli/Properties/launchSettings.json
similarity index 100%
rename from src/Networks/Bitcoin/Bitcoin.Cli/Properties/launchSettings.json
rename to src/Networks/Bitcoin.Cli/Properties/launchSettings.json
diff --git a/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj b/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj
deleted file mode 100644
index 1b50ed59a..000000000
--- a/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- blockcore.bitcoind
- Exe
- BitcoinD
-
-
-
-
- 1701;1702;1705;IDE0008;
-
-
-
- latest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Networks/Bitcoin/Bitcoind/Program.cs b/src/Networks/Bitcoin/Bitcoind/Program.cs
deleted file mode 100644
index 5d9eade9d..000000000
--- a/src/Networks/Bitcoin/Bitcoind/Program.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Blockcore;
-using Blockcore.Builder;
-using Blockcore.Configuration;
-using Blockcore.Features.NodeHost;
-using Blockcore.Features.BlockStore;
-using Blockcore.Features.Consensus;
-using Blockcore.Features.MemoryPool;
-using Blockcore.Features.Miner;
-using Blockcore.Features.RPC;
-using Blockcore.Features.Wallet;
-using Blockcore.Networks;
-using Blockcore.Networks.Bitcoin;
-using Blockcore.Utilities;
-using Blockcore.Utilities.Store;
-
-namespace BitcoinD
-{
- public class Program
- {
-#pragma warning disable IDE1006 // Naming Styles
-
- public static async Task Main(string[] args)
-#pragma warning restore IDE1006 // Naming Styles
- {
- try
- {
- var nodeSettings = new NodeSettings(networksSelector: Networks.Bitcoin, args: args);
-
- IFullNode node = new FullNodeBuilder()
- .UseNodeSettings(nodeSettings)
- .UseBlockStore()
- .UsePowConsensus()
- .UseMempool()
- .AddMining()
- .AddRPC()
- .UseWallet()
- .UseNodeHost()
- .Build();
-
- if (node != null)
- await node.RunAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine("There was a problem initializing the node. Details: '{0}'", ex.ToString());
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Bitcoin/Bitcoind/Properties/launchSettings.json b/src/Networks/Bitcoin/Bitcoind/Properties/launchSettings.json
deleted file mode 100644
index 986cb1ddf..000000000
--- a/src/Networks/Bitcoin/Bitcoind/Properties/launchSettings.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "profiles": {
- "BitcoinD": {
- "commandName": "Project",
- "commandLineArgs": ""
- },
- "BitcoinD Low memory": {
- "commandName": "Project",
- "commandLineArgs": "-maxblkmem=5 -dbcache=50"
- },
- "BitcoinD Test": {
- "commandName": "Project",
- "commandLineArgs": "-testnet"
- },
- "BitcoinD Test with RPC": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -server -rpcpassword=rpcpassword -rpcuser=rpcuser"
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinMain.cs b/src/Networks/Blockcore.Networks.Bitcoin/BitcoinMain.cs
similarity index 100%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinMain.cs
rename to src/Networks/Blockcore.Networks.Bitcoin/BitcoinMain.cs
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinRegTest.cs b/src/Networks/Blockcore.Networks.Bitcoin/BitcoinRegTest.cs
similarity index 100%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinRegTest.cs
rename to src/Networks/Blockcore.Networks.Bitcoin/BitcoinRegTest.cs
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinTest.cs b/src/Networks/Blockcore.Networks.Bitcoin/BitcoinTest.cs
similarity index 100%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinTest.cs
rename to src/Networks/Blockcore.Networks.Bitcoin/BitcoinTest.cs
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Blockcore.Networks.Bitcoin.csproj b/src/Networks/Blockcore.Networks.Bitcoin/Blockcore.Networks.Bitcoin.csproj
similarity index 68%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Blockcore.Networks.Bitcoin.csproj
rename to src/Networks/Blockcore.Networks.Bitcoin/Blockcore.Networks.Bitcoin.csproj
index 461c9836b..e75809bc6 100644
--- a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Blockcore.Networks.Bitcoin.csproj
+++ b/src/Networks/Blockcore.Networks.Bitcoin/Blockcore.Networks.Bitcoin.csproj
@@ -14,7 +14,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Deployments/BitcoinBIP9Deployments.cs b/src/Networks/Blockcore.Networks.Bitcoin/Deployments/BitcoinBIP9Deployments.cs
similarity index 100%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Deployments/BitcoinBIP9Deployments.cs
rename to src/Networks/Blockcore.Networks.Bitcoin/Deployments/BitcoinBIP9Deployments.cs
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Networks.cs b/src/Networks/Blockcore.Networks.Bitcoin/Networks.cs
similarity index 100%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Networks.cs
rename to src/Networks/Blockcore.Networks.Bitcoin/Networks.cs
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Policies/BitcoinStandardScriptsRegistry.cs b/src/Networks/Blockcore.Networks.Bitcoin/Policies/BitcoinStandardScriptsRegistry.cs
similarity index 100%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Policies/BitcoinStandardScriptsRegistry.cs
rename to src/Networks/Blockcore.Networks.Bitcoin/Policies/BitcoinStandardScriptsRegistry.cs
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Rules/BitcoinActivationRule.cs b/src/Networks/Blockcore.Networks.Bitcoin/Rules/BitcoinActivationRule.cs
similarity index 100%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Rules/BitcoinActivationRule.cs
rename to src/Networks/Blockcore.Networks.Bitcoin/Rules/BitcoinActivationRule.cs
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Rules/BitcoinHeaderVersionRule.cs b/src/Networks/Blockcore.Networks.Bitcoin/Rules/BitcoinHeaderVersionRule.cs
similarity index 100%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/Rules/BitcoinHeaderVersionRule.cs
rename to src/Networks/Blockcore.Networks.Bitcoin/Rules/BitcoinHeaderVersionRule.cs
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/icon.png b/src/Networks/Blockcore.Networks.Bitcoin/icon.png
similarity index 100%
rename from src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/icon.png
rename to src/Networks/Blockcore.Networks.Bitcoin/icon.png
diff --git a/src/Networks/City/City/Blockcore.Networks.City.csproj b/src/Networks/Blockcore.Networks.City/Blockcore.Networks.City.csproj
similarity index 70%
rename from src/Networks/City/City/Blockcore.Networks.City.csproj
rename to src/Networks/Blockcore.Networks.City/Blockcore.Networks.City.csproj
index 6ecba37c2..889dd6425 100644
--- a/src/Networks/City/City/Blockcore.Networks.City.csproj
+++ b/src/Networks/Blockcore.Networks.City/Blockcore.Networks.City.csproj
@@ -18,7 +18,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Networks/City/City/CitySetup.cs b/src/Networks/Blockcore.Networks.City/CitySetup.cs
similarity index 100%
rename from src/Networks/City/City/CitySetup.cs
rename to src/Networks/Blockcore.Networks.City/CitySetup.cs
diff --git a/src/Networks/City/City/Networks/CityMain.cs b/src/Networks/Blockcore.Networks.City/Networks/CityMain.cs
similarity index 100%
rename from src/Networks/City/City/Networks/CityMain.cs
rename to src/Networks/Blockcore.Networks.City/Networks/CityMain.cs
diff --git a/src/Networks/City/City/Networks/CityRegTest.cs b/src/Networks/Blockcore.Networks.City/Networks/CityRegTest.cs
similarity index 100%
rename from src/Networks/City/City/Networks/CityRegTest.cs
rename to src/Networks/Blockcore.Networks.City/Networks/CityRegTest.cs
diff --git a/src/Networks/City/City/Networks/CityTest.cs b/src/Networks/Blockcore.Networks.City/Networks/CityTest.cs
similarity index 100%
rename from src/Networks/City/City/Networks/CityTest.cs
rename to src/Networks/Blockcore.Networks.City/Networks/CityTest.cs
diff --git a/src/Networks/City/City/Networks/Consensus/CityPosConsensusOptions.cs b/src/Networks/Blockcore.Networks.City/Networks/Consensus/CityPosConsensusOptions.cs
similarity index 100%
rename from src/Networks/City/City/Networks/Consensus/CityPosConsensusOptions.cs
rename to src/Networks/Blockcore.Networks.City/Networks/Consensus/CityPosConsensusOptions.cs
diff --git a/src/Networks/City/City/Networks/Deployments/CityBIP9Deployments.cs b/src/Networks/Blockcore.Networks.City/Networks/Deployments/CityBIP9Deployments.cs
similarity index 100%
rename from src/Networks/City/City/Networks/Deployments/CityBIP9Deployments.cs
rename to src/Networks/Blockcore.Networks.City/Networks/Deployments/CityBIP9Deployments.cs
diff --git a/src/Networks/City/City/Networks/Networks.cs b/src/Networks/Blockcore.Networks.City/Networks/Networks.cs
similarity index 100%
rename from src/Networks/City/City/Networks/Networks.cs
rename to src/Networks/Blockcore.Networks.City/Networks/Networks.cs
diff --git a/src/Networks/City/City/Networks/Policies/CityStandardScriptsRegistry.cs b/src/Networks/Blockcore.Networks.City/Networks/Policies/CityStandardScriptsRegistry.cs
similarity index 100%
rename from src/Networks/City/City/Networks/Policies/CityStandardScriptsRegistry.cs
rename to src/Networks/Blockcore.Networks.City/Networks/Policies/CityStandardScriptsRegistry.cs
diff --git a/src/Networks/City/City/Networks/Rules/CityHeaderVersionRule.cs b/src/Networks/Blockcore.Networks.City/Networks/Rules/CityHeaderVersionRule.cs
similarity index 100%
rename from src/Networks/City/City/Networks/Rules/CityHeaderVersionRule.cs
rename to src/Networks/Blockcore.Networks.City/Networks/Rules/CityHeaderVersionRule.cs
diff --git a/src/Networks/City/City/Networks/Setup/CoinSetup.cs b/src/Networks/Blockcore.Networks.City/Networks/Setup/CoinSetup.cs
similarity index 100%
rename from src/Networks/City/City/Networks/Setup/CoinSetup.cs
rename to src/Networks/Blockcore.Networks.City/Networks/Setup/CoinSetup.cs
diff --git a/src/Networks/City/City/Networks/Setup/ConversionTools.cs b/src/Networks/Blockcore.Networks.City/Networks/Setup/ConversionTools.cs
similarity index 100%
rename from src/Networks/City/City/Networks/Setup/ConversionTools.cs
rename to src/Networks/Blockcore.Networks.City/Networks/Setup/ConversionTools.cs
diff --git a/src/Networks/City/City/ico.png b/src/Networks/Blockcore.Networks.City/ico.png
similarity index 100%
rename from src/Networks/City/City/ico.png
rename to src/Networks/Blockcore.Networks.City/ico.png
diff --git a/src/Networks/OpenExo/OpenExo/OpenExo.csproj b/src/Networks/Blockcore.Networks.OpenExo/Blockcore.Networks.OpenExo.csproj
similarity index 69%
rename from src/Networks/OpenExo/OpenExo/OpenExo.csproj
rename to src/Networks/Blockcore.Networks.OpenExo/Blockcore.Networks.OpenExo.csproj
index eb97b6ff5..7af2a6201 100644
--- a/src/Networks/OpenExo/OpenExo/OpenExo.csproj
+++ b/src/Networks/Blockcore.Networks.OpenExo/Blockcore.Networks.OpenExo.csproj
@@ -18,8 +18,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Networks/OpenExo/OpenExo/Networks/Consensus/OpenExoPosConsensusOptions.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/Consensus/OpenExoPosConsensusOptions.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/Consensus/OpenExoPosConsensusOptions.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/Consensus/OpenExoPosConsensusOptions.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/Deployments/OpenExoBIP9Deployments.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/Deployments/OpenExoBIP9Deployments.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/Deployments/OpenExoBIP9Deployments.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/Deployments/OpenExoBIP9Deployments.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/Networks.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/Networks.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/Networks.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/Networks.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/OpenExoMain.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/OpenExoMain.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/OpenExoMain.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/OpenExoMain.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/OpenExoRegTest.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/OpenExoRegTest.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/OpenExoRegTest.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/OpenExoRegTest.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/OpenExoTest.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/OpenExoTest.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/OpenExoTest.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/OpenExoTest.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/Policies/OpenExoStandardScriptRegistry.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/Policies/OpenExoStandardScriptRegistry.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/Policies/OpenExoStandardScriptRegistry.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/Policies/OpenExoStandardScriptRegistry.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/Rules/OpenExoBugFixPosFutureDriftRule.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/Rules/OpenExoBugFixPosFutureDriftRule.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/Rules/OpenExoBugFixPosFutureDriftRule.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/Rules/OpenExoBugFixPosFutureDriftRule.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/Rules/OpenExoHeaderVersionRule.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/Rules/OpenExoHeaderVersionRule.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/Rules/OpenExoHeaderVersionRule.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/Rules/OpenExoHeaderVersionRule.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/Setup/CoinSetup.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/Setup/CoinSetup.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/Setup/CoinSetup.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/Setup/CoinSetup.cs
diff --git a/src/Networks/OpenExo/OpenExo/Networks/Setup/ConversionTools.cs b/src/Networks/Blockcore.Networks.OpenExo/Networks/Setup/ConversionTools.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/Networks/Setup/ConversionTools.cs
rename to src/Networks/Blockcore.Networks.OpenExo/Networks/Setup/ConversionTools.cs
diff --git a/src/Networks/OpenExo/OpenExo/OpenExoSetup.cs b/src/Networks/Blockcore.Networks.OpenExo/OpenExoSetup.cs
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/OpenExoSetup.cs
rename to src/Networks/Blockcore.Networks.OpenExo/OpenExoSetup.cs
diff --git a/src/Networks/OpenExo/OpenExo/icon.png b/src/Networks/Blockcore.Networks.OpenExo/icon.png
similarity index 100%
rename from src/Networks/OpenExo/OpenExo/icon.png
rename to src/Networks/Blockcore.Networks.OpenExo/icon.png
diff --git a/src/Networks/Rutanio/Rutanio/Rutanio.csproj b/src/Networks/Blockcore.Networks.Rutanio/Blockcore.Networks.Rutanio.csproj
similarity index 69%
rename from src/Networks/Rutanio/Rutanio/Rutanio.csproj
rename to src/Networks/Blockcore.Networks.Rutanio/Blockcore.Networks.Rutanio.csproj
index 266693e4d..17946425a 100644
--- a/src/Networks/Rutanio/Rutanio/Rutanio.csproj
+++ b/src/Networks/Blockcore.Networks.Rutanio/Blockcore.Networks.Rutanio.csproj
@@ -18,8 +18,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Networks/Rutanio/Rutanio/Networks/Consensus/RutanioPosConsensusOptions.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/Consensus/RutanioPosConsensusOptions.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/Consensus/RutanioPosConsensusOptions.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/Consensus/RutanioPosConsensusOptions.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/Deployments/RutanioBIP39Deployments.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/Deployments/RutanioBIP39Deployments.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/Deployments/RutanioBIP39Deployments.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/Deployments/RutanioBIP39Deployments.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/Networks.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/Networks.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/Networks.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/Networks.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/Policies/RutanioStandardScriptsRegistry.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/Policies/RutanioStandardScriptsRegistry.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/Policies/RutanioStandardScriptsRegistry.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/Policies/RutanioStandardScriptsRegistry.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/Rules/RutanioBugFixPosFutureDriftRule.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/Rules/RutanioBugFixPosFutureDriftRule.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/Rules/RutanioBugFixPosFutureDriftRule.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/Rules/RutanioBugFixPosFutureDriftRule.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/Rules/RutanioHeaderVersionRule.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/Rules/RutanioHeaderVersionRule.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/Rules/RutanioHeaderVersionRule.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/Rules/RutanioHeaderVersionRule.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/RutanioMain.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/RutanioMain.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/RutanioMain.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/RutanioMain.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/RutanioRegTest.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/RutanioRegTest.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/RutanioRegTest.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/RutanioRegTest.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/RutanioTest.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/RutanioTest.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/RutanioTest.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/RutanioTest.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/Setup/CoinSetup.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/Setup/CoinSetup.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/Setup/CoinSetup.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/Setup/CoinSetup.cs
diff --git a/src/Networks/Rutanio/Rutanio/Networks/Setup/ConversionTools.cs b/src/Networks/Blockcore.Networks.Rutanio/Networks/Setup/ConversionTools.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/Networks/Setup/ConversionTools.cs
rename to src/Networks/Blockcore.Networks.Rutanio/Networks/Setup/ConversionTools.cs
diff --git a/src/Networks/Rutanio/Rutanio/RutanioSetup.cs b/src/Networks/Blockcore.Networks.Rutanio/RutanioSetup.cs
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/RutanioSetup.cs
rename to src/Networks/Blockcore.Networks.Rutanio/RutanioSetup.cs
diff --git a/src/Networks/Rutanio/Rutanio/icon.png b/src/Networks/Blockcore.Networks.Rutanio/icon.png
similarity index 100%
rename from src/Networks/Rutanio/Rutanio/icon.png
rename to src/Networks/Blockcore.Networks.Rutanio/icon.png
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/Blockcore.Networks.Stratis.csproj b/src/Networks/Blockcore.Networks.Stratis/Blockcore.Networks.Stratis.csproj
similarity index 65%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/Blockcore.Networks.Stratis.csproj
rename to src/Networks/Blockcore.Networks.Stratis/Blockcore.Networks.Stratis.csproj
index 17ca2d386..553405423 100644
--- a/src/Networks/Stratis/Blockcore.Networks.Stratis/Blockcore.Networks.Stratis.csproj
+++ b/src/Networks/Blockcore.Networks.Stratis/Blockcore.Networks.Stratis.csproj
@@ -13,7 +13,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/Deployments/StratisBIP9Deployments.cs b/src/Networks/Blockcore.Networks.Stratis/Deployments/StratisBIP9Deployments.cs
similarity index 100%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/Deployments/StratisBIP9Deployments.cs
rename to src/Networks/Blockcore.Networks.Stratis/Deployments/StratisBIP9Deployments.cs
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/Networks.cs b/src/Networks/Blockcore.Networks.Stratis/Networks.cs
similarity index 100%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/Networks.cs
rename to src/Networks/Blockcore.Networks.Stratis/Networks.cs
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/Policies/StratisStandardScriptsRegistry.cs b/src/Networks/Blockcore.Networks.Stratis/Policies/StratisStandardScriptsRegistry.cs
similarity index 100%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/Policies/StratisStandardScriptsRegistry.cs
rename to src/Networks/Blockcore.Networks.Stratis/Policies/StratisStandardScriptsRegistry.cs
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/Rules/StratisBugFixPosFutureDriftRule.cs b/src/Networks/Blockcore.Networks.Stratis/Rules/StratisBugFixPosFutureDriftRule.cs
similarity index 100%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/Rules/StratisBugFixPosFutureDriftRule.cs
rename to src/Networks/Blockcore.Networks.Stratis/Rules/StratisBugFixPosFutureDriftRule.cs
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/Rules/StratisHeaderVersionRule.cs b/src/Networks/Blockcore.Networks.Stratis/Rules/StratisHeaderVersionRule.cs
similarity index 100%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/Rules/StratisHeaderVersionRule.cs
rename to src/Networks/Blockcore.Networks.Stratis/Rules/StratisHeaderVersionRule.cs
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisMain.cs b/src/Networks/Blockcore.Networks.Stratis/StratisMain.cs
similarity index 100%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/StratisMain.cs
rename to src/Networks/Blockcore.Networks.Stratis/StratisMain.cs
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisRegTest.cs b/src/Networks/Blockcore.Networks.Stratis/StratisRegTest.cs
similarity index 100%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/StratisRegTest.cs
rename to src/Networks/Blockcore.Networks.Stratis/StratisRegTest.cs
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisTest.cs b/src/Networks/Blockcore.Networks.Stratis/StratisTest.cs
similarity index 100%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/StratisTest.cs
rename to src/Networks/Blockcore.Networks.Stratis/StratisTest.cs
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/icon.png b/src/Networks/Blockcore.Networks.Stratis/icon.png
similarity index 100%
rename from src/Networks/Stratis/Blockcore.Networks.Stratis/icon.png
rename to src/Networks/Blockcore.Networks.Stratis/icon.png
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Blockcore.Networks.Xds.csproj b/src/Networks/Blockcore.Networks.Xds/Blockcore.Networks.Xds.csproj
similarity index 65%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Blockcore.Networks.Xds.csproj
rename to src/Networks/Blockcore.Networks.Xds/Blockcore.Networks.Xds.csproj
index 6e8f1a4c1..94567debb 100644
--- a/src/Networks/Xds/Blockcore.Networks.Xds/Blockcore.Networks.Xds.csproj
+++ b/src/Networks/Blockcore.Networks.Xds/Blockcore.Networks.Xds.csproj
@@ -13,7 +13,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Configuration/MemoryPoolConfiguration.cs b/src/Networks/Blockcore.Networks.Xds/Configuration/MemoryPoolConfiguration.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Configuration/MemoryPoolConfiguration.cs
rename to src/Networks/Blockcore.Networks.Xds/Configuration/MemoryPoolConfiguration.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Configuration/XdsMempoolValidator.cs b/src/Networks/Blockcore.Networks.Xds/Configuration/XdsMempoolValidator.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Configuration/XdsMempoolValidator.cs
rename to src/Networks/Blockcore.Networks.Xds/Configuration/XdsMempoolValidator.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Configuration/XdsPreMempoolChecksMempoolRule.cs b/src/Networks/Blockcore.Networks.Xds/Configuration/XdsPreMempoolChecksMempoolRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Configuration/XdsPreMempoolChecksMempoolRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Configuration/XdsPreMempoolChecksMempoolRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsBlockHeader.cs b/src/Networks/Blockcore.Networks.Xds/Consensus/XdsBlockHeader.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsBlockHeader.cs
rename to src/Networks/Blockcore.Networks.Xds/Consensus/XdsBlockHeader.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsConsensusFactory.cs b/src/Networks/Blockcore.Networks.Xds/Consensus/XdsConsensusFactory.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsConsensusFactory.cs
rename to src/Networks/Blockcore.Networks.Xds/Consensus/XdsConsensusFactory.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsConsensusOptions.cs b/src/Networks/Blockcore.Networks.Xds/Consensus/XdsConsensusOptions.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsConsensusOptions.cs
rename to src/Networks/Blockcore.Networks.Xds/Consensus/XdsConsensusOptions.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsProvenBlockHeader.cs b/src/Networks/Blockcore.Networks.Xds/Consensus/XdsProvenBlockHeader.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsProvenBlockHeader.cs
rename to src/Networks/Blockcore.Networks.Xds/Consensus/XdsProvenBlockHeader.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsTransaction.cs b/src/Networks/Blockcore.Networks.Xds/Consensus/XdsTransaction.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Consensus/XdsTransaction.cs
rename to src/Networks/Blockcore.Networks.Xds/Consensus/XdsTransaction.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Deployments/XdsBIP9Deployments.cs b/src/Networks/Blockcore.Networks.Xds/Deployments/XdsBIP9Deployments.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Deployments/XdsBIP9Deployments.cs
rename to src/Networks/Blockcore.Networks.Xds/Deployments/XdsBIP9Deployments.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Networks.cs b/src/Networks/Blockcore.Networks.Xds/Networks.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Networks.cs
rename to src/Networks/Blockcore.Networks.Xds/Networks.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Policies/XdsStandardScriptsRegistry.cs b/src/Networks/Blockcore.Networks.Xds/Policies/XdsStandardScriptsRegistry.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Policies/XdsStandardScriptsRegistry.cs
rename to src/Networks/Blockcore.Networks.Xds/Policies/XdsStandardScriptsRegistry.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsCheckFeeMempoolRule.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsCheckFeeMempoolRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsCheckFeeMempoolRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsCheckFeeMempoolRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsConsensusErrors.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsConsensusErrors.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsConsensusErrors.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsConsensusErrors.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsEmptyScriptSigMempoolRule.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsEmptyScriptSigMempoolRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsEmptyScriptSigMempoolRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsEmptyScriptSigMempoolRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsEmptyScriptSigRule.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsEmptyScriptSigRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsEmptyScriptSigRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsEmptyScriptSigRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsHeaderVersionRule.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsHeaderVersionRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsHeaderVersionRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsHeaderVersionRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsOutputNotWhitelistedMempoolRule.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsOutputNotWhitelistedMempoolRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsOutputNotWhitelistedMempoolRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsOutputNotWhitelistedMempoolRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsOutputNotWhitelistedRule.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsOutputNotWhitelistedRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsOutputNotWhitelistedRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsOutputNotWhitelistedRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsPosCoinviewRule.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsPosCoinviewRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsPosCoinviewRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsPosCoinviewRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsRequireWitnessMempoolRule.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsRequireWitnessMempoolRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsRequireWitnessMempoolRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsRequireWitnessMempoolRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsRequireWitnessRule.cs b/src/Networks/Blockcore.Networks.Xds/Rules/XdsRequireWitnessRule.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/Rules/XdsRequireWitnessRule.cs
rename to src/Networks/Blockcore.Networks.Xds/Rules/XdsRequireWitnessRule.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/XdsMain.cs b/src/Networks/Blockcore.Networks.Xds/XdsMain.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/XdsMain.cs
rename to src/Networks/Blockcore.Networks.Xds/XdsMain.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/XdsRegTest.cs b/src/Networks/Blockcore.Networks.Xds/XdsRegTest.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/XdsRegTest.cs
rename to src/Networks/Blockcore.Networks.Xds/XdsRegTest.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/XdsTest.cs b/src/Networks/Blockcore.Networks.Xds/XdsTest.cs
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/XdsTest.cs
rename to src/Networks/Blockcore.Networks.Xds/XdsTest.cs
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/icon.png b/src/Networks/Blockcore.Networks.Xds/icon.png
similarity index 100%
rename from src/Networks/Xds/Blockcore.Networks.Xds/icon.png
rename to src/Networks/Blockcore.Networks.Xds/icon.png
diff --git a/src/Networks/x42/x42/x42.Networks.csproj b/src/Networks/Blockcore.Networks.x42/Blockcore.Networks.x42.csproj
similarity index 61%
rename from src/Networks/x42/x42/x42.Networks.csproj
rename to src/Networks/Blockcore.Networks.x42/Blockcore.Networks.x42.csproj
index 583fd75f2..b95c6ddf1 100644
--- a/src/Networks/x42/x42/x42.Networks.csproj
+++ b/src/Networks/Blockcore.Networks.x42/Blockcore.Networks.x42.csproj
@@ -18,8 +18,8 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/Networks/x42/x42/Networks/Consensus/x42Consensus.cs b/src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42Consensus.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Consensus/x42Consensus.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42Consensus.cs
diff --git a/src/Networks/x42/x42/Networks/Consensus/x42ConsensusErrors.cs b/src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42ConsensusErrors.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Consensus/x42ConsensusErrors.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42ConsensusErrors.cs
diff --git a/src/Networks/x42/x42/Networks/Consensus/x42PosConsensusOptions.cs b/src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42PosConsensusOptions.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Consensus/x42PosConsensusOptions.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42PosConsensusOptions.cs
diff --git a/src/Networks/x42/x42/Networks/Deployments/x42BIP9Deployments.cs b/src/Networks/Blockcore.Networks.x42/Networks/Deployments/x42BIP9Deployments.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Deployments/x42BIP9Deployments.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Deployments/x42BIP9Deployments.cs
diff --git a/src/Networks/x42/x42/Networks/Networks.cs b/src/Networks/Blockcore.Networks.x42/Networks/Networks.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Networks.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Networks.cs
diff --git a/src/Networks/x42/x42/Networks/Policies/x42StandardScriptsRegistry.cs b/src/Networks/Blockcore.Networks.x42/Networks/Policies/x42StandardScriptsRegistry.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Policies/x42StandardScriptsRegistry.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Policies/x42StandardScriptsRegistry.cs
diff --git a/src/Networks/x42/x42/Networks/Rules/x42HeaderVersionRule.cs b/src/Networks/Blockcore.Networks.x42/Networks/Rules/x42HeaderVersionRule.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Rules/x42HeaderVersionRule.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Rules/x42HeaderVersionRule.cs
diff --git a/src/Networks/x42/x42/Networks/Rules/x42OpReturnFeeMempoolRule.cs b/src/Networks/Blockcore.Networks.x42/Networks/Rules/x42OpReturnFeeMempoolRule.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Rules/x42OpReturnFeeMempoolRule.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Rules/x42OpReturnFeeMempoolRule.cs
diff --git a/src/Networks/x42/x42/Networks/Rules/x42PosCoinviewRule.cs b/src/Networks/Blockcore.Networks.x42/Networks/Rules/x42PosCoinviewRule.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Rules/x42PosCoinviewRule.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Rules/x42PosCoinviewRule.cs
diff --git a/src/Networks/x42/x42/Networks/Setup/CoinSetup.cs b/src/Networks/Blockcore.Networks.x42/Networks/Setup/CoinSetup.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Setup/CoinSetup.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Setup/CoinSetup.cs
diff --git a/src/Networks/x42/x42/Networks/Setup/ConversionTools.cs b/src/Networks/Blockcore.Networks.x42/Networks/Setup/ConversionTools.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/Setup/ConversionTools.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/Setup/ConversionTools.cs
diff --git a/src/Networks/x42/x42/Networks/x42Main.cs b/src/Networks/Blockcore.Networks.x42/Networks/x42Main.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/x42Main.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/x42Main.cs
diff --git a/src/Networks/x42/x42/Networks/x42RegTest.cs b/src/Networks/Blockcore.Networks.x42/Networks/x42RegTest.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/x42RegTest.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/x42RegTest.cs
diff --git a/src/Networks/x42/x42/Networks/x42Test.cs b/src/Networks/Blockcore.Networks.x42/Networks/x42Test.cs
similarity index 100%
rename from src/Networks/x42/x42/Networks/x42Test.cs
rename to src/Networks/Blockcore.Networks.x42/Networks/x42Test.cs
diff --git a/src/Networks/x42/x42/icon.png b/src/Networks/Blockcore.Networks.x42/icon.png
similarity index 100%
rename from src/Networks/x42/x42/icon.png
rename to src/Networks/Blockcore.Networks.x42/icon.png
diff --git a/src/Networks/x42/x42/x42Setup.cs b/src/Networks/Blockcore.Networks.x42/x42Setup.cs
similarity index 100%
rename from src/Networks/x42/x42/x42Setup.cs
rename to src/Networks/Blockcore.Networks.x42/x42Setup.cs
diff --git a/src/Networks/City/City.Node/City.Node.csproj b/src/Networks/City/City.Node/City.Node.csproj
deleted file mode 100644
index fe210403e..000000000
--- a/src/Networks/City/City.Node/City.Node.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- City.Node
- Exe
- Blockcore
-
-
-
- latest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Networks/City/City.Node/Program.cs b/src/Networks/City/City.Node/Program.cs
deleted file mode 100644
index 336775279..000000000
--- a/src/Networks/City/City.Node/Program.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Blockcore;
-using Blockcore.Builder;
-using Blockcore.Configuration;
-using Blockcore.Features.NodeHost;
-using Blockcore.Features.BlockStore;
-using Blockcore.Features.ColdStaking;
-using Blockcore.Features.Consensus;
-using Blockcore.Features.Diagnostic;
-using Blockcore.Features.MemoryPool;
-using Blockcore.Features.Miner;
-using Blockcore.Features.RPC;
-using Blockcore.Utilities;
-
-namespace City.Daemon
-{
- public class Program
- {
- public static async Task Main(string[] args)
- {
- try
- {
- var nodeSettings = new NodeSettings(networksSelector: Networks.Networks.City, args: args);
-
- IFullNodeBuilder nodeBuilder = new FullNodeBuilder()
- .UseNodeSettings(nodeSettings)
- .UseBlockStore()
- .UsePosConsensus()
- .UseMempool()
- .UseColdStakingWallet()
- .AddPowPosMining()
- .UseNodeHost()
- .AddRPC()
- .UseDiagnosticFeature();
-
- IFullNode node = nodeBuilder.Build();
-
- if (node != null)
- await node.RunAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine("There was a problem initializing the node. Details: '{0}'", ex);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/City/City.Node/Properties/launchSettings.json b/src/Networks/City/City.Node/Properties/launchSettings.json
deleted file mode 100644
index 243f4dfd0..000000000
--- a/src/Networks/City/City.Node/Properties/launchSettings.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "profiles": {
- "CITY (MAIN)": {
- "commandName": "Project"
- },
- "CITY (TEST)": {
- "commandName": "Project",
- "commandLineArgs": "-testnet"
- },
- "CITY (MAIN/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser"
- },
- "CITY (TEST/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -testnet"
- },
- "CITY (MAIN/LOCAL/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata"
- },
- "CITY (TEST/LOCAL/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -testnet"
- },
- "CITY (MAIN/LOCAL/RPC/DEFAULT)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -defaultwalletname=default -defaultwalletpassword=default -unlockdefaultwallet -server"
- },
- "CITY (TEST/LOCAL/RPC/DEFAULT)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -defaultwalletname=default -defaultwalletpassword=default -unlockdefaultwallet -server -testnet"
- },
- "CITY (TEST/NO ASSUME VALID)": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -assumevalid=0 -checkpoints=false"
- }
- }
-}
diff --git a/src/Networks/OpenExo/OpenExo.Node/OpenExo.Node.csproj b/src/Networks/OpenExo/OpenExo.Node/OpenExo.Node.csproj
deleted file mode 100644
index ee3d49041..000000000
--- a/src/Networks/OpenExo/OpenExo.Node/OpenExo.Node.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- OpenExo.Node
- Exe
- Blockcore
-
-
-
- latest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Networks/OpenExo/OpenExo.Node/Program.cs b/src/Networks/OpenExo/OpenExo.Node/Program.cs
deleted file mode 100644
index f9a6ce697..000000000
--- a/src/Networks/OpenExo/OpenExo.Node/Program.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Blockcore;
-using Blockcore.Builder;
-using Blockcore.Configuration;
-using Blockcore.Features.NodeHost;
-using Blockcore.Features.BlockStore;
-using Blockcore.Features.ColdStaking;
-using Blockcore.Features.Consensus;
-using Blockcore.Features.Dns;
-using Blockcore.Features.Diagnostic;
-using Blockcore.Features.MemoryPool;
-using Blockcore.Features.Miner;
-using Blockcore.Features.RPC;
-using Blockcore.Utilities;
-
-namespace OpenExo.Node
-{
- public class Program
- {
- public static async Task Main(string[] args)
- {
- try
- {
- var nodeSettings = new NodeSettings(networksSelector: Networks.Networks.OpenExo, args: args);
-
- IFullNodeBuilder nodeBuilder = new FullNodeBuilder()
- .UseNodeSettings(nodeSettings)
- .UseBlockStore()
- .UsePosConsensus()
- .UseMempool()
- .AddPowPosMining()
- .UseColdStakingWallet()
- .UseDiagnosticFeature()
- .UseNodeHost()
- .AddRPC();
-
- // Build DNS FullNode if enable
- UseDnsFullNode(nodeBuilder, nodeSettings);
-
- IFullNode node = nodeBuilder.Build();
-
- if (node != null)
- await node.RunAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine("There was a problem initializing the node. Details: '{0}'", ex);
- }
- }
-
- static void UseDnsFullNode(IFullNodeBuilder nodeBuilder, NodeSettings nodeSettings)
- {
- if (nodeSettings.ConfigReader.GetOrDefault("dnsfullnode", false, nodeSettings.Logger))
- {
- var dnsSettings = new DnsSettings(nodeSettings);
-
- if (string.IsNullOrWhiteSpace(dnsSettings.DnsHostName) || string.IsNullOrWhiteSpace(dnsSettings.DnsNameServer) || string.IsNullOrWhiteSpace(dnsSettings.DnsMailBox))
- throw new ConfigurationException("When running as a DNS Seed service, the -dnshostname, -dnsnameserver and -dnsmailbox arguments must be specified on the command line.");
-
- nodeBuilder.UseDns();
- }
- }
- }
-}
diff --git a/src/Networks/OpenExo/OpenExo.Node/Properties/launchSettings.json b/src/Networks/OpenExo/OpenExo.Node/Properties/launchSettings.json
deleted file mode 100644
index 851906ef8..000000000
--- a/src/Networks/OpenExo/OpenExo.Node/Properties/launchSettings.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "profiles": {
- "OpenExo (MAIN)": {
- "commandName": "Project"
- },
- "OpenExo (TEST)": {
- "commandName": "Project",
- "commandLineArgs": "-testnet"
- },
- "OpenExo (MAIN/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser"
- },
- "OpenExo (TEST/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -testnet"
- },
- "OpenExo (MAIN/LOCAL/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata"
- },
- "OpenExo (TEST/LOCAL/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -testnet"
- },
- "OpenExo (MAIN/LOCAL/RPC/DEFAULT)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -defaultwalletname=default -defaultwalletpassword=default -unlockdefaultwallet -server"
- },
- "OpenExo (TEST/LOCAL/RPC/DEFAULT)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -defaultwalletname=default -defaultwalletpassword=default -unlockdefaultwallet -server -testnet"
- },
- "OpenExo (TEST/NO ASSUME VALID)": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -assumevalid=0 -checkpoints=false"
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Rutanio/Rutanio.Node/Program.cs b/src/Networks/Rutanio/Rutanio.Node/Program.cs
deleted file mode 100644
index 0641c0786..000000000
--- a/src/Networks/Rutanio/Rutanio.Node/Program.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Blockcore;
-using Blockcore.Builder;
-using Blockcore.Configuration;
-using Blockcore.Features.NodeHost;
-using Blockcore.Features.BlockStore;
-using Blockcore.Features.ColdStaking;
-using Blockcore.Features.Consensus;
-using Blockcore.Features.Dns;
-using Blockcore.Features.Diagnostic;
-using Blockcore.Features.MemoryPool;
-using Blockcore.Features.Miner;
-using Blockcore.Features.RPC;
-using Blockcore.Utilities;
-
-namespace Rutanio.Daemon
-{
- public class Program
- {
- public static async Task Main(string[] args)
- {
- try
- {
- var nodeSettings = new NodeSettings(networksSelector: Networks.Networks.Rutanio, args: args);
-
- IFullNodeBuilder nodeBuilder = new FullNodeBuilder()
- .UseNodeSettings(nodeSettings)
- .UseBlockStore()
- .UsePosConsensus()
- .UseMempool()
- .AddPowPosMining()
- .UseColdStakingWallet()
- .UseDiagnosticFeature()
- .UseNodeHost()
- .AddRPC();
-
- // Build the Dns full node if enabled
- UseDnsFullNode(nodeBuilder, nodeSettings);
-
- IFullNode node = nodeBuilder.Build();
-
- if (node != null)
- await node.RunAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine("There was a problem initializing the node. Details: '{0}'", ex);
- }
- }
- static void UseDnsFullNode(IFullNodeBuilder nodeBuilder, NodeSettings nodeSettings)
- {
- if (nodeSettings.ConfigReader.GetOrDefault("dnsfullnode", false, nodeSettings.Logger))
- {
- var dnsSettings = new DnsSettings(nodeSettings);
-
- if (string.IsNullOrWhiteSpace(dnsSettings.DnsHostName) || string.IsNullOrWhiteSpace(dnsSettings.DnsNameServer) || string.IsNullOrWhiteSpace(dnsSettings.DnsMailBox))
- throw new ConfigurationException("When running as a DNS Seed service, the -dnshostname, -dnsnameserver and -dnsmailbox arguments must be specified on the command line.");
-
- nodeBuilder.UseDns();
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Rutanio/Rutanio.Node/Properties/launchSettings.json b/src/Networks/Rutanio/Rutanio.Node/Properties/launchSettings.json
deleted file mode 100644
index 888f6313b..000000000
--- a/src/Networks/Rutanio/Rutanio.Node/Properties/launchSettings.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "profiles": {
- "Rutanio (MAIN)": {
- "commandName": "Project"
- },
- "Rutanio (TEST)": {
- "commandName": "Project",
- "commandLineArgs": "-testnet"
- },
- "Rutanio (MAIN/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser"
- },
- "Rutanio (TEST/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -testnet"
- },
- "Rutanio (MAIN/LOCAL/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata"
- },
- "Rutanio (TEST/LOCAL/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -testnet"
- },
- "Rutanio (MAIN/LOCAL/RPC/DEFAULT)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -defaultwalletname=default -defaultwalletpassword=default -unlockdefaultwallet -server"
- },
- "Rutanio (TEST/LOCAL/RPC/DEFAULT)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -defaultwalletname=default -defaultwalletpassword=default -unlockdefaultwallet -server -testnet"
- },
- "Rutanio (TEST/NO ASSUME VALID)": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -assumevalid=0 -checkpoints=false"
- }
- }
- }
\ No newline at end of file
diff --git a/src/Networks/Rutanio/Rutanio.Node/Rutanio.Node.csproj b/src/Networks/Rutanio/Rutanio.Node/Rutanio.Node.csproj
deleted file mode 100644
index c9f830f46..000000000
--- a/src/Networks/Rutanio/Rutanio.Node/Rutanio.Node.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- Rutanio.Node
- Exe
- Blockcore
-
-
-
- latest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Networks/Stratis/StratisDns/Program.cs b/src/Networks/Stratis/StratisDns/Program.cs
deleted file mode 100644
index b1e611b5d..000000000
--- a/src/Networks/Stratis/StratisDns/Program.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Blockcore;
-using Blockcore.Builder;
-using Blockcore.Configuration;
-using Blockcore.Features.NodeHost;
-using Blockcore.Features.BlockStore;
-using Blockcore.Features.Consensus;
-using Blockcore.Features.Dns;
-using Blockcore.Features.MemoryPool;
-using Blockcore.Features.Miner;
-using Blockcore.Features.RPC;
-using Blockcore.Features.Wallet;
-using Blockcore.Networks.Stratis;
-using Blockcore.Utilities;
-
-namespace StratisDnsD
-{
- ///
- /// Main entry point.
- ///
- public class Program
- {
- ///
- /// The async entry point for the Stratis Dns process.
- ///
- /// Command line arguments.
- /// A task used to await the operation.
- public static async Task Main(string[] args)
- {
- try
- {
- var nodeSettings = new NodeSettings(networksSelector: Networks.Stratis, args: args);
- var dnsSettings = new DnsSettings(nodeSettings);
-
- if (string.IsNullOrWhiteSpace(dnsSettings.DnsHostName) || string.IsNullOrWhiteSpace(dnsSettings.DnsNameServer) || string.IsNullOrWhiteSpace(dnsSettings.DnsMailBox))
- throw new ConfigurationException("When running as a DNS Seed service, the -dnshostname, -dnsnameserver and -dnsmailbox arguments must be specified on the command line.");
-
- // Run as a full node with DNS or just a DNS service?
- IFullNode node;
- if (dnsSettings.DnsFullNode)
- {
- // Build the Dns full node.
- node = new FullNodeBuilder()
- .UseNodeSettings(nodeSettings)
- .UseBlockStore()
- .UsePosConsensus()
- .UseMempool()
- .UseWallet()
- .AddPowPosMining()
- .UseNodeHost()
- .AddRPC()
- .UseDns()
- .Build();
- }
- else
- {
- // Build the Dns node.
- node = new FullNodeBuilder()
- .UseNodeSettings(nodeSettings)
- .UsePosConsensus()
- .UseNodeHost()
- .AddRPC()
- .UseDns()
- .Build();
- }
-
- // Run node.
- if (node != null)
- await node.RunAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine("There was a problem initializing the node. Details: '{0}'", ex.ToString());
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Stratis/StratisDns/Properties/launchSettings.json b/src/Networks/Stratis/StratisDns/Properties/launchSettings.json
deleted file mode 100644
index f8326043b..000000000
--- a/src/Networks/Stratis/StratisDns/Properties/launchSettings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "profiles": {
- "Stratis.StratisDnsD": {
- "commandName": "Project"
- },
- "Stratis.StratisDnsD Test": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -dnslistenport=5399 -dnshostname=dns.stratisplatform.com -dnsnameserver=ns1.dns.stratisplatform.com -dnsmailbox=admin@stratisplatform.com"
- },
- "Stratis.StratisDnsD FullNode Test": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -dnsfullnode -dnslistenport=5399 -dnshostname=dns.stratisplatform.com -dnsnameserver=ns1.dns.stratisplatform.com -dnsmailbox=admin@stratisplatform.com"
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Stratis/StratisDns/StratisDnsD.csproj b/src/Networks/Stratis/StratisDns/StratisDnsD.csproj
deleted file mode 100644
index 912384505..000000000
--- a/src/Networks/Stratis/StratisDns/StratisDnsD.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- Stratis.StratisDnsD
- Exe
- Stratis.StratisDnsD
-
-
-
- 1701;1702;1705;IDE0008;
-
-
-
- latest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Networks/Stratis/Stratisd/Program.cs b/src/Networks/Stratis/Stratisd/Program.cs
deleted file mode 100644
index a0722b5b5..000000000
--- a/src/Networks/Stratis/Stratisd/Program.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Blockcore;
-using Blockcore.Builder;
-using Blockcore.Configuration;
-using Blockcore.Features.NodeHost;
-using Blockcore.Features.BlockStore;
-using Blockcore.Features.ColdStaking;
-using Blockcore.Features.Consensus;
-using Blockcore.Features.Diagnostic;
-using Blockcore.Features.MemoryPool;
-using Blockcore.Features.Miner;
-using Blockcore.Features.RPC;
-using Blockcore.Networks.Stratis;
-using Blockcore.Utilities;
-
-namespace StratisD
-{
- public class Program
- {
-#pragma warning disable IDE1006 // Naming Styles
-
- public static async Task Main(string[] args)
-#pragma warning restore IDE1006 // Naming Styles
- {
- try
- {
- var nodeSettings = new NodeSettings(networksSelector: Networks.Stratis, args: args);
-
- IFullNodeBuilder nodeBuilder = new FullNodeBuilder()
- .UseNodeSettings(nodeSettings)
- .UseBlockStore()
- .UsePosConsensus()
- .UseMempool()
- .UseColdStakingWallet()
- .AddPowPosMining()
- .UseNodeHost()
- .AddRPC()
- .UseDiagnosticFeature();
-
- IFullNode node = nodeBuilder.Build();
-
- if (node != null)
- await node.RunAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine("There was a problem initializing the node. Details: '{0}'", ex.ToString());
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Stratis/Stratisd/Properties/launchSettings.json b/src/Networks/Stratis/Stratisd/Properties/launchSettings.json
deleted file mode 100644
index c6b1d05bf..000000000
--- a/src/Networks/Stratis/Stratisd/Properties/launchSettings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "profiles": {
- "Stratis.StratisD": {
- "commandName": "Project"
- },
- "Stratis.StratisD Test": {
- "commandName": "Project",
- "commandLineArgs": "-testnet"
- },
- "Stratis.StratisD Test with Default wallet": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -rpcallowip=127.0.0.1 -defaultwalletname=default -defaultwalletpassword=default -unlockdefaultwallet -server -rpcpassword=rpcpassword -rpcuser=rpcuser"
- },
- "Stratis.StratisD Test with RPC": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -server -rpcpassword=rpcpassword -rpcuser=rpcuser"
- },
- "Stratis.StratisD Test No assumevalid": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -assumevalid=0 -checkpoints=false"
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Stratis/Stratisd/StratisD.csproj b/src/Networks/Stratis/Stratisd/StratisD.csproj
deleted file mode 100644
index 3474eb6f2..000000000
--- a/src/Networks/Stratis/Stratisd/StratisD.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- blockcore.stratisd
- Exe
- StratisD
-
-
-
- 1701;1702;1705;IDE0008;
-
-
-
- latest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Networks/Xds/Xdsd/Program.cs b/src/Networks/Xds/Xdsd/Program.cs
deleted file mode 100644
index c782b136b..000000000
--- a/src/Networks/Xds/Xdsd/Program.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Blockcore.Builder;
-using Blockcore.Configuration;
-using Blockcore.Features.NodeHost;
-using Blockcore.Features.BlockStore;
-using Blockcore.Features.ColdStaking;
-using Blockcore.Features.Consensus;
-using Blockcore.Features.Diagnostic;
-using Blockcore.Features.MemoryPool;
-using Blockcore.Features.Miner;
-using Blockcore.Features.RPC;
-using Blockcore.Networks.Xds;
-using Blockcore.Utilities;
-
-namespace StratisD
-{
- public class Program
- {
-#pragma warning disable IDE1006 // Naming Styles
-
- public static async Task Main(string[] args)
-#pragma warning restore IDE1006 // Naming Styles
- {
- try
- {
- var nodeSettings = new NodeSettings(networksSelector: Networks.Xds, args: args);
-
- IFullNodeBuilder nodeBuilder = new FullNodeBuilder()
- .UseNodeSettings(nodeSettings)
- .UseBlockStore()
- .UsePosConsensus()
- .UseMempool()
- .UseColdStakingWallet()
- .AddPowPosMining()
- .UseNodeHost()
- .AddRPC()
- .UseDiagnosticFeature();
-
- await nodeBuilder.Build().RunAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine("There was a problem initializing the node. Details: '{0}'", ex.ToString());
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Xds/Xdsd/Properties/launchSettings.json b/src/Networks/Xds/Xdsd/Properties/launchSettings.json
deleted file mode 100644
index 5c2e6015b..000000000
--- a/src/Networks/Xds/Xdsd/Properties/launchSettings.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "profiles": {
- "Xds": {
- "commandName": "Project",
- "commandLineArgs": "-addnode=178.62.62.160 -datadir=C:\\testtttt -apiport=48339"
- },
- "RocksDb": {
- "commandName": "Project",
- "commandLineArgs": "-addnode=178.62.62.160 -datadir=C:\\testtttt\\rocksdb -dbtype=rocksdb -apiport=48339"
- },
- "LevelDb": {
- "commandName": "Project",
- "commandLineArgs": "-addnode=178.62.62.160 -datadir=C:\\testtttt\\leveldb -dbtype=leveldb -apiport=48339"
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/Xds/Xdsd/XdsD.csproj b/src/Networks/Xds/Xdsd/XdsD.csproj
deleted file mode 100644
index 75c1d1e4b..000000000
--- a/src/Networks/Xds/Xdsd/XdsD.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- blockcore.xdsd
- Exe
- StratisD
-
-
-
- 1701;1702;1705;IDE0008;
-
-
-
- latest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Networks/x42/x42.Node/Program.cs b/src/Networks/x42/x42.Node/Program.cs
deleted file mode 100644
index e6ec9c423..000000000
--- a/src/Networks/x42/x42.Node/Program.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Blockcore;
-using Blockcore.Builder;
-using Blockcore.Configuration;
-using Blockcore.Features.NodeHost;
-using Blockcore.Features.BlockStore;
-using Blockcore.Features.ColdStaking;
-using Blockcore.Features.Consensus;
-using Blockcore.Features.Diagnostic;
-using Blockcore.Features.MemoryPool;
-using Blockcore.Features.Miner;
-using Blockcore.Features.RPC;
-using Blockcore.Utilities;
-using Blockcore.Features.WalletWatchOnly;
-using Blockcore.Features.Notifications;
-
-namespace x42.Daemon
-{
- public class Program
- {
- public static async Task Main(string[] args)
- {
- try
- {
- var nodeSettings = new NodeSettings(networksSelector: Networks.Networks.x42, args: args);
-
- IFullNodeBuilder nodeBuilder = new FullNodeBuilder()
- .UseNodeSettings(nodeSettings)
- .UseBlockStore()
- .UsePosConsensus()
- .UseMempool()
- .UseBlockNotification()
- .UseTransactionNotification()
- .UseColdStakingWallet()
- .UseWatchOnlyWallet()
- .AddPowPosMining()
- .UseNodeHost()
- .AddRPC()
- .UseDiagnosticFeature();
-
- IFullNode node = nodeBuilder.Build();
-
- if (node != null)
- await node.RunAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine("There was a problem initializing the node. Details: '{0}'", ex);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/Networks/x42/x42.Node/Properties/launchSettings.json b/src/Networks/x42/x42.Node/Properties/launchSettings.json
deleted file mode 100644
index 55afe0567..000000000
--- a/src/Networks/x42/x42.Node/Properties/launchSettings.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "profiles": {
- "x42 (MAIN)": {
- "commandName": "Project"
- },
- "x42 (TEST)": {
- "commandName": "Project",
- "commandLineArgs": "-testnet"
- },
- "x42 (MAIN/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser"
- },
- "x42 (TEST/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -testnet"
- },
- "x42 (MAIN/LOCAL/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata"
- },
- "x42 (TEST/LOCAL/RPC)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -testnet"
- },
- "x42 (MAIN/LOCAL/RPC/DEFAULT)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -defaultwalletname=default -defaultwalletpassword=default -unlockdefaultwallet -server"
- },
- "x42 (TEST/LOCAL/RPC/DEFAULT)": {
- "commandName": "Project",
- "commandLineArgs": "-server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -defaultwalletname=default -defaultwalletpassword=default -unlockdefaultwallet -server -testnet"
- },
- "x42 (TEST/NO ASSUME VALID)": {
- "commandName": "Project",
- "commandLineArgs": "-testnet -assumevalid=0 -checkpoints=false"
- }
- }
-}
diff --git a/src/Networks/x42/x42.Node/x42.Node.csproj b/src/Networks/x42/x42.Node/x42.Node.csproj
deleted file mode 100644
index 925d241c2..000000000
--- a/src/Networks/x42/x42.Node/x42.Node.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- x42.Node
- Exe
- Blockcore
-
-
-
- latest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Node/Blockcore.Node/Blockcore.Node.csproj b/src/Node/Blockcore.Node/Blockcore.Node.csproj
index cd8bb67cd..3c29a8d75 100644
--- a/src/Node/Blockcore.Node/Blockcore.Node.csproj
+++ b/src/Node/Blockcore.Node/Blockcore.Node.csproj
@@ -11,14 +11,16 @@
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/Node/Blockcore.Node/NodeBuilder.cs b/src/Node/Blockcore.Node/NodeBuilder.cs
index a86609266..ce21839d3 100644
--- a/src/Node/Blockcore.Node/NodeBuilder.cs
+++ b/src/Node/Blockcore.Node/NodeBuilder.cs
@@ -11,6 +11,8 @@
using Blockcore.Features.NodeHost;
using Blockcore.Features.Dns;
using Blockcore.Persistence;
+using Blockcore.Features.Notifications;
+using Blockcore.Features.WalletWatchOnly;
namespace Blockcore.Node
{
@@ -29,11 +31,13 @@ public static IFullNodeBuilder Create(string chain, NodeSettings settings)
case "BTC":
nodeBuilder.UsePowConsensus().AddMining().UseWallet();
break;
+ case "X42":
+ nodeBuilder.UsePosConsensus().AddPowPosMining().UseColdStakingWallet().UseWatchOnlyWallet();
+ break;
case "CITY":
case "STRAT":
case "RUTA":
case "EXOS":
- case "X42":
case "XDS":
nodeBuilder.UsePosConsensus().AddPowPosMining().UseColdStakingWallet();
break;
@@ -48,6 +52,8 @@ private static IFullNodeBuilder CreateBaseBuilder(string chain, NodeSettings set
.UseNodeSettings(settings)
.UseBlockStore()
.UseMempool()
+ .UseBlockNotification()
+ .UseTransactionNotification()
.UseNodeHost()
.AddRPC()
.UseDiagnosticFeature();
diff --git a/src/Node/Blockcore.Node/Properties/launchSettings.json b/src/Node/Blockcore.Node/Properties/launchSettings.json
index 5434de8ff..46d289989 100644
--- a/src/Node/Blockcore.Node/Properties/launchSettings.json
+++ b/src/Node/Blockcore.Node/Properties/launchSettings.json
@@ -71,6 +71,14 @@
"XDS (MAIN/LOCAL/UI/API/WS)": {
"commandName": "Project",
"commandLineArgs": "--chain=XDS -server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -enableUI=true -enableAPI=true -enableWS=true"
+ },
+ "XDS (MAIN/LOCAL/ROCKSDB)": {
+ "commandName": "Project",
+ "commandLineArgs": "--chain=XDS -server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=rocksdbdata -dbtype=rocksdb"
+ },
+ "XDS (MAIN/LOCAL/LEVELDB)": {
+ "commandName": "Project",
+ "commandLineArgs": "--chain=XDS -server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=leveldbdata -dbtype=leveldb"
}
}
}
\ No newline at end of file
diff --git a/src/Tests/Blockcore.Features.BlockStore.Tests/Blockcore.Features.BlockStore.Tests.csproj b/src/Tests/Blockcore.Features.BlockStore.Tests/Blockcore.Features.BlockStore.Tests.csproj
index b515524d0..79abd2478 100644
--- a/src/Tests/Blockcore.Features.BlockStore.Tests/Blockcore.Features.BlockStore.Tests.csproj
+++ b/src/Tests/Blockcore.Features.BlockStore.Tests/Blockcore.Features.BlockStore.Tests.csproj
@@ -29,8 +29,8 @@
-
-
+
+
diff --git a/src/Tests/Blockcore.Features.ColdStaking.Tests/Blockcore.Features.ColdStaking.Tests.csproj b/src/Tests/Blockcore.Features.ColdStaking.Tests/Blockcore.Features.ColdStaking.Tests.csproj
index b3c6eec21..ab3375613 100644
--- a/src/Tests/Blockcore.Features.ColdStaking.Tests/Blockcore.Features.ColdStaking.Tests.csproj
+++ b/src/Tests/Blockcore.Features.ColdStaking.Tests/Blockcore.Features.ColdStaking.Tests.csproj
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/src/Tests/Blockcore.Features.Consensus.Tests/Blockcore.Features.Consensus.Tests.csproj b/src/Tests/Blockcore.Features.Consensus.Tests/Blockcore.Features.Consensus.Tests.csproj
index eb721b30e..9a33976b9 100644
--- a/src/Tests/Blockcore.Features.Consensus.Tests/Blockcore.Features.Consensus.Tests.csproj
+++ b/src/Tests/Blockcore.Features.Consensus.Tests/Blockcore.Features.Consensus.Tests.csproj
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/src/Tests/Blockcore.Features.MemoryPool.Tests/Blockcore.Features.MemoryPool.Tests.csproj b/src/Tests/Blockcore.Features.MemoryPool.Tests/Blockcore.Features.MemoryPool.Tests.csproj
index ab5d891f2..0d8b6f241 100644
--- a/src/Tests/Blockcore.Features.MemoryPool.Tests/Blockcore.Features.MemoryPool.Tests.csproj
+++ b/src/Tests/Blockcore.Features.MemoryPool.Tests/Blockcore.Features.MemoryPool.Tests.csproj
@@ -26,8 +26,8 @@
-
-
+
+
diff --git a/src/Tests/Blockcore.Features.Miner.Tests/Blockcore.Features.Miner.Tests.csproj b/src/Tests/Blockcore.Features.Miner.Tests/Blockcore.Features.Miner.Tests.csproj
index 12c449990..9c9d86b76 100644
--- a/src/Tests/Blockcore.Features.Miner.Tests/Blockcore.Features.Miner.Tests.csproj
+++ b/src/Tests/Blockcore.Features.Miner.Tests/Blockcore.Features.Miner.Tests.csproj
@@ -26,8 +26,8 @@
-
-
+
+
diff --git a/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj b/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj
index 45993286b..31645a2ca 100644
--- a/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj
+++ b/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj b/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj
index 1284f7105..dc7af9c13 100644
--- a/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj
+++ b/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj
@@ -35,8 +35,8 @@
-
-
+
+
diff --git a/src/Tests/Blockcore.Tests.Common/Blockcore.Tests.Common.csproj b/src/Tests/Blockcore.Tests.Common/Blockcore.Tests.Common.csproj
index b73697536..28eec0a88 100644
--- a/src/Tests/Blockcore.Tests.Common/Blockcore.Tests.Common.csproj
+++ b/src/Tests/Blockcore.Tests.Common/Blockcore.Tests.Common.csproj
@@ -23,8 +23,8 @@
-
-
+
+
diff --git a/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj b/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj
index d61d766b6..c13e71b01 100644
--- a/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj
+++ b/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj
@@ -27,8 +27,8 @@
-
-
+
+