Merge branch 'release/v1.12.0' into jen/v1.13.0-rc3-prep
This commit is contained in:
Jennifer Wang
commit
9fcc27edd5
53
CHANGELOG.md
53
CHANGELOG.md
@ -6,10 +6,6 @@ This is the second release candidates for lotus v1.13.0, a recommended lotus rel
|
||||
[Network v14 Chocolate upgrade](https://github.com/filecoin-project/lotus/discussions/7431).
|
||||
This feature release includes latest functionality and improvements, like data transfer rate-limiting, rust-proof-ffi experimental CUDA support and so on. We *highly recommend* users like storage providers, data brokers, and so on to upgrade your nodes and all subsystems to this release!
|
||||
|
||||
> Note: This release candidate sets the upgrade epoch for calibration net, however, it does not set the Network v14
|
||||
> Chocolate upgrade for mainnet. FIPs(FIP0020-0025) included are based on optimistic acceptance, things may well
|
||||
> change according to the result of FIP last calls.
|
||||
|
||||
## Highlights
|
||||
- Enable separate storage and retrieval transfer limits ([filecoin-project/lotus#7405](https://github.com/filecoin-project/lotus/pull/7405))
|
||||
- Update proofs to v10.0.0 ([filecoin-project/lotus#7420](https://github.com/filecoin-project/lotus/pull/7420))
|
||||
@ -68,6 +64,30 @@ This feature release includes latest functionality and improvements, like data t
|
||||
- Create CODEOWNERS (#1465) ([filecoin-project/specs-actors#1465](https://github.com/filecoin-project/specs-actors/pull/1465))
|
||||
- Test deterministic offset (#1462) ([filecoin-project/specs-actors#1462](https://github.com/filecoin-project/specs-actors/pull/1462)
|
||||
- Update go-libp2p to v0.15.0 ([filecoin-project/lotus#7362](https://github.com/filecoin-project/lotus/pull/7362))
|
||||
on optimistic acceptance, things may well change according to the result of FIP last calls on Oct 11th.
|
||||
|
||||
## New Features
|
||||
- Implement and support [FIP-0024](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0024.md)
|
||||
(BatchBalancer & BatchDiscount Post-HyperDrive Adjustment）:
|
||||
- Precommit batch balancer support/config ([filecoin-project/lotus#7410](https://github.com/filecoin-project/lotus/pull/7410))
|
||||
|
||||
## Improvements
|
||||
- Implement [FIP-0023](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0023.md) (Break ties between tipsets of equal weight)
|
||||
- ChainStore: Add a tiebreaker rule for tipsets of equal weight ([filecoin-project/lotus#7378](https://github.com/filecoin-project/lotus/pull/7378))
|
||||
- Sync: Sanity check msg siggy type ([filecoin-project/lotus#7379](https://github.com/filecoin-project/lotus/pull/7379))
|
||||
- Randomness: Move getters from ChainAPI to StateAPI
|
||||
|
||||
## Bug Fixes
|
||||
- Fix Drand fetching around null tipsets ([filecoin-project/lotus#7376](https://github.com/filecoin-project/lotus/pull/7376))
|
||||
|
||||
## Dependency Updates
|
||||
- Add v6 actors ([filecoin-project/lotus#7357](https://github.com/filecoin-project/lotus/pull/7357))
|
||||
- github.com/filecoin-project/go-state-types (v0.1.1-0.20210810190654-139e0e79e69e -> v0.1.1-0.20210915140513-d354ccf10379):
|
||||
|
||||
## Others
|
||||
- v1.12.0-rc1 prep ([filecoin-project/lotus#7426](https://github.com/filecoin-project/lotus/pull/7426)
|
||||
- Extend FaultMaxAge to 6 weeks for actors v6 on test networks only ([filecoin-project/lotus#7421](https://github.com/filecoin-project/lotus/pull/7421))
|
||||
>>>>>>> release/v1.12.0
|
||||
|
||||
## Others
|
||||
- Chocolate to master ([filecoin-project/lotus#7440](https://github.com/filecoin-project/lotus/pull/7440))
|
||||
@ -80,6 +100,7 @@ This feature release includes latest functionality and improvements, like data t
|
||||
|
||||
| Contributor | Commits | Lines ± | Files Changed |
|
||||
|-------------|---------|---------|---------------|
|
||||
<<<<<<< HEAD
|
||||
| ZenGround0 | 12 | +4202/-2752 | 187 |
|
||||
| Aayush Rajasekaran | 28 | +5023/-1059 | 213 |
|
||||
| c r | 4 | +1276/-435 | 37 |
|
||||
@ -104,6 +125,30 @@ This feature release includes latest functionality and improvements, like data t
|
||||
| Adrian Lanzafame | 1 | +3/-3 | 1 |
|
||||
| swift-mx | 1 | +1/-1 | 1 |
|
||||
|
||||
||||||| 41be8fc9e
|
||||
| ZenGround0 | 12 | +4202/-2752 | 187 |
|
||||
| Aayush Rajasekaran | 19 | +4491/-825 | 169 |
|
||||
| c r | 4 | +1276/-435 | 37 |
|
||||
| Claudia Richoux | 12 | +1350/-209 | 43 |
|
||||
| Łukasz Magiera | 1 | +171/-13 | 8 |
|
||||
| Steven Allen | 2 | +115/-12 | 6 |
|
||||
| Travis Person | 2 | +19/-19 | 7 |
|
||||
| Peter Rabbitson | 1 | +5/-3 | 1 |
|
||||
| Jennifer Wang | 1 | +4/-4 | 7 |
|
||||
| Steve Loeppky | 1 | +6/-0 | 1 |
|
||||
=======
|
||||
| @ZenGround0 | 12 | +4202/-2752 | 187 |
|
||||
| @arajasek | 25 | +4567/-854 | 190 |
|
||||
| @laudiacay | 4 | +1276/-435 | 37 |
|
||||
| @laudiacay | 12 | +1350/-209 | 43 |
|
||||
| @magik6k | 1 | +171/-13 | 8 |
|
||||
| @Stebalien | 2 | +115/-12 | 6 |
|
||||
| @jennijuju | 7 | +73/-34 | 26 |
|
||||
| @travisperson | 2 | +19/-19 | 7 |
|
||||
| @coryschwartz | 1 | +16/-2 | 2 |
|
||||
| @Kubuxu | 5 | +5/-5 | 5 |
|
||||
| @ribasushi | 1 | +5/-3 | 1 |
|
||||
>>>>>>> release/v1.12.0
|
||||
|
||||
# v1.11.3 / 2021-09-29
|
||||
|
||||
|
||||
@ -12,7 +12,6 @@ import (
|
||||
"github.com/filecoin-project/go-state-types/abi"
|
||||
"github.com/filecoin-project/go-state-types/network"
|
||||
"github.com/filecoin-project/lotus/chain/actors/policy"
|
||||
miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner"
|
||||
)
|
||||
|
||||
const BootstrappersFile = ""
|
||||
@ -92,8 +91,6 @@ func init() {
|
||||
|
||||
BuildType |= Build2k
|
||||
|
||||
// To test out what this proposal would like on devnets / testnets: https://github.com/filecoin-project/FIPs/pull/190
|
||||
miner6.FaultMaxAge = miner6.WPoStProvingPeriod * 42
|
||||
}
|
||||
|
||||
const BlockDelaySecs = uint64(4)
|
||||
|
||||
@ -9,7 +9,6 @@ import (
|
||||
"github.com/filecoin-project/go-state-types/network"
|
||||
"github.com/filecoin-project/lotus/chain/actors/policy"
|
||||
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
|
||||
miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner"
|
||||
"github.com/ipfs/go-cid"
|
||||
)
|
||||
|
||||
@ -54,9 +53,6 @@ func init() {
|
||||
Devnet = true
|
||||
|
||||
BuildType = BuildButterflynet
|
||||
|
||||
// To test out what this proposal would like on devnets / testnets: https://github.com/filecoin-project/FIPs/pull/190
|
||||
miner6.FaultMaxAge = miner6.WPoStProvingPeriod * 42
|
||||
}
|
||||
|
||||
const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)
|
||||
|
||||
@ -9,7 +9,6 @@ import (
|
||||
"github.com/filecoin-project/go-state-types/network"
|
||||
"github.com/filecoin-project/lotus/chain/actors/policy"
|
||||
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
|
||||
miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner"
|
||||
"github.com/ipfs/go-cid"
|
||||
)
|
||||
|
||||
@ -68,8 +67,6 @@ func init() {
|
||||
|
||||
BuildType = BuildCalibnet
|
||||
|
||||
// To test out what this proposal would like on devnets / testnets: https://github.com/filecoin-project/FIPs/pull/190
|
||||
miner6.FaultMaxAge = miner6.WPoStProvingPeriod * 42
|
||||
}
|
||||
|
||||
const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)
|
||||
|
||||
@ -12,10 +12,8 @@ import (
|
||||
"github.com/filecoin-project/go-address"
|
||||
"github.com/filecoin-project/go-state-types/abi"
|
||||
"github.com/filecoin-project/go-state-types/network"
|
||||
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
|
||||
miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner"
|
||||
|
||||
"github.com/filecoin-project/lotus/chain/actors/policy"
|
||||
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
|
||||
)
|
||||
|
||||
const BootstrappersFile = "interopnet.pi"
|
||||
@ -99,8 +97,6 @@ func init() {
|
||||
SetAddressNetwork(address.Testnet)
|
||||
Devnet = true
|
||||
|
||||
// To test out what this proposal would like on devnets / testnets: https://github.com/filecoin-project/FIPs/pull/190
|
||||
miner6.FaultMaxAge = miner6.WPoStProvingPeriod * 42
|
||||
}
|
||||
|
||||
const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)
|
||||
|
||||
@ -64,8 +64,8 @@ const UpgradeTurboHeight = 712320
|
||||
// 2021-06-30T22:00:00Z
|
||||
var UpgradeHyperdriveHeight = abi.ChainEpoch(892800)
|
||||
|
||||
// ???
|
||||
var UpgradeChocolateHeight = abi.ChainEpoch(999999999)
|
||||
// 2021-10-26T13:30:00Z
|
||||
var UpgradeChocolateHeight = abi.ChainEpoch(1231620)
|
||||
|
||||
func init() {
|
||||
if os.Getenv("LOTUS_USE_TEST_ADDRESSES") != "1" {
|
||||
|
||||
87
build/params_nerpanet.go
Normal file
87
build/params_nerpanet.go
Normal file
@ -0,0 +1,87 @@
|
||||
//go:build nerpanet
|
||||
// +build nerpanet
|
||||
|
||||
package build
|
||||
|
||||
import (
|
||||
"github.com/filecoin-project/go-state-types/abi"
|
||||
"github.com/filecoin-project/go-state-types/network"
|
||||
"github.com/filecoin-project/lotus/chain/actors/policy"
|
||||
"github.com/ipfs/go-cid"
|
||||
|
||||
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
|
||||
)
|
||||
|
||||
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
|
||||
0: DrandMainnet,
|
||||
}
|
||||
|
||||
const GenesisNetworkVersion = network.Version0
|
||||
|
||||
const BootstrappersFile = "nerpanet.pi"
|
||||
const GenesisFile = "nerpanet.car"
|
||||
|
||||
const UpgradeBreezeHeight = -1
|
||||
const BreezeGasTampingDuration = 0
|
||||
|
||||
const UpgradeSmokeHeight = -1
|
||||
|
||||
const UpgradeIgnitionHeight = -2
|
||||
const UpgradeRefuelHeight = -3
|
||||
|
||||
const UpgradeLiftoffHeight = -5
|
||||
|
||||
const UpgradeAssemblyHeight = 30 // critical: the network can bootstrap from v1 only
|
||||
const UpgradeTapeHeight = 60
|
||||
|
||||
const UpgradeKumquatHeight = 90
|
||||
|
||||
const UpgradeCalicoHeight = 100
|
||||
const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1)
|
||||
|
||||
const UpgradeClausHeight = 250
|
||||
|
||||
const UpgradeOrangeHeight = 300
|
||||
|
||||
const UpgradeTrustHeight = 600
|
||||
const UpgradeNorwegianHeight = 201000
|
||||
const UpgradeTurboHeight = 203000
|
||||
const UpgradeHyperdriveHeight = 379178
|
||||
|
||||
const UpgradeChocolateHeight = 999999999
|
||||
|
||||
func init() {
|
||||
// Minimum block production power is set to 4 TiB
|
||||
// Rationale is to discourage small-scale miners from trying to take over the network
|
||||
// One needs to invest in ~2.3x the compute to break consensus, making it not worth it
|
||||
//
|
||||
// DOWNSIDE: the fake-seals need to be kept alive/protected, otherwise network will seize
|
||||
//
|
||||
policy.SetConsensusMinerMinPower(abi.NewStoragePower(4 << 40))
|
||||
|
||||
policy.SetSupportedProofTypes(
|
||||
abi.RegisteredSealProof_StackedDrg512MiBV1,
|
||||
abi.RegisteredSealProof_StackedDrg32GiBV1,
|
||||
abi.RegisteredSealProof_StackedDrg64GiBV1,
|
||||
)
|
||||
|
||||
// Lower the most time-consuming parts of PoRep
|
||||
policy.SetPreCommitChallengeDelay(10)
|
||||
|
||||
// TODO - make this a variable
|
||||
//miner.WPoStChallengeLookback = abi.ChainEpoch(2)
|
||||
|
||||
Devnet = false
|
||||
|
||||
BuildType = BuildNerpanet
|
||||
|
||||
}
|
||||
|
||||
const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)
|
||||
|
||||
const PropagationDelaySecs = uint64(6)
|
||||
|
||||
// BootstrapPeerThreshold is the minimum number peers we need to track for a sync worker to start
|
||||
const BootstrapPeerThreshold = 4
|
||||
|
||||
var WhitelistedBlock = cid.Undef
|
||||
@ -282,7 +282,7 @@ var actorWithdrawCmd = &cli.Command{
|
||||
fmt.Printf("Requested rewards withdrawal in message %s\n", smsg.Cid())
|
||||
|
||||
// wait for it to get mined into a block
|
||||
fmt.Printf("waiting for %x epochs for confirmation..\n", uint64(cctx.Int("confidence")))
|
||||
fmt.Printf("waiting for %d epochs for confirmation..\n", uint64(cctx.Int("confidence")))
|
||||
wait, err := api.StateWaitMsg(ctx, smsg.Cid(), uint64(cctx.Int("confidence")))
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
2
go.mod
2
go.mod
@ -49,7 +49,7 @@ require (
|
||||
github.com/filecoin-project/specs-actors/v3 v3.1.1
|
||||
github.com/filecoin-project/specs-actors/v4 v4.0.1
|
||||
github.com/filecoin-project/specs-actors/v5 v5.0.4
|
||||
github.com/filecoin-project/specs-actors/v6 v6.0.0-20211001193936-c3afe7fa3c5c
|
||||
github.com/filecoin-project/specs-actors/v6 v6.0.0-20211007184712-855f60561dfc
|
||||
github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506
|
||||
github.com/filecoin-project/test-vectors/schema v0.0.5
|
||||
github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1
|
||||
|
||||
4
go.sum
4
go.sum
@ -365,8 +365,8 @@ github.com/filecoin-project/specs-actors/v4 v4.0.1/go.mod h1:TkHXf/l7Wyw4ZejyXIP
|
||||
github.com/filecoin-project/specs-actors/v5 v5.0.0-20210512015452-4fe3889fff57/go.mod h1:283yBMMUSDB2abcjP/hhrwTkhb9h3sfM6KGrep/ZlBI=
|
||||
github.com/filecoin-project/specs-actors/v5 v5.0.4 h1:OY7BdxJWlUfUFXWV/kpNBYGXNPasDIedf42T3sGx08s=
|
||||
github.com/filecoin-project/specs-actors/v5 v5.0.4/go.mod h1:5BAKRAMsOOlD8+qCw4UvT/lTLInCJ3JwOWZbX8Ipwq4=
|
||||
github.com/filecoin-project/specs-actors/v6 v6.0.0-20211001193936-c3afe7fa3c5c h1:29m9oz0AP3TglBFC9Sii9M3skIAbhZhZr+2FyomSTTo=
|
||||
github.com/filecoin-project/specs-actors/v6 v6.0.0-20211001193936-c3afe7fa3c5c/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk=
|
||||
github.com/filecoin-project/specs-actors/v6 v6.0.0-20211007184712-855f60561dfc h1:1oeH5dJHNC8VdyYGfu1pr2/L86825hPiVMaV477msho=
|
||||
github.com/filecoin-project/specs-actors/v6 v6.0.0-20211007184712-855f60561dfc/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk=
|
||||
github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506 h1:Ur/l2+6qN+lQiqjozWWc5p9UDaAMDZKTlDS98oRnlIw=
|
||||
github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506/go.mod h1:nJRRM7Aa9XVvygr3W9k6xGF46RWzr2zxF/iGoAIfA/g=
|
||||
github.com/filecoin-project/test-vectors/schema v0.0.5 h1:w3zHQhzM4pYxJDl21avXjOKBLF8egrvwUwjpT8TquDg=
|
||||
|
||||
Loading…
Reference in New Issue
Block a user