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

Merge pull request #1909 from nspcc-dev/cli/default-cosigner-scope

Browse source 
cli, rpc: use CalledByEntry as a default cosigner's scope
This commit is contained in:
Roman Khimov 2021-04-19 14:43:31 +03:00 committed by GitHub
commit 881ed3065e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/smartcontract/smart_contract.go
View file

@ -291,7 +291,7 @@ func NewCommands() []cli.Command {
- 'CustomContracts' - define valid custom contract hashes for witness check. - 'CustomContracts' - define valid custom contract hashes for witness check.
- 'CustomGroups' - define custom pubkey for group members. - 'CustomGroups' - define custom pubkey for group members.
If no scopes were specified, 'Global' used as default. If no signers were If no scopes were specified, 'CalledByEntry' used as default. If no signers were
specified, no array is passed. Note that scopes are properly handled by specified, no array is passed. Note that scopes are properly handled by
neo-go RPC server only. C# implementation does not support scopes capability. neo-go RPC server only. C# implementation does not support scopes capability.
@ -937,7 +937,7 @@ func parseCosigner(c string) (transaction.Signer, error) {
var ( var (
err error err error
res = transaction.Signer{ res = transaction.Signer{
Scopes: transaction.Global, Scopes: transaction.CalledByEntry,
} }
) )
data := strings.SplitN(c, ":", 2) data := strings.SplitN(c, ":", 2)

4
cli/smartcontract/smart_contract_test.go
View file

@ -74,11 +74,11 @@ func TestParseCosigner(t *testing.T) {
testCases := map[string]transaction.Signer{ testCases := map[string]transaction.Signer{
acc.StringLE(): { acc.StringLE(): {
Account: acc, Account: acc,
Scopes: transaction.Global, Scopes: transaction.CalledByEntry,
}, },
"0x" + acc.StringLE(): { "0x" + acc.StringLE(): {
Account: acc, Account: acc,
Scopes: transaction.Global, Scopes: transaction.CalledByEntry,
}, },
acc.StringLE() + ":Global": { acc.StringLE() + ":Global": {
Account: acc, Account: acc,

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

@ -224,9 +224,9 @@ func (p Param) GetSignerWithWitness() (SignerWithWitness, error) {
return c, nil return c, nil
} }
// GetSignersWithWitnesses returns a slice of SignerWithWitness with global scope from // GetSignersWithWitnesses returns a slice of SignerWithWitness with CalledByEntry
// array of Uint160 or array of serialized transaction.Signer stored in the // scope from array of Uint160 or array of serialized transaction.Signer stored
// parameter. // in the parameter.
func (p Param) GetSignersWithWitnesses() ([]transaction.Signer, []transaction.Witness, error) { func (p Param) GetSignersWithWitnesses() ([]transaction.Signer, []transaction.Witness, error) {
hashes, err := p.GetArray() hashes, err := p.GetArray()
if err != nil { if err != nil {
@ -243,7 +243,7 @@ func (p Param) GetSignersWithWitnesses() ([]transaction.Signer, []transaction.Wi
} }
signers[i] = transaction.Signer{ signers[i] = transaction.Signer{
Account: u, Account: u,
Scopes: transaction.Global, Scopes: transaction.CalledByEntry,
} }
} }
if err != nil { if err != nil {