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

core/config: move MaxTraceableBlocks to configuration file

Browse source 
Follow neo-project/neo#2042, use 2102400 setting for mainnet/testnet and
200000 for private networks.
This commit is contained in:
Roman Khimov 2020-11-05 22:01:12 +03:00
parent 39a38dc5f5
commit b327308df8
13 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/protocol.mainnet.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 5195086 Magic: 5195086
MaxTraceableBlocks: 2102400
SecondsPerBlock: 15 SecondsPerBlock: 15
MemPoolSize: 50000 MemPoolSize: 50000
StandbyCommittee: StandbyCommittee:

1
config/protocol.privnet.docker.four.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 56753 Magic: 56753
MaxTraceableBlocks: 200000
SecondsPerBlock: 15 SecondsPerBlock: 15
MemPoolSize: 50000 MemPoolSize: 50000
StandbyCommittee: StandbyCommittee:

1
config/protocol.privnet.docker.one.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 56753 Magic: 56753
MaxTraceableBlocks: 200000
SecondsPerBlock: 15 SecondsPerBlock: 15
MemPoolSize: 50000 MemPoolSize: 50000
StandbyCommittee: StandbyCommittee:

1
config/protocol.privnet.docker.single.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 56753 Magic: 56753
MaxTraceableBlocks: 200000
SecondsPerBlock: 1 SecondsPerBlock: 1
MemPoolSize: 50000 MemPoolSize: 50000
StandbyCommittee: StandbyCommittee:

1
config/protocol.privnet.docker.three.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 56753 Magic: 56753
MaxTraceableBlocks: 200000
SecondsPerBlock: 15 SecondsPerBlock: 15
MemPoolSize: 50000 MemPoolSize: 50000
StandbyCommittee: StandbyCommittee:

1
config/protocol.privnet.docker.two.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 56753 Magic: 56753
MaxTraceableBlocks: 200000
SecondsPerBlock: 15 SecondsPerBlock: 15
MemPoolSize: 50000 MemPoolSize: 50000
StandbyCommittee: StandbyCommittee:

1
config/protocol.privnet.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 56753 Magic: 56753
MaxTraceableBlocks: 200000
SecondsPerBlock: 15 SecondsPerBlock: 15
MemPoolSize: 50000 MemPoolSize: 50000
StandbyCommittee: StandbyCommittee:

1
config/protocol.testnet.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 1951352142 Magic: 1951352142
MaxTraceableBlocks: 2102400
SecondsPerBlock: 15 SecondsPerBlock: 15
MemPoolSize: 50000 MemPoolSize: 50000
StandbyCommittee: StandbyCommittee:

1
config/protocol.unit_testnet.single.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 42 Magic: 42
MaxTraceableBlocks: 200000
SecondsPerBlock: 1 SecondsPerBlock: 1
MemPoolSize: 100 MemPoolSize: 100
StandbyCommittee: StandbyCommittee:

1
config/protocol.unit_testnet.yml
View file

@ -1,5 +1,6 @@
ProtocolConfiguration: ProtocolConfiguration:
Magic: 42 Magic: 42
MaxTraceableBlocks: 200000
SecondsPerBlock: 15 SecondsPerBlock: 15
MemPoolSize: 50000 MemPoolSize: 50000
StandbyCommittee: StandbyCommittee:

2
pkg/config/protocol_config.go
View file

@ -9,6 +9,8 @@ type (
ProtocolConfiguration struct { ProtocolConfiguration struct {
Magic netmode.Magic `yaml:"Magic"` Magic netmode.Magic `yaml:"Magic"`
MemPoolSize int `yaml:"MemPoolSize"` MemPoolSize int `yaml:"MemPoolSize"`
// MaxTraceableBlocks is the length of the chain accessible to smart contracts.
MaxTraceableBlocks uint32 `yaml:"MaxTraceableBlocks"`
// P2PSigExtensions enables additional signature-related transaction attributes // P2PSigExtensions enables additional signature-related transaction attributes
P2PSigExtensions bool `yaml:"P2PSigExtensions"` P2PSigExtensions bool `yaml:"P2PSigExtensions"`
// ReservedAttributes allows to have reserved attributes range for experimental or private purposes. // ReservedAttributes allows to have reserved attributes range for experimental or private purposes.

5
pkg/core/blockchain.go
View file

@ -41,6 +41,7 @@ const (
version = "0.1.0" version = "0.1.0"
defaultMemPoolSize = 50000 defaultMemPoolSize = 50000
defaultMaxTraceableBlocks = 2102400 // 1 year of 15s blocks
verificationGasLimit = 100000000 // 1 GAS verificationGasLimit = 100000000 // 1 GAS
) )
@ -148,6 +149,10 @@ func NewBlockchain(s storage.Store, cfg config.ProtocolConfiguration, log *zap.L
cfg.MemPoolSize = defaultMemPoolSize cfg.MemPoolSize = defaultMemPoolSize
log.Info("mempool size is not set or wrong, setting default value", zap.Int("MemPoolSize", cfg.MemPoolSize)) log.Info("mempool size is not set or wrong, setting default value", zap.Int("MemPoolSize", cfg.MemPoolSize))
} }
if cfg.MaxTraceableBlocks == 0 {
cfg.MaxTraceableBlocks = defaultMaxTraceableBlocks
log.Info("MaxTraceableBlocks is not set or wrong, using default value", zap.Uint32("MaxTraceableBlocks", cfg.MaxTraceableBlocks))
}
committee, err := committeeFromConfig(cfg) committee, err := committeeFromConfig(cfg)
if err != nil { if err != nil {
return nil, err return nil, err

4
pkg/core/interop_system.go
View file

@ -26,9 +26,6 @@ const (
// MaxStorageValueLen is the maximum length of a value for storage items. // MaxStorageValueLen is the maximum length of a value for storage items.
// It is set to be the maximum value for uint16. // It is set to be the maximum value for uint16.
MaxStorageValueLen = 65535 MaxStorageValueLen = 65535
// MaxTraceableBlocks is the maximum number of blocks before current chain
// height we're able to give information about.
MaxTraceableBlocks = transaction.MaxValidUntilBlockIncrement
// MaxEventNameLen is the maximum length of a name for event. // MaxEventNameLen is the maximum length of a name for event.
MaxEventNameLen = 32 MaxEventNameLen = 32
// MaxNotificationSize is the maximum length of a runtime log message. // MaxNotificationSize is the maximum length of a runtime log message.
@ -155,6 +152,7 @@ func getTransactionAndHeight(cd *dao.Cached, v *vm.VM) (*transaction.Transaction
// the block with index specified. // the block with index specified.
func isTraceableBlock(ic *interop.Context, index uint32) bool { func isTraceableBlock(ic *interop.Context, index uint32) bool {
height := ic.Chain.BlockHeight() height := ic.Chain.BlockHeight()
MaxTraceableBlocks := ic.Chain.GetConfig().MaxTraceableBlocks
return index <= height && index+MaxTraceableBlocks > height return index <= height && index+MaxTraceableBlocks > height
} }