NeoGo 0.111.0 (#3474)

Author: roman-khimov

CHANGELOG.md

@@ -6,6 +6,7 @@ Changelog for NeoFS Node
 ### Added
 - `Head` operation for FSTree (#3383)
 - `GetStream` operation for FSTree (#3431)
+- `max_time_per_block` configuration for embedded IR CN (#3474)
 
 ### Fixed
 - IR exponentially retries updating SN lists in the Container contract in error cases (#3344)
@@ -45,7 +46,7 @@ Changelog for NeoFS Node
 
 ### Updated
 - `github.com/nspcc-dev/neofs-sdk-go` dependency to `v1.0.0-rc.13.0.20250715070617-c7038b450691` (#3406, #3461)
-- NeoGo dependency to v0.110.1-0.20250709130255-4f05526f09f6 (#3456)
+- NeoGo dependency to v0.111.0 (#3456, #3474)
 
 ### Updating from v0.47.1
 Storage group objects are no longer supported (rejected by SN), you can

cmd/neofs-ir/validate_test.go

@@ -40,6 +40,7 @@ fschain:
       type: boltdb
       path: ./db/fschain.bolt
     time_per_block: 1s
+    max_time_per_block: 20s
     max_traceable_blocks: 11520
     seed_nodes:
       - node2
@@ -200,6 +201,7 @@ func TestCheckForUnknownFieldsExample(t *testing.T) {
 					Path: "./db/morph.bolt",
 				},
 				TimePerBlock:                time.Second,
+				MaxTimePerBlock:             20 * time.Second,
 				MaxTraceableBlocks:          11520,
 				MaxValidUntilBlockIncrement: 3600,
 				SeedNodes:                   []string{"node2", "node3:20333"},

config/example/ir.yaml

@@ -41,6 +41,8 @@ fschain:
       path: ./db/morph.bolt # File system path to the storage. Ignored for 'inmemory' storage.
     time_per_block: 1s # Optional time period (approximate) between two adjacent blocks. Defaults to 15s.
       # Must not be negative
+    max_time_per_block: 20s # Optional maximum time period (approximate) between two adjacent blocks, enabled dynamic block time. Not set by default (time_per_block only used).
+      # Must not be negative, must be bigger than time_per_block.
     max_traceable_blocks: 11520 # Optional length of the chain accessible to smart contracts. Defaults to 17280.
       # Must not be greater than 4294967295
     max_valid_until_block_increment: 3600 # Optional transaction validity period relative to the current height. Defaults to 8640.

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/multiformats/go-multiaddr v0.12.2
 	github.com/nspcc-dev/hrw/v2 v2.0.3
 	github.com/nspcc-dev/locode-db v0.6.0
-	github.com/nspcc-dev/neo-go v0.110.1-0.20250709130255-4f05526f09f6
+	github.com/nspcc-dev/neo-go v0.111.0
 	github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea
 	github.com/nspcc-dev/neofs-contract v0.23.0
 	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250715070617-c7038b450691
@@ -73,7 +73,7 @@ require (
 	github.com/multiformats/go-multihash v0.2.3 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nspcc-dev/dbft v0.3.3-0.20250321140139-7462b47e4d2d // indirect
+	github.com/nspcc-dev/dbft v0.4.0 // indirect
 	github.com/nspcc-dev/go-ordered-json v0.0.0-20250226190835-fb3f82b1f468 // indirect
 	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20250423172732-0e55bd820115 // indirect
 	github.com/nspcc-dev/rfc6979 v0.2.3 // indirect

go.sum

@@ -187,16 +187,16 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nspcc-dev/bbolt v0.0.0-20250612101626-5df2544a4a22 h1:M5Nmg1iCnbZngzIBDIlMr9vW+okFfcSMBvBlXG8r+14=
 github.com/nspcc-dev/bbolt v0.0.0-20250612101626-5df2544a4a22/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
-github.com/nspcc-dev/dbft v0.3.3-0.20250321140139-7462b47e4d2d h1:Mm0bp0YRAuGfoUDPbleQ9zByJc6HTCu3B4/UBoen9cQ=
-github.com/nspcc-dev/dbft v0.3.3-0.20250321140139-7462b47e4d2d/go.mod h1:msYlF5GIGwOZ9jUIHttBAAtiqJ29jzV8PPKKv1avXAI=
+github.com/nspcc-dev/dbft v0.4.0 h1:4/atD4GrrMEtrYBDiZPrPzdKZ6ws7PR/cg0M4DEdVeI=
+github.com/nspcc-dev/dbft v0.4.0/go.mod h1:msYlF5GIGwOZ9jUIHttBAAtiqJ29jzV8PPKKv1avXAI=
 github.com/nspcc-dev/go-ordered-json v0.0.0-20250226190835-fb3f82b1f468 h1:qOd9/UANpXOME/3RTSa/dJoSzdVwYOkD32XQah0xj1E=
 github.com/nspcc-dev/go-ordered-json v0.0.0-20250226190835-fb3f82b1f468/go.mod h1:d3cUseu4Asxfo9/QA/w4TtGjM0AbC9ynyab+PfH+Bso=
 github.com/nspcc-dev/hrw/v2 v2.0.3 h1:GUIitIiDpAaQat9SZccp7XVAuwtqaM40+uZ9D8Q4A84=
 github.com/nspcc-dev/hrw/v2 v2.0.3/go.mod h1:VWlFSGGPcHG1abuIDJb5u83tIF2EqOatC8Z7svZmgWQ=
 github.com/nspcc-dev/locode-db v0.6.0 h1:EdRUug+sL0EMLZgucLETD6bnegKjyEZh+D5x4r5VMvY=
 github.com/nspcc-dev/locode-db v0.6.0/go.mod h1:mJLXdzlcRucr3AFUvf5fJH+rFv1bJuU85e1jtDHDTz8=
-github.com/nspcc-dev/neo-go v0.110.1-0.20250709130255-4f05526f09f6 h1:2T/whI2JcweHqlCsH/PHhGTefP8nrtRFzmHZg/4TCVs=
-github.com/nspcc-dev/neo-go v0.110.1-0.20250709130255-4f05526f09f6/go.mod h1:PkLFBJPwuyEu+KSccDBMzdfjEr+Wml8mxZRliQWL8Ck=
+github.com/nspcc-dev/neo-go v0.111.0 h1:60gxcLIe7xbD+P8W5N/o3dLp/qvltuEEkkNVaQnTscU=
+github.com/nspcc-dev/neo-go v0.111.0/go.mod h1:VhxUMpQI/5iz7Q7kP1C274idruGTh61o5zq/IHSH2BI=
 github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20250423172732-0e55bd820115 h1:VWIceT+fh7sB5H+J5hhOIN+pWCy9/PHcvpvjSXteIQg=
 github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20250423172732-0e55bd820115/go.mod h1:3byneDNT60tiD8MSyGSyjpI1uVp9v+coySegJoQPF8c=
 github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea h1:mK0EMGLvunXcFyq7fBURS/CsN4MH+4nlYiqn6pTwWAU=

pkg/innerring/config.go

@@ -1,6 +1,7 @@
 package innerring
 
 import (
+	"errors"
 	"fmt"
 	"math"
 	"net"
@@ -70,6 +71,15 @@ func validateBlockchainConfig(cfg *config.Config) error {
 		return err
 	}
 
+	err = checkDurationPositive(cfgFSChainLocalConsensus.MaxTimePerBlock, cfgPathFSChainLocalConsensus+".max_time_per_block")
+	if err != nil {
+		return err
+	}
+
+	if cfgFSChainLocalConsensus.MaxTimePerBlock != 0 && cfgFSChainLocalConsensus.MaxTimePerBlock < cfgFSChainLocalConsensus.TimePerBlock {
+		return errors.New("consensus max_time_per_block set to lower value than time_per_block")
+	}
+
 	cfgFSChainLocalConsensus.SeedNodes, err = parseConfigAddressesTCP(cfgFSChainLocalConsensus.SeedNodes,
 		cfgPathFSChainLocalConsensus+".seed_nodes", p2pDefaultListenPort, false)
 	if err != nil {

pkg/innerring/config/fschain.go

@@ -33,11 +33,20 @@ type Consensus struct {
 	// Required.
 	Storage Storage `mapstructure:"storage"`
 
-	// Time period (approximate) between two adjacent blocks.
+	// Time period (approximate) between two adjacent blocks. If used
+	// with MaxTimePerBlock, specifies minimal time.
 	//
 	// Optional: defaults to 15s. Must not be negative.
 	TimePerBlock time.Duration `mapstructure:"time_per_block"`
 
+	// Maximum time period (approximate) between two adjacent blocks,
+	// if used enables dynamic block time (contrary to TimePerBlock
+	// targeting for every block).
+	//
+	// Optional: not set by default. Must not be negative, must be
+	// bigger than TimePerBlock.
+	MaxTimePerBlock time.Duration `mapstructure:"max_time_per_block"`
+
 	// Length of the chain accessible to smart contracts.
 	//
 	// Optional: defaults to 17280.

pkg/innerring/config_test.go

@@ -38,6 +38,7 @@ fschain:
 // YAML sub-configuration of the IR consensus with all optional fields.
 const validBlockchainConfigOptions = `
     time_per_block: 1s
+    max_time_per_block: 20s
     max_traceable_blocks: 200
     seed_nodes:
       - localhost:20000
@@ -178,9 +179,10 @@ func TestParseBlockchainConfig(t *testing.T) {
 		require.Equal(t, &irconfig.Config{
 			FSChain: irconfig.Chain{
 				Consensus: irconfig.Consensus{
-					Magic:        15405,
-					Committee:    validCommittee,
-					TimePerBlock: time.Second,
+					Magic:           15405,
+					Committee:       validCommittee,
+					TimePerBlock:    time.Second,
+					MaxTimePerBlock: 20 * time.Second,
 					RPC: irconfig.RPC{
 						MaxWebSocketClients: 100,
 						SessionPoolSize:     100,
@@ -357,6 +359,7 @@ fschain:
 				{kvF("magic", math.MaxUint32+1)},
 				{kvF("committee", []string{"not a key"})},
 				{kvF("time_per_block", "not a duration")},
+				{kvF("max_time_per_block", "not a duration")},
 				{kvF("max_traceable_blocks", -1)},
 				{kvF("max_traceable_blocks", math.MaxUint32+1)},
 				{kvF("max_valid_until_block_increment", -1)},
@@ -398,6 +401,8 @@ fschain:
 				{kvF("committee", []string{})},
 				{kvF("storage.type", "random string")},
 				{kvF("time_per_block", -time.Second)},
+				{kvF("max_time_per_block", -time.Second)},
+				{kvF("max_time_per_block", time.Millisecond)},
 				{kvF("seed_nodes", []string{"a:1:2"})},
 				{kvF("hardforks", map[string]any{"": 1})},
 				{kvF("validators_history", map[string]any{"0": len(validCommittee) + 1})},

pkg/innerring/internal/blockchain/blockchain.go

@@ -54,6 +54,8 @@ func New(cfg *config.Consensus, wallet *config.Wallet, errChan chan<- error, log
 		panic("uninitialized storage config")
 	case cfg.TimePerBlock < 0:
 		panic("negative block interval")
+	case cfg.MaxTimePerBlock < 0:
+		panic("negative max block interval")
 	case wallet.Path == "":
 		panic("missing wallet path")
 	case errChan == nil:
@@ -155,6 +157,7 @@ func New(cfg *config.Consensus, wallet *config.Wallet, errChan chan<- error, log
 	cfgBaseProto.StandbyCommittee = standByCommittee
 
 	cfgBaseProto.TimePerBlock = cfg.TimePerBlock
+	cfgBaseProto.MaxTimePerBlock = cfg.MaxTimePerBlock
 	cfgBaseProto.Genesis.TimePerBlock = cfg.TimePerBlock
 	cfgBaseProto.SeedList = cfg.SeedNodes
 	cfgBaseProto.VerifyTransactions = true

pkg/morph/client/client.go

@@ -525,13 +525,7 @@ func (c *Client) GetBlockHeader(ind uint32) (*block.Header, error) {
 		return nil, ErrConnectionLost
 	}
 
-	// there is no header by index in neo-go's client yet
-	b, err := conn.client.GetBlockByIndex(ind)
-	if err != nil {
-		return nil, err
-	}
-
-	return &b.Header, nil
+	return conn.client.GetBlockHeaderByIndex(ind)
 }
 
 // MsPerBlock returns MillisecondsPerBlock network parameter.