aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

core: use native NEO GetValidators for bc.GetValidators

Browse source 
NextBlockValidators are updated before the new block persist, so we need to
use GetValidators to get the list corresponding to the current state of the
chain.
This commit is contained in:
Roman Khimov 2020-07-11 12:29:06 +03:00
parent 815c075112
commit ae497228f0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/core/blockchain.go
View file

@ -1242,7 +1242,7 @@ func (bc *Blockchain) GetStandByValidators() keys.PublicKeys {
// GetValidators returns next block validators. // GetValidators returns next block validators.
func (bc *Blockchain) GetValidators() ([]*keys.PublicKey, error) { func (bc *Blockchain) GetValidators() ([]*keys.PublicKey, error) {
return bc.contracts.NEO.GetNextBlockValidatorsInternal(bc, bc.dao) return bc.contracts.NEO.GetValidatorsInternal(bc, bc.dao)
} }
// GetEnrollments returns all registered validators. // GetEnrollments returns all registered validators.

10
pkg/core/native/native_neo.go
View file

@ -142,7 +142,7 @@ func (n *NEO) Initialize(ic *interop.Context) error {
// OnPersist implements Contract interface. // OnPersist implements Contract interface.
func (n *NEO) OnPersist(ic *interop.Context) error { func (n *NEO) OnPersist(ic *interop.Context) error {
pubs, err := n.getValidatorsInternal(ic.Chain, ic.DAO) pubs, err := n.GetValidatorsInternal(ic.Chain, ic.DAO)
if err != nil { if err != nil {
return err return err
} }
@ -385,8 +385,8 @@ func (n *NEO) getRegisteredValidatorsCall(ic *interop.Context, _ []stackitem.Ite
return stackitem.NewArray(arr) return stackitem.NewArray(arr)
} }
// getValidatorsInternal returns a list of current validators. // GetValidatorsInternal returns a list of current validators.
func (n *NEO) getValidatorsInternal(bc blockchainer.Blockchainer, d dao.DAO) (keys.PublicKeys, error) { func (n *NEO) GetValidatorsInternal(bc blockchainer.Blockchainer, d dao.DAO) (keys.PublicKeys, error) {
if vals := n.validators.Load().(keys.PublicKeys); vals != nil { if vals := n.validators.Load().(keys.PublicKeys); vals != nil {
return vals, nil return vals, nil
} }
@ -442,7 +442,7 @@ func (n *NEO) getValidatorsInternal(bc blockchainer.Blockchainer, d dao.DAO) (ke
} }
func (n *NEO) getValidators(ic *interop.Context, _ []stackitem.Item) stackitem.Item { func (n *NEO) getValidators(ic *interop.Context, _ []stackitem.Item) stackitem.Item {
result, err := n.getValidatorsInternal(ic.Chain, ic.DAO) result, err := n.GetValidatorsInternal(ic.Chain, ic.DAO)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -470,7 +470,7 @@ func (n *NEO) GetNextBlockValidatorsInternal(bc blockchainer.Blockchainer, d dao
func (n *NEO) getNextBlockValidatorsInternal(bc blockchainer.Blockchainer, d dao.DAO) (keys.PublicKeys, error) { func (n *NEO) getNextBlockValidatorsInternal(bc blockchainer.Blockchainer, d dao.DAO) (keys.PublicKeys, error) {
si := d.GetStorageItem(n.ContractID, nextValidatorsKey) si := d.GetStorageItem(n.ContractID, nextValidatorsKey)
if si == nil { if si == nil {
return n.getValidatorsInternal(bc, d) return n.GetValidatorsInternal(bc, d)
} }
pubs := keys.PublicKeys{} pubs := keys.PublicKeys{}
err := pubs.DecodeBytes(si.Value) err := pubs.DecodeBytes(si.Value)