From 8cf2bbca3ac867886d2db377ef54ea347fa583bc Mon Sep 17 00:00:00 2001 From: Phi Date: Mon, 4 Mar 2024 15:38:28 +0100 Subject: [PATCH 1/2] chore: deps: update to go-state-types v13.0.0-rc.2 chore: deps: update to go-state-types v13.0.0-rc.2 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 691377e733a..139cb3fdcbc 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/filecoin-project/go-jsonrpc v0.3.1 github.com/filecoin-project/go-padreader v0.0.1 github.com/filecoin-project/go-paramfetch v0.0.4 - github.com/filecoin-project/go-state-types v0.13.0-rc.1 + github.com/filecoin-project/go-state-types v0.13.0-rc.2 github.com/filecoin-project/go-statemachine v1.0.3 github.com/filecoin-project/go-statestore v0.2.0 github.com/filecoin-project/go-storedcounter v0.1.0 diff --git a/go.sum b/go.sum index 24cba76cd99..0d886c0f6d1 100644 --- a/go.sum +++ b/go.sum @@ -334,8 +334,8 @@ github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psS github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= github.com/filecoin-project/go-state-types v0.11.2-0.20230712101859-8f37624fa540/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8= -github.com/filecoin-project/go-state-types v0.13.0-rc.1 h1:K0CJrLT418d8IuGH/hFovnUYPaI+bIeQlCuTadlmc3A= -github.com/filecoin-project/go-state-types v0.13.0-rc.1/go.mod h1:cHpOPup9H1g2T29dKHAjC2sc7/Ef5ypjuW9A3I+e9yY= +github.com/filecoin-project/go-state-types v0.13.0-rc.2 h1:JHyDDx/nV8sbQNgjUfhumiGWh8Dedc8psbiVtD0YOh0= +github.com/filecoin-project/go-state-types v0.13.0-rc.2/go.mod h1:cHpOPup9H1g2T29dKHAjC2sc7/Ef5ypjuW9A3I+e9yY= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk= github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54= From 544a16d737241475e32b790a88b8953d4923dbde Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Mon, 4 Mar 2024 11:23:32 -0500 Subject: [PATCH 2/2] feat: set migration config UpgradeEpoch for v13 actors upgrade --- chain/consensus/filcns/upgrades.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go index e59c092f869..502f370c0a3 100644 --- a/chain/consensus/filcns/upgrades.go +++ b/chain/consensus/filcns/upgrades.go @@ -2174,6 +2174,7 @@ func PreUpgradeActorsV13(ctx context.Context, sm *stmgr.StateManager, cache stmg config := migration.Config{ MaxWorkers: uint(workerCount), ProgressLogPeriod: time.Minute * 5, + UpgradeEpoch: build.UpgradeDragonHeight, } _, err = upgradeActorsV13Common(ctx, sm, cache, lbRoot, epoch, lbts, config) @@ -2192,6 +2193,7 @@ func UpgradeActorsV13(ctx context.Context, sm *stmgr.StateManager, cache stmgr.M JobQueueSize: 1000, ResultQueueSize: 100, ProgressLogPeriod: 10 * time.Second, + UpgradeEpoch: build.UpgradeDragonHeight, } newRoot, err := upgradeActorsV13Common(ctx, sm, cache, root, epoch, ts, config) if err != nil {