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

Keep up to date with Neo: Add role designation history #387

Merged
merged 7 commits into from
Nov 10, 2020
Merged

Keep up to date with Neo: Add role designation history #387

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cdc135f
Merge pull request #1 from neo-project/master
Sep 11, 2020
be2a614
Merge pull request #2 from neo-project/master
Oct 15, 2020
30893a3
Merge pull request #3 from neo-project/master
Nov 3, 2020
7363e27
update
Nov 3, 2020
8f9a6fe
Update UT
Nov 9, 2020
0fa1de5
f
Nov 9, 2020
1ccc7d8
Merge branch 'master' into designation
shargon Nov 10, 2020
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
2 changes: 1 addition & 1 deletion src/Neo.Compiler.MSIL/Neo.Compiler.MSIL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.4.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="Neo" Version="3.0.0-CI01048" />
<PackageReference Include="Neo" Version="3.0.0-CI01066" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Neo.SmartContract.Framework/Services/Neo/Designation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ namespace Neo.SmartContract.Framework.Services.Neo
public class Designation
{
public static extern string Name { get; }
public static extern byte[][] GetDesignatedByRole(DesignationRole role);
public static extern byte[][] GetDesignatedByRole(DesignationRole role, uint index);
}
}
4 changes: 3 additions & 1 deletion src/Neo.SmartContract.Framework/Services/System/SyscallCallback.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ public enum SyscallCallback : uint
System_Runtime_CheckWitness = 0x8cec27f8,
System_Runtime_GetInvocationCounter = 0x43112784,
System_Runtime_GetNotifications = 0xf1354327,
System_Runtime_GasLeft = 0xced88814
System_Runtime_GasLeft = 0xced88814,
System_Binary_Itoa = 2109399931,
System_Binary_Atoi = 3946854428,
}
}
2 changes: 1 addition & 1 deletion tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_NativeContracts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static string GASSymbol()

public static byte[][] getOracleNodes()
{
return Designation.GetDesignatedByRole(DesignationRole.Oracle);
return Designation.GetDesignatedByRole(DesignationRole.Oracle, 0);
}
}
}
2 changes: 2 additions & 0 deletions tests/Neo.SmartContract.Framework.UnitTests/SyscallTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public void TestAllSyscalls()
if (syscall.Value.Name == "Neo.Native.Policy") continue;
if (syscall.Value.Name == "Neo.Native.Call") continue;
if (syscall.Value.Name == "System.Runtime.Notify") continue;
if (syscall.Value.Name == "System.Binary.Itoa") continue;
if (syscall.Value.Name == "System.Binary.Atoi") continue;

if (list.Remove(syscall.Value.Name)) continue;

Expand Down