f674b17ae0
Merge #228
228: Fix error text r=thomaseizinger a=da-kami
Co-authored-by: Daniel Karzel <daniel@comit.network>
3 years ago
ff6f3d4b39
Merge #225
225: Bump tracing from 0.1.28 to 0.1.29 r=thomaseizinger a=dependabot[bot]
Bumps [tracing](https://github.com/tokio-rs/tracing ) from 0.1.28 to 0.1.29.
<details>
<summary>Commits</summary>
<ul>
<li><a href="d0ef14d3f5https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1623 ">#1623</a>)</li>
<li><a href="6692aaf738https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1622 ">#1622</a>)</li>
<li><a href="29ffdbc2b2https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1619 ">#1619</a>)</li>
<li><a href="645f282eeehttps://github-redirect.dependabot.com/tokio-rs/tracing/issues/1621 ">#1621</a>)</li>
<li><a href="7dda7f5e90https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1617 ">#1617</a>)</li>
<li><a href="243a3e2d2fhttps://github-redirect.dependabot.com/tokio-rs/tracing/issues/1616 ">#1616</a>)</li>
<li><a href="ac74ba0ca5https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1614 ">#1614</a>)</li>
<li><a href="66cd79f72ahttps://github-redirect.dependabot.com/tokio-rs/tracing/issues/1611 ">#1611</a>)</li>
<li><a href="3ee87f3cb9https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1610 ">#1610</a>)</li>
<li><a href="84c1c264adhttps://github.com/tokio-rs/tracing/compare/tracing-0.1.28...tracing-0.1.29 ">compare view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores )
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
</details>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
dc6f5703e4
Fix URl to fetch attestations
`https://h00.ooo//x/BitMEX/BXBT/2021-10-08T03:00:00.price[n:20] ` for attestations because the event includes a leading slash.
Fixed by removing it from the base url and adding a specific slash when fetching events.
3 years ago
79de722cf4
Bug fix: chose correct identity
3 years ago
3216fdbda3
Merge #247
247: Add RollOver button to UI r=bonomat a=bonomat
Probably got lost in one of the rebases...
Co-authored-by: Philipp Hoenisch <philipp@hoenisch.at>
3 years ago
8b59895a05
Rename "Accept / Reject" to "Pending" in CfdTables
Pending is a more succinct nudge to the user that they should react with an
action to the CFDs inside these tables.
3 years ago
963a9e58e6
Add RollOver button to UI
3 years ago
62f15255c0
Merge #240
240: Implement rollover protocol in daemons r=luckysori a=luckysori
Fix #136 .
Co-authored-by: Lucas Soriano del Pino <l.soriano.del.pino@gmail.com>
Co-authored-by: Philipp Hoenisch <philipp@hoenisch.at>
3 years ago
9bef47cb83
Merge #246
246: Fixed leverage of 2 instead of 5 r=da-kami a=da-kami
Co-authored-by: Daniel Karzel <daniel@comit.network>
3 years ago
4e2ec513d0
Merge #245
245: Spread of `0.3%` instead of `3%` r=da-kami a=da-kami
Co-authored-by: Daniel Karzel <daniel@comit.network>
Co-authored-by: Daniel Karzel <daniel.karzel@coblox.tech>
3 years ago
03648c61ea
Fixed leverage of 2 instead of 5
3 years ago
78ccad01e3
1
Co-authored-by: Philipp Hoenisch <philipp@coblox.tech>
3 years ago
a172e9da4a
Spread of `0.3%` instead of `3%`
3 years ago
9b755b9a59
PR feedback and fmt
3 years ago
3b4fc777a4
Merge #242
242: Notify maker_cfd::Actor about new taker r=da-kami a=thomaseizinger
Fixes #239 .
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
3 years ago
b103a21228
Notify maker_cfd::Actor about new taker
Fixes #239 .
3 years ago
5cd723441d
Implement rollover protocol in daemons
3 years ago
8be1e46374
Merge #237
237: Oracle actor startup behavior r=da-kami a=da-kami
Co-authored-by: Daniel Karzel <daniel@comit.network>
3 years ago
6bb4824c22
Handle attestation not ready response
... and other minor cleanups concerning Olivia's response handling.
3 years ago
0660e02b1f
Oracle actor initial state update
Block until we are sure that the update was done, because otherwise we might have weird side effects in the UI because there is a dependency on the announcements being available when creating offers.
3 years ago
7b6e4dbb14
Merge #234
234: Fix contract setup r=da-kami a=da-kami
Co-authored-by: Daniel Karzel <daniel@comit.network>
3 years ago
7232269205
Merge #227
227: Handle collab settlement response from the maker r=klochowicz a=klochowicz
- store TakerId for proposals to be able to respond to specific taker about
settlement proposal when the user takes action
- send the collab settlement response (accept or reject) from the maker
- handle rejection (remove from the map), CFD state in the UI returns to "Open"
Co-authored-by: Mariusz Klochowicz <mariusz@klochowicz.com>
3 years ago
1dcb23bdf6
Handle oracle actor pending attestations upon startup
We `insert` - which returns true if the value was not present in the set yet and false if it already was (does not fail if already in set).
3 years ago
1114a90e34
Use `OracleEventId` for pending attestations
3 years ago
eb33172e9f
Handle collab settlement response from the maker
- store TakerId for proposals to be able to respond to specific taker about
settlement proposal when the user takes action
- send the collab settlement response (accept or reject) from the maker
- handle rejection (remove from the map), CFD state in the UI returns to "Open"
3 years ago
ac9a6d9af7
Use the correct sets of nonce-pks for verification
3 years ago
0e4037eb5d
Use Olivia's hardcoded pubkey
3 years ago
a62dcfb9ac
Merge #222
222: Prevent zero-priced CFD offers r=klochowicz a=klochowicz
Simplify the UI code and disable the button for posting a new offer if there is
no price set.
Co-authored-by: Mariusz Klochowicz <mariusz@klochowicz.com>
3 years ago
6c4bc68921
Fix error text
3 years ago
349069ad8c
Merge #223
223: Publish cet r=da-kami a=da-kami
- Handles the Oracle's attestation in the cfd actor, transition according to the knowledge we have about the timelock expiry already.
- Tries to publish the CET if we are in `CetStatus::Ready`, i.e. both the attestation and timelock expiry happened. We try publishing if either event happened, and just print a log in case it's not ready yet.
- Tries to re-publish CET if we are in `PendingCet` upon restart.
- Re-triggers CET monitoring upon startup.
- Extends any state after `ContractSetup` to be able to store the attestation. (see below for ideas to change that)
Things that could be done different:
Currently we are carrying on the attestation through a lot of states - because we cannot just transition the user to `OpenCommitted` because it is a user decision to go for commit, but we have to keep the attestation around once it happened.
To reduce the state complexity, we could store the attestation independent of the state, but associated with the cfd.
This would make things a lot simpler, but we would then always have to go to the database to check if the attestation is already around (which might make other parts more complex).
---
TODO:
- [ ] Test it 😬
Co-authored-by: Daniel Karzel <daniel@comit.network>
3 years ago
159240cc9f
Wire in automatic CET publication
- Handles the Oracle's attestation in the cfd actor, transition according to the knowledge we have about the timelock expiry already.
- Tries to publish the CET if we are in `CetStatus::Ready`, i.e. both the attestation and timelock expiry happened. We try publishing if either event happened, and just print a log in case it's not ready yet.
- Tries to re-publish CET if we are in `PendingCet` upon restart.
- Re-triggers CET monitoring upon startup.
- Extends any state after `ContractSetup` to be able to store the attestation. (see below for ideas to change that)
Things that could be done different:
Currently we are carrying on the attestation through a lot of states - because we cannot just transition the user to `OpenCommitted` because it is a user decision to go for commit, but we have to keep the attestation around once it happened.
To reduce the state complexity, we could store the attestation independent of the state, but associated with the cfd.
This would make things a lot simpler, but we would then always have to go to the database to check if the attestation is already around (which might make other parts more complex).
3 years ago
2f9a969aba
Use `OracleEventId` instead of `String` for `Attestation` id
3 years ago
c07adab5f1
Bump tracing from 0.1.28 to 0.1.29
Bumps [tracing](https://github.com/tokio-rs/tracing ) from 0.1.28 to 0.1.29.
- [Release notes](https://github.com/tokio-rs/tracing/releases )
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-0.1.28...tracing-0.1.29 )
---
updated-dependencies:
- dependency-name: tracing
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
d5f08ab333
Merge #224
224: Bump tracing-subscriber from 0.2.24 to 0.2.25 r=thomaseizinger a=dependabot[bot]
Bumps [tracing-subscriber](https://github.com/tokio-rs/tracing ) from 0.2.24 to 0.2.25.
<details>
<summary>Commits</summary>
<ul>
<li><a href="6692aaf738https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1622 ">#1622</a>)</li>
<li><a href="29ffdbc2b2https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1619 ">#1619</a>)</li>
<li><a href="645f282eeehttps://github-redirect.dependabot.com/tokio-rs/tracing/issues/1621 ">#1621</a>)</li>
<li><a href="7dda7f5e90https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1617 ">#1617</a>)</li>
<li><a href="243a3e2d2fhttps://github-redirect.dependabot.com/tokio-rs/tracing/issues/1616 ">#1616</a>)</li>
<li><a href="ac74ba0ca5https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1614 ">#1614</a>)</li>
<li><a href="66cd79f72ahttps://github-redirect.dependabot.com/tokio-rs/tracing/issues/1611 ">#1611</a>)</li>
<li><a href="3ee87f3cb9https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1610 ">#1610</a>)</li>
<li><a href="84c1c264adc9db496a95https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1607 ">#1607</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/tokio-rs/tracing/compare/tracing-subscriber-0.2.24...tracing-subscriber-0.2.25 ">compare view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores )
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
</details>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
c1aa456124
Bump tracing-subscriber from 0.2.24 to 0.2.25
Bumps [tracing-subscriber](https://github.com/tokio-rs/tracing ) from 0.2.24 to 0.2.25.
- [Release notes](https://github.com/tokio-rs/tracing/releases )
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-subscriber-0.2.24...tracing-subscriber-0.2.25 )
---
updated-dependencies:
- dependency-name: tracing-subscriber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
9c46ea4046
Disable posting new offers in the maker when there is no order price
3 years ago
f59267af0a
Allow auto-refreshing price suggestions in the maker
If the switch is enabled, the maker gets price suggestions based on the current
ask price on Bitmex + 3% spread.
Auto-refresh turns off whenever user modifies the field manually, and can be
re-enabled later if desired.
Fixes #214
3 years ago
30db30f2a7
Merge #217
217: Allow application to run on mainnet or testnet r=thomaseizinger a=thomaseizinger
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
3 years ago
1cd2413d59
Merge #221
221: Adds boiler plate for rolling over r=bonomat a=bonomat
The actual roll over is not yet implemented but I'm afraid of the code changing below me too fast hence a PR adding the boiler plate :)
Co-authored-by: Philipp Hoenisch <philipp@hoenisch.at>
3 years ago
b012aa7a37
Rollover order boilerplate
Add support for multiple update proposals.
A taker might request to update/change a CFD in different ways, e.g.: propose to settle it or roll over.
In order to support different scenarios we introduce another layer of abstraction.
The rest of the changes creates a boilerplate for the actual rollover protocol.
3 years ago
04906a938b
Allow application to run on mainnet or testnet
I decided to use a sub-command because it allows me to keep the
default values for the electrum client within clap.
3 years ago
31b562e85d
Merge #219
219: Configure bors for merging pull-requests r=thomaseizinger a=thomaseizinger
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
3 years ago
8a0695c0b6
Increase sleep time for starting up maker & taker
3 years ago
5e28e4c582
Merge pull request #213 from comit-network/price-info-improvement
3 years ago
b3b6cc97bb
Configure bors for merging pull-requests
3 years ago
44383a965c
Merge pull request #218 from comit-network/fix-dummy-payouts
Fix `payout_curve::calculate` dummy implementation
3 years ago
62c8ffb65b
Avoid overlapping CETs in dummy payouts
3 years ago
fdd41c9c37
Use new generate_payouts API
3 years ago
d20b9a9d9f
Merge pull request #215 from comit-network/settlement-proposals-refactor
Optimise data structure used for settlement proposals
3 years ago
98f92067c7
Merge pull request #181 from comit-network/dummy-payouts
3 years ago
bors[bot]
Daniel Karzel
Philipp Hoenisch
Mariusz Klochowicz
Daniel Karzel
Thomas Eizinger
Lucas Soriano del Pino
dependabot[bot]
Philipp Hoenisch
Lucas Soriano