Archives/xmr-btc-swap
2
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-11-09 19:10:36 +00:00
Code Issues Projects Releases Wiki Activity
2,772 Commits 73 Branches 27 Tags 32 MiB
12b9ceebcf
Commit Graph

2772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Byron Hambly
12b9ceebcf
Merge pull request #1676 from patrini32/cooperative-release-of-funds 
Allow for cooperative release of funds
 2024-07-15 10:00:44 +02:00
Byron Hambly
77f7222f71
Merge pull request #1712 from comit-network/dependabot/cargo/thiserror-1.0.62 
build(deps): bump thiserror from 1.0.61 to 1.0.62
 2024-07-15 09:38:24 +02:00
dependabot[bot]
31d76cbdf4
build(deps): bump thiserror from 1.0.61 to 1.0.62 
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.61 to 1.0.62.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.61...1.0.62)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-12 11:25:56 +00:00
patrini32
845b9428b7
remove whitespaces 2024-07-11 11:02:23 +03:00
patrini32
ee04ff8a3b
fix formatting 2024-07-11 10:58:07 +03:00
binarybaron
f8c3276642 Merge branch 'cooperative-release-of-funds' of https://github.com/patrini32/xmr-btc-swap into pr/1676 2024-07-11 09:30:49 +02:00
binarybaron
073baa9752 Update swap.rs 2024-07-11 09:30:48 +02:00
binarybaron
f72005312c
Merge branch 'master' into cooperative-release-of-funds 2024-07-11 09:23:38 +02:00
Einliterflasche
4115a452e3
allow --change-address to be omitted and default to internal wallet address (#1709) 
allow --change-address to be omitted and default to internal wallet address (#1709)

Co-authored-by: binarybaron <86064887+binarybaron@users.noreply.github.com>
Co-authored-by: Byron Hambly <byron@hambly.dev>
 2024-07-11 09:19:41 +02:00
Byron Hambly
c385059138
Merge pull request #1710 from comit-network/dependabot/cargo/hyper-1.4.1 
build(deps): bump hyper from 1.3.1 to 1.4.1
 2024-07-10 15:25:03 +02:00
Byron Hambly
c283d6a911
Merge pull request #1711 from comit-network/dependabot/cargo/vergen-8.3.2 
build(deps): bump vergen from 8.3.1 to 8.3.2
 2024-07-10 15:24:45 +02:00
dependabot[bot]
dcb4edf585
build(deps): bump vergen from 8.3.1 to 8.3.2 
Bumps [vergen](https://github.com/rustyhorde/vergen) from 8.3.1 to 8.3.2.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/commits)

---
updated-dependencies:
- dependency-name: vergen
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-10 11:19:33 +00:00
dependabot[bot]
47f8a65209
build(deps): bump hyper from 1.3.1 to 1.4.1 
Bumps [hyper](https://github.com/hyperium/hyper) from 1.3.1 to 1.4.1.
- [Release notes](https://github.com/hyperium/hyper/releases)
- [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/hyper/compare/v1.3.1...v1.4.1)

---
updated-dependencies:
- dependency-name: hyper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-10 11:19:16 +00:00
Byron Hambly
bf9abd4101
Merge pull request #1707 from comit-network/dependabot/cargo/uuid-1.10.0 
build(deps): bump uuid from 1.9.1 to 1.10.0
 2024-07-10 09:23:25 +02:00
dependabot[bot]
2af22c1aba
build(deps): bump uuid from 1.9.1 to 1.10.0 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.9.1 to 1.10.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.9.1...1.10.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-09 11:08:29 +00:00
Byron Hambly
e2198d49a0
Merge pull request #1704 from comit-network/dependabot/cargo/qrcode-0.14.1 
build(deps): bump qrcode from 0.14.0 to 0.14.1
 2024-07-09 09:03:58 +02:00
Byron Hambly
f0abb4396d
Merge pull request #1705 from comit-network/dependabot/cargo/serde-1.0.204 
build(deps): bump serde from 1.0.203 to 1.0.204
 2024-07-09 09:03:48 +02:00
Byron Hambly
537672df08
Merge pull request #1706 from comit-network/dependabot/cargo/async-trait-0.1.81 
build(deps): bump async-trait from 0.1.80 to 0.1.81
 2024-07-09 09:03:37 +02:00
dependabot[bot]
cd29870e11
build(deps): bump async-trait from 0.1.80 to 0.1.81 
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.80 to 0.1.81.
- [Release notes](https://github.com/dtolnay/async-trait/releases)
- [Commits](https://github.com/dtolnay/async-trait/compare/0.1.80...0.1.81)

---
updated-dependencies:
- dependency-name: async-trait
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-08 11:04:55 +00:00
dependabot[bot]
ab1001a18c
build(deps): bump serde from 1.0.203 to 1.0.204 
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.203 to 1.0.204.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.203...v1.0.204)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-08 11:04:38 +00:00
dependabot[bot]
294b658f43
build(deps): bump qrcode from 0.14.0 to 0.14.1 
Bumps [qrcode](https://github.com/kennytm/qrcode-rust) from 0.14.0 to 0.14.1.
- [Release notes](https://github.com/kennytm/qrcode-rust/releases)
- [Commits](https://github.com/kennytm/qrcode-rust/commits/v0.14.1)

---
updated-dependencies:
- dependency-name: qrcode
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-08 11:04:18 +00:00
binarybaron
2824ebc893 Update swap.rs 2024-07-03 20:39:49 +02:00
binarybaron
07f788eb81 Update swap.rs 2024-07-03 20:14:09 +02:00
binarybaron
ef75019ac6 Update swap.rs 2024-07-03 20:12:22 +02:00
binarybaron
26e66ce9b9 Update swap.rs 2024-07-03 20:02:04 +02:00
binarybaron
d7b649b7a6 feat: Allow for cooperative Monero redeem after Bitcoin punish has happened 2024-07-03 19:47:45 +02:00
binarybaron
c5aa7edb6b
chore: Fix typo (#1701) 2024-07-02 12:03:56 +02:00
COMIT Botty McBotface
5c9185876d
Prepare release 0.13.2 (#1700) 2024-07-02 02:11:36 +02:00
binarybaron
6c1b85e408
Revert "Prepare release 0.13.2 (#1694)" (#1699) 
This reverts commit 415323e4fc.
 2024-07-02 01:53:57 +02:00
binarybaron
26109d6d8a
Revert "Prepare release 0.13.2 (#1697)" (#1698) 
This reverts commit 5e735ef4f7.
 2024-07-02 01:51:58 +02:00
COMIT Botty McBotface
5e735ef4f7
Prepare release 0.13.2 (#1697) 2024-07-02 01:28:07 +02:00
binarybaron
aa9b3c4687
fix: Add a new migration script for creating the buffered_transfer_proofs table (#1695) 2024-07-02 01:20:20 +02:00
COMIT Botty McBotface
415323e4fc
Prepare release 0.13.2 (#1694) 2024-07-01 23:27:00 +02:00
patrini32
173d077751
feat (Cli): Display reason for failed cancel-refund operation to the user (#1668) 
We now display the reason for a failed cancel-refund operation to the user.

Fixes #683
 2024-07-01 23:14:44 +02:00
binarybaron
23a27680a4
feat (Bob): Buffer transfer proof to database when we are running a different swap (#1669) 2024-06-28 21:39:30 +02:00
binarybaron
4c9d1e8d8d
Reduce check interval for Monero watch_for_transfer (#1670) 
Oftentimes we fail to check the status of the Monero transaction on the first try (because it hasn't been registered on our Monero daemon yet, it takes a few seconds).

By decreasing the check interval from the default of 2 minutes to a 10th of that, we ensure that Bob get's his transfer proof faster.
 2024-06-27 14:24:27 +02:00
Byron Hambly
21fed8c291
Merge pull request #1689 from comit-network/dependabot/cargo/uuid-1.9.1 
build(deps): bump uuid from 1.9.0 to 1.9.1
 2024-06-25 15:34:43 +02:00
Byron Hambly
5390a50eda
Merge pull request #1688 from comit-network/dependabot/cargo/serde_json-1.0.118 
build(deps): bump serde_json from 1.0.117 to 1.0.118
 2024-06-25 15:34:33 +02:00
dependabot[bot]
5551f513d5
build(deps): bump uuid from 1.9.0 to 1.9.1 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.9.0 to 1.9.1.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.9.0...1.9.1)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-25 11:49:47 +00:00
dependabot[bot]
fbf1c3dabf
build(deps): bump serde_json from 1.0.117 to 1.0.118 
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.117 to 1.0.118.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.117...v1.0.118)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-25 11:48:33 +00:00
Byron Hambly
23a4d624da
Merge pull request #1687 from ikmckenz/add-missing-test 
Add concurrent_bobs_after_xmr_lock_proof_sent test to ci
 2024-06-25 10:37:50 +02:00
Ian McKenzie
3fc934a189 Add concurrent_bobs_after_xmr_lock_proof_sent test to ci 2024-06-24 21:27:13 -07:00
Byron Hambly
194fa1b1cb
Merge pull request #1686 from comit-network/dependabot/cargo/strum-0.26.3 
build(deps): bump strum from 0.26.2 to 0.26.3
 2024-06-24 14:00:21 +02:00
Byron Hambly
58baa48eba
Merge pull request #1685 from comit-network/dependabot/cargo/uuid-1.9.0 
build(deps): bump uuid from 1.8.0 to 1.9.0
 2024-06-24 14:00:02 +02:00
Byron Hambly
6f57517c05
Merge pull request #1684 from comit-network/dependabot/cargo/proptest-1.5.0 
build(deps): bump proptest from 1.4.0 to 1.5.0
 2024-06-24 13:59:52 +02:00
dependabot[bot]
2068a4cf78
build(deps): bump strum from 0.26.2 to 0.26.3 
Bumps [strum](https://github.com/Peternator7/strum) from 0.26.2 to 0.26.3.
- [Release notes](https://github.com/Peternator7/strum/releases)
- [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Peternator7/strum/compare/v0.26.2...v0.26.3)

---
updated-dependencies:
- dependency-name: strum
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-24 11:12:44 +00:00
dependabot[bot]
dabe1abb21
build(deps): bump uuid from 1.8.0 to 1.9.0 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.8.0 to 1.9.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.8.0...1.9.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-24 11:10:02 +00:00
dependabot[bot]
cca0d0027e
build(deps): bump proptest from 1.4.0 to 1.5.0 
Bumps [proptest](https://github.com/proptest-rs/proptest) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/proptest-rs/proptest/releases)
- [Changelog](https://github.com/proptest-rs/proptest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/proptest-rs/proptest/compare/v1.4.0...v1.5.0)

---
updated-dependencies:
- dependency-name: proptest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-24 11:09:33 +00:00
dependabot[bot]
4d557d1ef9
build(deps): bump mockito from 1.3.0 to 1.4.0 (#1567) 
* build(deps): bump mockito from 1.3.0 to 1.3.1

Bumps [mockito](https://github.com/lipanski/mockito) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/lipanski/mockito/releases)
- [Commits](https://github.com/lipanski/mockito/compare/1.3.0...1.3.1)

---
updated-dependencies:
- dependency-name: mockito
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix: breaking change in mockito async

* bump mockito to 1.4

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Byron Hambly <byron@hambly.dev>
 2024-06-19 15:35:05 +02:00
Byron Hambly
1d5df5498c
Merge pull request #1682 from comit-network/dependabot/cargo/serial_test-3.1.1 
build(deps): bump serial_test from 3.0.0 to 3.1.1
 2024-06-19 15:21:14 +02:00