Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to set initial block height at genesis #3416

Merged
merged 1 commit into from
Oct 16, 2020
Merged

Add ability to set initial block height at genesis #3416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/3416.internal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
go: Add ability to set initial block height at genesis
3 changes: 3 additions & 0 deletions go/oasis-net-runner/fixtures/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const (
cfgRuntimeLoader = "fixture.default.runtime.loader"
cfgSetupRuntimes = "fixture.default.setup_runtimes"
cfgTEEHardware = "fixture.default.tee_hardware"
cfgInitialHeight = "fixture.default.initial_height"
)

var (
Expand Down Expand Up @@ -61,6 +62,7 @@ func newDefaultFixture() (*oasis.NetworkFixture, error) {
},
},
EpochtimeMock: viper.GetBool(cfgEpochtimeMock),
InitialHeight: viper.GetInt64(cfgInitialHeight),
HaltEpoch: viper.GetUint64(cfgHaltEpoch),
IAS: oasis.IASCfg{
Mock: true,
Expand Down Expand Up @@ -160,6 +162,7 @@ func init() {
DefaultFixtureFlags.String(cfgRuntimeLoader, "oasis-core-runtime-loader", "path to the runtime loader")
DefaultFixtureFlags.String(cfgTEEHardware, "", "TEE hardware to use")
DefaultFixtureFlags.Uint64(cfgHaltEpoch, math.MaxUint64, "halt epoch height")
DefaultFixtureFlags.Int64(cfgInitialHeight, 1, "initial block height")

_ = viper.BindPFlags(DefaultFixtureFlags)

Expand Down
22 changes: 12 additions & 10 deletions go/oasis-node/cmd/genesis/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,16 @@ import (
)

const (
cfgEntity = "entity"
cfgRuntime = "runtime"
cfgNode = "node"
cfgRootHash = "roothash"
cfgKeyManager = "keymanager"
cfgStaking = "staking"
cfgBlockHeight = "height"
cfgChainID = "chain.id"
cfgHaltEpoch = "halt.epoch"
cfgEntity = "entity"
cfgRuntime = "runtime"
cfgNode = "node"
cfgRootHash = "roothash"
cfgKeyManager = "keymanager"
cfgStaking = "staking"
cfgBlockHeight = "height"
cfgChainID = "chain.id"
cfgHaltEpoch = "halt.epoch"
cfgInitialHeight = "initial_height"

// Registry config flags.
CfgRegistryMaxNodeExpiration = "registry.max_node_expiration"
Expand Down Expand Up @@ -165,7 +166,7 @@ func doInitGenesis(cmd *cobra.Command, args []string) {

// Build the genesis state, if any.
doc := &genesis.Document{
Height: 1,
Height: viper.GetInt64(cfgInitialHeight),
ChainID: chainID,
Time: time.Now(),
HaltEpoch: epochtime.EpochTime(viper.GetUint64(cfgHaltEpoch)),
Expand Down Expand Up @@ -684,6 +685,7 @@ func init() {
initGenesisFlags.StringSlice(cfgKeyManager, nil, "path to key manager genesis status file")
initGenesisFlags.String(cfgChainID, "", "genesis chain id")
initGenesisFlags.Uint64(cfgHaltEpoch, math.MaxUint64, "genesis halt epoch height")
initGenesisFlags.Int64(cfgInitialHeight, 1, "initial block height")

// Registry config flags.
initGenesisFlags.Uint64(CfgRegistryMaxNodeExpiration, 5, "maximum node registration lifespan in epochs")
Expand Down
8 changes: 8 additions & 0 deletions go/oasis-test-runner/oasis/oasis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const (
defaultConsensusBackend = "tendermint"
defaultConsensusTimeoutCommit = 250 * time.Millisecond
defaultEpochtimeTendermintInterval = 30
defaultInitialHeight = 1
defaultHaltEpoch = math.MaxUint64

logNodeFile = "node.log"
Expand Down Expand Up @@ -294,6 +295,9 @@ type NetworkCfg struct { // nolint: maligned
// Consensus are the network-wide consensus parameters.
Consensus consensusGenesis.Genesis `json:"consensus"`

// InitialHeight is the initial block height.
InitialHeight int64 `json:"initial_height,omitempty"`

// HaltEpoch is the halt epoch height flag.
HaltEpoch uint64 `json:"halt_epoch"`

Expand Down Expand Up @@ -862,6 +866,7 @@ func (net *Network) MakeGenesis() error {
"genesis", "init",
"--genesis.file", net.GenesisPath(),
"--chain.id", genesisTestHelpers.TestChainID,
"--initial_height", strconv.FormatInt(net.cfg.InitialHeight, 10),
"--halt.epoch", strconv.FormatUint(net.cfg.HaltEpoch, 10),
"--consensus.backend", net.cfg.Consensus.Backend,
"--epochtime.tendermint.interval", strconv.FormatInt(net.cfg.EpochtimeTendermintInterval, 10),
Expand Down Expand Up @@ -1035,6 +1040,9 @@ func New(env *env.Env, cfg *NetworkCfg) (*Network, error) {
if cfgCopy.EpochtimeTendermintInterval == 0 {
cfgCopy.EpochtimeTendermintInterval = defaultEpochtimeTendermintInterval
}
if cfgCopy.InitialHeight == 0 {
cfgCopy.InitialHeight = defaultInitialHeight
}
if cfgCopy.HaltEpoch == 0 {
cfgCopy.HaltEpoch = defaultHaltEpoch
}
Expand Down