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

fix: dont crash on startup if funds migration fails

Browse Source
This commit is contained in:
Dirk McCormick 2020-11-12 17:15:05 +01:00
parent d525acdeda
commit 26e12e6f6a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/modules/client.go
View File

@ -55,16 +55,20 @@ func HandleMigrateClientFunds(lc fx.Lifecycle, ds dtypes.MetadataDS, wallet full
if xerrors.Is(err, datastore.ErrNotFound) { if xerrors.Is(err, datastore.ErrNotFound) {
return nil return nil
} }
return err log.Errorf("client funds migration - getting datastore value: %w", err)
return nil
} }
var value abi.TokenAmount var value abi.TokenAmount
if err = value.UnmarshalCBOR(bytes.NewReader(b)); err != nil { if err = value.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
return err log.Errorf("client funds migration - unmarshalling datastore value: %w", err)
return nil
} }
_, err = fundMgr.Reserve(ctx, addr, addr, value) _, err = fundMgr.Reserve(ctx, addr, addr, value)
if err != nil { if err != nil {
return err log.Errorf("client funds migration - reserving funds (wallet %s, addr %s, funds %d): %w",
addr, addr, value, err)
return nil
} }
return ds.Delete(datastore.NewKey("/marketfunds/client")) return ds.Delete(datastore.NewKey("/marketfunds/client"))

10
node/modules/storageminer.go
View File

@ -263,17 +263,21 @@ func HandleMigrateProviderFunds(lc fx.Lifecycle, ds dtypes.MetadataDS, node api.
} }
ts, err := node.ChainHead(ctx) ts, err := node.ChainHead(ctx)
if err != nil { if err != nil {
return err log.Errorf("provider funds migration - getting chain head: %w", err)
return nil
} }
mi, err := node.StateMinerInfo(ctx, address.Address(minerAddress), ts.Key()) mi, err := node.StateMinerInfo(ctx, address.Address(minerAddress), ts.Key())
if err != nil { if err != nil {
return err log.Errorf("provider funds migration - getting miner info %s: %w", minerAddress, err)
return nil
} }
_, err = node.MarketReserveFunds(ctx, mi.Worker, address.Address(minerAddress), value) _, err = node.MarketReserveFunds(ctx, mi.Worker, address.Address(minerAddress), value)
if err != nil { if err != nil {
return err log.Errorf("provider funds migration - reserving funds (wallet %s, addr %s, funds %d): %w",
mi.Worker, minerAddress, value, err)
return nil
} }
return ds.Delete(datastore.NewKey("/marketfunds/provider")) return ds.Delete(datastore.NewKey("/marketfunds/provider"))