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

dealpublisher: Fix provider address checks

Browse Source
This commit is contained in:
Łukasz Magiera 2021-07-07 20:01:40 +02:00
parent 2dc27d6ab4
commit d0e87a7487
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
itests/deals_publish_test.go
View File

@ -114,9 +114,8 @@ func TestPublishDealsBatching(t *testing.T) {
err = pubDealsParams.UnmarshalCBOR(bytes.NewReader(msg.Params)) err = pubDealsParams.UnmarshalCBOR(bytes.NewReader(msg.Params))
require.NoError(t, err) require.NoError(t, err)
require.Len(t, pubDealsParams.Deals, int(maxDealsPerMsg)) require.Len(t, pubDealsParams.Deals, int(maxDealsPerMsg))
require.Equal(t, publisherKey.Address.String(), msg.From.String())
} }
require.Equal(t, publisherKey.Address.String(), msg.From.String())
} }
require.Equal(t, 1, count) require.Equal(t, 1, count)

12
markets/storageadapter/client.go
View File

@ -160,8 +160,16 @@ func (c *ClientNodeAdapter) ValidatePublishedDeal(ctx context.Context, deal stor
return 0, xerrors.Errorf("failed to resolve from msg ID addr: %w", err) return 0, xerrors.Errorf("failed to resolve from msg ID addr: %w", err)
} }
if fromid != mi.Worker { var pubOk bool
return 0, xerrors.Errorf("deal wasn't published by storage provider: from=%s, provider=%s", pubmsg.From, deal.Proposal.Provider) pubAddrs := append([]address.Address{mi.Worker, mi.Owner}, mi.ControlAddresses...)
for _, a := range pubAddrs {
if fromid == a {
pubOk = true
break
}
}
if !pubOk {
return 0, xerrors.Errorf("deal wasn't published by storage provider: from=%s, provider=%s,%+v", pubmsg.From, deal.Proposal.Provider, pubAddrs)
} }
if pubmsg.To != miner2.StorageMarketActorAddr { if pubmsg.To != miner2.StorageMarketActorAddr {