cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #8756 from filecoin-project/jen/devnetfixport

Browse Source 
fix: build: genesis miner network version
This commit is contained in:
Aayush Rajasekaran 2022-06-06 23:33:01 -04:00 committed by GitHub
commit 05c19b37a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/params_2k.go
View File

@ -11,6 +11,7 @@ import (
"github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/go-state-types/network"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/actors/policy"
) )
@ -49,6 +50,10 @@ var UpgradeChocolateHeight = abi.ChainEpoch(-17)
var UpgradeOhSnapHeight = abi.ChainEpoch(-18) var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
var UpgradeSkyrHeight = abi.ChainEpoch(100)
var ActorsCIDs = map[actors.Version]cid.Cid{}
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet, 0: DrandMainnet,
} }

2
cmd/lotus-seed/genesis.go
View File

@ -59,7 +59,7 @@ var genesisNewCmd = &cli.Command{
return xerrors.New("seed genesis new [genesis.json]") return xerrors.New("seed genesis new [genesis.json]")
} }
out := genesis.Template{ out := genesis.Template{
NetworkVersion: build.NewestNetworkVersion, NetworkVersion: build.GenesisNetworkVersion,
Accounts: []genesis.Actor{}, Accounts: []genesis.Actor{},
Miners: []genesis.Miner{}, Miners: []genesis.Miner{},
VerifregRootKey: gen.DefaultVerifregRootkeyActor, VerifregRootKey: gen.DefaultVerifregRootkeyActor,

4
cmd/lotus-seed/main.go
View File

@ -97,7 +97,7 @@ var preSealCmd = &cli.Command{
&cli.UintFlag{ &cli.UintFlag{
Name: "network-version", Name: "network-version",
Usage: "specify network version", Usage: "specify network version",
Value: uint(build.NewestNetworkVersion), Value: uint(build.GenesisNetworkVersion),
}, },
}, },
Action: func(c *cli.Context) error { Action: func(c *cli.Context) error {
@ -134,7 +134,7 @@ var preSealCmd = &cli.Command{
} }
sectorSize := abi.SectorSize(sectorSizeInt) sectorSize := abi.SectorSize(sectorSizeInt)
nv := build.NewestNetworkVersion nv := build.GenesisNetworkVersion
if c.IsSet("network-version") { if c.IsSet("network-version") {
nv = network.Version(c.Uint64("network-version")) nv = network.Version(c.Uint64("network-version"))
} }