Skip to content

Commit afd3d47

Browse files
simlecodesimlecode
authored
Merge pull request #5926 from filecoin-project/pre/v1.11.0
Pre/v1.11.0 / 合并 v1.11.0 预发布分支
2 parents 1a45324 + 785f1ef commit afd3d47

File tree

10 files changed

+130
-121
lines changed

10 files changed

+130
-121
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# venus changelog
22

3+
## v1.11.0
4+
5+
This is the stable release of Venus v1.11.0 for the upcoming MANDATORY network upgrade at `2023-04-27T13:00:00Z`, epoch `2809800`. This release delivers the nv19 Lighting and nv20 Thunder network upgrade for mainnet.
6+
The Lighting and Thunder upgrade introduces the following Filecoin Improvement Proposals (FIPs), delivered by builtin-actors v11 (see actors [v11.0.0](https://github.com/filecoin-project/builtin-actors/releases/tag/v11.0.0)):
7+
8+
- [FIP 0060](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0060.md) - Thirty day market deal maintenance interval
9+
- [FIP 0061](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0061.md) - WindowPoSt grindability fix
10+
- [FIP 0062](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0062.md) - Fallback method handler for multisig actor
11+
12+
### New Features
13+
14+
- add interface for health check /各组件增加状态检查接口 [[#4887](https://github.com/filecoin-project/venus/issues/4887)]
15+
- ffi validation parallelism / ffi 验证平行计算 [[#5838](https://github.com/filecoin-project/venus/issues/5838)]
16+
- chain fetch faster / chain fetch 优化 [[#5814](https://github.com/filecoin-project/venus/issues/5814)]
17+
318
## v1.11.0-rc2
419

520
### Main Changes

‎fixtures/networks/mainnet.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,12 @@ func Mainnet() *NetworkConf {
6767
UpgradeTurboHeight: 712320, // 2021-04-29T06:00:00Z
6868
UpgradeHyperdriveHeight: 892800, // 2021-06-30T22:00:00Z
6969
UpgradeChocolateHeight: 1231620,
70-
UpgradeOhSnapHeight: 1594680, // 2022-03-01T15:00:00Z
71-
UpgradeSkyrHeight: 1960320, // 2022-07-06T14:00:00Z
72-
UpgradeSharkHeight: 2383680, // 2022-11-30T14:00:00Z
73-
UpgradeHyggeHeight: 2683348, // 2023-03-14T15:14:00Z
74-
// TODO: set correct upgrade height
75-
UpgradeLightningHeight: 999999999999999,
76-
UpgradeThunderHeight: 999999999999999 + 1,
70+
UpgradeOhSnapHeight: 1594680, // 2022-03-01T15:00:00Z
71+
UpgradeSkyrHeight: 1960320, // 2022-07-06T14:00:00Z
72+
UpgradeSharkHeight: 2383680, // 2022-11-30T14:00:00Z
73+
UpgradeHyggeHeight: 2683348, // 2023-03-14T15:14:00Z
74+
UpgradeLightningHeight: 2809800, // 2023-04-27T13:00:00Z
75+
UpgradeThunderHeight: 2809800 + 2880*21, // 2023-05-18T13:00:00Z
7776
},
7877
DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
7978
AddressNetwork: address.Mainnet,

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/filecoin-project/go-fil-markets v1.25.2
3333
github.com/filecoin-project/go-jsonrpc v0.1.5
3434
github.com/filecoin-project/go-paramfetch v0.0.4
35-
github.com/filecoin-project/go-state-types v0.11.0-rc2
35+
github.com/filecoin-project/go-state-types v0.11.1
3636
github.com/filecoin-project/pubsub v1.0.0
3737
github.com/filecoin-project/specs-actors v0.9.15
3838
github.com/filecoin-project/specs-actors/v2 v2.3.6
@@ -44,7 +44,7 @@ require (
4444
github.com/filecoin-project/specs-actors/v8 v8.0.1
4545
github.com/filecoin-project/specs-storage v0.4.1
4646
github.com/filecoin-project/test-vectors/schema v0.0.5
47-
github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e
47+
github.com/filecoin-project/venus-auth v1.11.0
4848
github.com/fxamacker/cbor/v2 v2.4.0
4949
github.com/go-errors/errors v1.0.1
5050
github.com/go-kit/kit v0.12.0

‎go.sum‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,9 @@ github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psS
352352
github.com/filecoin-project/go-state-types v0.1.4/go.mod h1:xCA/WfKlC2zcn3fUmDv4IrzznwS98X5XW/irUP3Lhxg=
353353
github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
354354
github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
355-
github.com/filecoin-project/go-state-types v0.11.0-rc2 h1:zUx7aRxEGn56n4A1RS2J8FZzpzAozEMsqF11aXjtmkc=
356355
github.com/filecoin-project/go-state-types v0.11.0-rc2/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
356+
github.com/filecoin-project/go-state-types v0.11.1 h1:GDtCN9V18bYVwXDZe+vJXc6Ck+qY9OUaQqpoVlp1FAk=
357+
github.com/filecoin-project/go-state-types v0.11.1/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
357358
github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig=
358359
github.com/filecoin-project/go-statemachine v1.0.2 h1:421SSWBk8GIoCoWYYTE/d+qCWccgmRH0uXotXRDjUbc=
359360
github.com/filecoin-project/go-statemachine v1.0.2/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
@@ -386,8 +387,8 @@ github.com/filecoin-project/specs-storage v0.4.1/go.mod h1:Z2eK6uMwAOSLjek6+sy0j
386387
github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893 h1:6GCuzxLVHBzlz7y+FkbHh6n0UyoEGWqDwJKQPJoz7bE=
387388
github.com/filecoin-project/test-vectors/schema v0.0.5 h1:w3zHQhzM4pYxJDl21avXjOKBLF8egrvwUwjpT8TquDg=
388389
github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E=
389-
github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e h1:Bxpt1AzPeNxmUnFT2Y8rpabr9x0wIC0Q87DeRmjL2co=
390-
github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e/go.mod h1:aBfIfNxQkdcY8Rk5wrQn9qRtJpH4RTDdc10Ac+ferzs=
390+
github.com/filecoin-project/venus-auth v1.11.0 h1:9PBswWxc113vqaHABMcRyMm+1BtlJCwOFTPQJg/OVtQ=
391+
github.com/filecoin-project/venus-auth v1.11.0/go.mod h1:aBfIfNxQkdcY8Rk5wrQn9qRtJpH4RTDdc10Ac+ferzs=
391392
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
392393
github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ=
393394
github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=

‎pkg/constants/version.go‎

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

77
// BuildVersion is the local build version, set by build system
8-
const BuildVersion = "1.11.0-rc2"
8+
const BuildVersion = "1.11.0"
99

1010
var CurrentCommit string
1111

‎venus-devtool/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/filecoin-project/go-data-transfer v1.15.2
99
github.com/filecoin-project/go-fil-markets v1.25.2
1010
github.com/filecoin-project/go-jsonrpc v0.2.1
11-
github.com/filecoin-project/go-state-types v0.11.0-rc2
12-
github.com/filecoin-project/lotus v1.22.0-rc4
11+
github.com/filecoin-project/go-state-types v0.11.1
12+
github.com/filecoin-project/lotus v1.22.0
1313
github.com/filecoin-project/venus v0.0.0-00010101000000-000000000000
1414
github.com/google/uuid v1.3.0
1515
github.com/ipfs/go-cid v0.3.2

‎venus-devtool/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,15 +330,15 @@ github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psS
330330
github.com/filecoin-project/go-state-types v0.1.4/go.mod h1:xCA/WfKlC2zcn3fUmDv4IrzznwS98X5XW/irUP3Lhxg=
331331
github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
332332
github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
333-
github.com/filecoin-project/go-state-types v0.11.0-rc1/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
334-
github.com/filecoin-project/go-state-types v0.11.0-rc2 h1:zUx7aRxEGn56n4A1RS2J8FZzpzAozEMsqF11aXjtmkc=
335333
github.com/filecoin-project/go-state-types v0.11.0-rc2/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
334+
github.com/filecoin-project/go-state-types v0.11.1 h1:GDtCN9V18bYVwXDZe+vJXc6Ck+qY9OUaQqpoVlp1FAk=
335+
github.com/filecoin-project/go-state-types v0.11.1/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
336336
github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk=
337337
github.com/filecoin-project/go-statestore v0.2.0 h1:cRRO0aPLrxKQCZ2UOQbzFGn4WDNdofHZoGPjfNaAo5Q=
338338
github.com/filecoin-project/go-statestore v0.2.0/go.mod h1:8sjBYbS35HwPzct7iT4lIXjLlYyPor80aU7t7a/Kspo=
339339
github.com/filecoin-project/index-provider v0.9.1 h1:Jnh9dviIHvQxZ2baNoYu3n8z6F9O62ksnVlyREgPyyM=
340-
github.com/filecoin-project/lotus v1.22.0-rc4 h1:jem6qAi/J5cASvCS/Di51sZcY8MNRXgd92Ydg6R/bRM=
341-
github.com/filecoin-project/lotus v1.22.0-rc4/go.mod h1:5DOVWy5G4IRgll0pNTs+K3jEEossouSpdFc/GTYqrrc=
340+
github.com/filecoin-project/lotus v1.22.0 h1:hZFe28of6g83cy4w/4OafnASlWu1tjd8YxPkTOJo0eE=
341+
github.com/filecoin-project/lotus v1.22.0/go.mod h1:gUAd0I0RuuA6LY9kwhid1uJeGB5sz8rRPLpSzky7Xlw=
342342
github.com/filecoin-project/pubsub v1.0.0 h1:ZTmT27U07e54qV1mMiQo4HDr0buo8I1LDHBYLXlsNXM=
343343
github.com/filecoin-project/pubsub v1.0.0/go.mod h1:GkpB33CcUtUNrLPhJgfdy4FDx4OMNR9k+46DHx/Lqrg=
344344
github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao=

‎venus-shared/actors/builtin-actors-code/v11.tar.zst‎

-32.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)