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

storageminer: Unregister genesis miner in init

Browse Source
This commit is contained in:
Łukasz Magiera 2019-08-20 20:17:59 +02:00
parent 90dd19fe49
commit f43757f9f2
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/lotus-storage-miner/init.go
View File

@ -25,6 +25,10 @@ var initCmd = &cli.Command{
Name: "actor",
Usage: "specify the address of an already created miner actor",
},
&cli.BoolFlag{
Name: "genesis-miner",
Usage: "enable genesis mining (DON'T USE ON BOOTSTRAPPED NETWORK)",
},
},
Action: func(cctx *cli.Context) error {
log.Info("Initializing lotus storage miner")
@ -93,7 +97,7 @@ var initCmd = &cli.Command{
return err
}
if err := configureStorageMiner(ctx, api, a, peerid); err != nil {
if err := configureStorageMiner(ctx, api, a, peerid, cctx.Bool("genesis-miner")); err != nil {
return xerrors.Errorf("failed to configure storage miner: %w", err)
}
@ -122,11 +126,20 @@ var initCmd = &cli.Command{
},
}
func configureStorageMiner(ctx context.Context, api api.FullNode, addr address.Address, peerid peer.ID) error {
// We may be one of genesis miners, start mining before trying to do any chain operations
// (otherwise our messages won't be mined)
if err := api.MinerRegister(ctx, addr); err != nil {
return err
func configureStorageMiner(ctx context.Context, api api.FullNode, addr address.Address, peerid peer.ID, genmine bool) error {
if genmine {
log.Warn("Starting genesis mining. This shouldn't happen when connecting to the real network.")
// We may be one of genesis miners, start mining before trying to do any chain operations
// (otherwise our messages won't be mined)
if err := api.MinerRegister(ctx, addr); err != nil {
return err
}
defer func() {
if err := api.MinerUnregister(ctx, addr); err != nil {
log.Errorf("failed to call api.MinerUnregister: %s", err)
}
}()
}
// This really just needs to be an api call at this point...

4
miner/miner.go
View File

@ -121,10 +121,14 @@ func (m *Miner) mine(ctx context.Context) {
select {
case <-m.stop:
m.lk.Lock()
close(m.stopping)
m.stop = nil
m.stopping = nil
m.lk.Unlock()
return
default:
}