native: store TimePerBlock setting inside native Policy

A part of #3745.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>

Author: AnnaShaleva

docs/node-configuration.md

@@ -480,7 +480,7 @@ in development and can change in an incompatible way.
 | `Basilisk`      | Enables strict smart contract script check against a set of JMP instructions and against method boundaries enabled on contract deploy or update. Increases `stackitem.Integer` JSON parsing precision up to the maximum value supported by the NeoVM. Enables strict check for notifications emitted by a contract to precisely match the events specified in the contract manifest. | https://github.com/nspcc-dev/neo-go/pull/3056 <br> https://github.com/neo-project/neo/pull/2881 <br> https://github.com/nspcc-dev/neo-go/pull/3080 <br> https://github.com/neo-project/neo/pull/2883 <br> https://github.com/nspcc-dev/neo-go/pull/3085 <br> https://github.com/neo-project/neo/pull/2810 |
 | `Cockatrice`    | Introduces the ability to update native contracts. Includes a couple of new native smart contract APIs: `keccak256` of native CryptoLib contract and `getCommitteeAddress` of native NeoToken contract. | https://github.com/nspcc-dev/neo-go/pull/3402 <br> https://github.com/neo-project/neo/pull/2942 <br> https://github.com/nspcc-dev/neo-go/pull/3301 <br> https://github.com/neo-project/neo/pull/2925 <br> https://github.com/nspcc-dev/neo-go/pull/3362 <br> https://github.com/neo-project/neo/pull/3154 |
 | `Domovoi`       | Makes node use executing contract state for the contract call permissions check instead of the state stored in the native Management contract. In C# also makes System.Runtime.GetNotifications interop properly count stack references of notification parameters which prevents users from creating objects that exceed MaxStackSize constraint, but NeoGo has never had this bug, thus proper behaviour is preserved even before HFDomovoi. It results in the fact that some T5 testnet transactions have different ApplicationLogs compared to the C# node, but the node states match. | https://github.com/nspcc-dev/neo-go/pull/3476 <br> https://github.com/neo-project/neo/pull/3290 <br> https://github.com/nspcc-dev/neo-go/pull/3473 <br> https://github.com/neo-project/neo/pull/3290 <br> https://github.com/neo-project/neo/pull/3301 <br> https://github.com/nspcc-dev/neo-go/pull/3485 |
-| `Echidna`       | Introduces `Designation` event extension with `Old` and `New` roles data to native RoleManagement contract. Adds support for `base64UrlEncode` and `base64UrlDecode` methods to native StdLib contract. Extends the list of required call flags for `registerCandidate`, `unregisterCandidate`and `vote` methods of native NeoToken contract with AllowNotify flag. Enables `onNEP17Payment` method of NEO contract for candidate registration. Introduces constraint for maximum number of execution notifications. | https://github.com/nspcc-dev/neo-go/pull/3554 <br> https://github.com/nspcc-dev/neo-go/pull/3761 <br> https://github.com/nspcc-dev/neo-go/pull/3554 <br> https://github.com/neo-project/neo/pull/3597 <br> https://github.com/nspcc-dev/neo-go/pull/3700 <br> https://github.com/nspcc-dev/neo-go/pull/3640 <br> https://github.com/neo-project/neo/pull/3548 |
+| `Echidna`       | Introduces `Designation` event extension with `Old` and `New` roles data to native RoleManagement contract. Adds support for `base64UrlEncode` and `base64UrlDecode` methods to native StdLib contract. Extends the list of required call flags for `registerCandidate`, `unregisterCandidate`and `vote` methods of native NeoToken contract with AllowNotify flag. Enables `onNEP17Payment` method of NEO contract for candidate registration. Introduces constraint for maximum number of execution notifications. Introduces `setMSPerBlock` and `getMSPerBlock` methods of native Policy contract. | https://github.com/nspcc-dev/neo-go/pull/3554 <br> https://github.com/nspcc-dev/neo-go/pull/3761 <br> https://github.com/nspcc-dev/neo-go/pull/3554 <br> https://github.com/neo-project/neo/pull/3597 <br> https://github.com/nspcc-dev/neo-go/pull/3700 <br> https://github.com/nspcc-dev/neo-go/pull/3640 <br> https://github.com/neo-project/neo/pull/3548 <br> https://github.com/neo-project/neo/pull/3622 <br> https://github.com/nspcc-dev/neo-go/pull/3835 |
 
 
 ## DB compatibility

pkg/config/genesis_extensions.go

@@ -3,6 +3,7 @@ package config
 import (
 	"encoding/base64"
 	"fmt"
+	"time"
 
 	"github.com/nspcc-dev/neo-go/pkg/core/native/noderoles"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
@@ -19,6 +20,12 @@ type Genesis struct {
 	// genesis block. It is NeoGo extension and must be disabled on the public
 	// Neo N3 networks.
 	Transaction *GenesisTransaction
+	// DefaultTimePerBlock is the time interval between blocks that consensus
+	// nodes work with. It must be an integer number of milliseconds. It differs
+	// from Protocol level configuration in that this value is used starting
+	// from HFEchidna to initialize MSPerBlock value of native Policy
+	// contract.
+	DefaultTimePerBlock time.Duration
 }
 
 // GenesisTransaction is a placeholder for script that should be included into genesis

pkg/config/hardfork.go

@@ -45,7 +45,8 @@ const (
 	HFDomovoi // Domovoi
 	// HFEchidna represents hard-fork introduced in #3554 (ported from
 	// https://github.com/neo-project/neo/pull/3454), #3640 (ported from
-	// https://github.com/neo-project/neo/pull/3548).
+	// https://github.com/neo-project/neo/pull/3548), #3835 (ported from
+	// https://github.com/neo-project/neo/pull/3622).
 	HFEchidna // Echidna
 	// hfLast denotes the end of hardforks enum. Consider adding new hardforks
 	// before hfLast.

pkg/config/protocol_config.go

@@ -62,7 +62,9 @@ type (
 		// It is valid only if P2PStateExchangeExtensions are enabled.
 		StateSyncInterval int `yaml:"StateSyncInterval"`
 		// TimePerBlock is the time interval between blocks that consensus nodes work with.
-		// It must be an integer number of milliseconds.
+		// It must be an integer number of milliseconds. This value is applicable till
+		// HFEchidna; use Genesis-level configuration to set up further block acceptance
+		// interval.
 		TimePerBlock    time.Duration `yaml:"TimePerBlock"`
 		ValidatorsCount uint32        `yaml:"ValidatorsCount"`
 		// Validators stores history of changes to consensus node number (height: number).

pkg/core/blockchain.go

@@ -293,6 +293,11 @@ func NewBlockchain(s storage.Store, cfg config.Blockchain, log *zap.Logger) (*Bl
 		log.Info("TimePerBlock is not set or wrong, using default value",
 			zap.Duration("TimePerBlock", cfg.TimePerBlock))
 	}
+	if cfg.Genesis.DefaultTimePerBlock <= 0 {
+		cfg.Genesis.DefaultTimePerBlock = defaultTimePerBlock
+		log.Info("Genesis DefaultTimePerBlock is not set or wrong, using default value",
+			zap.Duration("DefaultTimePerBlock", cfg.Genesis.DefaultTimePerBlock))
+	}
 	if cfg.MaxValidUntilBlockIncrement == 0 {
 		const timePerDay = 24 * time.Hour
 
@@ -1109,7 +1114,7 @@ func (bc *Blockchain) initializeNativeCache(blockHeight uint32, d *dao.Simple) e
 		if !bc.isHardforkEnabled(c.ActiveIn(), blockHeight) {
 			continue
 		}
-		err := c.InitializeCache(blockHeight, d)
+		err := c.InitializeCache(bc.isHardforkEnabled, blockHeight, d)
 		if err != nil {
 			return fmt.Errorf("failed to initialize cache for %s: %w", c.Metadata().Name, err)
 		}

pkg/core/interop/context.go

@@ -190,13 +190,17 @@ type Contract interface {
 	// been deployed, but in-memory cached data were lost due to the node reset.
 	// It should be called each time after node restart iff the contract was
 	// deployed and no Initialize method was called.
-	InitializeCache(blockHeight uint32, d *dao.Simple) error
+	InitializeCache(isHardforkEnabled IsHardforkEnabled, blockHeight uint32, d *dao.Simple) error
 	// Metadata returns generic native contract metadata.
 	Metadata() *ContractMD
 	OnPersist(*Context) error
 	PostPersist(*Context) error
 }
 
+// IsHardforkEnabled is a delegate denoting whether specific hardfork is enabled
+// at the given height.
+type IsHardforkEnabled func(hf *config.Hardfork, blockHeight uint32) bool
+
 // ContractMD represents a generic hardfork-independent native contract instance.
 type ContractMD struct {
 	ID   int32

pkg/core/native/crypto.go

@@ -341,7 +341,7 @@ func (c *Crypto) Initialize(ic *interop.Context, hf *config.Hardfork, newMD *int
 }
 
 // InitializeCache implements the Contract interface.
-func (c *Crypto) InitializeCache(blockHeight uint32, d *dao.Simple) error {
+func (c *Crypto) InitializeCache(_ interop.IsHardforkEnabled, blockHeight uint32, d *dao.Simple) error {
 	return nil
 }
 

pkg/core/native/designate.go

@@ -163,7 +163,7 @@ func (s *Designate) Initialize(ic *interop.Context, hf *config.Hardfork, newMD *
 
 // InitializeCache fills native Designate cache from DAO. It is called at non-zero height, thus
 // we can fetch the roles data right from the storage.
-func (s *Designate) InitializeCache(blockHeight uint32, d *dao.Simple) error {
+func (s *Designate) InitializeCache(_ interop.IsHardforkEnabled, blockHeight uint32, d *dao.Simple) error {
 	cache := &DesignationCache{}
 	roles := []noderoles.Role{noderoles.Oracle, noderoles.NeoFSAlphabet, noderoles.StateValidator, noderoles.P2PNotary}
 	for _, r := range roles {

pkg/core/native/ledger.go

@@ -86,7 +86,7 @@ func (l *Ledger) Initialize(ic *interop.Context, hf *config.Hardfork, newMD *int
 }
 
 // InitializeCache implements the Contract interface.
-func (l *Ledger) InitializeCache(blockHeight uint32, d *dao.Simple) error {
+func (l *Ledger) InitializeCache(_ interop.IsHardforkEnabled, blockHeight uint32, d *dao.Simple) error {
 	return nil
 }
 

pkg/core/native/management.go

@@ -704,7 +704,7 @@ func (m *Management) OnPersist(ic *interop.Context) error {
 // InitializeCache initializes contract cache with the proper values from storage.
 // Cache initialization should be done apart from Initialize because Initialize is
 // called only when deploying native contracts.
-func (m *Management) InitializeCache(blockHeight uint32, d *dao.Simple) error {
+func (m *Management) InitializeCache(_ interop.IsHardforkEnabled, blockHeight uint32, d *dao.Simple) error {
 	cache := &ManagementCache{
 		contracts: make(map[util.Uint160]*state.Contract),
 		nep11:     make(map[util.Uint160]struct{}),