Merge pull request #7480 from filecoin-project/jen/v1.12.0-rc2-prep

v1.12.0-rc2
2021-10-11 12:57:58 -04:00 · 2021-10-11 12:57:58 -04:00 · 0eb2152012
commit 0eb2152012
parent 41be8fc9e5 16743a25c2
25 changed files with 105 additions and 95 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -989,7 +989,14 @@ workflows:
              only:
                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
      - build-lotus-soup
-      - build-macos
+      - build-macos:
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
      - build-appimage:
          filters:
            branches:
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@ -844,7 +844,14 @@ workflows:
              only:
                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
      - build-lotus-soup
-      - build-macos
+      - build-macos:
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
      - build-appimage:
          filters:
            branches:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,60 +1,48 @@
 # Lotus changelog

-# v1.12.0-rc1 / 2021-10-01
+# v1.12.0-rc2 / 2021-10-11

-This is the first release candidate for lotus v1.11.3. Changelog will be updated later.
+This is the second release candidates of v1.12.0, a mandatory release of Lotus that introduces Filecoin Network v14, 
+codenamed the Chocolate upgrade. The Filecoin mainnet will upgrade at epoch 1231620, on 2021-10-26T13:30:00Z. 

-## Changelog
- github.com/filecoin-project/lotus:
-  - bump the version to v1.12.0-rc1
-  - Upgrade to actors v6-rc1
-  - Set Chocolate upgrade epoch for butterfly
-  - reset of the butterfly network
-  - reset butterfly network
+> FIPs(FIP0020-0025) were included are based 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))
-  - Extend FaultMaxAge to 6 weeks for actors v6 on test networks only ([filecoin-project/lotus#7421](https://github.com/filecoin-project/lotus/pull/7421))
-  - Update to actors master ([filecoin-project/lotus#7404](https://github.com/filecoin-project/lotus/pull/7404))
-  - Fix Drand fetching around null tipsets ([filecoin-project/lotus#7376](https://github.com/filecoin-project/lotus/pull/7376))
+
+## 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))
-  - Add v6 actors ([filecoin-project/lotus#7357](https://github.com/filecoin-project/lotus/pull/7357))
-  - Randomness: Move getters from ChainAPI to StateAPI
+- 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):
-  - Add v14
- github.com/filecoin-project/specs-actors/v6 (null -> v6.0.0-20211001193936-c3afe7fa3c5c):
-  - Better logging (#1503) ([filecoin-project/specs-actors#1503](https://github.com/filecoin-project/specs-actors/pull/1503))
-  - Defensive programming: harden power actor against seal verify failures (#1502) ([filecoin-project/specs-actors#1502](https://github.com/filecoin-project/specs-actors/pull/1502))
-  - BatchBalancer fee charged on precommit aggregate (#1497) ([filecoin-project/specs-actors#1497](https://github.com/filecoin-project/specs-actors/pull/1497))
-  - Fix #1486 (#1489) ([filecoin-project/specs-actors#1489](https://github.com/filecoin-project/specs-actors/pull/1489))
-  - Sector extension deal weight bug fix  (#1498) ([filecoin-project/specs-actors#1498](https://github.com/filecoin-project/specs-actors/pull/1498))
-  - Fip 0021 (#1487) ([filecoin-project/specs-actors#1487](https://github.com/filecoin-project/specs-actors/pull/1487))
-  - Fix #176 (swap to xerrors from pkg/errors) (#1494) ([filecoin-project/specs-actors#1494](https://github.com/filecoin-project/specs-actors/pull/1494))
-  - Merge branch 'master' of github.com:filecoin-project/specs-actors
-  - Merge branch 'fix-799'
-  - compute the hash of the proposal iff the proposal hash is present (#1365) ([filecoin-project/specs-actors#1365](https://github.com/filecoin-project/specs-actors/pull/1365))
-  - Revert "Remove cc upgrade (#1473)" (#1475) ([filecoin-project/specs-actors#1475](https://github.com/filecoin-project/specs-actors/pull/1475))
-  - Remove cc upgrade (#1473) ([filecoin-project/specs-actors#1473](https://github.com/filecoin-project/specs-actors/pull/1473))
-  - Update to v6 (#1468) ([filecoin-project/specs-actors#1468](https://github.com/filecoin-project/specs-actors/pull/1468))
-  - go state types version revert (#1467) ([filecoin-project/specs-actors#1467](https://github.com/filecoin-project/specs-actors/pull/1467))
-  - Adjust code for subtle change in go-multihash 0.0.15 (#1463) ([filecoin-project/specs-actors#1463](https://github.com/filecoin-project/specs-actors/pull/1463))
-  - Bump go state types (#1464) ([filecoin-project/specs-actors#1464](https://github.com/filecoin-project/specs-actors/pull/1464))
-  - 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))
+
+## 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))

 Contributors

 | Contributor | Commits | Lines ± | Files Changed |
 |-------------|---------|---------|---------------|
-| 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 |

 # v1.11.3 / 2021-09-29

--- a/build/openrpc/full.json.gz
+++ b/build/openrpc/full.json.gz
--- a/build/openrpc/miner.json.gz
+++ b/build/openrpc/miner.json.gz
--- a/build/openrpc/worker.json.gz
+++ b/build/openrpc/worker.json.gz
--- 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)
--- 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)
--- 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)
--- 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)
--- a/build/params_mainnet.go
+++ b/build/params_mainnet.go
@ -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" {
--- 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)
--- a/build/params_shared_vals.go
+++ b/build/params_shared_vals.go
@ -28,7 +28,7 @@ const UnixfsLinksPerLevel = 1024
 const AllowableClockDriftSecs = uint64(1)

 // TODO: This is still terrible...What's the impact of updating this before mainnet actually upgrades
-const NewestNetworkVersion = network.Version13
+const NewestNetworkVersion = network.Version14

 // Epochs
 const ForkLengthThreshold = Finality
--- a/build/version.go
+++ b/build/version.go
@ -40,7 +40,7 @@ func buildType() string {
 }

 // BuildVersion is the local build version
-const BuildVersion = "1.12.0-rc1"
+const BuildVersion = "1.12.0-rc2"

 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {
--- a/chain/stmgr/stmgr.go
+++ b/chain/stmgr/stmgr.go
@ -134,9 +134,6 @@ func NewStateManager(cs *store.ChainStore, exec Executor, sys vm.SyscallBuilder,
 			})
 			lastVersion = upgrade.Network
 		}
-	} else {
-		// Otherwise, go directly to the latest version.
-		lastVersion = build.NewestNetworkVersion
 	}

 	return &StateManager{
--- a/cli/wallet.go
+++ b/cli/wallet.go
@ -10,6 +10,8 @@ import (
 	"os"
 	"strings"

+	"github.com/filecoin-project/go-state-types/network"
+
 	"github.com/filecoin-project/lotus/build"

 	"github.com/urfave/cli/v2"
@ -634,15 +636,22 @@ var walletMarketWithdraw = &cli.Command{
 			return err
 		}

+		nv, err := api.StateNetworkVersion(ctx, wait.TipSet)
+		if err != nil {
+			return err
+		}
+
+		if nv >= network.Version14 {
 			var withdrawn abi.TokenAmount
 			if err := withdrawn.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return)); err != nil {
 				return err
 			}

 			fmt.Printf("Successfully withdrew %s FIL\n", withdrawn)
-		if withdrawn != amt {
+			if withdrawn.LessThan(amt) {
 				fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amt)
 			}
+		}

 		return nil
 	},
--- a/cmd/lotus-miner/actor.go
+++ b/cmd/lotus-miner/actor.go
@ -6,6 +6,8 @@ import (
 	"os"
 	"strings"

+	"github.com/filecoin-project/go-state-types/network"
+
 	rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
 	cbor "github.com/ipfs/go-ipld-cbor"

@ -280,6 +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 %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
@ -291,15 +294,22 @@ var actorWithdrawCmd = &cli.Command{
 			return err
 		}

+		nv, err := api.StateNetworkVersion(ctx, wait.TipSet)
+		if err != nil {
+			return err
+		}
+
+		if nv >= network.Version14 {
 			var withdrawn abi.TokenAmount
 			if err := withdrawn.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return)); err != nil {
 				return err
 			}

 			fmt.Printf("Successfully withdrew %s FIL\n", withdrawn)
-		if withdrawn != amount {
+			if withdrawn.LessThan(amount) {
 				fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amount)
 			}
+		}

 		return nil
 	},
--- a/cmd/lotus-shed/actor.go
+++ b/cmd/lotus-shed/actor.go
@ -5,6 +5,8 @@ import (
 	"fmt"
 	"os"

+	"github.com/filecoin-project/go-state-types/network"
+
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
@ -138,15 +140,22 @@ var actorWithdrawCmd = &cli.Command{
 			return err
 		}

+		nv, err := nodeAPI.StateNetworkVersion(ctx, wait.TipSet)
+		if err != nil {
+			return err
+		}
+
+		if nv >= network.Version14 {
 			var withdrawn abi.TokenAmount
 			if err := withdrawn.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return)); err != nil {
 				return err
 			}

 			fmt.Printf("Successfully withdrew %s FIL\n", withdrawn)
-		if withdrawn != amount {
+			if withdrawn.LessThan(amount) {
 				fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amount)
 			}
+		}

 		return nil
 	},
--- a/documentation/en/api-v0-methods.md
+++ b/documentation/en/api-v0-methods.md
@ -4696,7 +4696,7 @@ Inputs:
 ]
 ```

-Response: `13`
+Response: `14`

 ### StateReadState
 StateReadState returns the indicated actor's state.
--- a/documentation/en/api-v1-unstable-methods.md
+++ b/documentation/en/api-v1-unstable-methods.md
@ -4946,7 +4946,7 @@ Inputs:
 ]
 ```

-Response: `13`
+Response: `14`

 ### StateReadState
 StateReadState returns the indicated actor's state.
--- a/documentation/en/cli-lotus-miner.md
+++ b/documentation/en/cli-lotus-miner.md
@ -7,7 +7,7 @@ USAGE:
   lotus-miner [global options] command [command options] [arguments...]

 VERSION:
-   1.12.0-rc1
+   1.12.0-rc2

 COMMANDS:
   init     Initialize a lotus miner repo
--- a/documentation/en/cli-lotus-worker.md
+++ b/documentation/en/cli-lotus-worker.md
@ -7,7 +7,7 @@ USAGE:
   lotus-worker [global options] command [command options] [arguments...]

 VERSION:
-   1.12.0-rc1
+   1.12.0-rc2

 COMMANDS:
   run         Start lotus worker
--- a/documentation/en/cli-lotus.md
+++ b/documentation/en/cli-lotus.md
@ -7,7 +7,7 @@ USAGE:
   lotus [global options] command [command options] [arguments...]

 VERSION:
-   1.12.0-rc1
+   1.12.0-rc2

 COMMANDS:
   daemon   Start a lotus daemon process
--- 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
--- 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=