From e62aaa3d3d080d47db9375045b02267231eaca58 Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Fri, 8 Oct 2021 15:09:57 -0400 Subject: [PATCH] update to actor v6-rc2 --- build/params_2k.go | 3 --- build/params_butterfly.go | 4 ---- build/params_calibnet.go | 3 --- build/params_interop.go | 6 +----- build/params_nerpanet.go | 3 --- go.mod | 2 +- go.sum | 4 ++-- 7 files changed, 4 insertions(+), 21 deletions(-) diff --git a/build/params_2k.go b/build/params_2k.go index 485f7bec0..b9db0a467 100644 --- a/build/params_2k.go +++ b/build/params_2k.go @@ -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) diff --git a/build/params_butterfly.go b/build/params_butterfly.go index 70d1cff95..9a0018e73 100644 --- a/build/params_butterfly.go +++ b/build/params_butterfly.go @@ -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) diff --git a/build/params_calibnet.go b/build/params_calibnet.go index be16d08b9..8cd99d642 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -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) diff --git a/build/params_interop.go b/build/params_interop.go index e928da8a0..de5ee9a12 100644 --- a/build/params_interop.go +++ b/build/params_interop.go @@ -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) diff --git a/build/params_nerpanet.go b/build/params_nerpanet.go index 6a27d8d7f..0e2913adc 100644 --- a/build/params_nerpanet.go +++ b/build/params_nerpanet.go @@ -10,7 +10,6 @@ import ( "github.com/ipfs/go-cid" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" ) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ @@ -76,8 +75,6 @@ func init() { BuildType = BuildNerpanet - // 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) diff --git a/go.mod b/go.mod index f27f2eaaa..d7a432828 100644 --- a/go.mod +++ b/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 diff --git a/go.sum b/go.sum index 2c7b492f9..fe1478cd2 100644 --- a/go.sum +++ b/go.sum @@ -344,8 +344,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=