Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: adapt deal filter format to CIDgravity / 修改 dealfilter 的实现, 以兼容 CIDgravity #329

Merged
merged 4 commits into from
May 17, 2023
Merged

fix: adapt deal filter format to CIDgravity / 修改 dealfilter 的实现, 以兼容 CIDgravity #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4da09fe
fix: adapt deal format to CIDgravity
LinZexiao May 17, 2023
59357e3
feat: log info when deal was rejected
LinZexiao May 17, 2023
360097f
feat: update doc about deal filter
LinZexiao May 17, 2023
daaee6c
fix: log reject info with proposal cid
LinZexiao May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions dealfilter/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,21 @@ func CliStorageDealFilter(cfg *config.MarketConfig) config.StorageDealFilter {
}

d := struct {
IsOffline bool
vsTypes.ClientDealProposal
DealType string
Agent string
FormatVersion string
IsOffline bool
ClientDealProposal vsTypes.ClientDealProposal
FastRetrieval bool
TransferType string
DealType string
Agent string
}{
IsOffline: isOffline,
ClientDealProposal: deal.ClientDealProposal,
DealType: "storage",
Agent: "venus-market",
FormatVersion: "1.0.0",
FastRetrieval: deal.FastRetrieval,
TransferType: deal.Ref.TransferType,
}
return runDealFilter(ctx, pCfg.Filter, d)
}
Expand Down
45 changes: 25 additions & 20 deletions docs/zh/订单过滤器.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,29 @@
```json
{
"IsOffline": false,
"Proposal": {
"PieceCID": {
"/": "baga6ea4seaqihx2pxanewwxvqwgeyrcmal7aomucelef52vhqy7qaarciamaqoq"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "f3r3hr3xl27unpefvipve2f4hlfvdnq3forgr253z6dqahufvanatdandxm74zikheccvx74ys7by5vzafq2va",
"Provider": "f01000",
"Label": "bafk2bzacebiupsywspqnsvc5v7ing74i3u4y3r7wtgjioor7pqn3cxopq7lo4",
"StartEpoch": 18171,
"EndEpoch": 536571,
"StoragePricePerEpoch": "1",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ClientSignature": {
"Type": 2,
"Data": "oEnUUL1WejrLawl3sP9o/TZYRZgPYA86xmF3RMQt5bPQJbrK/5x3UXYxeUKoIDMjE96fA1GSqfrE14tFl/nMyatPLUvzzZ0ulsPTQVwfb54Mgx0yBSMYTf/O8Bg09MNq"
"FormatVersion": "1.0.0",
"FastRetrieval": false,
"TransferType" : "manual",
"ClientDealProposal":{
"Proposal": {
"PieceCID": {
"/": "baga6ea4seaqihx2pxanewwxvqwgeyrcmal7aomucelef52vhqy7qaarciamaqoq"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "f3r3hr3xl27unpefvipve2f4hlfvdnq3forgr253z6dqahufvanatdandxm74zikheccvx74ys7by5vzafq2va",
"Provider": "f01000",
"Label": "bafk2bzacebiupsywspqnsvc5v7ing74i3u4y3r7wtgjioor7pqn3cxopq7lo4",
"StartEpoch": 18171,
"EndEpoch": 536571,
"StoragePricePerEpoch": "1",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ClientSignature": {
"Type": 2,
"Data": "oEnUUL1WejrLawl3sP9o/TZYRZgPYA86xmF3RMQt5bPQJbrK/5x3UXYxeUKoIDMjE96fA1GSqfrE14tFl/nMyatPLUvzzZ0ulsPTQVwfb54Mgx0yBSMYTf/O8Bg09MNq"
},
},
"DealType": "storage",
"Agent": "venus-market"
Expand Down Expand Up @@ -95,7 +100,7 @@ Filter = "exit 0"
- 例子: 只接受来自 `f01000` 的订单

```toml
Filter = "jq -r '.Proposal.Provider' | grep -q '^f01000$'"
Filter = "jq -r '.ClientDealProposal.Proposal.Provider' | grep -q '^f01000$'"
```

- 例子: 使用 `python` 脚本
Expand All @@ -114,7 +119,7 @@ try:
json_str = sys.stdin.read()
data = json.loads(json_str)

if data['Proposal']['PieceSize'] < 2048:
if data["ClientDealProposal"]['Proposal']['PieceSize'] < 2048:
print("")
sys.exit(0)
else:
Expand Down
2 changes: 2 additions & 0 deletions storageprovider/deal_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,8 @@ func (storageDealPorcess *StorageDealProcessImpl) SendSignedResponse(ctx context
// StorageDealRejecting(RejectDeal)->StorageDealFailing(FailDeal)
func (storageDealPorcess *StorageDealProcessImpl) HandleReject(ctx context.Context, deal *types.MinerDeal, event storagemarket.StorageDealStatus, err error) error {
storageDealPorcess.eventPublisher.Publish(storagemarket.ProviderEventDealRejected, deal)
log.Infof("deal rejected (proposal cid: %s ): %s", deal.ProposalCid, err)

deal.State = event
deal.Message = err.Error()

Expand Down