Skip to content

Commit 81ff96a

Browse files
simlecodesimlecode
authored
build v1.2.0-rc6 (#4785)
* 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
1 parent 1515aa6 commit 81ff96a

12 files changed

Lines changed: 101 additions & 61 deletions

File tree

‎fixtures/networks/integrationtestnet.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func IntegrationNet() *NetworkConf {
3636
UpgradeTurboHeight: 712320,
3737
UpgradeHyperdriveHeight: 892800,
3838
UpgradeChocolateHeight: 1231620,
39-
UpgradeOhSnapHeight: 999999999999,
39+
UpgradeOhSnapHeight: 1594680,
4040

4141
BreezeGasTampingDuration: 120,
4242
UpgradeClausHeight: 343200,

‎fixtures/networks/mainnet.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func Mainnet() *NetworkConf {
5757
UpgradeTurboHeight: 712320, // 2021-04-29T06:00:00Z
5858
UpgradeHyperdriveHeight: 892800, // 2021-06-30T22:00:00Z
5959
UpgradeChocolateHeight: 1231620,
60-
UpgradeOhSnapHeight: 999999999999,
60+
UpgradeOhSnapHeight: 1594680, // 2022-03-02T15:00:00Z
6161

6262
BreezeGasTampingDuration: 120,
6363
UpgradeClausHeight: 343200, // 2020-12-22T02:00:00Z

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/filecoin-project/specs-actors/v7 v7.0.0-rc1
4343
github.com/filecoin-project/specs-storage v0.2.0
4444
github.com/filecoin-project/test-vectors/schema v0.0.5
45-
github.com/filecoin-project/venus-auth v1.3.2-0.20220216020521-0dc6dfccd444
45+
github.com/filecoin-project/venus-auth v1.3.2
4646
github.com/fxamacker/cbor/v2 v2.4.0
4747
github.com/gbrlsnchs/jwt/v3 v3.0.1
4848
github.com/go-errors/errors v1.0.1

‎go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,8 @@ github.com/filecoin-project/specs-storage v0.2.0 h1:Y4UDv0apRQ3zI2GiPPubi8JblpUZ
640640
github.com/filecoin-project/specs-storage v0.2.0/go.mod h1:Tb88Zq+IBJbvAn3mS89GYj3jdRThBTE/771HCVZdRJU=
641641
github.com/filecoin-project/test-vectors/schema v0.0.5 h1:w3zHQhzM4pYxJDl21avXjOKBLF8egrvwUwjpT8TquDg=
642642
github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E=
643-
github.com/filecoin-project/venus-auth v1.3.2-0.20220216020521-0dc6dfccd444 h1:3rvPIIVB5X39Is9rdDhzP0eEqRCEa2ADAj+/CFPbSa8=
644-
github.com/filecoin-project/venus-auth v1.3.2-0.20220216020521-0dc6dfccd444/go.mod h1:KDW3vz4rQY1ZTZdp4jVyXASWrB1DRc9x2mPGJwqqBXI=
643+
github.com/filecoin-project/venus-auth v1.3.2 h1:MDiXZAKB8cj1f1se8xzVH7eukHxL1NvMO2vmC2xwUl4=
644+
github.com/filecoin-project/venus-auth v1.3.2/go.mod h1:m5Jog2GYxztwP7w3m/iJdv/V1/bTcAVU9rm/CbhxRQU=
645645
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
646646
github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ=
647647
github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
@@ -2398,13 +2398,11 @@ github.com/uber/jaeger-lib v1.5.1-0.20181102163054-1fc5c315e03c/go.mod h1:ComeND
23982398
github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=
23992399
github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
24002400
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
2401+
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
24012402
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
2402-
github.com/ugorji/go v1.2.4 h1:cTciPbZ/VSOzCLKclmssnfQ/jyoVyOcJ3aoJyUV1Urc=
2403-
github.com/ugorji/go v1.2.4/go.mod h1:EuaSCk8iZMdIspsu6HXH7X2UGKw1ezO4wCfGszGmmo4=
24042403
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
2404+
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
24052405
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
2406-
github.com/ugorji/go/codec v1.2.4 h1:C5VurWRRCKjuENsbM6GYVw8W++WVW9rSxoACKIvxzz8=
2407-
github.com/ugorji/go/codec v1.2.4/go.mod h1:bWBu1+kIRWcF8uMklKaJrR6fTWQOwAlrIzX22pHwryA=
24082406
github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA=
24092407
github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
24102408
github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg=

‎pkg/config/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ var DefaultForkUpgradeParam = &ForkUpgradeConfig{
310310
UpgradeTurboHeight: 712320,
311311
UpgradeHyperdriveHeight: 892800,
312312
UpgradeChocolateHeight: 1231620,
313-
UpgradeOhSnapHeight: 999999999999,
313+
UpgradeOhSnapHeight: 1594680,
314314
}
315315

316316
func newDefaultNetworkParamsConfig() *NetworkParamsConfig {

‎pkg/constants/version.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

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

1212
// software version
1313
func UserVersion() string {

‎pkg/fork/fork.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,8 @@ func DefaultUpgradeSchedule(cf *ChainFork, upgradeHeight *config.ForkUpgradeConf
271271
Migration: cf.UpgradeActorsV7,
272272
PreMigrations: []PreMigration{{
273273
PreMigration: cf.PreUpgradeActorsV7,
274-
StartWithin: 120,
274+
StartWithin: 180,
275275
DontStartWithin: 60,
276-
StopWithin: 35,
277-
}, {
278-
PreMigration: cf.PreUpgradeActorsV7,
279-
StartWithin: 30,
280-
DontStartWithin: 15,
281276
StopWithin: 5,
282277
}},
283278
Expensive: true,
@@ -1952,7 +1947,7 @@ func (c *ChainFork) upgradeActorsV7Common(
19521947
ts *types.TipSet,
19531948
config nv15.Config,
19541949
) (cid.Cid, error) {
1955-
writeStore := blockstoreutil.NewAutobatch(ctx, c.bs, units.GiB)
1950+
writeStore := blockstoreutil.NewAutobatch(ctx, c.bs, units.GiB/4)
19561951
// TODO: pretty sure we'd achieve nothing by doing this, confirm in review
19571952
//buf := blockstore.NewTieredBstore(sm.ChainStore().StateBlockstore(), writeStore)
19581953
store := chain.ActorStore(ctx, writeStore)

‎pkg/migration/migrate.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func Version7Upgrade(repoPath string) (err error) {
205205
switch cfg.NetworkParams.NetworkType {
206206
case constants.NetworkMainnet:
207207
cfg.NetworkParams.GenesisNetworkVersion = network.Version0
208-
cfg.NetworkParams.ForkUpgradeParam.UpgradeOhSnapHeight = 999999999999
208+
cfg.NetworkParams.ForkUpgradeParam.UpgradeOhSnapHeight = 1594680
209209
case constants.Network2k:
210210
cfg.NetworkParams.GenesisNetworkVersion = network.Version0
211211
cfg.NetworkParams.ForkUpgradeParam.UpgradeOhSnapHeight = -18

‎venus-devtool/go.mod‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@ go 1.16
55
require (
66
github.com/filecoin-project/go-address v0.0.6
77
github.com/filecoin-project/go-bitfield v0.2.4
8-
github.com/filecoin-project/go-data-transfer v1.12.1
9-
github.com/filecoin-project/go-ds-versioning v0.1.0 // indirect
10-
github.com/filecoin-project/go-fil-markets v1.14.1
8+
github.com/filecoin-project/go-data-transfer v1.14.0
9+
github.com/filecoin-project/go-fil-markets v1.19.0
1110
github.com/filecoin-project/go-jsonrpc v0.1.5
1211
github.com/filecoin-project/go-state-types v0.1.3
13-
github.com/filecoin-project/lotus v1.13.3-0.20220112013034-7559e4311ea0
12+
github.com/filecoin-project/lotus v1.14.0
1413
github.com/filecoin-project/venus v0.0.0-00010101000000-000000000000
1514
github.com/ipfs/go-cid v0.1.0
16-
github.com/ipfs/go-graphsync v0.11.5
15+
github.com/ipfs/go-graphsync v0.12.0
1716
github.com/ipfs/go-ipfs-http-client v0.1.0 // indirect
1817
github.com/ipld/go-ipld-selector-text-lite v0.0.1
19-
github.com/libp2p/go-libp2p-core v0.13.0
20-
github.com/libp2p/go-libp2p-pubsub v0.6.0
21-
github.com/multiformats/go-multiaddr v0.4.1
18+
github.com/libp2p/go-libp2p-core v0.14.0
19+
github.com/libp2p/go-libp2p-pubsub v0.6.1
20+
github.com/multiformats/go-multiaddr v0.5.0
2221
github.com/urfave/cli/v2 v2.3.0
2322
github.com/whyrusleeping/cbor-gen v0.0.0-20211110122933-f57984553008
2423
)

0 commit comments

Comments
 (0)