cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
pull from: v1.27.0-a
merge into: cerc-io:master
Conversation 0 Commits 473 Files Changed 452 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d9bb2e0bf - Show all commits

4
chain/consensus/filcns/upgrades.go
View File

@ -1893,7 +1893,7 @@ func UpgradeActorsV12(ctx context.Context, sm *stmgr.StateManager, cache stmgr.M
} }
newRoot, err := upgradeActorsV12Common(ctx, sm, cache, root, epoch, ts, config) newRoot, err := upgradeActorsV12Common(ctx, sm, cache, root, epoch, ts, config)
if err != nil { if err != nil {
return cid.Undef, xerrors.Errorf("migrating actors v11 state: %w", err) return cid.Undef, xerrors.Errorf("migrating actors v12 state: %w", err)
} }
return newRoot, nil return newRoot, nil
} }
@ -2210,7 +2210,7 @@ func UpgradeActorsV13(ctx context.Context, sm *stmgr.StateManager, cache stmgr.M
} }
newRoot, err := upgradeActorsV13Common(ctx, sm, cache, root, epoch, ts, config) newRoot, err := upgradeActorsV13Common(ctx, sm, cache, root, epoch, ts, config)
if err != nil { if err != nil {
return cid.Undef, xerrors.Errorf("migrating actors v11 state: %w", err) return cid.Undef, xerrors.Errorf("migrating actors v13 state: %w", err)
} }
return newRoot, nil return newRoot, nil
} }