Merge pull request #8756 from filecoin-project/jen/devnetfixport
fix: build: genesis miner network version
This commit is contained in:
commit
05c19b37a4
@ -11,6 +11,7 @@ import (
|
||||
|
||||
"github.com/filecoin-project/go-state-types/abi"
|
||||
"github.com/filecoin-project/go-state-types/network"
|
||||
"github.com/filecoin-project/lotus/chain/actors"
|
||||
"github.com/filecoin-project/lotus/chain/actors/policy"
|
||||
)
|
||||
|
||||
@ -49,6 +50,10 @@ var UpgradeChocolateHeight = abi.ChainEpoch(-17)
|
||||
|
||||
var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
|
||||
|
||||
var UpgradeSkyrHeight = abi.ChainEpoch(100)
|
||||
|
||||
var ActorsCIDs = map[actors.Version]cid.Cid{}
|
||||
|
||||
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
|
||||
0: DrandMainnet,
|
||||
}
|
||||
|
@ -59,7 +59,7 @@ var genesisNewCmd = &cli.Command{
|
||||
return xerrors.New("seed genesis new [genesis.json]")
|
||||
}
|
||||
out := genesis.Template{
|
||||
NetworkVersion: build.NewestNetworkVersion,
|
||||
NetworkVersion: build.GenesisNetworkVersion,
|
||||
Accounts: []genesis.Actor{},
|
||||
Miners: []genesis.Miner{},
|
||||
VerifregRootKey: gen.DefaultVerifregRootkeyActor,
|
||||
|
@ -97,7 +97,7 @@ var preSealCmd = &cli.Command{
|
||||
&cli.UintFlag{
|
||||
Name: "network-version",
|
||||
Usage: "specify network version",
|
||||
Value: uint(build.NewestNetworkVersion),
|
||||
Value: uint(build.GenesisNetworkVersion),
|
||||
},
|
||||
},
|
||||
Action: func(c *cli.Context) error {
|
||||
@ -134,7 +134,7 @@ var preSealCmd = &cli.Command{
|
||||
}
|
||||
sectorSize := abi.SectorSize(sectorSizeInt)
|
||||
|
||||
nv := build.NewestNetworkVersion
|
||||
nv := build.GenesisNetworkVersion
|
||||
if c.IsSet("network-version") {
|
||||
nv = network.Version(c.Uint64("network-version"))
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user