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

fix trusts conflicts #2892

Merged
merged 7 commits into from
Sep 1, 2023
Merged

fix trusts conflicts #2892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f93881
fix trusts conflicts
Jim8y Aug 29, 2023
32a1d07
update to process wildcard while converting to stackitem
Jim8y Aug 30, 2023
efb1522
code optimization
Jim8y Aug 30, 2023
07d5853
clean the ut test
Jim8y Aug 30, 2023
ae83132
Merge branch 'master' into fix-trusts
shargon Aug 31, 2023
6735ee3
Add unit test to check manifest Trusts serialization to stack item
AnnaShaleva Aug 31, 2023
63d91f8
Merge pull request #1 from AnnaShaleva/test-trust-serialize
Jim8y Aug 31, 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
5 changes: 3 additions & 2 deletions src/Neo/SmartContract/Manifest/ContractManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ void IInteroperable.FromStackItem(StackItem stackItem)
Permissions = ((Array)@struct[5]).Select(p => p.ToInteroperable<ContractPermission>()).ToArray();
Trusts = @struct[6] switch
{
Null => WildcardContainer<ContractPermissionDescriptor>.CreateWildcard(),
Null _ => WildcardContainer<ContractPermissionDescriptor>.CreateWildcard(),
// Array array when array.Any(p => ((ByteString)p).Size == 0) => WildcardContainer<ContractPermissionDescriptor>.CreateWildcard(),
Array array => WildcardContainer<ContractPermissionDescriptor>.Create(array.Select(p => new ContractPermissionDescriptor(p.GetSpan())).ToArray()),
_ => throw new ArgumentException(null, nameof(stackItem))
};
Expand All @@ -96,7 +97,7 @@ public StackItem ToStackItem(ReferenceCounter referenceCounter)
new Array(referenceCounter, SupportedStandards.Select(p => (StackItem)p)),
Abi.ToStackItem(referenceCounter),
new Array(referenceCounter, Permissions.Select(p => p.ToStackItem(referenceCounter))),
Trusts.IsWildcard ? StackItem.Null : new Array(referenceCounter, Trusts.Select(p => (StackItem)p.ToArray())),
Trusts.IsWildcard ? StackItem.Null : new Array(referenceCounter, Trusts.Select(p => p.ToArray()?? StackItem.Null)),
Extra is null ? "null" : Extra.ToByteArray(false)
};
}
Expand Down
24 changes: 21 additions & 3 deletions tests/Neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.Cryptography.ECC;
using Neo.IO;
using Neo.Json;
using Neo.SmartContract;
using Neo.SmartContract.Manifest;
using Neo.VM;

namespace Neo.UnitTests.SmartContract.Manifest
{
Expand Down Expand Up @@ -53,12 +56,12 @@ public void ParseFromJson_SafeMethods()
[TestMethod]
public void ParseFromJson_Trust()
{
var json = @"{""name"":""testManifest"",""groups"":[],""features"":{},""supportedstandards"":[],""abi"":{""methods"":[{""name"":""testMethod"",""parameters"":[],""returntype"":""Void"",""offset"":0,""safe"":true}],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[""0x0000000000000000000000000000000000000001""],""extra"":null}";
ReferenceCounter referenceCounter = new ReferenceCounter();
var json = @"{""name"":""testManifest"",""groups"":[],""features"":{},""supportedstandards"":[],""abi"":{""methods"":[{""name"":""testMethod"",""parameters"":[],""returntype"":""Void"",""offset"":0,""safe"":true}],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[""0x0000000000000000000000000000000000000001"",""*""],""extra"":null}";
var manifest = ContractManifest.Parse(json);
Assert.AreEqual(manifest.ToJson().ToString(), json);

var check = TestUtils.CreateDefaultManifest();
check.Trusts = WildcardContainer<ContractPermissionDescriptor>.Create(ContractPermissionDescriptor.Create(UInt160.Parse("0x0000000000000000000000000000000000000001")));
check.Trusts = WildcardContainer<ContractPermissionDescriptor>.Create(ContractPermissionDescriptor.Create(UInt160.Parse("0x0000000000000000000000000000000000000001")), ContractPermissionDescriptor.CreateWildcard());
Assert.AreEqual(manifest.ToJson().ToString(), check.ToJson().ToString());
}

Expand Down Expand Up @@ -103,6 +106,21 @@ public void TestDeserializeAndSerialize()
Assert.AreEqual(expected.ToString(), clone.ToString());
}

[TestMethod]
public void TestSerializeTrusts()
{
var check = TestUtils.CreateDefaultManifest();
check.Trusts = WildcardContainer<ContractPermissionDescriptor>.Create(ContractPermissionDescriptor.Create(UInt160.Parse("0x0000000000000000000000000000000000000001")), ContractPermissionDescriptor.CreateWildcard());
var si = check.ToStackItem(null);

var actualTrusts = ((VM.Types.Array)si)[6];

Assert.AreEqual(((VM.Types.Array)actualTrusts).Count, 2);
Assert.AreEqual(((VM.Types.Array)actualTrusts)[0], new VM.Types.ByteString(UInt160.Parse("0x0000000000000000000000000000000000000001").ToArray()));
// Wildcard trust should be represented as Null stackitem (not as zero-length ByteString):
Assert.AreEqual(((VM.Types.Array)actualTrusts)[1], VM.Types.StackItem.Null);
}

[TestMethod]
public void TestGenerator()
{
Expand Down