Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added hardfork to RpcClient #825

Merged
merged 3 commits into from
Sep 26, 2023
Merged

Added hardfork to RpcClient #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f04d1ae
Added hardfork to RpcClient
cschuchardt88 Sep 15, 2023
bad5683
fixed unit test for getversionasync
cschuchardt88 Sep 15, 2023
d7b1cdc
Merge branch 'master' into Hardfork-settings-rpcclient
cschuchardt88 Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/RpcClient/Models/RpcVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
// modifications are permitted.

using Neo.Json;
using System;
using System.Collections.Generic;
using System.Linq;

namespace Neo.Network.RPC.Models
{
Expand All @@ -25,6 +28,7 @@ public class RpcProtocol
public uint MaxTransactionsPerBlock { get; set; }
public int MemoryPoolMaxTransactions { get; set; }
public ulong InitialGasDistribution { get; set; }
public IReadOnlyDictionary<Hardfork, uint> Hardforks { get; set; }

public JObject ToJson()
{
Expand All @@ -38,6 +42,11 @@ public JObject ToJson()
json["maxtransactionsperblock"] = MaxTransactionsPerBlock;
json["memorypoolmaxtransactions"] = MemoryPoolMaxTransactions;
json["initialgasdistribution"] = InitialGasDistribution;
json["hardforks"] = new JArray(Hardforks.Select(s => new JObject()
{
["name"] = s.Key,
["blockheight"] = s.Value,
}));
return json;
}

Expand All @@ -54,6 +63,7 @@ public static RpcProtocol FromJson(JObject json)
MaxTransactionsPerBlock = (uint)json["maxtransactionsperblock"].AsNumber(),
MemoryPoolMaxTransactions = (int)json["memorypoolmaxtransactions"].AsNumber(),
InitialGasDistribution = (ulong)json["initialgasdistribution"].AsNumber(),
Hardforks = new Dictionary<Hardfork, uint>(((JArray)json["hardforks"]).Select(s => new KeyValuePair<Hardfork, uint>(Enum.Parse<Hardfork>(s["name"].AsString()), (uint)s["blockheight"].AsNumber()))),
};
}
}
Expand Down
8 changes: 7 additions & 1 deletion tests/Neo.Network.RPC.Tests/RpcTestCases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2491,7 +2491,13 @@
"addressversion": 0,
"maxtransactionsperblock": 0,
"memorypoolmaxtransactions": 0,
"initialgasdistribution": 0
"initialgasdistribution": 0,
"hardforks": [
{
"name": "HF_Aspidochelone",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, speaking of #822, can we avoid HF_ prefixes here? It's hardforks section already.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but it based off Enum Hardfork, So its parses the name, i guess i could put value, i believe that works.

Copy link
Member Author

@cschuchardt88 cschuchardt88 Sep 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh i see what your saying, Thats how its used in #823.

public enum Hardfork : byte
{
    HF_Aspidochelone,
    HF_Basilisk
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it's not a client problem and not something client should be bothered with. It's just that I've only noticed it here. But server-side it'd probably be a bit better.

Copy link
Member Author

@cschuchardt88 cschuchardt88 Sep 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

neo-modules/src/RpcServer/RpcServer.Node.cs

Line 88 in 63e3ec3

forkJson["name"] = hf.Key;

Code uses key of the enum which in our case is HF_Aspidochelone and HF_Basilisk. We would have to change the server to use the value instead. If you would like me to proceed in changing the server let me know.

Edit: I feel that you think the server didn't implement this. but it did, thats why im doing this. Yes i do think they merged it too fast #823.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it's not a client problem and not something client should be bothered with. It's just that I've only noticed it here. But server-side it'd probably be a bit better.

Why we need it in server? We can remove it from both

Copy link
Member Author

@cschuchardt88 cschuchardt88 Sep 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remember this #823 someone merged it. To late in 3.6.1

"blockheight": 0
}
]
}
}
}
Expand Down