Review fixes

cli/filplus.go

@@ -280,7 +280,7 @@ func checkNotary(ctx context.Context, api v0api.FullNode, vaddr address.Address)
 
 var filplusSignRemoveDataCapProposal = &cli.Command{
 	Name:  "sign-remove-data-cap-proposal",
-	Usage: "TODO",
+	Usage: "allows a notary to sign a Remove Data Cap Proposal",
 	Flags: []cli.Flag{
 		&cli.Int64Flag{
 			Name:     "id",
@@ -290,7 +290,7 @@ var filplusSignRemoveDataCapProposal = &cli.Command{
 	},
 	Action: func(cctx *cli.Context) error {
 		if cctx.Args().Len() != 3 {
-			return fmt.Errorf("must specify three arguments: verifier address, client address, and allowance to remove")
+			return fmt.Errorf("must specify three arguments: notary address, client address, and allowance to remove")
 		}
 
 		api, closer, err := GetFullNodeAPI(cctx)
@@ -336,6 +336,14 @@ var filplusSignRemoveDataCapProposal = &cli.Command{
 			return err
 		}
 
+		_, dataCap, err := st.VerifiedClientDataCap(clientIdAddr)
+		if err != nil {
+			return xerrors.Errorf("failed to find verified client data cap: %w", err)
+		}
+		if dataCap.LessThanEqual(big.Zero()) {
+			return xerrors.Errorf("client data cap %s is less than amount requested to be removed %s", dataCap.String(), allowanceToRemove.String())
+		}
+
 		found, _, err := checkNotary(ctx, api, verifier)
 		if err != nil {
 			return xerrors.Errorf("failed to check notary status: %w", err)
@@ -353,7 +361,6 @@ var filplusSignRemoveDataCapProposal = &cli.Command{
 			}
 		}
 
-		// TODO: This should be abstracted over actor versions
 		params := verifreg.RemoveDataCapProposal{
 			RemovalProposalID: verifreg.RmDcProposalID{ProposalID: id},
 			DataCapAmount:     allowanceToRemove,

cmd/lotus-shed/verifreg.go

@@ -4,6 +4,8 @@ import (
 	"encoding/hex"
 	"fmt"
 
+	"github.com/filecoin-project/lotus/chain/actors/builtin/multisig"
+
 	"github.com/filecoin-project/go-state-types/crypto"
 
 	"github.com/filecoin-project/go-state-types/big"
@@ -498,6 +500,45 @@ var verifRegRemoveVerifiedClientDataCapCmd = &cli.Command{
 			return err
 		}
 
+		vrkState, err := api.StateGetActor(ctx, vrk, types.EmptyTSK)
+		if err != nil {
+			return err
+		}
+
+		apibs := blockstore.NewAPIBlockstore(api)
+		store := adt.WrapStore(ctx, cbor.NewCborStore(apibs))
+
+		st, err := multisig.Load(store, vrkState)
+		if err != nil {
+			return err
+		}
+
+		signers, err := st.Signers()
+		if err != nil {
+			return err
+		}
+
+		senderIsSigner := false
+		senderIdAddr, err := address.IDFromAddress(sender)
+		if err != nil {
+			return err
+		}
+
+		for _, signer := range signers {
+			signerIdAddr, err := address.IDFromAddress(signer)
+			if err != nil {
+				return err
+			}
+
+			if signerIdAddr == senderIdAddr {
+				senderIsSigner = true
+			}
+		}
+
+		if !senderIsSigner {
+			return fmt.Errorf("sender must be a vrk signer")
+		}
+
 		proto, err := api.MsigPropose(ctx, vrk, verifreg.Address, big.Zero(), sender, uint64(verifreg.Methods.RemoveVerifiedClientDataCap), params)
 		if err != nil {
 			return err