From f5a7a650e7b10851887d8972820044d92c1a98ed Mon Sep 17 00:00:00 2001 From: LexLuthr Date: Tue, 2 Aug 2022 13:04:54 +0530 Subject: [PATCH] rename to ActorWithdrawBalance --- api/api_storage.go | 2 +- api/proxy_gen.go | 26 ++++++------ build/openrpc/miner.json.gz | Bin 14424 -> 14411 bytes cmd/lotus-miner/actor.go | 2 +- documentation/en/api-v0-methods-miner.md | 50 +++++++++++------------ node/impl/storminer.go | 2 +- 6 files changed, 39 insertions(+), 43 deletions(-) diff --git a/api/api_storage.go b/api/api_storage.go index 7bfb6eccd..4379031b0 100644 --- a/api/api_storage.go +++ b/api/api_storage.go @@ -51,7 +51,7 @@ type StorageMiner interface { // WithdrawBalance allows to withdraw balance from miner actor to owner address // Specify amount as "0" to withdraw full balance. This method returns a message CID // and does not wait for message execution - WithdrawBalance(ctx context.Context, amount abi.TokenAmount) (cid.Cid, error) //perm:admin + ActorWithdrawBalance(ctx context.Context, amount abi.TokenAmount) (cid.Cid, error) //perm:admin MiningBase(context.Context) (*types.TipSet, error) //perm:read diff --git a/api/proxy_gen.go b/api/proxy_gen.go index 52c01693d..ec532866f 100644 --- a/api/proxy_gen.go +++ b/api/proxy_gen.go @@ -656,6 +656,8 @@ type StorageMinerStruct struct { ActorSectorSize func(p0 context.Context, p1 address.Address) (abi.SectorSize, error) `perm:"read"` + ActorWithdrawBalance func(p0 context.Context, p1 abi.TokenAmount) (cid.Cid, error) `perm:"admin"` + CheckProvable func(p0 context.Context, p1 abi.RegisteredPoStProof, p2 []storiface.SectorRef, p3 bool) (map[abi.SectorNumber]string, error) `perm:"admin"` ComputeDataCid func(p0 context.Context, p1 abi.UnpaddedPieceSize, p2 storiface.Data) (abi.PieceInfo, error) `perm:"admin"` @@ -880,8 +882,6 @@ type StorageMinerStruct struct { StorageTryLock func(p0 context.Context, p1 abi.SectorID, p2 storiface.SectorFileType, p3 storiface.SectorFileType) (bool, error) `perm:"admin"` - WithdrawBalance func(p0 context.Context, p1 abi.TokenAmount) (cid.Cid, error) `perm:"admin"` - WorkerConnect func(p0 context.Context, p1 string) error `perm:"admin"` WorkerJobs func(p0 context.Context) (map[uuid.UUID][]storiface.WorkerJob, error) `perm:"admin"` @@ -3956,6 +3956,17 @@ func (s *StorageMinerStub) ActorSectorSize(p0 context.Context, p1 address.Addres return *new(abi.SectorSize), ErrNotSupported } +func (s *StorageMinerStruct) ActorWithdrawBalance(p0 context.Context, p1 abi.TokenAmount) (cid.Cid, error) { + if s.Internal.ActorWithdrawBalance == nil { + return *new(cid.Cid), ErrNotSupported + } + return s.Internal.ActorWithdrawBalance(p0, p1) +} + +func (s *StorageMinerStub) ActorWithdrawBalance(p0 context.Context, p1 abi.TokenAmount) (cid.Cid, error) { + return *new(cid.Cid), ErrNotSupported +} + func (s *StorageMinerStruct) CheckProvable(p0 context.Context, p1 abi.RegisteredPoStProof, p2 []storiface.SectorRef, p3 bool) (map[abi.SectorNumber]string, error) { if s.Internal.CheckProvable == nil { return *new(map[abi.SectorNumber]string), ErrNotSupported @@ -5188,17 +5199,6 @@ func (s *StorageMinerStub) StorageTryLock(p0 context.Context, p1 abi.SectorID, p return false, ErrNotSupported } -func (s *StorageMinerStruct) WithdrawBalance(p0 context.Context, p1 abi.TokenAmount) (cid.Cid, error) { - if s.Internal.WithdrawBalance == nil { - return *new(cid.Cid), ErrNotSupported - } - return s.Internal.WithdrawBalance(p0, p1) -} - -func (s *StorageMinerStub) WithdrawBalance(p0 context.Context, p1 abi.TokenAmount) (cid.Cid, error) { - return *new(cid.Cid), ErrNotSupported -} - func (s *StorageMinerStruct) WorkerConnect(p0 context.Context, p1 string) error { if s.Internal.WorkerConnect == nil { return ErrNotSupported diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz index 3c54c65d1505f2507147231f88ecc73f796349ec..da5cc51f89b305ab437c9b2da6f36831a70ef487 100644 GIT binary patch delta 14081 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 delta 14085 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 D>3eQR diff --git a/cmd/lotus-miner/actor.go b/cmd/lotus-miner/actor.go index 32fb066b9..3707f3f5b 100644 --- a/cmd/lotus-miner/actor.go +++ b/cmd/lotus-miner/actor.go @@ -243,7 +243,7 @@ var actorWithdrawCmd = &cli.Command{ ctx := lcli.ReqContext(cctx) - res, err := nodeApi.WithdrawBalance(ctx, amount) + res, err := nodeApi.ActorWithdrawBalance(ctx, amount) if err != nil { return err } diff --git a/documentation/en/api-v0-methods-miner.md b/documentation/en/api-v0-methods-miner.md index 73aab2168..e24520b20 100644 --- a/documentation/en/api-v0-methods-miner.md +++ b/documentation/en/api-v0-methods-miner.md @@ -9,6 +9,7 @@ * [ActorAddress](#ActorAddress) * [ActorAddressConfig](#ActorAddressConfig) * [ActorSectorSize](#ActorSectorSize) + * [ActorWithdrawBalance](#ActorWithdrawBalance) * [Auth](#Auth) * [AuthNew](#AuthNew) * [AuthVerify](#AuthVerify) @@ -170,8 +171,6 @@ * [StorageReportHealth](#StorageReportHealth) * [StorageStat](#StorageStat) * [StorageTryLock](#StorageTryLock) -* [Withdraw](#Withdraw) - * [WithdrawBalance](#WithdrawBalance) * [Worker](#Worker) * [WorkerConnect](#WorkerConnect) * [WorkerJobs](#WorkerJobs) @@ -294,6 +293,28 @@ Inputs: Response: `34359738368` +### ActorWithdrawBalance +WithdrawBalance allows to withdraw balance from miner actor to owner address +Specify amount as "0" to withdraw full balance. This method returns a message CID +and does not wait for message execution + + +Perms: admin + +Inputs: +```json +[ + "0" +] +``` + +Response: +```json +{ + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" +} +``` + ## Auth @@ -3664,31 +3685,6 @@ Inputs: Response: `true` -## Withdraw - - -### WithdrawBalance -WithdrawBalance allows to withdraw balance from miner actor to owner address -Specify amount as "0" to withdraw full balance. This method returns a message CID -and does not wait for message execution - - -Perms: admin - -Inputs: -```json -[ - "0" -] -``` - -Response: -```json -{ - "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" -} -``` - ## Worker diff --git a/node/impl/storminer.go b/node/impl/storminer.go index f1cd3a62c..74b1dc776 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -1283,7 +1283,7 @@ func (sm *StorageMinerAPI) RuntimeSubsystems(context.Context) (res api.MinerSubs return sm.EnabledSubsystems, nil } -func (sm *StorageMinerAPI) WithdrawBalance(ctx context.Context, amount abi.TokenAmount) (cid.Cid, error) { +func (sm *StorageMinerAPI) ActorWithdrawBalance(ctx context.Context, amount abi.TokenAmount) (cid.Cid, error) { available, err := sm.Full.StateMinerAvailableBalance(ctx, sm.Miner.Address(), types.EmptyTSK) if err != nil { return cid.Undef, xerrors.Errorf("Error getting miner balance: %w", err)