From e0e0b0b62fe48bc2d901ec177f87a29f00a919fe Mon Sep 17 00:00:00 2001 From: LexLuthr Date: Mon, 1 Aug 2022 23:41:24 +0530 Subject: [PATCH] don't wait for msg to land on chain --- api/api_storage.go | 6 ++---- api/proxy_gen.go | 8 ++++---- build/openrpc/miner.json.gz | Bin 14527 -> 14424 bytes cmd/lotus-miner/actor.go | 15 ++++++++++----- documentation/en/api-v0-methods-miner.md | 7 ++----- node/impl/storminer.go | 14 ++------------ 6 files changed, 20 insertions(+), 30 deletions(-) diff --git a/api/api_storage.go b/api/api_storage.go index f42ab6327..7bfb6eccd 100644 --- a/api/api_storage.go +++ b/api/api_storage.go @@ -50,10 +50,8 @@ 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 - // even when StateWaitMessage() fails and receipt exit code is non-zero - // User should check for message execution manually if this method returns a - // "Timeout waiting for withdrawal message" error. - WithdrawBalance(ctx context.Context, amount abi.TokenAmount, confidence uint64) (cid.Cid, error) //perm:admin + // and does not wait for message execution + WithdrawBalance(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 37e123105..52c01693d 100644 --- a/api/proxy_gen.go +++ b/api/proxy_gen.go @@ -880,7 +880,7 @@ 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, p2 uint64) (cid.Cid, 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"` @@ -5188,14 +5188,14 @@ func (s *StorageMinerStub) StorageTryLock(p0 context.Context, p1 abi.SectorID, p return false, ErrNotSupported } -func (s *StorageMinerStruct) WithdrawBalance(p0 context.Context, p1 abi.TokenAmount, p2 uint64) (cid.Cid, error) { +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, p2) + return s.Internal.WithdrawBalance(p0, p1) } -func (s *StorageMinerStub) WithdrawBalance(p0 context.Context, p1 abi.TokenAmount, p2 uint64) (cid.Cid, error) { +func (s *StorageMinerStub) WithdrawBalance(p0 context.Context, p1 abi.TokenAmount) (cid.Cid, error) { return *new(cid.Cid), ErrNotSupported } diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz index a05e0ac52038e289837dbb82edc0f61e383183db..3c54c65d1505f2507147231f88ecc73f796349ec 100644 GIT binary patch delta 14202 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 Q0ssL2|L9ec2!qH105a^b(EtDd delta 14321 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 fw|6P>u2z5V_l?KLo5%kP009607MDd*= network.Version14 { var withdrawn abi.TokenAmount - if err := withdrawn.UnmarshalCBOR(bytes.NewReader(msg.Receipt.Return)); err != nil { + if err := withdrawn.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return)); err != nil { return err } diff --git a/documentation/en/api-v0-methods-miner.md b/documentation/en/api-v0-methods-miner.md index 581f8fb0d..73aab2168 100644 --- a/documentation/en/api-v0-methods-miner.md +++ b/documentation/en/api-v0-methods-miner.md @@ -3670,9 +3670,7 @@ Response: `true` ### 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 -even when StateWaitMessage() fails and receipt exit code is non-zero -User should check for message execution manually if this method returns a -"Timeout waiting for withdrawal message" error. +and does not wait for message execution Perms: admin @@ -3680,8 +3678,7 @@ Perms: admin Inputs: ```json [ - "0", - 42 + "0" ] ``` diff --git a/node/impl/storminer.go b/node/impl/storminer.go index e4a908fa9..f1cd3a62c 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, confidence uint64) (cid.Cid, error) { +func (sm *StorageMinerAPI) WithdrawBalance(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) @@ -1320,15 +1320,5 @@ func (sm *StorageMinerAPI) WithdrawBalance(ctx context.Context, amount abi.Token return cid.Undef, err } - // wait for it to get mined into a block - wait, err := sm.Full.StateWaitMsg(ctx, smsg.Cid(), confidence, abi.ChainEpoch(2), true) - if err != nil { - return smsg.Cid(), xerrors.Errorf("Timeout waiting for withdrawal message") - } - - if wait.Receipt.ExitCode != 0 { - return wait.Message, xerrors.Errorf("Failed to execute withdrawal message: %w", err) - } - - return wait.Message, nil + return smsg.Cid(), nil }