Skip to content

Add P2PNotary node role for native RoleManagement contract #3172

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

Merged
merged 3 commits into from
Mar 3, 2024
Merged

Add P2PNotary node role for native RoleManagement contract #3172

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
ef23f5d
Add P2PNotary node role for native RoleManagement contract
AnnaShaleva Mar 3, 2024
5710e1a
Squash TestDesignateP2PNotary and TestGetSet of native RoleManagement
AnnaShaleva Mar 3, 2024
03a3d65
Merge branch 'master' into notary-role
shargon Mar 3, 2024
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
7 changes: 6 additions & 1 deletion src/Neo/SmartContract/Native/Role.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ public enum Role : byte
/// <summary>
/// NeoFS Alphabet nodes.
/// </summary>
NeoFSAlphabetNode = 16
NeoFSAlphabetNode = 16,

/// <summary>
/// P2P Notary nodes used to process P2P notary requests.
/// </summary>
P2PNotary = 32
}
}
96 changes: 54 additions & 42 deletions tests/Neo.UnitTests/SmartContract/Native/UT_RoleManagement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using Neo.SmartContract;
using Neo.SmartContract.Native;
using Neo.UnitTests.Extensions;
using Neo.Wallets;
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down Expand Up @@ -45,49 +46,60 @@ public void Clean()
[TestMethod]
public void TestSetAndGet()
{
var snapshot1 = _snapshot.CreateSnapshot();
UInt160 committeeMultiSigAddr = NativeContract.NEO.GetCommitteeAddress(snapshot1);
ECPoint[] validators = NativeContract.NEO.ComputeNextBlockValidators(snapshot1, TestProtocolSettings.Default);
List<NotifyEventArgs> notifications = new List<NotifyEventArgs>();
EventHandler<NotifyEventArgs> ev = (o, e) => notifications.Add(e);
ApplicationEngine.Notify += ev;
var ret = NativeContract.RoleManagement.Call(
snapshot1,
new Nep17NativeContractExtensions.ManualWitness(committeeMultiSigAddr),
new Block { Header = new Header() },
"designateAsRole",
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger((int)Role.StateValidator) },
new ContractParameter(ContractParameterType.Array) { Value = validators.Select(p => new ContractParameter(ContractParameterType.ByteArray) { Value = p.ToArray() }).ToList() }
);
snapshot1.Commit();
ApplicationEngine.Notify -= ev;
notifications.Count.Should().Be(1);
notifications[0].EventName.Should().Be("Designation");
var snapshot2 = _snapshot.CreateSnapshot();
ret = NativeContract.RoleManagement.Call(
snapshot2,
"getDesignatedByRole",
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger((int)Role.StateValidator) },
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger(1u) }
);
ret.Should().BeOfType<VM.Types.Array>();
(ret as VM.Types.Array).Count.Should().Be(7);
(ret as VM.Types.Array)[0].GetSpan().ToHexString().Should().Be(validators[0].ToArray().ToHexString());
(ret as VM.Types.Array)[1].GetSpan().ToHexString().Should().Be(validators[1].ToArray().ToHexString());
(ret as VM.Types.Array)[2].GetSpan().ToHexString().Should().Be(validators[2].ToArray().ToHexString());
(ret as VM.Types.Array)[3].GetSpan().ToHexString().Should().Be(validators[3].ToArray().ToHexString());
(ret as VM.Types.Array)[4].GetSpan().ToHexString().Should().Be(validators[4].ToArray().ToHexString());
(ret as VM.Types.Array)[5].GetSpan().ToHexString().Should().Be(validators[5].ToArray().ToHexString());
(ret as VM.Types.Array)[6].GetSpan().ToHexString().Should().Be(validators[6].ToArray().ToHexString());
byte[] privateKey1 = new byte[32];
var rng1 = System.Security.Cryptography.RandomNumberGenerator.Create();
rng1.GetBytes(privateKey1);
KeyPair key1 = new KeyPair(privateKey1);
byte[] privateKey2 = new byte[32];
var rng2 = System.Security.Cryptography.RandomNumberGenerator.Create();
rng2.GetBytes(privateKey2);
KeyPair key2 = new KeyPair(privateKey2);
ECPoint[] publicKeys = new ECPoint[2];
publicKeys[0] = key1.PublicKey;
publicKeys[1] = key2.PublicKey;
publicKeys = publicKeys.OrderBy(p => p).ToArray();

ret = NativeContract.RoleManagement.Call(
snapshot2,
"getDesignatedByRole",
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger((int)Role.StateValidator) },
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger(0) }
);
ret.Should().BeOfType<VM.Types.Array>();
(ret as VM.Types.Array).Count.Should().Be(0);
List<Role> roles = new List<Role>() { Role.StateValidator, Role.Oracle, Role.NeoFSAlphabetNode, Role.P2PNotary };
foreach (var role in roles)
{
var snapshot1 = _snapshot.CreateSnapshot();
UInt160 committeeMultiSigAddr = NativeContract.NEO.GetCommitteeAddress(snapshot1);
List<NotifyEventArgs> notifications = new List<NotifyEventArgs>();
EventHandler<NotifyEventArgs> ev = (o, e) => notifications.Add(e);
ApplicationEngine.Notify += ev;
var ret = NativeContract.RoleManagement.Call(
snapshot1,
new Nep17NativeContractExtensions.ManualWitness(committeeMultiSigAddr),
new Block { Header = new Header() },
"designateAsRole",
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger((int)role) },
new ContractParameter(ContractParameterType.Array) { Value = publicKeys.Select(p => new ContractParameter(ContractParameterType.ByteArray) { Value = p.ToArray() }).ToList() }
);
snapshot1.Commit();
ApplicationEngine.Notify -= ev;
notifications.Count.Should().Be(1);
notifications[0].EventName.Should().Be("Designation");
var snapshot2 = _snapshot.CreateSnapshot();
ret = NativeContract.RoleManagement.Call(
snapshot2,
"getDesignatedByRole",
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger((int)role) },
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger(1u) }
);
ret.Should().BeOfType<VM.Types.Array>();
(ret as VM.Types.Array).Count.Should().Be(2);
(ret as VM.Types.Array)[0].GetSpan().ToHexString().Should().Be(publicKeys[0].ToArray().ToHexString());
(ret as VM.Types.Array)[1].GetSpan().ToHexString().Should().Be(publicKeys[1].ToArray().ToHexString());

ret = NativeContract.RoleManagement.Call(
snapshot2,
"getDesignatedByRole",
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger((int)role) },
new ContractParameter(ContractParameterType.Integer) { Value = new BigInteger(0) }
);
ret.Should().BeOfType<VM.Types.Array>();
(ret as VM.Types.Array).Count.Should().Be(0);
}
}

private void ApplicationEngine_Notify(object sender, NotifyEventArgs e)
Expand Down