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

Fix rpc signer rules #773

Merged
merged 2 commits into from
Oct 25, 2022
Merged

Fix rpc signer rules #773

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd36f14
Fix rules
shargon Oct 21, 2022
55ebdc2
Update src/RpcClient/Utility.cs
superboyiii Oct 25, 2022
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
38 changes: 38 additions & 0 deletions src/RpcClient/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Neo.Cryptography.ECC;
using Neo.Json;
using Neo.Network.P2P.Payloads;
using Neo.Network.P2P.Payloads.Conditions;
using Neo.SmartContract;
using Neo.SmartContract.Native;
using Neo.VM.Types;
Expand Down Expand Up @@ -188,6 +189,7 @@ public static Signer SignerFromJson(JObject json, ProtocolSettings protocolSetti
return new Signer
{
Account = json["account"].ToScriptHash(protocolSettings),
Rules = ((JArray)json["rules"])?.Select(p => RuleFromJson((JObject)p, protocolSettings)).ToArray(),
Scopes = (WitnessScope)Enum.Parse(typeof(WitnessScope), json["scopes"].AsString()),
AllowedContracts = ((JArray)json["allowedcontracts"])?.Select(p => p.ToScriptHash(protocolSettings)).ToArray(),
AllowedGroups = ((JArray)json["allowedgroups"])?.Select(p => ECPoint.Parse(p.AsString(), ECCurve.Secp256r1)).ToArray()
Expand Down Expand Up @@ -219,6 +221,42 @@ public static Witness WitnessFromJson(JObject json)
};
}

public static WitnessRule RuleFromJson(JObject json, ProtocolSettings protocolSettings)
{
return new WitnessRule()
{
Action = Enum.Parse<WitnessRuleAction>(json["action"].AsString()),
Condition = RuleExpressionFromJson((JObject)json["condition"], protocolSettings)
};
}

public static WitnessCondition RuleExpressionFromJson(JObject json, ProtocolSettings protocolSettings)
{
switch (json["type"].AsString())
{
case "Or":
return new OrCondition() { Expressions = ((JArray)json["expressions"])?.Select(p => RuleExpressionFromJson((JObject)p, protocolSettings)).ToArray() };
case "And":
return new AndCondition() { Expressions = ((JArray)json["expressions"])?.Select(p => RuleExpressionFromJson((JObject)p, protocolSettings)).ToArray() };
case "Boolean":
return new BooleanCondition() { Expression = json["expressions"].AsBoolean() };
case "Not":
return new NotCondition() { Expression = RuleExpressionFromJson((JObject)json["expressions"], protocolSettings)) };
case "Group":
return new GroupCondition() { Group = ECPoint.Parse(json["group"].AsString(), ECCurve.Secp256r1) };
case "CalledByContract":
return new CalledByContractCondition() { Hash = json["hash"].ToScriptHash(protocolSettings) };
case "ScriptHash":
return new ScriptHashCondition() { Hash = json["hash"].ToScriptHash(protocolSettings) };
case "CalledByEntry":
return new CalledByEntryCondition();
case "CalledByGroup":
return new CalledByGroupCondition() { Group = ECPoint.Parse(json["group"].AsString(), ECCurve.Secp256r1) };
}

throw new FormatException("Wrong rule's condition type");
}

public static StackItem StackItemFromJson(JObject json)
{
StackItemType type = json["type"].GetEnum<StackItemType>();
Expand Down