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.

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

Event API #902

Merged
merged 92 commits into from
Jan 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
a84b785
[mkt] REST endpoints to comply with yaml spec
tworec Nov 4, 2020
d687289
Merge branch 'master' into market/fix-rest-responses
tworec Nov 4, 2020
d31d948
[mkt] REST to return ApprovalStatus as string
tworec Nov 4, 2020
7436ef8
Merge branch 'master' into market/fix-rest-responses
tworec Nov 10, 2020
8aa12fe
bump ya-client to align with golemfactory/ya-client#59
tworec Nov 10, 2020
ef047cb
Re-group api's based on alpha.4 event api update
maaktweluit Dec 9, 2020
c88bfd8
Remove provider/requestor specific db queries
maaktweluit Dec 9, 2020
c6992c4
Merge pull request #857 from golemfactory/mwu/pay-event-api
maaktweluit Dec 9, 2020
f1a6893
Apply all renames
maaktweluit Dec 9, 2020
ffc1536
First working Query<FilterParams>
maaktweluit Dec 9, 2020
3969a49
Merge branch 'master' into market/fix-rest-responses
tworec Dec 10, 2020
6b18463
bump ya-client reference
tworec Dec 10, 2020
843139e
Merge branch 'market/fix-rest-responses' into market/reject-proposal
tworec Dec 10, 2020
d57a444
[mkt] reject proposal & cancel agreement with reason mocked
tworec Dec 10, 2020
8a16117
Removed solved TODO
maaktweluit Dec 10, 2020
9f1d795
Update to ya-client branch, fix missing timezone
maaktweluit Dec 10, 2020
785e6df
revert debit note changes for now
maaktweluit Dec 10, 2020
ad5c0c8
Update limit to be u32 instead of i64
maaktweluit Dec 10, 2020
47a5d6a
[mkt] change proposal state to Rejected in DB
tworec Dec 10, 2020
2859ec2
validate_subscription used wider
tworec Dec 10, 2020
921bbd4
Merge pull request #861 from golemfactory/mwu/pay-event-new-params
maaktweluit Dec 10, 2020
c741514
Use new InvoiceEvent format, disabled REJECTED for now: not used and …
maaktweluit Dec 12, 2020
486ffec
cargo fmt + log all the events
maaktweluit Dec 12, 2020
c588a8e
update debit note event
maaktweluit Dec 12, 2020
1978a8b
Add timestamp to allocation
maaktweluit Dec 13, 2020
9d5565e
update get_debit_notes params
maaktweluit Dec 13, 2020
b186145
update get_payments_for_debit_note params
maaktweluit Dec 13, 2020
687ad5e
update invoice_event, debit_note_event and payments input parameters
maaktweluit Dec 13, 2020
49667e4
Remove compiler warning
maaktweluit Dec 13, 2020
b014919
Merge provider and requestor api-client, like in yagna
maaktweluit Dec 13, 2020
e951d17
update final input parameters, cargo fmt
maaktweluit Dec 13, 2020
49b426b
decorate_demand -> get_demand_decorations
maaktweluit Dec 14, 2020
a1a9087
Make ya-client work from branch again
maaktweluit Dec 14, 2020
9b37ebb
Market GSB GetAgreement with Role (#864)
nieznanysprawiciel Dec 14, 2020
0c1c798
Review comments: rename invoice -> debitnote, better in migrations
maaktweluit Dec 14, 2020
f15a2f7
Split allocation read/write object
maaktweluit Dec 14, 2020
ef57d0a
Merge branch 'event-api/master' into market/fix-rest-responses
tworec Dec 14, 2020
1be1382
Point to merged branch in ya-client
maaktweluit Dec 14, 2020
9f2557a
Merge pull request #867 from golemfactory/mwu/e-api-new-events
Wiezzel Dec 14, 2020
b602a44
Activity Event API [1/2]
mfranciszkiewicz Dec 14, 2020
da09808
Merge branch 'event-api/master' into pay/event-api
Wiezzel Dec 14, 2020
30f8bbf
bump ya-client to newest event-api/master
tworec Dec 14, 2020
f3a51fb
Merge remote-tracking branch 'origin/mf/activity/event-api' into mark…
tworec Dec 14, 2020
ff68555
Merge branch 'market/agreement-events-extract-common-fields' into mar…
tworec Dec 14, 2020
783a64e
Payment API: filtering by app_session_id
Wiezzel Dec 14, 2020
eba2dad
Merge branch 'market/agreement-events-extract-common-fields' into mar…
tworec Dec 14, 2020
46c5f79
Updates required to get ya-provider compiling ( payment side )
maaktweluit Dec 14, 2020
89a34b8
Fix ClientAgreement::app_session_id
mfranciszkiewicz Dec 15, 2020
9b2708c
Merge pull request #765 from golemfactory/market/fix-rest-responses
tworec Dec 15, 2020
0093cd3
Merge remote-tracking branch 'origin/event-api/master' into pay/event…
maaktweluit Dec 15, 2020
b14bcc6
Update cargo to point to event-api/master
maaktweluit Dec 15, 2020
eb6977d
Merge pull request #870 from golemfactory/pay/event-api
maaktweluit Dec 15, 2020
1dc5043
Merge pull request #872 from golemfactory/mwu/ea-ya-provider
maaktweluit Dec 15, 2020
9a048bc
Merge pull request #871 from golemfactory/wiezzel/event-api
maaktweluit Dec 15, 2020
4e38cdf
Update lock file after payment-api updates
maaktweluit Dec 15, 2020
9c9db31
Merge pull request #876 from golemfactory/mwu/lock-update
Wiezzel Dec 15, 2020
47a4e8f
Persist data during event-api/down migration
maaktweluit Dec 15, 2020
302779c
Fixed review comments
maaktweluit Dec 15, 2020
e02703b
Merge pull request #877 from golemfactory/mwu/better-migration
maaktweluit Dec 15, 2020
f3fce12
remove deprecated endpoints
tworec Dec 15, 2020
5263442
Payment API: examples adjusted for event API
Wiezzel Dec 15, 2020
4a027f7
reject proposal api call + more:
tworec Dec 15, 2020
1d36923
Merge pull request #879 from golemfactory/wiezzel/event_api
Wiezzel Dec 16, 2020
e64040a
Payment: DB views for querying events
Wiezzel Dec 16, 2020
9a089fa
reject proposal GSB endpoint enabled + more:
tworec Dec 16, 2020
f1faee4
Merge branch 'event-api/master' into market/reject-proposal
tworec Dec 17, 2020
be9a668
[mkt tst] get rid of tests with Result output
tworec Dec 15, 2020
2c6bdb9
use serial_test with built-in atctix_rt::test
tworec Dec 15, 2020
8abb4e8
remove unreachable statement
tworec Dec 17, 2020
7316986
Merge pull request #888 from golemfactory/wiezzel/db_views
Wiezzel Dec 17, 2020
7a5a1b0
review: fix metrics reporting
tworec Dec 17, 2020
06e5956
terminate_agreement consistent with other common methods:
tworec Dec 17, 2020
92696d2
apply review comments
tworec Dec 17, 2020
f5fa86e
Merge pull request #859 from golemfactory/market/reject-proposal
tworec Dec 17, 2020
3aa75d1
[mkt] align HTTP Codes with newest spec
tworec Dec 17, 2020
057fd6a
Merge pull request #889 from golemfactory/market/align-http-codes
tworec Dec 17, 2020
f62722d
bump version to 0.6
tworec Dec 18, 2020
afe870c
use ya-client with fixed InvoiceEvents to camel case
tworec Dec 21, 2020
949f8be
bump to newest commit
tworec Dec 21, 2020
2baba0b
use ya-client with changed EventTypes
tworec Dec 21, 2020
7ce0e7d
bump ya-client to newest event-api/master
tworec Dec 21, 2020
636bbee
Merge pull request #894 from golemfactory/event-api/pay-invoice-event…
tworec Dec 21, 2020
afb4a96
logging to file
etam Dec 21, 2020
75cb9a3
review comments: cli moved to service run + middleware workaround res…
tworec Dec 21, 2020
fabbcf3
[pay] use backward compatible event types against DB
tworec Dec 22, 2020
899776b
Merge pull request #898 from golemfactory/event-api/pay-invoice-event…
tworec Dec 22, 2020
a0d7cf4
Merge branch 'master' of github.com:golemfactory/yagna into event-api…
nieznanysprawiciel Jan 7, 2021
c869dae
Merge branch 'master' into event-api/master
nieznanysprawiciel Jan 7, 2021
b88ce0b
go back to ya-client dependency via gitrev pointing current `master`
tworec Jan 11, 2021
3f76367
Merge branch 'master' into event-api/master
tworec Jan 11, 2021
67206ec
revert secp crate to fix sgx build
tworec Jan 12, 2021
4de3b2c
- revert removal of identity filtering
mfranciszkiewicz Jan 12, 2021
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
111 changes: 67 additions & 44 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "yagna"
version = "0.5.0"
version = "0.6.0"
description = "Open platform and marketplace for distributed computations"
readme = "README.md"
authors = ["Golem Factory <[email protected]>"]
Expand Down Expand Up @@ -51,6 +51,7 @@ actix-rt = "1.0"
actix-service = "1.0"
actix-web = "3.2"
anyhow = "1.0"
chrono = "0.4"
directories = "2.0.2"
dotenv = "0.15.0"
futures = "0.3"
Expand Down Expand Up @@ -171,8 +172,11 @@ ya-sb-router = { path = "service-bus/router" }
ya-sb-util = { path = "service-bus/util" }

## CLIENT
ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "e68bbd90c903c6f74f77fddb80a432d20e4e2b2a"}
ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "e68bbd90c903c6f74f77fddb80a432d20e4e2b2a"}
ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "87f106498a7a7b1519d82d0981fc21b260a89cf2"}
ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "87f106498a7a7b1519d82d0981fc21b260a89cf2"}

#ya-client = { path = "../ya-client" }
#ya-client-model = { path = "../ya-client/model" }

## OTHERS
gftp = { path = "core/gftp" }
Expand Down
2 changes: 1 addition & 1 deletion agent/provider/examples/mock_requestor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ async fn wait_for_approval(client: &MarketRequestorApi, proposal_id: &str) {
let _ = match client.wait_for_approval(proposal_id, None).await {
Err(Error::TimeoutError { .. }) => {
println!("Timeout waiting for Agreement approval...");
Ok("".into())
Ok(())
}
Ok(_) => {
println!("OK! Agreement {} approved by Provider.", proposal_id);
Expand Down
Loading