Skip to content

Commit ceea5a1

Browse files
dangershonydangershony
authored
Move NBitcoin to core (#212)
* Delete bloom filters * Delete colored address * Delete empty files * Removing Stealth addresses * Move all NBitcon code to blockcore project including tests * Rename folders to NBitcoin * Moving types from NBitcoin to respective folders * Moving types Block and Transaction to respective folders
1 parent 734324a commit ceea5a1

455 files changed

Lines changed: 423 additions & 5308 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Blockcore.sln‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{15
4141
EndProject
4242
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.NodeHost", "Features\Blockcore.Features.NodeHost\Blockcore.Features.NodeHost.csproj", "{FB78D861-F3DF-412D-8A3D-D1756ADA39D4}"
4343
EndProject
44-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBitcoin", "External\NBitcoin\NBitcoin.csproj", "{2051FCAC-D4C7-498D-B935-2E9E6DEA0C29}"
45-
EndProject
46-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBitcoin.Tests", "External\NBitcoin.Tests\NBitcoin.Tests.csproj", "{D97693D7-6A83-4143-83D8-621AC545D961}"
47-
EndProject
4844
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Miner.Tests", "Tests\Blockcore.Features.Miner.Tests\Blockcore.Features.Miner.Tests.csproj", "{59F274B7-0FC5-4AD6-A8AE-27BF6F15CC12}"
4945
EndProject
5046
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Dns", "Features\Blockcore.Features.Dns\Blockcore.Features.Dns.csproj", "{6181B889-81B0-4A1E-A29F-E20DCD8BFC1F}"
@@ -208,14 +204,6 @@ Global
208204
{FB78D861-F3DF-412D-8A3D-D1756ADA39D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
209205
{FB78D861-F3DF-412D-8A3D-D1756ADA39D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
210206
{FB78D861-F3DF-412D-8A3D-D1756ADA39D4}.Release|Any CPU.Build.0 = Release|Any CPU
211-
{2051FCAC-D4C7-498D-B935-2E9E6DEA0C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
212-
{2051FCAC-D4C7-498D-B935-2E9E6DEA0C29}.Debug|Any CPU.Build.0 = Debug|Any CPU
213-
{2051FCAC-D4C7-498D-B935-2E9E6DEA0C29}.Release|Any CPU.ActiveCfg = Release|Any CPU
214-
{2051FCAC-D4C7-498D-B935-2E9E6DEA0C29}.Release|Any CPU.Build.0 = Release|Any CPU
215-
{D97693D7-6A83-4143-83D8-621AC545D961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
216-
{D97693D7-6A83-4143-83D8-621AC545D961}.Debug|Any CPU.Build.0 = Debug|Any CPU
217-
{D97693D7-6A83-4143-83D8-621AC545D961}.Release|Any CPU.ActiveCfg = Release|Any CPU
218-
{D97693D7-6A83-4143-83D8-621AC545D961}.Release|Any CPU.Build.0 = Release|Any CPU
219207
{59F274B7-0FC5-4AD6-A8AE-27BF6F15CC12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
220208
{59F274B7-0FC5-4AD6-A8AE-27BF6F15CC12}.Debug|Any CPU.Build.0 = Debug|Any CPU
221209
{59F274B7-0FC5-4AD6-A8AE-27BF6F15CC12}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -368,8 +356,6 @@ Global
368356
{75C364C1-0785-4EDD-9DB8-B0B21F27573C} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
369357
{84433C94-9CB7-4D6F-B2C1-C16B6F7F277C} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
370358
{FB78D861-F3DF-412D-8A3D-D1756ADA39D4} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
371-
{2051FCAC-D4C7-498D-B935-2E9E6DEA0C29} = {1B9A916F-DDAC-4675-B424-EDEDC1A58231}
372-
{D97693D7-6A83-4143-83D8-621AC545D961} = {1B9A916F-DDAC-4675-B424-EDEDC1A58231}
373359
{59F274B7-0FC5-4AD6-A8AE-27BF6F15CC12} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
374360
{6181B889-81B0-4A1E-A29F-E20DCD8BFC1F} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
375361
{CB7A2800-8E98-4CD5-A88A-832E03AF7ABF} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
@@ -400,11 +386,11 @@ Global
400386
{36CE71D7-812A-40D7-96B7-8220E8E86643} = {88A9A633-DA22-412B-A04C-2A3405D3E2C8}
401387
{8E17F166-F15A-42F7-9407-06CE2A4AA0AF} = {88A9A633-DA22-412B-A04C-2A3405D3E2C8}
402388
{D0A183FE-C913-4F8F-92EC-BD4502745140} = {8820C3A5-74B4-45AB-B80C-2495DFBA4A2B}
403-
{50759380-AF62-11EA-BC6D-7563ABA8C5CA} = {3B56C02B-4468-4268-B797-851562789FCC}
404389
{B3D4208F-797A-4893-BC33-BAB77508DFEE} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
405390
{EADB5247-F704-4B87-8B0E-606730B8517A} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
406391
{F64554A3-EC9A-4DBF-9AD6-25C78176C74E} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
407392
{53DA5042-1325-48A0-815A-C586590EC2EB} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
393+
{50759380-AF62-11EA-BC6D-7563ABA8C5CA} = {3B56C02B-4468-4268-B797-851562789FCC}
408394
{EECEF785-EC8C-4037-9BF9-1DACABDE0E3D} = {50759380-AF62-11EA-BC6D-7563ABA8C5CA}
409395
{271E03B3-5DD6-4A16-A54A-1E72AF9B4902} = {50759380-AF62-11EA-BC6D-7563ABA8C5CA}
410396
{4F3C67B3-D96D-46A6-9BBC-19EB0A1A8712} = {4B0889C8-78BE-41C2-BB7B-7E82B3B83753}

src/External/NBitcoin/BIP9Deployments.cs renamed to src/Blockcore/Base/Deployments/BIP9Deployments.cs

File renamed without changes.

src/External/NBitcoin/BIP9DeploymentsArray.cs renamed to src/Blockcore/Base/Deployments/BIP9DeploymentsArray.cs

File renamed without changes.

src/External/NBitcoin/BuriedDeploymentsArray.cs renamed to src/Blockcore/Base/Deployments/BuriedDeploymentsArray.cs

File renamed without changes.

‎src/Blockcore/Blockcore.csproj‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,18 @@
1010
<IsPackable>true</IsPackable>
1111
</PropertyGroup>
1212

13+
<ItemGroup>
14+
<None Remove="NBitcoin\icon.png" />
15+
</ItemGroup>
16+
1317
<ItemGroup>
1418
<AdditionalFiles Include="..\stylecop.json" />
1519
</ItemGroup>
1620

21+
<ItemGroup>
22+
<EmbeddedResource Include="NBitcoin\icon.png" />
23+
</ItemGroup>
24+
1725
<ItemGroup>
1826
<PackageReference Include="ConcurrentHashSet" Version="1.1.0" />
1927
<PackageReference Include="DBreeze" Version="1.95.0" />
@@ -40,10 +48,7 @@
4048
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.4" />
4149
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
4250
<PackageReference Include="LevelDB.Standard" Version="2.1.6.1" />
43-
</ItemGroup>
44-
45-
<ItemGroup>
46-
<ProjectReference Include="..\External\NBitcoin\NBitcoin.csproj" />
51+
<PackageReference Include="NStratis.HashLib" Version="1.0.0.1" />
4752
</ItemGroup>
4853

4954
<ItemGroup>

src/External/NBitcoin/Block.cs renamed to src/Blockcore/Consensus/Block/Block.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,5 @@ public MerkleBlock Filter(params uint256[] txIds)
185185
{
186186
return new MerkleBlock(this, txIds);
187187
}
188-
189-
public MerkleBlock Filter(BloomFilter filter)
190-
{
191-
return new MerkleBlock(this, filter);
192-
}
193188
}
194189
}

src/External/NBitcoin/BlockHeader.cs renamed to src/Blockcore/Consensus/Block/BlockHeader.cs

File renamed without changes.

src/External/NBitcoin/BlockSignature.cs renamed to src/Blockcore/Consensus/Block/BlockSignature.cs

File renamed without changes.

src/External/NBitcoin/BlockStake.cs renamed to src/Blockcore/Consensus/Block/BlockStake.cs

File renamed without changes.

src/External/NBitcoin/ProvenBlockHeader.cs renamed to src/Blockcore/Consensus/Block/ProvenBlockHeader.cs

File renamed without changes.

0 commit comments

Comments
 (0)