TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2025-03-13 09:18:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3819 from nspcc-dev/genesis-header-size

Browse source 
*: fix GetExpectedHeaderSize for genesis block case
This commit is contained in:
Anna Shaleva 2025-02-26 20:49:34 +08:00 • committed by GitHub
commit 64e3b6aa48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/core/block/header.go
View file

@ -238,7 +238,14 @@ func (b *Header) UnmarshalJSON(data []byte) error {
} }
// GetExpectedHeaderSize returns the expected Header size with the given number of validators. // GetExpectedHeaderSize returns the expected Header size with the given number of validators.
// To calculate genesis block Header size numOfValidators should be 0.
func GetExpectedHeaderSize(stateRootInHeader bool, numOfValidators int) int { func GetExpectedHeaderSize(stateRootInHeader bool, numOfValidators int) int {
var size int
// Genesis block case.
if numOfValidators == 0 {
// 1 byte for the PUSH1 opcode.
size = expectedHeaderSizeWithEmptyWitness + 1
} else {
m := smartcontract.GetDefaultHonestNodeCount(numOfValidators) m := smartcontract.GetDefaultHonestNodeCount(numOfValidators)
// expectedHeaderSizeWithEmptyWitness contains 2 bytes for zero-length (new(Header)).Script.Invocation/Verification // expectedHeaderSizeWithEmptyWitness contains 2 bytes for zero-length (new(Header)).Script.Invocation/Verification
// InvocationScript: // InvocationScript:
@ -249,7 +256,8 @@ func GetExpectedHeaderSize(stateRootInHeader bool, numOfValidators int) int {
// 33 = 1 push opcode + 1 length + 33 bytes for public key // 33 = 1 push opcode + 1 length + 33 bytes for public key
// n = 1 bytes // n = 1 bytes
// 5 for SYSCALL // 5 for SYSCALL
size := expectedHeaderSizeWithEmptyWitness + (1+1+64)*m + 2 + numOfValidators*(1+1+33) + 2 + 5 size = expectedHeaderSizeWithEmptyWitness + (1+1+64)*m + 2 + numOfValidators*(1+1+33) + 2 + 5
}
if stateRootInHeader { if stateRootInHeader {
size += util.Uint256Size size += util.Uint256Size

13
pkg/core/util_test.go
View file

@ -5,7 +5,9 @@ import (
"github.com/nspcc-dev/neo-go/pkg/config" "github.com/nspcc-dev/neo-go/pkg/config"
"github.com/nspcc-dev/neo-go/pkg/config/netmode" "github.com/nspcc-dev/neo-go/pkg/config/netmode"
"github.com/nspcc-dev/neo-go/pkg/core/block"
"github.com/nspcc-dev/neo-go/pkg/encoding/address" "github.com/nspcc-dev/neo-go/pkg/encoding/address"
"github.com/nspcc-dev/neo-go/pkg/io"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
@ -39,3 +41,14 @@ func TestGetConsensusAddressMainNet(t *testing.T) {
assert.Equal(t, consensusScript, script.String()) assert.Equal(t, consensusScript, script.String())
assert.Equal(t, consensusAddr, address.Uint160ToString(script)) assert.Equal(t, consensusAddr, address.Uint160ToString(script))
} }
func TestGetExpectedHeaderSize(t *testing.T) {
cfg, err := config.Load("../../config", netmode.MainNet)
require.NoError(t, err)
blk, err := CreateGenesisBlock(cfg.ProtocolConfiguration)
require.NoError(t, err)
w := io.NewBufBinWriter()
blk.Header.EncodeBinary(w.BinWriter)
require.NoError(t, w.Err)
require.Equal(t, block.GetExpectedHeaderSize(false, 0), w.Len())
}

3
pkg/services/blockfetcher/blockfetcher.go
View file

@ -192,7 +192,8 @@ func New(chain Ledger, cfg config.NeoFSBlockFetcher, logger *zap.Logger, put fun
func getHeaderSizeMap(chain config.Blockchain) map[int]int { func getHeaderSizeMap(chain config.Blockchain) map[int]int {
headerSizeMap := make(map[int]int) headerSizeMap := make(map[int]int)
headerSizeMap[0] = block.GetExpectedHeaderSize(chain.StateRootInHeader, chain.GetNumOfCNs(0)) headerSizeMap[0] = block.GetExpectedHeaderSize(chain.StateRootInHeader, 0) // genesis header size.
headerSizeMap[1] = block.GetExpectedHeaderSize(chain.StateRootInHeader, chain.GetNumOfCNs(0))
for height := range chain.CommitteeHistory { for height := range chain.CommitteeHistory {
headerSizeMap[int(height)] = block.GetExpectedHeaderSize(chain.StateRootInHeader, chain.GetNumOfCNs(height)) headerSizeMap[int(height)] = block.GetExpectedHeaderSize(chain.StateRootInHeader, chain.GetNumOfCNs(height))
} }