Skip to content

Commit 09d12dd

Browse files
tanishqjasoriatanishqjasoria
authored
Merge branch 'master' into eip-7623-update
2 parents 54807eb + 7db869c commit 09d12dd

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
lines changed

‎src/Nethermind/Nethermind.Synchronization.Test/SnapSync/RecreateStateFromAccountRangesTests.cs

+6-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Linq;
99
using Autofac;
1010
using FluentAssertions;
11-
using Nethermind.Blockchain.Synchronization;
1211
using Nethermind.Core;
1312
using Nethermind.Core.Crypto;
1413
using Nethermind.Core.Test.Builders;
@@ -325,19 +324,19 @@ bool HasMoreChildren(ValueHash256 limitHash)
325324
}
326325

327326
HasMoreChildren(TestItem.Tree.AccountsWithPaths[1].Path).Should().BeFalse();
328-
HasMoreChildren(TestItem.Tree.AccountsWithPaths[2].Path).Should().BeFalse();
327+
HasMoreChildren(TestItem.Tree.AccountsWithPaths[2].Path).Should().BeTrue(); //expect leaves exactly at limit path to be included
329328
HasMoreChildren(TestItem.Tree.AccountsWithPaths[3].Path).Should().BeTrue();
330329
HasMoreChildren(TestItem.Tree.AccountsWithPaths[4].Path).Should().BeTrue();
331330

332-
UInt256 between2and3 = new UInt256(TestItem.Tree.AccountsWithPaths[1].Path.Bytes, true);
333-
between2and3 += 5;
331+
UInt256 between1and2 = new UInt256(TestItem.Tree.AccountsWithPaths[1].Path.Bytes, true);
332+
between1and2 += 5;
334333

335-
HasMoreChildren(new Hash256(between2and3.ToBigEndian())).Should().BeFalse();
334+
HasMoreChildren(new Hash256(between1and2.ToBigEndian())).Should().BeFalse();
336335

337-
between2and3 = new UInt256(TestItem.Tree.AccountsWithPaths[2].Path.Bytes, true);
336+
UInt256 between2and3 = new UInt256(TestItem.Tree.AccountsWithPaths[2].Path.Bytes, true);
338337
between2and3 -= 1;
339338

340-
HasMoreChildren(new Hash256(between2and3.ToBigEndian())).Should().BeFalse();
339+
HasMoreChildren(new Hash256(between2and3.ToBigEndian())).Should().BeTrue();
341340
}
342341

343342
[Test]

‎src/Nethermind/Nethermind.Synchronization/SnapSync/SnapProviderHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ private static (AddRangeResult result, List<(TrieNode, TreePath)> sortedBoundary
229229
{
230230
bool hasKeccak = node.GetChildHashAsValueKeccak(ci, out ValueHash256 childKeccak);
231231

232-
moreChildrenToRight |= hasKeccak && (ci > right && (ci < limit || noLimit));
232+
moreChildrenToRight |= hasKeccak && (ci > right && (ci <= limit || noLimit));
233233

234234
if (ci >= left && ci <= right)
235235
{

‎src/Nethermind/Nethermind.sln

+21-18
Original file line numberDiff line numberDiff line change
@@ -212,24 +212,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
212212
nuget.config = nuget.config
213213
EndProjectSection
214214
EndProject
215-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Optimism.Test", "Nethermind.Optimism.Test\Nethermind.Optimism.Test.csproj", "{2438958D-46EA-4A7E-B89F-29E069DA0CCA}"
216-
EndProject
217215
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Signer", "Signer", "{89311B58-AF36-4956-883D-54531BC1D5A3}"
218216
EndProject
219217
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.ExternalSigner.Plugin", "Nethermind.ExternalSigner.Plugin\Nethermind.ExternalSigner.Plugin.csproj", "{6528010D-7DCE-4935-9785-5270FF515F3E}"
220218
EndProject
221219
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Taiko", "Nethermind.Taiko\Nethermind.Taiko.csproj", "{B4070433-328E-40E6-B89A-6554F015694C}"
222220
EndProject
223-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Taiko.Test", "Nethermind.Taiko.Test\Nethermind.Taiko.Test.csproj", "{3E097797-F8D5-4BB5-B544-C78FF0A14986}"
224-
EndProject
225221
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Shutter", "Nethermind.Shutter\Nethermind.Shutter.csproj", "{F38037D2-98EA-4263-887A-4B383635F605}"
226222
EndProject
227-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Shutter.Test", "Nethermind.Shutter.Test\Nethermind.Shutter.Test.csproj", "{CEA1C413-A96C-4339-AC1C-839B603DECC8}"
228-
EndProject
229223
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Serialization.SszGenerator", "Nethermind.Serialization.SszGenerator\Nethermind.Serialization.SszGenerator.csproj", "{F2F02874-8DF2-4434-A5F7-3418F24E1E56}"
230224
EndProject
231225
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Serialization.SszGenerator.Test", "Nethermind.Serialization.SszGenerator.Test\Nethermind.Serialization.SszGenerator.Test.csproj", "{E11DA65F-7F52-40DA-BBF4-E6E90932EB68}"
232226
EndProject
227+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Taiko.Test", "Nethermind.Taiko.Test\Nethermind.Taiko.Test.csproj", "{B1CE6CBC-D85B-4631-A9F3-437ADB1FB049}"
228+
EndProject
229+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Shutter.Test", "Nethermind.Shutter.Test\Nethermind.Shutter.Test.csproj", "{B068C72F-8B77-474E-A58C-5B929096FEF3}"
230+
EndProject
231+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Optimism.Test", "Nethermind.Optimism.Test\Nethermind.Optimism.Test.csproj", "{DC983CEF-BA18-45DE-9AEB-AB9B459655BC}"
232+
EndProject
233233
Global
234234
GlobalSection(SolutionConfigurationPlatforms) = preSolution
235235
Debug|Any CPU = Debug|Any CPU
@@ -604,10 +604,6 @@ Global
604604
{AD09FBCB-5496-499B-9129-B6D139A65B6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
605605
{AD09FBCB-5496-499B-9129-B6D139A65B6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
606606
{AD09FBCB-5496-499B-9129-B6D139A65B6F}.Release|Any CPU.Build.0 = Release|Any CPU
607-
{2438958D-46EA-4A7E-B89F-29E069DA0CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
608-
{2438958D-46EA-4A7E-B89F-29E069DA0CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
609-
{2438958D-46EA-4A7E-B89F-29E069DA0CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
610-
{2438958D-46EA-4A7E-B89F-29E069DA0CCA}.Release|Any CPU.Build.0 = Release|Any CPU
611607
{6528010D-7DCE-4935-9785-5270FF515F3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
612608
{6528010D-7DCE-4935-9785-5270FF515F3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
613609
{6528010D-7DCE-4935-9785-5270FF515F3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -616,18 +612,10 @@ Global
616612
{B4070433-328E-40E6-B89A-6554F015694C}.Debug|Any CPU.Build.0 = Debug|Any CPU
617613
{B4070433-328E-40E6-B89A-6554F015694C}.Release|Any CPU.ActiveCfg = Release|Any CPU
618614
{B4070433-328E-40E6-B89A-6554F015694C}.Release|Any CPU.Build.0 = Release|Any CPU
619-
{3E097797-F8D5-4BB5-B544-C78FF0A14986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
620-
{3E097797-F8D5-4BB5-B544-C78FF0A14986}.Debug|Any CPU.Build.0 = Debug|Any CPU
621-
{3E097797-F8D5-4BB5-B544-C78FF0A14986}.Release|Any CPU.ActiveCfg = Release|Any CPU
622-
{3E097797-F8D5-4BB5-B544-C78FF0A14986}.Release|Any CPU.Build.0 = Release|Any CPU
623615
{F38037D2-98EA-4263-887A-4B383635F605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
624616
{F38037D2-98EA-4263-887A-4B383635F605}.Debug|Any CPU.Build.0 = Debug|Any CPU
625617
{F38037D2-98EA-4263-887A-4B383635F605}.Release|Any CPU.ActiveCfg = Release|Any CPU
626618
{F38037D2-98EA-4263-887A-4B383635F605}.Release|Any CPU.Build.0 = Release|Any CPU
627-
{CEA1C413-A96C-4339-AC1C-839B603DECC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
628-
{CEA1C413-A96C-4339-AC1C-839B603DECC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
629-
{CEA1C413-A96C-4339-AC1C-839B603DECC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
630-
{CEA1C413-A96C-4339-AC1C-839B603DECC8}.Release|Any CPU.Build.0 = Release|Any CPU
631619
{F2F02874-8DF2-4434-A5F7-3418F24E1E56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
632620
{F2F02874-8DF2-4434-A5F7-3418F24E1E56}.Debug|Any CPU.Build.0 = Debug|Any CPU
633621
{F2F02874-8DF2-4434-A5F7-3418F24E1E56}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -636,6 +624,18 @@ Global
636624
{E11DA65F-7F52-40DA-BBF4-E6E90932EB68}.Debug|Any CPU.Build.0 = Debug|Any CPU
637625
{E11DA65F-7F52-40DA-BBF4-E6E90932EB68}.Release|Any CPU.ActiveCfg = Release|Any CPU
638626
{E11DA65F-7F52-40DA-BBF4-E6E90932EB68}.Release|Any CPU.Build.0 = Release|Any CPU
627+
{B1CE6CBC-D85B-4631-A9F3-437ADB1FB049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
628+
{B1CE6CBC-D85B-4631-A9F3-437ADB1FB049}.Debug|Any CPU.Build.0 = Debug|Any CPU
629+
{B1CE6CBC-D85B-4631-A9F3-437ADB1FB049}.Release|Any CPU.ActiveCfg = Release|Any CPU
630+
{B1CE6CBC-D85B-4631-A9F3-437ADB1FB049}.Release|Any CPU.Build.0 = Release|Any CPU
631+
{B068C72F-8B77-474E-A58C-5B929096FEF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
632+
{B068C72F-8B77-474E-A58C-5B929096FEF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
633+
{B068C72F-8B77-474E-A58C-5B929096FEF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
634+
{B068C72F-8B77-474E-A58C-5B929096FEF3}.Release|Any CPU.Build.0 = Release|Any CPU
635+
{DC983CEF-BA18-45DE-9AEB-AB9B459655BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
636+
{DC983CEF-BA18-45DE-9AEB-AB9B459655BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
637+
{DC983CEF-BA18-45DE-9AEB-AB9B459655BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
638+
{DC983CEF-BA18-45DE-9AEB-AB9B459655BC}.Release|Any CPU.Build.0 = Release|Any CPU
639639
EndGlobalSection
640640
GlobalSection(SolutionProperties) = preSolution
641641
HideSolutionNode = FALSE
@@ -697,6 +697,9 @@ Global
697697
{89311B58-AF36-4956-883D-54531BC1D5A3} = {78BED57D-720E-4E6C-ABA2-397B73B494F9}
698698
{6528010D-7DCE-4935-9785-5270FF515F3E} = {89311B58-AF36-4956-883D-54531BC1D5A3}
699699
{E11DA65F-7F52-40DA-BBF4-E6E90932EB68} = {4019B82F-1104-4D2C-9F96-05FD7D3575E8}
700+
{B1CE6CBC-D85B-4631-A9F3-437ADB1FB049} = {4019B82F-1104-4D2C-9F96-05FD7D3575E8}
701+
{B068C72F-8B77-474E-A58C-5B929096FEF3} = {4019B82F-1104-4D2C-9F96-05FD7D3575E8}
702+
{DC983CEF-BA18-45DE-9AEB-AB9B459655BC} = {4019B82F-1104-4D2C-9F96-05FD7D3575E8}
700703
EndGlobalSection
701704
GlobalSection(ExtensibilityGlobals) = postSolution
702705
SolutionGuid = {092CA5E3-6180-4ED7-A3CB-9B57FAC2AA85}

0 commit comments

Comments
 (0)