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

core: initialize NEO config cache in constructor

Browse source 
It isn't changed within the contract lifetime, thus initialisation can be
safely performed in constructor.
This commit is contained in:
Anna Shaleva 2022-04-13 16:09:39 +03:00
parent e63d6aeff7
commit 812fa3f76a
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/core/native/contract.go
View file

@ -76,7 +76,7 @@ func NewContracts(cfg config.ProtocolConfiguration) *Contracts {
cs.Contracts = append(cs.Contracts, ledger) cs.Contracts = append(cs.Contracts, ledger)
gas := newGAS(int64(cfg.InitialGASSupply), cfg.P2PSigExtensions) gas := newGAS(int64(cfg.InitialGASSupply), cfg.P2PSigExtensions)
neo := newNEO() neo := newNEO(cfg)
policy := newPolicy() policy := newPolicy()
neo.GAS = gas neo.GAS = gas
neo.Policy = policy neo.Policy = policy

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

@ -58,7 +58,8 @@ type NEO struct {
// It is set in state-modifying methods only and read in `PostPersist` thus is not protected // It is set in state-modifying methods only and read in `PostPersist` thus is not protected
// by any mutex. // by any mutex.
gasPerVoteCache map[string]big.Int gasPerVoteCache map[string]big.Int
// Configuration and standby keys are set during initialization and then
// Configuration and standby keys are set in constructor and then
// only read from. // only read from.
cfg config.ProtocolConfiguration cfg config.ProtocolConfiguration
standbyKeys keys.PublicKeys standbyKeys keys.PublicKeys
@ -116,7 +117,7 @@ func makeValidatorKey(key *keys.PublicKey) []byte {
} }
// newNEO returns NEO native contract. // newNEO returns NEO native contract.
func newNEO() *NEO { func newNEO(cfg config.ProtocolConfiguration) *NEO {
n := &NEO{} n := &NEO{}
defer n.UpdateHash() defer n.UpdateHash()
@ -136,6 +137,11 @@ func newNEO() *NEO {
n.registerPriceChanged.Store(true) n.registerPriceChanged.Store(true)
n.gasPerVoteCache = make(map[string]big.Int) n.gasPerVoteCache = make(map[string]big.Int)
err := n.initConfigCache(cfg)
if err != nil {
panic(fmt.Errorf("failed to initialize NEO config cache: %w", err))
}
desc := newDescriptor("unclaimedGas", smartcontract.IntegerType, desc := newDescriptor("unclaimedGas", smartcontract.IntegerType,
manifest.NewParameter("account", smartcontract.Hash160Type), manifest.NewParameter("account", smartcontract.Hash160Type),
manifest.NewParameter("end", smartcontract.IntegerType)) manifest.NewParameter("end", smartcontract.IntegerType))
@ -198,10 +204,6 @@ func newNEO() *NEO {
// Initialize initializes NEO contract. // Initialize initializes NEO contract.
func (n *NEO) Initialize(ic *interop.Context) error { func (n *NEO) Initialize(ic *interop.Context) error {
err := n.initConfigCache(ic.Chain)
if err != nil {
return nil
}
if err := n.nep17TokenNative.Initialize(ic); err != nil { if err := n.nep17TokenNative.Initialize(ic); err != nil {
return err return err
} }
@ -213,7 +215,7 @@ func (n *NEO) Initialize(ic *interop.Context) error {
committee0 := n.standbyKeys[:n.cfg.GetCommitteeSize(ic.Block.Index)] committee0 := n.standbyKeys[:n.cfg.GetCommitteeSize(ic.Block.Index)]
cvs := toKeysWithVotes(committee0) cvs := toKeysWithVotes(committee0)
err = n.updateCache(cvs, ic.Chain) err := n.updateCache(cvs, ic.Chain)
if err != nil { if err != nil {
return err return err
} }
@ -245,10 +247,6 @@ func (n *NEO) Initialize(ic *interop.Context) error {
// Cache initialisation should be done apart from Initialize because Initialize is // Cache initialisation should be done apart from Initialize because Initialize is
// called only when deploying native contracts. // called only when deploying native contracts.
func (n *NEO) InitializeCache(bc interop.Ledger, d *dao.Simple) error { func (n *NEO) InitializeCache(bc interop.Ledger, d *dao.Simple) error {
err := n.initConfigCache(bc)
if err != nil {
return nil
}
var committee = keysWithVotes{} var committee = keysWithVotes{}
si := d.GetStorageItem(n.ID, prefixCommittee) si := d.GetStorageItem(n.ID, prefixCommittee)
if err := committee.DecodeBytes(si); err != nil { if err := committee.DecodeBytes(si); err != nil {
@ -264,10 +262,10 @@ func (n *NEO) InitializeCache(bc interop.Ledger, d *dao.Simple) error {
return nil return nil
} }
func (n *NEO) initConfigCache(bc interop.Ledger) error { func (n *NEO) initConfigCache(cfg config.ProtocolConfiguration) error {
var err error var err error
n.cfg = bc.GetConfig() n.cfg = cfg
n.standbyKeys, err = keys.NewPublicKeysFromStrings(n.cfg.StandbyCommittee) n.standbyKeys, err = keys.NewPublicKeysFromStrings(n.cfg.StandbyCommittee)
return err return err
} }