From 3d91633699634c720978069bfce4ae9fa5206c71 Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Thu, 1 Oct 2020 04:58:13 -0400 Subject: [PATCH] Update to v2/actors master --- build/params_2k.go | 2 +- build/params_shared_funcs.go | 2 +- build/params_testground.go | 2 +- build/params_testnet.go | 2 +- chain/stmgr/forks.go | 4 ++-- chain/stmgr/stmgr.go | 2 +- go.mod | 4 ++-- go.sum | 11 ++++------- 8 files changed, 13 insertions(+), 16 deletions(-) diff --git a/build/params_2k.go b/build/params_2k.go index 4428da748..f4a17f724 100644 --- a/build/params_2k.go +++ b/build/params_2k.go @@ -14,7 +14,7 @@ const BreezeGasTampingDuration = 0 const UpgradeSmokeHeight = -1 const UpgradeIgnitionHeight = -2 const UpgradeLiftoffHeight = -3 -const UpgradeActorsV2 = 10 +const UpgradeActorsV2Height = 10 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, diff --git a/build/params_shared_funcs.go b/build/params_shared_funcs.go index 95daa45e7..40ccca50b 100644 --- a/build/params_shared_funcs.go +++ b/build/params_shared_funcs.go @@ -41,7 +41,7 @@ func DhtProtocolName(netName dtypes.NetworkName) protocol.ID { func UseNewestNetwork() bool { // TODO: Put these in a container we can iterate over - if UpgradeBreezeHeight <= 0 && UpgradeSmokeHeight <= 0 && UpgradeActorsV2 <= 0 { + if UpgradeBreezeHeight <= 0 && UpgradeSmokeHeight <= 0 && UpgradeActorsV2Height <= 0 { return true } return false diff --git a/build/params_testground.go b/build/params_testground.go index de554f49e..6d51100e4 100644 --- a/build/params_testground.go +++ b/build/params_testground.go @@ -76,7 +76,7 @@ var ( UpgradeSmokeHeight abi.ChainEpoch = -1 UpgradeIgnitionHeight abi.ChainEpoch = -2 UpgradeLiftoffHeight abi.ChainEpoch = -3 - UpgradeActorsV2 abi.ChainEpoch = 10 + UpgradeActorsV2Height abi.ChainEpoch = 10 DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, diff --git a/build/params_testnet.go b/build/params_testnet.go index 66f30f869..ab579fd10 100644 --- a/build/params_testnet.go +++ b/build/params_testnet.go @@ -23,7 +23,7 @@ const UpgradeSmokeHeight = 51000 const UpgradeIgnitionHeight = 94000 -const UpgradeActorsV2 = 128888 +const UpgradeActorsV2Height = 128888 // This signals our tentative epoch for mainnet launch. Can make it later, but not earlier. // Miners, clients, developers, custodians all need time to prepare. diff --git a/chain/stmgr/forks.go b/chain/stmgr/forks.go index 96873b675..7d1555114 100644 --- a/chain/stmgr/forks.go +++ b/chain/stmgr/forks.go @@ -36,7 +36,7 @@ import ( var ForksAtHeight = map[abi.ChainEpoch]func(context.Context, *StateManager, ExecCallback, cid.Cid, *types.TipSet) (cid.Cid, error){ build.UpgradeBreezeHeight: UpgradeFaucetBurnRecovery, build.UpgradeIgnitionHeight: UpgradeIgnition, - build.UpgradeActorsV2: UpgradeActorsV2, + build.UpgradeActorsV2Height: UpgradeActorsV2, build.UpgradeLiftoffHeight: UpgradeLiftoff, } @@ -427,7 +427,7 @@ func UpgradeActorsV2(ctx context.Context, sm *StateManager, cb ExecCallback, roo return cid.Undef, xerrors.Errorf("failed to create new state info for actors v2: %w", err) } - newHamtRoot, err := m2.MigrateStateTree(ctx, store, root) + newHamtRoot, err := m2.MigrateStateTree(ctx, store, root, build.UpgradeActorsV2Height, m2.DefaultConfig()) if err != nil { return cid.Undef, xerrors.Errorf("upgrading to actors v2: %w", err) } diff --git a/chain/stmgr/stmgr.go b/chain/stmgr/stmgr.go index 2ce393378..e7947cac3 100644 --- a/chain/stmgr/stmgr.go +++ b/chain/stmgr/stmgr.go @@ -1277,7 +1277,7 @@ func (sm *StateManager) GetNtwkVersion(ctx context.Context, height abi.ChainEpoc return network.Version2 } - if height <= build.UpgradeActorsV2 { + if height <= build.UpgradeActorsV2Height { return network.Version3 } diff --git a/go.mod b/go.mod index 1f8d043fa..ea33b810e 100644 --- a/go.mod +++ b/go.mod @@ -37,8 +37,8 @@ require ( github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe github.com/filecoin-project/go-statestore v0.1.0 github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b - github.com/filecoin-project/specs-actors v0.9.12-0.20200930015636-a6848b2dd741 - github.com/filecoin-project/specs-actors/v2 v2.0.0-20200930035834-7115a78cb9a1 + github.com/filecoin-project/specs-actors v0.9.12 + github.com/filecoin-project/specs-actors/v2 v2.0.0-20201001041506-c7ff44a3ce9b github.com/filecoin-project/specs-storage v0.1.1-0.20200907031224-ed2e5cd13796 github.com/filecoin-project/test-vectors/schema v0.0.3 github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 diff --git a/go.sum b/go.sum index 3e16f9b74..6b3b00907 100644 --- a/go.sum +++ b/go.sum @@ -261,8 +261,6 @@ github.com/filecoin-project/go-paramfetch v0.0.2-0.20200701152213-3e0f0afdc261/g github.com/filecoin-project/go-state-types v0.0.0-20200903145444-247639ffa6ad/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I= github.com/filecoin-project/go-state-types v0.0.0-20200904021452-1883f36ca2f4/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I= github.com/filecoin-project/go-state-types v0.0.0-20200905071437-95828685f9df/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I= -github.com/filecoin-project/go-state-types v0.0.0-20200911004822-964d6c679cfc h1:1vr/LoqGq5m5g37Q3sNSAjfwF1uJY0zmiHcvnxY6hik= -github.com/filecoin-project/go-state-types v0.0.0-20200911004822-964d6c679cfc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab h1:cEDC5Ei8UuT99hPWhCjA72SM9AuRtnpvdSTIYbnzN8I= github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-statemachine v0.0.0-20200714194326-a77c3ae20989/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= @@ -274,11 +272,10 @@ github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b/go.mod h1:Q0GQOBtKf1oE10eSXSlhN45kDBdGvEcVOqMiffqX+N8= github.com/filecoin-project/specs-actors v0.9.4/go.mod h1:BStZQzx5x7TmCkLv0Bpa07U6cPKol6fd3w9KjMPZ6Z4= github.com/filecoin-project/specs-actors v0.9.7/go.mod h1:wM2z+kwqYgXn5Z7scV1YHLyd1Q1cy0R8HfTIWQ0BFGU= -github.com/filecoin-project/specs-actors v0.9.9/go.mod h1:czlvLQGEX0fjLLfdNHD7xLymy6L3n7aQzRWzsYGf+ys= -github.com/filecoin-project/specs-actors v0.9.12-0.20200930015636-a6848b2dd741 h1:pqAfjHE+yLFj1mvtx68S3HKdd9LSy6Byziz2qRNh3fA= -github.com/filecoin-project/specs-actors v0.9.12-0.20200930015636-a6848b2dd741/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao= -github.com/filecoin-project/specs-actors/v2 v2.0.0-20200930035834-7115a78cb9a1 h1:lNMXodbyskP3ZfTWL/t6M4NYI0hhcZQ2GAJCIVK8Y/E= -github.com/filecoin-project/specs-actors/v2 v2.0.0-20200930035834-7115a78cb9a1/go.mod h1:/2Zra1BhLtpRywUhm++QP+3I5Ir+hBk/W24TpYjj43E= +github.com/filecoin-project/specs-actors v0.9.12 h1:iIvk58tuMtmloFNHhAOQHG+4Gci6Lui0n7DYQGi3cJk= +github.com/filecoin-project/specs-actors v0.9.12/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao= +github.com/filecoin-project/specs-actors/v2 v2.0.0-20201001041506-c7ff44a3ce9b h1:8JRxR0rKdiuCHIDKi7Zbs+/jiygr6eXEX47QXhjX+kA= +github.com/filecoin-project/specs-actors/v2 v2.0.0-20201001041506-c7ff44a3ce9b/go.mod h1:52FuQUNDXq2WDg+6+UOhkqBuNc2e62h9BCIB67Bluxg= github.com/filecoin-project/specs-storage v0.1.1-0.20200907031224-ed2e5cd13796 h1:dJsTPWpG2pcTeojO2pyn0c6l+x/3MZYCBgo/9d11JEk= github.com/filecoin-project/specs-storage v0.1.1-0.20200907031224-ed2e5cd13796/go.mod h1:nJRRM7Aa9XVvygr3W9k6xGF46RWzr2zxF/iGoAIfA/g= github.com/filecoin-project/test-vectors/schema v0.0.3 h1:1zuBo25B3016inbygYLgYFdpJ2m1BDTbAOCgABRleiU=