[Neo Rpc Methods] fix contract rpc methods parameters #3485
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| // Copyright (C) 2015-2024 The Neo Project. | ||
| // | ||
| // SignerOrWitness.cs file belongs to the neo project and is free | ||
| // software distributed under the MIT software license, see the | ||
| // accompanying file LICENSE in the main directory of the | ||
| // repository or http://www.opensource.org/licenses/mit-license.php | ||
| // for more details. | ||
| // | ||
| // Redistribution and use in source and binary forms with or without | ||
| // modifications are permitted. | ||
|
|
||
| using Neo.Cryptography.ECC; | ||
| using Neo.Json; | ||
| using Neo.Network.P2P.Payloads; | ||
| using Neo.Wallets; | ||
| using System; | ||
| using System.Diagnostics.CodeAnalysis; | ||
| using System.Linq; | ||
|
|
||
| namespace Neo.Plugins.RpcServer.Model; | ||
|
|
||
| public class SignerOrWitness | ||
Jim8y marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| private readonly object _value; | ||
|
|
||
| public SignerOrWitness(Signer signer) | ||
| { | ||
| _value = signer ?? throw new ArgumentNullException(nameof(signer)); | ||
| } | ||
|
|
||
| public SignerOrWitness(Witness witness) | ||
| { | ||
| _value = witness ?? throw new ArgumentNullException(nameof(witness)); | ||
| } | ||
|
|
||
| public bool IsSigner => _value is Signer; | ||
|
|
||
| public static bool TryParse(JToken value, ProtocolSettings settings, [NotNullWhen(true)] out SignerOrWitness? signerOrWitness) | ||
|
Check warning on line 38 in src/Plugins/RpcServer/Model/SignerOrWitness.cs
|
||
| { | ||
| signerOrWitness = null; | ||
|
|
||
| if (value == null) | ||
| return false; | ||
|
|
||
| if (value is JObject jObject) | ||
| { | ||
| if (jObject.ContainsProperty("account")) | ||
| { | ||
| signerOrWitness = new SignerOrWitness(SignerFromJson(jObject, settings)); | ||
| return true; | ||
| } | ||
| else if (jObject.ContainsProperty("invocation") || jObject.ContainsProperty("verification")) | ||
| { | ||
| signerOrWitness = new SignerOrWitness(WitnessFromJson(jObject)); | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| private static Signer SignerFromJson(JObject jObject, ProtocolSettings settings) | ||
| { | ||
| return new Signer | ||
| { | ||
| Account = AddressToScriptHash(jObject["account"].AsString(), settings.AddressVersion), | ||
| Scopes = jObject.ContainsProperty("scopes") | ||
| ? (WitnessScope)Enum.Parse(typeof(WitnessScope), jObject["scopes"].AsString()) | ||
| : WitnessScope.CalledByEntry, | ||
| AllowedContracts = ((JArray)jObject["allowedcontracts"])?.Select(p => UInt160.Parse(p.AsString())).ToArray() ?? Array.Empty<UInt160>(), | ||
| AllowedGroups = ((JArray)jObject["allowedgroups"])?.Select(p => ECPoint.Parse(p.AsString(), ECCurve.Secp256r1)).ToArray() ?? Array.Empty<ECPoint>(), | ||
| Rules = ((JArray)jObject["rules"])?.Select(r => WitnessRule.FromJson((JObject)r)).ToArray() ?? Array.Empty<WitnessRule>() | ||
| }; | ||
| } | ||
|
|
||
| private static Witness WitnessFromJson(JObject jObject) | ||
| { | ||
| return new Witness | ||
| { | ||
| InvocationScript = Convert.FromBase64String(jObject["invocation"]?.AsString() ?? string.Empty), | ||
| VerificationScript = Convert.FromBase64String(jObject["verification"]?.AsString() ?? string.Empty) | ||
| }; | ||
| } | ||
|
|
||
| public static SignerOrWitness[] ParseArray(JArray array, ProtocolSettings settings) | ||
| { | ||
| if (array == null) | ||
| throw new ArgumentNullException(nameof(array)); | ||
|
|
||
| if (array.Count > Transaction.MaxTransactionAttributes) | ||
| throw new RpcException(RpcError.InvalidParams.WithData("Max allowed signers or witnesses exceeded.")); | ||
|
|
||
| return array.Select(item => | ||
| { | ||
| if (TryParse(item, settings, out var signerOrWitness)) | ||
| return signerOrWitness; | ||
| throw new ArgumentException($"Invalid signer or witness format: {item}"); | ||
| }).ToArray(); | ||
| } | ||
|
|
||
| public Signer AsSigner() | ||
| { | ||
| return _value as Signer ?? throw new InvalidOperationException("The value is not a Signer."); | ||
| } | ||
|
|
||
| public Witness AsWitness() | ||
| { | ||
| return _value as Witness ?? throw new InvalidOperationException("The value is not a Witness."); | ||
| } | ||
|
|
||
| private static UInt160 AddressToScriptHash(string address, byte version) | ||
| { | ||
| if (UInt160.TryParse(address, out var scriptHash)) | ||
| { | ||
| return scriptHash; | ||
| } | ||
|
|
||
| return address.ToScriptHash(version); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not make a
baseclass for common stuff? Than two different classes one, beingSignerand other beingWitness. This way we can getSignerattributes likeRulesor other properties that separate the two classes.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make it work first, optimize it later. I think you are better than me to make the code more elegent.