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

Change ContractManifest serialization #2254

Merged
merged 7 commits into from
Jan 21, 2021
Merged

Change ContractManifest serialization #2254

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
841dcab
Change ContractManifest serialization
erikzhang Jan 20, 2021
b2fcd3d
Restore some UT
shargon Jan 20, 2021
9d81c25
nullable Extra
shargon Jan 20, 2021
10d0d62
Merge branch 'master' into manifest-serialization
shargon Jan 20, 2021
63f9731
Revert and Test
shargon Jan 21, 2021
51d01ba
Update ContractManifest.cs
shargon Jan 21, 2021
27be506
Merge branch 'master' into manifest-serialization
shargon Jan 21, 2021
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
4 changes: 2 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 @@ -69,7 +69,7 @@ void IInteroperable.FromStackItem(StackItem stackItem)
Array array => WildcardContainer<UInt160>.Create(array.Select(p => new UInt160(p.GetSpan())).ToArray()),
_ => throw new ArgumentException(null, nameof(stackItem))
};
Extra = JObject.Parse(@struct[6].GetSpan());
Extra = @struct[6].IsNull ? null : JObject.Parse(@struct[6].GetSpan());
erikzhang marked this conversation as resolved.
Show resolved Hide resolved
}

public StackItem ToStackItem(ReferenceCounter referenceCounter)
Expand All @@ -82,7 +82,7 @@ public StackItem ToStackItem(ReferenceCounter referenceCounter)
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())),
Extra is null ? "null" : Extra.ToByteArray(false)
Extra is null ? StackItem.Null : Extra.ToByteArray(false)
erikzhang marked this conversation as resolved.
Show resolved Hide resolved
};
}

Expand Down