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

paych: Print available amounts in paych status

Browse Source
This commit is contained in:
Łukasz Magiera 2022-01-04 23:20:11 +01:00
parent 7a938b2dea
commit 8f6f21c94c
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api_full.go
View File

@ -854,6 +854,10 @@ type ChannelAvailableFunds struct {
ConfirmedAmt types.BigInt ConfirmedAmt types.BigInt
// PendingAmt is the amount of funds that are pending confirmation on-chain // PendingAmt is the amount of funds that are pending confirmation on-chain
PendingAmt types.BigInt PendingAmt types.BigInt
// AvailableAmt is part of ConfirmedAmt that is available for use (pre-allocated)
AvailableAmt types.BigInt
// PendingAvailableAmt is the amount of available funds that are pending confirmation on-chain
PendingAvailableAmt types.BigInt
// PendingWaitSentinel can be used with PaychGetWaitReady to wait for // PendingWaitSentinel can be used with PaychGetWaitReady to wait for
// confirmation of pending funds // confirmation of pending funds
PendingWaitSentinel *cid.Cid PendingWaitSentinel *cid.Cid

2
cli/paych.go
View File

@ -191,6 +191,8 @@ func paychStatus(writer io.Writer, avail *api.ChannelAvailableFunds) {
{"To", avail.To.String()}, {"To", avail.To.String()},
{"Confirmed Amt", fmt.Sprintf("%s", types.FIL(avail.ConfirmedAmt))}, {"Confirmed Amt", fmt.Sprintf("%s", types.FIL(avail.ConfirmedAmt))},
{"Pending Amt", fmt.Sprintf("%s", types.FIL(avail.PendingAmt))}, {"Pending Amt", fmt.Sprintf("%s", types.FIL(avail.PendingAmt))},
{"Available Amt", fmt.Sprintf("%s", types.FIL(avail.AvailableAmt))},
{"Pending Available Amt", fmt.Sprintf("%s", types.FIL(avail.PendingAvailableAmt))},
{"Queued Amt", fmt.Sprintf("%s", types.FIL(avail.QueuedAmt))}, {"Queued Amt", fmt.Sprintf("%s", types.FIL(avail.QueuedAmt))},
{"Voucher Redeemed Amt", fmt.Sprintf("%s", types.FIL(avail.VoucherReedeemedAmt))}, {"Voucher Redeemed Amt", fmt.Sprintf("%s", types.FIL(avail.VoucherReedeemedAmt))},
} }

2
paychmgr/manager.go
View File

@ -142,6 +142,8 @@ func (pm *Manager) AvailableFundsByFromTo(ctx context.Context, from address.Addr
To: to, To: to,
ConfirmedAmt: types.NewInt(0), ConfirmedAmt: types.NewInt(0),
PendingAmt: types.NewInt(0), PendingAmt: types.NewInt(0),
AvailableAmt: types.NewInt(0),
PendingAvailableAmt: types.NewInt(0),
PendingWaitSentinel: nil, PendingWaitSentinel: nil,
QueuedAmt: types.NewInt(0), QueuedAmt: types.NewInt(0),
VoucherReedeemedAmt: types.NewInt(0), VoucherReedeemedAmt: types.NewInt(0),

2
paychmgr/simple.go
View File

@ -340,6 +340,8 @@ func (ca *channelAccessor) currentAvailableFunds(ctx context.Context, channelID
To: channelInfo.to(), To: channelInfo.to(),
ConfirmedAmt: channelInfo.Amount, ConfirmedAmt: channelInfo.Amount,
PendingAmt: channelInfo.PendingAmount, PendingAmt: channelInfo.PendingAmount,
AvailableAmt: channelInfo.AvailableAmount,
PendingAvailableAmt: channelInfo.PendingAvailableAmount,
PendingWaitSentinel: waitSentinel, PendingWaitSentinel: waitSentinel,
QueuedAmt: queuedAmt, QueuedAmt: queuedAmt,
VoucherReedeemedAmt: totalRedeemed, VoucherReedeemedAmt: totalRedeemed,