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

runtime: fix CustomGroups witness

Browse source 
See neo-project/neo#2586.
This commit is contained in:
Roman Khimov 2021-08-24 15:50:24 +03:00
parent 581132727b
commit de4ed7d020
2 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/core/interop/runtime/witness.go
View file

@ -49,16 +49,12 @@ func checkScope(ic *interop.Context, tx *transaction.Transaction, v *vm.VM, hash
} }
} }
if c.Scopes&transaction.CustomGroups != 0 { if c.Scopes&transaction.CustomGroups != 0 {
callingScriptHash := v.GetCallingScriptHash()
if callingScriptHash.Equals(util.Uint160{}) {
return false, nil
}
if !v.Context().GetCallFlags().Has(callflag.ReadStates) { if !v.Context().GetCallFlags().Has(callflag.ReadStates) {
return false, errors.New("missing ReadStates call flag") return false, errors.New("missing ReadStates call flag")
} }
cs, err := ic.GetContract(callingScriptHash) cs, err := ic.GetContract(v.GetCurrentScriptHash())
if err != nil { if err != nil {
return false, fmt.Errorf("unable to find calling script: %w", err) return false, nil
} }
// check if the current group is the required one // check if the current group is the required one
for _, allowedGroup := range c.AllowedGroups { for _, allowedGroup := range c.AllowedGroups {

20
pkg/core/interop_system_test.go
View file

@ -1119,23 +1119,6 @@ func TestRuntimeCheckWitness(t *testing.T) {
ic.VM.LoadScriptWithHash([]byte{0x1}, random.Uint160(), callflag.AllowCall) ic.VM.LoadScriptWithHash([]byte{0x1}, random.Uint160(), callflag.AllowCall)
check(t, ic, hash.BytesBE(), true) check(t, ic, hash.BytesBE(), true)
}) })
t.Run("CustomGroups, unknown contract", func(t *testing.T) {
hash := random.Uint160()
tx := &transaction.Transaction{
Signers: []transaction.Signer{
{
Account: hash,
Scopes: transaction.CustomGroups,
AllowedGroups: []*keys.PublicKey{},
},
},
}
ic.Container = tx
callingScriptHash := scriptHash
loadScriptWithHashAndFlags(ic, script, callingScriptHash, callflag.All)
ic.VM.LoadScriptWithHash([]byte{0x1}, random.Uint160(), callflag.ReadStates)
check(t, ic, hash.BytesBE(), true)
})
}) })
}) })
t.Run("positive", func(t *testing.T) { t.Run("positive", func(t *testing.T) {
@ -1200,7 +1183,7 @@ func TestRuntimeCheckWitness(t *testing.T) {
check(t, ic, hash.BytesBE(), false, true) check(t, ic, hash.BytesBE(), false, true)
}) })
t.Run("CustomGroups", func(t *testing.T) { t.Run("CustomGroups", func(t *testing.T) {
t.Run("empty calling scripthash", func(t *testing.T) { t.Run("unknown scripthash", func(t *testing.T) {
hash := random.Uint160() hash := random.Uint160()
tx := &transaction.Transaction{ tx := &transaction.Transaction{
Signers: []transaction.Signer{ Signers: []transaction.Signer{
@ -1244,7 +1227,6 @@ func TestRuntimeCheckWitness(t *testing.T) {
} }
require.NoError(t, bc.contracts.Management.PutContractState(ic.DAO, contractState)) require.NoError(t, bc.contracts.Management.PutContractState(ic.DAO, contractState))
loadScriptWithHashAndFlags(ic, contractScript, contractScriptHash, callflag.All) loadScriptWithHashAndFlags(ic, contractScript, contractScriptHash, callflag.All)
ic.VM.LoadScriptWithHash([]byte{0x1}, random.Uint160(), callflag.ReadStates)
ic.Container = tx ic.Container = tx
check(t, ic, targetHash.BytesBE(), false, true) check(t, ic, targetHash.BytesBE(), false, true)
}) })