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

fix: paych - check wallet for key for channel To address

Browse Source
This commit is contained in:
Dirk McCormick 2020-08-19 18:56:51 -04:00
parent b25215e31b
commit 4a3c273072
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
paychmgr/manager.go
View File

@ -45,6 +45,7 @@ type stateManagerAPI interface {
// paychAPI defines the API methods needed by the payment channel manager // paychAPI defines the API methods needed by the payment channel manager
type paychAPI interface { type paychAPI interface {
StateAccountKey(context.Context, address.Address, types.TipSetKey) (address.Address, error)
StateWaitMsg(ctx context.Context, msg cid.Cid, confidence uint64) (*api.MsgLookup, error) StateWaitMsg(ctx context.Context, msg cid.Cid, confidence uint64) (*api.MsgLookup, error)
MpoolPushMessage(ctx context.Context, msg *types.Message, maxFee *api.MessageSendSpec) (*types.SignedMessage, error) MpoolPushMessage(ctx context.Context, msg *types.Message, maxFee *api.MessageSendSpec) (*types.SignedMessage, error)
WalletHas(ctx context.Context, addr address.Address) (bool, error) WalletHas(ctx context.Context, addr address.Address) (bool, error)
@ -256,7 +257,11 @@ func (pm *Manager) trackInboundChannel(ctx context.Context, ch address.Address)
// Check that channel To address is in wallet // Check that channel To address is in wallet
to := stateCi.Control // Inbound channel so To addr is Control (this node) to := stateCi.Control // Inbound channel so To addr is Control (this node)
has, err := pm.pchapi.WalletHas(ctx, to) toKey, err := pm.pchapi.StateAccountKey(ctx, to, types.EmptyTSK)
if err != nil {
return nil, err
}
has, err := pm.pchapi.WalletHas(ctx, toKey)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
paychmgr/mock_test.go
View File

@ -202,6 +202,10 @@ func (pchapi *mockPaychAPI) pushedMessageCount() int {
return len(pchapi.messages) return len(pchapi.messages)
} }
func (pchapi *mockPaychAPI) StateAccountKey(ctx context.Context, addr address.Address, tsk types.TipSetKey) (address.Address, error) {
return addr, nil
}
func (pchapi *mockPaychAPI) WalletHas(ctx context.Context, addr address.Address) (bool, error) { func (pchapi *mockPaychAPI) WalletHas(ctx context.Context, addr address.Address) (bool, error) {
pchapi.lk.Lock() pchapi.lk.Lock()
defer pchapi.lk.Unlock() defer pchapi.lk.Unlock()