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

Simplify the miner actor set owner command

Browse Source
This commit is contained in:
Aayush Rajasekaran 2021-01-08 00:55:13 -05:00
parent 7d0296c409
commit 02f33e2b8e
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
cmd/lotus-storage-miner/actor.go
View File

@ -622,8 +622,8 @@ var actorControlSet = &cli.Command{
var actorSetOwnerCmd = &cli.Command{ var actorSetOwnerCmd = &cli.Command{
Name: "set-owner", Name: "set-owner",
Usage: "Set owner address", Usage: "Set owner address (this command should be invoked twice, first with the old owner as the senderAddress, and then with the new owner)",
ArgsUsage: "[address]", ArgsUsage: "[newOwnerAddress senderAddress]",
Flags: []cli.Flag{ Flags: []cli.Flag{
&cli.BoolFlag{ &cli.BoolFlag{
Name: "really-do-it", Name: "really-do-it",
@ -637,8 +637,8 @@ var actorSetOwnerCmd = &cli.Command{
return nil return nil
} }
if !cctx.Args().Present() { if cctx.NArg() != 2 {
return fmt.Errorf("must pass address of new owner address") return fmt.Errorf("must pass new owner address and sender address")
} }
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx) nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
@ -660,7 +660,17 @@ var actorSetOwnerCmd = &cli.Command{
return err return err
} }
newAddr, err := api.StateLookupID(ctx, na, types.EmptyTSK) newAddrId, err := api.StateLookupID(ctx, na, types.EmptyTSK)
if err != nil {
return err
}
fa, err := address.NewFromString(cctx.Args().Get(1))
if err != nil {
return err
}
fromAddrId, err := api.StateLookupID(ctx, na, types.EmptyTSK)
if err != nil { if err != nil {
return err return err
} }
@ -675,13 +685,17 @@ var actorSetOwnerCmd = &cli.Command{
return err return err
} }
sp, err := actors.SerializeParams(&newAddr) if fromAddrId != mi.Owner && fromAddrId != newAddrId {
return xerrors.New("from address must either be the old owner or the new owner")
}
sp, err := actors.SerializeParams(&newAddrId)
if err != nil { if err != nil {
return xerrors.Errorf("serializing params: %w", err) return xerrors.Errorf("serializing params: %w", err)
} }
smsg, err := api.MpoolPushMessage(ctx, &types.Message{ smsg, err := api.MpoolPushMessage(ctx, &types.Message{
From: mi.Owner, From: fromAddrId,
To: maddr, To: maddr,
Method: miner.Methods.ChangeOwnerAddress, Method: miner.Methods.ChangeOwnerAddress,
Value: big.Zero(), Value: big.Zero(),
@ -691,7 +705,7 @@ var actorSetOwnerCmd = &cli.Command{
return xerrors.Errorf("mpool push: %w", err) return xerrors.Errorf("mpool push: %w", err)
} }
fmt.Println("Propose Message CID:", smsg.Cid()) fmt.Println("Message CID:", smsg.Cid())
// wait for it to get mined into a block // wait for it to get mined into a block
wait, err := api.StateWaitMsg(ctx, smsg.Cid(), build.MessageConfidence) wait, err := api.StateWaitMsg(ctx, smsg.Cid(), build.MessageConfidence)
@ -701,32 +715,7 @@ var actorSetOwnerCmd = &cli.Command{
// check it executed successfully // check it executed successfully
if wait.Receipt.ExitCode != 0 { if wait.Receipt.ExitCode != 0 {
fmt.Println("Propose owner change failed!") fmt.Println("owner change failed!")
return err
}
smsg, err = api.MpoolPushMessage(ctx, &types.Message{
From: newAddr,
To: maddr,
Method: miner.Methods.ChangeOwnerAddress,
Value: big.Zero(),
Params: sp,
}, nil)
if err != nil {
return xerrors.Errorf("mpool push: %w", err)
}
fmt.Println("Approve Message CID:", smsg.Cid())
// wait for it to get mined into a block
wait, err = api.StateWaitMsg(ctx, smsg.Cid(), build.MessageConfidence)
if err != nil {
return err
}
// check it executed successfully
if wait.Receipt.ExitCode != 0 {
fmt.Println("Approve owner change failed!")
return err return err
} }