TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

rpc/request: support passing accounts as addresses

Browse source 
Turns out, it's completely legal in C#, see neo-project/neo#2543.
This commit is contained in:
Roman Khimov 2021-07-18 16:45:53 +03:00
parent 05cb6586a6
commit a617390185
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/rpc/request/param.go
View file

@ -316,9 +316,14 @@ func (p *Param) UnmarshalJSON(data []byte) error {
}
case *signerWithWitnessAux:
aux := *val
accParam := Param{StringT, aux.Account}
acc, err := accParam.GetUint160FromAddressOrHex()
if err != nil {
return err
}
p.Value = SignerWithWitness{
Signer: transaction.Signer{
Account: aux.Account,
Account: acc,
Scopes: aux.Scopes,
AllowedContracts: aux.AllowedContracts,
AllowedGroups: aux.AllowedGroups,
@ -341,7 +346,7 @@ func (p *Param) UnmarshalJSON(data []byte) error {
// signerWithWitnessAux is an auxiluary struct for JSON marshalling. We need it because of
// DisallowUnknownFields JSON marshaller setting.
type signerWithWitnessAux struct {
Account util.Uint160 `json:"account"`
Account string `json:"account"`
Scopes transaction.WitnessScope `json:"scopes"`
AllowedContracts []util.Uint160 `json:"allowedcontracts,omitempty"`
AllowedGroups []*keys.PublicKey `json:"allowedgroups,omitempty"`
@ -352,7 +357,7 @@ type signerWithWitnessAux struct {
// MarshalJSON implements json.Unmarshaler interface.
func (s *SignerWithWitness) MarshalJSON() ([]byte, error) {
signer := &signerWithWitnessAux{
Account: s.Account,
Account: s.Account.StringLE(),
Scopes: s.Scopes,
AllowedContracts: s.AllowedContracts,
AllowedGroups: s.AllowedGroups,