Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore merge release/v1.11 into master #5948

Merged
merged 18 commits into from
May 8, 2023
Merged

chore merge release/v1.11 into master #5948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
acbc7ab
fix: rm redundant PreMigration
LinZexiao Apr 19, 2023
f35e28e
feat: update WindowPoStProofTypeFromSectorSize
LinZexiao Apr 20, 2023
2ee31a3
Revert "Merge pull request #5901 from filecoin-project/feat/new-vm-ex…
LinZexiao Apr 20, 2023
2ddef29
chore: bump up version to v1.11.0-rc2
LinZexiao Apr 20, 2023
974b3df
Merge pull request #5919 from filecoin-project/pre/v1.11.0-rc2
simlecode Apr 20, 2023
bd10487
fix: update UpgradeHyggeHeight to -21 in forcenet
simlecode Apr 18, 2023
1a45324
Merge pull request #5921 from filecoin-project/fix/set-UpgradeHyggeHe…
LinZexiao Apr 21, 2023
6650212
chore: bump up version to v1.11.0
LinZexiao Apr 23, 2023
11e82bf
feat: update actor bundle to v11.0
LinZexiao Apr 23, 2023
81c231a
chore: correct actor version link
LinZexiao Apr 23, 2023
8003bac
feat: set main net upgrade height
LinZexiao Apr 23, 2023
7da4922
chore: update go-state-types to v0.11.1
LinZexiao Apr 23, 2023
61e13e7
chore: update version of auth
LinZexiao Apr 23, 2023
785f1ef
fix: update devtool go mod
LinZexiao Apr 23, 2023
afd3d47
Merge pull request #5926 from filecoin-project/pre/v1.11.0
simlecode Apr 23, 2023
0274be4
feat: update ffi
LinZexiao Apr 24, 2023
3b419ed
chore: bump up version to v1.11.1
LinZexiao Apr 24, 2023
870f1b4
Merge pull request #5927 from filecoin-project/fix/veryfy-window-PoST…
LinZexiao Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
# venus changelog

## v1.11.1

* fix: windowPoST verify fail [[#fvm-1750](https://github.com/filecoin-project/ref-fvm/pull/1750)]

## v1.11.0

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.
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)):

- [FIP 0060](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0060.md) - Thirty day market deal maintenance interval
- [FIP 0061](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0061.md) - WindowPoSt grindability fix
- [FIP 0062](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0062.md) - Fallback method handler for multisig actor

### New Features

- add interface for health check /各组件增加状态检查接口 [[#4887](https://github.com/filecoin-project/venus/issues/4887)]
- ffi validation parallelism / ffi 验证平行计算 [[#5838](https://github.com/filecoin-project/venus/issues/5838)]
- chain fetch faster / chain fetch 优化 [[#5814](https://github.com/filecoin-project/venus/issues/5814)]

## v1.11.0-rc2

### Main Changes

* Revert add new-vm-exec-tracer [[#5901](https://github.com/filecoin-project/venus/pull/5901)]

## v1.11.0-rc1

### New Features
Expand Down
2 changes: 1 addition & 1 deletion extern/filecoin-ffi
Open in desktop
Submodule filecoin-ffi updated 5 files
+1 −1 go.mod
+2 −2 go.sum
+7 −7 rust/Cargo.lock
+2 −2 rust/Cargo.toml
+29 −51 rust/src/fvm/machine.rs
4 changes: 2 additions & 2 deletions fixtures/networks/butterfly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ func ButterflySnapNet() *NetworkConf {
return &NetworkConf{
Bootstrap: config.BootstrapConfig{
Addresses: []string{
"/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWEwwFTMAi8rMnVX4fzih9pW5xZgTMbcacAFPinaT1g4wo",
"/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWSJ8KShJSdW8cqz29K7k3AR5frbAaun8gdW3ELFV3T4Ck",
"/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWD5mtdmjHQ1Puj9Md7SEfoa7kWMpwqUhAKsyYsBP56LQC",
"/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWEoYPkm6o87ES6AppFY7d7WHJUQg7XVPRAyQZjEU31efQ",
},
MinPeerThreshold: 0,
Period: "30s",
Expand Down
2 changes: 1 addition & 1 deletion fixtures/networks/forcenet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func ForceNet() *NetworkConf {
UpgradeOhSnapHeight: -18,
UpgradeSkyrHeight: -19,
UpgradeSharkHeight: -20,
UpgradeHyggeHeight: 30,
UpgradeHyggeHeight: -21,
UpgradeLightningHeight: 30,
UpgradeThunderHeight: 1000,
},
Expand Down
13 changes: 6 additions & 7 deletions fixtures/networks/mainnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,12 @@ func Mainnet() *NetworkConf {
UpgradeTurboHeight: 712320, // 2021-04-29T06:00:00Z
UpgradeHyperdriveHeight: 892800, // 2021-06-30T22:00:00Z
UpgradeChocolateHeight: 1231620,
UpgradeOhSnapHeight: 1594680, // 2022-03-01T15:00:00Z
UpgradeSkyrHeight: 1960320, // 2022-07-06T14:00:00Z
UpgradeSharkHeight: 2383680, // 2022-11-30T14:00:00Z
UpgradeHyggeHeight: 2683348, // 2023-03-14T15:14:00Z
// TODO: set correct upgrade height
UpgradeLightningHeight: 999999999999999,
UpgradeThunderHeight: 999999999999999 + 1,
UpgradeOhSnapHeight: 1594680, // 2022-03-01T15:00:00Z
UpgradeSkyrHeight: 1960320, // 2022-07-06T14:00:00Z
UpgradeSharkHeight: 2383680, // 2022-11-30T14:00:00Z
UpgradeHyggeHeight: 2683348, // 2023-03-14T15:14:00Z
UpgradeLightningHeight: 2809800, // 2023-04-27T13:00:00Z
UpgradeThunderHeight: 2809800 + 2880*21, // 2023-05-18T13:00:00Z
},
DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
AddressNetwork: address.Mainnet,
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/filecoin-project/go-fil-markets v1.25.2
github.com/filecoin-project/go-jsonrpc v0.1.5
github.com/filecoin-project/go-paramfetch v0.0.4
github.com/filecoin-project/go-state-types v0.11.0-rc2
github.com/filecoin-project/go-state-types v0.11.1
github.com/filecoin-project/pubsub v1.0.0
github.com/filecoin-project/specs-actors v0.9.15
github.com/filecoin-project/specs-actors/v2 v2.3.6
Expand All @@ -44,7 +44,7 @@ require (
github.com/filecoin-project/specs-actors/v8 v8.0.1
github.com/filecoin-project/specs-storage v0.4.1
github.com/filecoin-project/test-vectors/schema v0.0.5
github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e
github.com/filecoin-project/venus-auth v1.11.0
github.com/fxamacker/cbor/v2 v2.4.0
github.com/go-errors/errors v1.0.1
github.com/go-kit/kit v0.12.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,9 @@ github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psS
github.com/filecoin-project/go-state-types v0.1.4/go.mod h1:xCA/WfKlC2zcn3fUmDv4IrzznwS98X5XW/irUP3Lhxg=
github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
github.com/filecoin-project/go-state-types v0.11.0-rc1/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
github.com/filecoin-project/go-state-types v0.11.0-rc2 h1:zUx7aRxEGn56n4A1RS2J8FZzpzAozEMsqF11aXjtmkc=
github.com/filecoin-project/go-state-types v0.11.0-rc2/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
github.com/filecoin-project/go-state-types v0.11.1 h1:GDtCN9V18bYVwXDZe+vJXc6Ck+qY9OUaQqpoVlp1FAk=
github.com/filecoin-project/go-state-types v0.11.1/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig=
github.com/filecoin-project/go-statemachine v1.0.2 h1:421SSWBk8GIoCoWYYTE/d+qCWccgmRH0uXotXRDjUbc=
github.com/filecoin-project/go-statemachine v1.0.2/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
Expand Down Expand Up @@ -387,8 +387,8 @@ github.com/filecoin-project/specs-storage v0.4.1/go.mod h1:Z2eK6uMwAOSLjek6+sy0j
github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893 h1:6GCuzxLVHBzlz7y+FkbHh6n0UyoEGWqDwJKQPJoz7bE=
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.10.2-0.20230308100319-913815325d5e h1:Bxpt1AzPeNxmUnFT2Y8rpabr9x0wIC0Q87DeRmjL2co=
github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e/go.mod h1:aBfIfNxQkdcY8Rk5wrQn9qRtJpH4RTDdc10Ac+ferzs=
github.com/filecoin-project/venus-auth v1.11.0 h1:9PBswWxc113vqaHABMcRyMm+1BtlJCwOFTPQJg/OVtQ=
github.com/filecoin-project/venus-auth v1.11.0/go.mod h1:aBfIfNxQkdcY8Rk5wrQn9qRtJpH4RTDdc10Ac+ferzs=
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
2 changes: 1 addition & 1 deletion pkg/constants/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
)

// BuildVersion is the local build version, set by build system
const BuildVersion = "1.11.0-rc1"
const BuildVersion = "1.11.1"

var CurrentCommit string

Expand Down
5 changes: 0 additions & 5 deletions pkg/fork/fork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,6 @@ func DefaultUpgradeSchedule(cf *ChainFork, upgradeHeight *config.ForkUpgradeConf
StartWithin: 120,
DontStartWithin: 15,
StopWithin: 10,
}, {
PreMigration: cf.PreUpgradeActorsV11,
StartWithin: 15,
DontStartWithin: 10,
StopWithin: 5,
}},
Expensive: true,
}, {
Expand Down
Loading