Skip to content

Commit

Permalink
build v1.2.0-rc6 (#4785)
Browse files Browse the repository at this point in the history 
* tweak v15 migration params

* venus-devtool: upgrade lotus to v1.14.0

* set ohSnap mainnet upgrade epoch

* update version to v1.2.0-rc6

* upgrade venus-auth
  • Loading branch information
@simlecode
simlecode authored Feb 18, 2022
1 parent 1515aa6 commit 81ff96a
Show file tree
Hide file tree
Showing 12 changed files with 101 additions and 61 deletions.
2 changes: 1 addition & 1 deletion fixtures/networks/integrationtestnet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func IntegrationNet() *NetworkConf {
UpgradeTurboHeight: 712320,
UpgradeHyperdriveHeight: 892800,
UpgradeChocolateHeight: 1231620,
UpgradeOhSnapHeight: 999999999999,
UpgradeOhSnapHeight: 1594680,

BreezeGasTampingDuration: 120,
UpgradeClausHeight: 343200,
Expand Down
2 changes: 1 addition & 1 deletion fixtures/networks/mainnet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func Mainnet() *NetworkConf {
UpgradeTurboHeight: 712320, // 2021-04-29T06:00:00Z
UpgradeHyperdriveHeight: 892800, // 2021-06-30T22:00:00Z
UpgradeChocolateHeight: 1231620,
UpgradeOhSnapHeight: 999999999999,
UpgradeOhSnapHeight: 1594680, // 2022-03-02T15:00:00Z

BreezeGasTampingDuration: 120,
UpgradeClausHeight: 343200, // 2020-12-22T02:00:00Z
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (
github.com/filecoin-project/specs-actors/v7 v7.0.0-rc1
github.com/filecoin-project/specs-storage v0.2.0
github.com/filecoin-project/test-vectors/schema v0.0.5
github.com/filecoin-project/venus-auth v1.3.2-0.20220216020521-0dc6dfccd444
github.com/filecoin-project/venus-auth v1.3.2
github.com/fxamacker/cbor/v2 v2.4.0
github.com/gbrlsnchs/jwt/v3 v3.0.1
github.com/go-errors/errors v1.0.1
Expand Down
10 changes: 4 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,8 +640,8 @@ github.com/filecoin-project/specs-storage v0.2.0 h1:Y4UDv0apRQ3zI2GiPPubi8JblpUZ
github.com/filecoin-project/specs-storage v0.2.0/go.mod h1:Tb88Zq+IBJbvAn3mS89GYj3jdRThBTE/771HCVZdRJU=
github.com/filecoin-project/test-vectors/schema v0.0.5 h1:w3zHQhzM4pYxJDl21avXjOKBLF8egrvwUwjpT8TquDg=
github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E=
github.com/filecoin-project/venus-auth v1.3.2-0.20220216020521-0dc6dfccd444 h1:3rvPIIVB5X39Is9rdDhzP0eEqRCEa2ADAj+/CFPbSa8=
github.com/filecoin-project/venus-auth v1.3.2-0.20220216020521-0dc6dfccd444/go.mod h1:KDW3vz4rQY1ZTZdp4jVyXASWrB1DRc9x2mPGJwqqBXI=
github.com/filecoin-project/venus-auth v1.3.2 h1:MDiXZAKB8cj1f1se8xzVH7eukHxL1NvMO2vmC2xwUl4=
github.com/filecoin-project/venus-auth v1.3.2/go.mod h1:m5Jog2GYxztwP7w3m/iJdv/V1/bTcAVU9rm/CbhxRQU=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ=
github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
Expand Down Expand Up @@ -2398,13 +2398,11 @@ github.com/uber/jaeger-lib v1.5.1-0.20181102163054-1fc5c315e03c/go.mod h1:ComeND
github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=
github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go v1.2.4 h1:cTciPbZ/VSOzCLKclmssnfQ/jyoVyOcJ3aoJyUV1Urc=
github.com/ugorji/go v1.2.4/go.mod h1:EuaSCk8iZMdIspsu6HXH7X2UGKw1ezO4wCfGszGmmo4=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/ugorji/go/codec v1.2.4 h1:C5VurWRRCKjuENsbM6GYVw8W++WVW9rSxoACKIvxzz8=
github.com/ugorji/go/codec v1.2.4/go.mod h1:bWBu1+kIRWcF8uMklKaJrR6fTWQOwAlrIzX22pHwryA=
github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA=
github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg=
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ var DefaultForkUpgradeParam = &ForkUpgradeConfig{
UpgradeTurboHeight: 712320,
UpgradeHyperdriveHeight: 892800,
UpgradeChocolateHeight: 1231620,
UpgradeOhSnapHeight: 999999999999,
UpgradeOhSnapHeight: 1594680,
}

func newDefaultNetworkParamsConfig() *NetworkParamsConfig {
Expand Down
2 changes: 1 addition & 1 deletion pkg/constants/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

// BuildVersion is the local build version, set by build system
const BuildVersion = "1.2.0-rc5"
const BuildVersion = "1.2.0-rc6"

// software version
func UserVersion() string {
Expand Down
9 changes: 2 additions & 7 deletions pkg/fork/fork.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,8 @@ func DefaultUpgradeSchedule(cf *ChainFork, upgradeHeight *config.ForkUpgradeConf
Migration: cf.UpgradeActorsV7,
PreMigrations: []PreMigration{{
PreMigration: cf.PreUpgradeActorsV7,
StartWithin: 120,
StartWithin: 180,
DontStartWithin: 60,
StopWithin: 35,
}, {
PreMigration: cf.PreUpgradeActorsV7,
StartWithin: 30,
DontStartWithin: 15,
StopWithin: 5,
}},
Expensive: true,
Expand Down Expand Up @@ -1952,7 +1947,7 @@ func (c *ChainFork) upgradeActorsV7Common(
ts *types.TipSet,
config nv15.Config,
) (cid.Cid, error) {
writeStore := blockstoreutil.NewAutobatch(ctx, c.bs, units.GiB)
writeStore := blockstoreutil.NewAutobatch(ctx, c.bs, units.GiB/4)
// TODO: pretty sure we'd achieve nothing by doing this, confirm in review
//buf := blockstore.NewTieredBstore(sm.ChainStore().StateBlockstore(), writeStore)
store := chain.ActorStore(ctx, writeStore)
Expand Down
2 changes: 1 addition & 1 deletion pkg/migration/migrate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func Version7Upgrade(repoPath string) (err error) {
switch cfg.NetworkParams.NetworkType {
case constants.NetworkMainnet:
cfg.NetworkParams.GenesisNetworkVersion = network.Version0
cfg.NetworkParams.ForkUpgradeParam.UpgradeOhSnapHeight = 999999999999
cfg.NetworkParams.ForkUpgradeParam.UpgradeOhSnapHeight = 1594680
case constants.Network2k:
cfg.NetworkParams.GenesisNetworkVersion = network.Version0
cfg.NetworkParams.ForkUpgradeParam.UpgradeOhSnapHeight = -18
Expand Down
15 changes: 7 additions & 8 deletions venus-devtool/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@ go 1.16
require (
github.com/filecoin-project/go-address v0.0.6
github.com/filecoin-project/go-bitfield v0.2.4
github.com/filecoin-project/go-data-transfer v1.12.1
github.com/filecoin-project/go-ds-versioning v0.1.0 // indirect
github.com/filecoin-project/go-fil-markets v1.14.1
github.com/filecoin-project/go-data-transfer v1.14.0
github.com/filecoin-project/go-fil-markets v1.19.0
github.com/filecoin-project/go-jsonrpc v0.1.5
github.com/filecoin-project/go-state-types v0.1.3
github.com/filecoin-project/lotus v1.13.3-0.20220112013034-7559e4311ea0
github.com/filecoin-project/lotus v1.14.0
github.com/filecoin-project/venus v0.0.0-00010101000000-000000000000
github.com/ipfs/go-cid v0.1.0
github.com/ipfs/go-graphsync v0.11.5
github.com/ipfs/go-graphsync v0.12.0
github.com/ipfs/go-ipfs-http-client v0.1.0 // indirect
github.com/ipld/go-ipld-selector-text-lite v0.0.1
github.com/libp2p/go-libp2p-core v0.13.0
github.com/libp2p/go-libp2p-pubsub v0.6.0
github.com/multiformats/go-multiaddr v0.4.1
github.com/libp2p/go-libp2p-core v0.14.0
github.com/libp2p/go-libp2p-pubsub v0.6.1
github.com/multiformats/go-multiaddr v0.5.0
github.com/urfave/cli/v2 v2.3.0
github.com/whyrusleeping/cbor-gen v0.0.0-20211110122933-f57984553008
)
Expand Down
Loading

0 comments on commit 81ff96a

Please sign in to comment.