From e62aaa3d3d080d47db9375045b02267231eaca58 Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Fri, 8 Oct 2021 15:09:57 -0400 Subject: [PATCH 01/14] 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= From 46688e501b48f69c445cacf531d94b0625534c4c Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Fri, 8 Oct 2021 15:10:10 -0400 Subject: [PATCH 02/14] set network v14 chocolate upgrade epoch --- build/params_mainnet.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/params_mainnet.go b/build/params_mainnet.go index e6b730335..0c8c53ba8 100644 --- 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" { From b0687ecb093e661f676d87eb772bf3cb8403f34d Mon Sep 17 00:00:00 2001 From: Cory Schwartz Date: Wed, 6 Oct 2021 13:40:44 -0700 Subject: [PATCH 03/14] restore filters for the build-macos job --- .circleci/config.yml | 9 ++++++++- .circleci/template.yml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 81bc59cf4..11420ad16 100644 --- 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: diff --git a/.circleci/template.yml b/.circleci/template.yml index a7bbf8d0a..2d2512921 100644 --- 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: From fb4ef413f4a15f69a6a2cfa0425d6f86a2afe7d3 Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Fri, 8 Oct 2021 15:14:08 -0400 Subject: [PATCH 04/14] bump the version to v1.12.0-rc2 --- CHANGELOG.md | 2 +- build/openrpc/full.json.gz | Bin 25412 -> 25412 bytes build/openrpc/miner.json.gz | Bin 10424 -> 10424 bytes build/openrpc/worker.json.gz | Bin 2710 -> 2711 bytes build/version.go | 2 +- documentation/en/cli-lotus-miner.md | 2 +- documentation/en/cli-lotus-worker.md | 2 +- documentation/en/cli-lotus.md | 2 +- 8 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ea2175cd..374b920f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Lotus changelog -# v1.12.0-rc1 / 2021-10-01 +# v1.12.0-rc2 / 2021-10-08 This is the first release candidate for lotus v1.11.3. Changelog will be updated later. diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz index 89687128434d8480f8cc07160a2be55e9b74fdd5..64efba87a23350332e6d2708f6c7172df3b5a9e4 100644 GIT binary patch delta 23 fcmX?djPb}Z#tFTQcQ^K}OXB!-muce9?<@=ek}V6z delta 23 fcmX?djPb}Z#tFTQb2s*_OX9eGN7?r0cNPW!jIawZ diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz index 6297ceb72de280e26e7d4d55367daefb13cb18b6..feac875bd66c740db3048ad25372650756f5b6ae 100644 GIT binary patch delta 22 ecmdlHxFc{vJ5zPS#!ht&4mbX*AN+4KG5`Q=o(SCl delta 22 ecmdlHxFc{vJJas`jh*Tm95zP2fBbJVG5`Q?;Rwk9 diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz index 3d214fb30a9ed07891c1ddc4d29d75d20c8af132..e8d775574bb72a1ea953a54fe1d9554ba6a0939b 100644 GIT binary patch literal 2711 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 Q1pom5|9&GamRWiL0KxV)e*gdg diff --git a/build/version.go b/build/version.go index 7e28351f9..483e8eb73 100644 --- 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" { diff --git a/documentation/en/cli-lotus-miner.md b/documentation/en/cli-lotus-miner.md index bccb7e99a..bd09e70c7 100644 --- 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 diff --git a/documentation/en/cli-lotus-worker.md b/documentation/en/cli-lotus-worker.md index ec7667277..feed0873f 100644 --- 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 diff --git a/documentation/en/cli-lotus.md b/documentation/en/cli-lotus.md index c2e5ae8f1..9265bb8a8 100644 --- 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 From 23c6597836a82753982b68a238c903af5982911c Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Sun, 10 Oct 2021 11:24:57 -0400 Subject: [PATCH 05/14] Bugfix: Use current startup network versions --- build/openrpc/full.json.gz | Bin 25412 -> 25412 bytes build/params_shared_vals.go | 2 +- chain/stmgr/stmgr.go | 3 --- documentation/en/api-v0-methods.md | 2 +- documentation/en/api-v1-unstable-methods.md | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz index 64efba87a23350332e6d2708f6c7172df3b5a9e4..e237fa15a39a3f0aadefdfa7f6582c7ecfbf7b80 100644 GIT binary patch delta 5090 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 E079L-_5c6? delta 5167 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 diff --git a/build/params_shared_vals.go b/build/params_shared_vals.go index 5b6197d9b..22d1c30e3 100644 --- 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 diff --git a/chain/stmgr/stmgr.go b/chain/stmgr/stmgr.go index a3f17cd41..67c0bdb6a 100644 --- 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{ diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md index a3693261a..545750eae 100644 --- 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. diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md index f03203314..19ab3f547 100644 --- 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. From 2241f0262140007ef5bf3656e77bf092dd14d350 Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Sat, 9 Oct 2021 20:11:49 -0400 Subject: [PATCH 06/14] Bugfix: actor withdraw CLI should depend on network version --- cli/wallet.go | 19 ++++++++++++++----- cmd/lotus-miner/actor.go | 20 +++++++++++++++----- cmd/lotus-shed/actor.go | 19 ++++++++++++++----- 3 files changed, 43 insertions(+), 15 deletions(-) diff --git a/cli/wallet.go b/cli/wallet.go index f0f4e11f9..df526dc03 100644 --- 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,14 +636,21 @@ var walletMarketWithdraw = &cli.Command{ return err } - var withdrawn abi.TokenAmount - if err := withdrawn.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return)); err != nil { + nv, err := api.StateNetworkVersion(ctx, wait.TipSet) + if err != nil { return err } - fmt.Printf("Successfully withdrew %s FIL\n", withdrawn) - if withdrawn != amt { - fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amt) + 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 { + fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amt) + } } return nil diff --git a/cmd/lotus-miner/actor.go b/cmd/lotus-miner/actor.go index 88c5cbe67..70ca725ab 100644 --- 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.Println("using ", uint64(cctx.Int("confidence"))) wait, err := api.StateWaitMsg(ctx, smsg.Cid(), uint64(cctx.Int("confidence"))) if err != nil { return err @@ -291,14 +294,21 @@ var actorWithdrawCmd = &cli.Command{ return err } - var withdrawn abi.TokenAmount - if err := withdrawn.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return)); err != nil { + nv, err := api.StateNetworkVersion(ctx, wait.TipSet) + if err != nil { return err } - fmt.Printf("Successfully withdrew %s FIL\n", withdrawn) - if withdrawn != amount { - fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amount) + 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 { + fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amount) + } } return nil diff --git a/cmd/lotus-shed/actor.go b/cmd/lotus-shed/actor.go index fd7410c24..91a23a4ee 100644 --- 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,14 +140,21 @@ var actorWithdrawCmd = &cli.Command{ return err } - var withdrawn abi.TokenAmount - if err := withdrawn.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return)); err != nil { + nv, err := nodeAPI.StateNetworkVersion(ctx, wait.TipSet) + if err != nil { return err } - fmt.Printf("Successfully withdrew %s FIL\n", withdrawn) - if withdrawn != amount { - fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amount) + 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 { + fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amount) + } } return nil From cab724841a86fc5eaf73305b54000a5937334598 Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Sun, 10 Oct 2021 10:40:22 -0400 Subject: [PATCH 07/14] Update cmd/lotus-miner/actor.go Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> --- cmd/lotus-miner/actor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/lotus-miner/actor.go b/cmd/lotus-miner/actor.go index 70ca725ab..480ebeeff 100644 --- a/cmd/lotus-miner/actor.go +++ b/cmd/lotus-miner/actor.go @@ -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.Println("using ", uint64(cctx.Int("confidence"))) + fmt.Printf("waiting for %x epochs for confirmation..\n", uint64(cctx.Int("confidence"))) wait, err := api.StateWaitMsg(ctx, smsg.Cid(), uint64(cctx.Int("confidence"))) if err != nil { return err From 177033d0f2efbacb4e4d0c863ff623760c7dda0f Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Mon, 11 Oct 2021 14:03:21 +0200 Subject: [PATCH 08/14] Fix withdrawn amount equiality check Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> --- cmd/lotus-shed/actor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/lotus-shed/actor.go b/cmd/lotus-shed/actor.go index 91a23a4ee..04c137444 100644 --- a/cmd/lotus-shed/actor.go +++ b/cmd/lotus-shed/actor.go @@ -152,7 +152,7 @@ var actorWithdrawCmd = &cli.Command{ } 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) } } From e40c7b7a8687018711df1e9714fc13167c3a6529 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Mon, 11 Oct 2021 14:03:28 +0200 Subject: [PATCH 09/14] Fix withdrawn amount equiality check Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> --- cmd/lotus-miner/actor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/lotus-miner/actor.go b/cmd/lotus-miner/actor.go index 480ebeeff..7f0f2833d 100644 --- a/cmd/lotus-miner/actor.go +++ b/cmd/lotus-miner/actor.go @@ -306,7 +306,7 @@ var actorWithdrawCmd = &cli.Command{ } 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) } } From 8eeecb431b9837e2ccc0aeb4238860e0d334bcd6 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Mon, 11 Oct 2021 14:03:37 +0200 Subject: [PATCH 10/14] Fix withdrawn amount equiality check Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> --- cli/wallet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/wallet.go b/cli/wallet.go index df526dc03..5f3053293 100644 --- a/cli/wallet.go +++ b/cli/wallet.go @@ -648,7 +648,7 @@ var walletMarketWithdraw = &cli.Command{ } fmt.Printf("Successfully withdrew %s FIL\n", withdrawn) - if withdrawn != amt { + if withdrawn.LessThan(amount) { fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amt) } } From bb74308ac9b9d58537d78a22e3c1ea6068f62541 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Mon, 11 Oct 2021 14:06:21 +0200 Subject: [PATCH 11/14] Fix missnamed variable Signed-off-by: Jakub Sztandera --- cli/wallet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/wallet.go b/cli/wallet.go index 5f3053293..f7ad79e77 100644 --- a/cli/wallet.go +++ b/cli/wallet.go @@ -648,7 +648,7 @@ var walletMarketWithdraw = &cli.Command{ } fmt.Printf("Successfully withdrew %s FIL\n", withdrawn) - if withdrawn.LessThan(amount) { + if withdrawn.LessThan(amt) { fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amt) } } From 61e1297cc7bcd6712901783f6c5735e793bf248f Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Mon, 11 Oct 2021 14:10:06 +0200 Subject: [PATCH 12/14] gofmt Signed-off-by: Jakub Sztandera --- cmd/lotus-shed/actor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/lotus-shed/actor.go b/cmd/lotus-shed/actor.go index 04c137444..822159bb4 100644 --- a/cmd/lotus-shed/actor.go +++ b/cmd/lotus-shed/actor.go @@ -152,7 +152,7 @@ var actorWithdrawCmd = &cli.Command{ } fmt.Printf("Successfully withdrew %s FIL\n", withdrawn) - if withdrawn.LessThan(amount) { + if withdrawn.LessThan(amount) { fmt.Printf("Note that this is less than the requested amount of %s FIL\n", amount) } } From a5ee1c69fe5bb7095a9bb8004326faa74fac088c Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Mon, 11 Oct 2021 08:48:58 -0400 Subject: [PATCH 13/14] update the changelog --- CHANGELOG.md | 79 ++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 374b920f5..9e454bc02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,60 +1,49 @@ # Lotus changelog -# v1.12.0-rc2 / 2021-10-08 +# 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 +- 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): - - 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 From 16743a25c26f3c0e3b30fac0caa0e7772f4639fb Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Mon, 11 Oct 2021 12:34:51 -0400 Subject: [PATCH 14/14] print confidence in decimal --- cmd/lotus-miner/actor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/lotus-miner/actor.go b/cmd/lotus-miner/actor.go index 7f0f2833d..940a73240 100644 --- a/cmd/lotus-miner/actor.go +++ b/cmd/lotus-miner/actor.go @@ -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