Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,645 Commits 72 Branches 27 Tags 73 MiB
b3363654d7
Commit Graph

1234 Commits

Author SHA1 Message Date
pokkst
b3363654d7
Merge e81c6dca09 into 2b850924b1 2024-04-29 21:27:16 -07:00
dependabot[bot]
f0f197de20
build(deps): bump hyper from 1.2.0 to 1.3.0 
Bumps [hyper](https://github.com/hyperium/hyper) from 1.2.0 to 1.3.0.
- [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.2.0...v1.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-16 12:24:28 +00:00
dependabot[bot]
c231a34399
build(deps): bump port_check from 0.1.5 to 0.2.1 
Bumps [port_check](https://github.com/ufoscout/port-check-rs) from 0.1.5 to 0.2.1.
- [Commits](https://github.com/ufoscout/port-check-rs/commits/v0.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-02 11:28:21 +00:00
Byron Hambly
a19501a002
Revert "Monero wallet refresh fix (#1487)" 
This reverts commit d8dacbdee9.
 2024-03-26 09:06:31 +02:00
binarybaron
d8dacbdee9
Monero wallet refresh fix (#1487) 
* Upgrade monero-wallet-rpc to `v0.18.3.1`

* Give feedback to user about state of monero refresh and retry if fails

This commit changes the following behaviour in the refresh functionality of the monero wallet
- Allows for multiple retries because in some cases users have experienced an issue where the wallet rpc returns `no connection to daemon` even though the daemon is available. I'm not 100% sure why this happens but retrying often fixes the issue
- Attempt to print the current sync height while the wallet is syncing. This only works to some degree because the `monero-wallet-rpc` stops responding (or takes a long time to respond) while it's refreshing
- The `monero-wallet-rpc` is started with the `--no-initial-sync` flag which ensures that as soon as it's started, it's ready to respond to requests
---------

Co-authored-by: Byron Hambly <bhambly@blockstream.com>
Co-authored-by: Byron Hambly <byron@hambly.dev>
 2024-03-25 15:08:54 +01:00
Ian McKenzie
eb15f477fa
Verify hashes of monero cli on download (#1572) 
* Bump Monero CLI for macos aarch64 to match other platforms

* Check hash on download of monero cli

* change panic to bail

---------

Co-authored-by: Byron Hambly <bhambly@blockstream.com>
 2024-03-22 11:18:40 +02:00
dependabot[bot]
d77f208aae
build(deps): bump uuid from 1.7.0 to 1.8.0 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.7.0...1.8.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-03-19 11:22:48 +00:00
dependabot[bot]
fea34cc35b
build(deps): bump qrcode from 0.13.0 to 0.14.0 
Bumps [qrcode](https://github.com/kennytm/qrcode-rust) from 0.13.0 to 0.14.0.
- [Release notes](https://github.com/kennytm/qrcode-rust/releases)
- [Commits](https://github.com/kennytm/qrcode-rust/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-14 11:58:41 +00:00
dependabot[bot]
bb596fcc09
build(deps): bump base64 from 0.21.7 to 0.22.0 
Bumps [base64](https://github.com/marshallpierce/rust-base64) from 0.21.7 to 0.22.0.
- [Changelog](https://github.com/marshallpierce/rust-base64/blob/master/RELEASE-NOTES.md)
- [Commits](https://github.com/marshallpierce/rust-base64/compare/v0.21.7...v0.22.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-04 11:48:02 +00:00
dependabot[bot]
00abded1c5
build(deps): bump mockito from 1.2.0 to 1.3.0 (#1561) 
* build(deps): bump mockito from 1.2.0 to 1.3.0

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

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

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

* build(deps): update http to 0.2.11

---------

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 <bhambly@blockstream.com>
 2024-02-23 22:25:06 +02:00
Ian McKenzie
b2ca1b5f8c
Upgrade testcontainers from 0.12 to 0.14 (#1552) 
* Upgrade testcontainers from 0.12 to 0.14

* minor cleanup

---------

Co-authored-by: Byron Hambly <bhambly@blockstream.com>
 2024-02-23 21:04:27 +02:00
dependabot[bot]
005361c833
build(deps): bump hyper from 1.1.0 to 1.2.0 
Bumps [hyper](https://github.com/hyperium/hyper) from 1.1.0 to 1.2.0.
- [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.1.0...v1.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-22 11:43:08 +00:00
Ian McKenzie
140dc6dc04
Upgrade to vergen 8.3, move to git describe --dirty --tags for semver (#1543) 
* Upgrade to vergen 8.3, move to git describe --dirty --tags for semver

* Add newline to build.rs
 2024-02-04 08:43:59 +02:00
dependabot[bot]
83080abe30
build(deps): bump config from 0.13.4 to 0.14.0 
Bumps [config](https://github.com/mehcode/config-rs) from 0.13.4 to 0.14.0.
- [Changelog](https://github.com/mehcode/config-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mehcode/config-rs/compare/v0.13.4...0.14.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-01 11:32:59 +00:00
Byron Hambly
ab3720d51a
Merge pull request #1525 from comit-network/dependabot/cargo/serial_test-3.0.0 
build(deps): bump serial_test from 2.0.0 to 3.0.0
 2024-01-29 16:22:19 +02:00
dependabot[bot]
1ad6af6d5c
build(deps): bump strum from 0.25.0 to 0.26.1 
Bumps [strum](https://github.com/Peternator7/strum) from 0.25.0 to 0.26.1.
- [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Peternator7/strum/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-29 11:06:15 +00:00
dependabot[bot]
fada511c9a
build(deps): bump uuid from 1.6.1 to 1.7.0 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.6.1 to 1.7.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.6.1...1.7.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-01-19 11:58:59 +00:00
dependabot[bot]
dd9d5246c3
build(deps): bump serial_test from 2.0.0 to 3.0.0 
Bumps [serial_test](https://github.com/palfrey/serial_test) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/palfrey/serial_test/releases)
- [Commits](https://github.com/palfrey/serial_test/compare/v2.0.0...v3.0.0)

---
updated-dependencies:
- dependency-name: serial_test
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-08 11:27:04 +00:00
Byron Hambly
89312fe09d
Merge pull request #1500 from comit-network/dependabot/cargo/toml-0.8.8 
build(deps): bump toml from 0.7.6 to 0.8.8
 2023-12-19 14:38:13 +02:00
dependabot[bot]
cf89da7e84
build(deps): bump toml from 0.7.6 to 0.8.8 
Bumps [toml](https://github.com/toml-rs/toml) from 0.7.6 to 0.8.8.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.7.6...toml-v0.8.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-19 11:42:08 +00:00
dependabot[bot]
38ba2fc387
build(deps): bump hyper from 1.0.1 to 1.1.0 
Bumps [hyper](https://github.com/hyperium/hyper) from 1.0.1 to 1.1.0.
- [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.0.1...v1.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-19 11:41:54 +00:00
Byron Hambly
ec9b162585
Merge pull request #1477 from comit-network/dependabot/cargo/dialoguer-0.11.0 
build(deps): bump dialoguer from 0.10.4 to 0.11.0
 2023-12-18 14:58:42 +02:00
dependabot[bot]
46d93b67cb
build(deps): bump itertools from 0.10.5 to 0.12.0 
Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.10.5 to 0.12.0.
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-itertools/itertools/compare/v0.10.5...v0.12.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-18 11:17:44 +00:00
Byron Hambly
e81c6dca09
Merge branch 'master' into bugfix/bob-xmrlocked-redeemed 2023-12-16 16:50:03 +02:00
Byron Hambly
f5c2d63527
Merge pull request #1493 from comit-network/dependabot/cargo/mockito-1.2.0 
build(deps): bump mockito from 1.1.0 to 1.2.0
 2023-12-15 19:25:56 +02:00
dependabot[bot]
55f95c970e
build(deps): bump mockito from 1.1.0 to 1.2.0 
Bumps [mockito](https://github.com/lipanski/mockito) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/lipanski/mockito/releases)
- [Commits](https://github.com/lipanski/mockito/compare/1.1.0...1.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-15 11:22:38 +00:00
dependabot[bot]
e44134c96d
build(deps): bump qrcode from 0.12.0 to 0.13.0 
Bumps [qrcode](https://github.com/kennytm/qrcode-rust) from 0.12.0 to 0.13.0.
- [Release notes](https://github.com/kennytm/qrcode-rust/releases)
- [Commits](https://github.com/kennytm/qrcode-rust/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-15 11:21:20 +00:00
dependabot[bot]
641c107012
build(deps): bump toml from 0.5.11 to 0.7.6 
Bumps [toml](https://github.com/toml-rs/toml) from 0.5.11 to 0.7.6.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.5.11...toml-v0.7.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 11:45:38 +00:00
dependabot[bot]
69751d204d
build(deps): bump dialoguer from 0.10.4 to 0.11.0 
Bumps [dialoguer](https://github.com/console-rs/dialoguer) from 0.10.4 to 0.11.0.
- [Changelog](https://github.com/console-rs/dialoguer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/console-rs/dialoguer/compare/v0.10.4...v0.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 11:45:21 +00:00
Byron Hambly
66283194e5
Merge pull request #1474 from comit-network/dependabot/cargo/comfy-table-7.1.0 
build(deps): bump comfy-table from 6.1.4 to 7.1.0
 2023-12-12 20:11:36 +02:00
Byron Hambly
8a3eed18b0
Merge pull request #1468 from comit-network/dependabot/cargo/uuid-1.6.1 
build(deps): bump uuid from 1.4.1 to 1.6.1
 2023-12-12 20:11:15 +02:00
Byron Hambly
38e248ce3a
Merge pull request #1472 from comit-network/dependabot/cargo/hyper-1.0.1 
build(deps): bump hyper from 0.14.26 to 1.0.1
 2023-12-12 15:51:56 +02:00
dependabot[bot]
0ea8ce71b6
build(deps): bump comfy-table from 6.1.4 to 7.1.0 
Bumps [comfy-table](https://github.com/nukesor/comfy-table) from 6.1.4 to 7.1.0.
- [Release notes](https://github.com/nukesor/comfy-table/releases)
- [Changelog](https://github.com/Nukesor/comfy-table/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nukesor/comfy-table/compare/v6.1.4...v7.1.0)

---
updated-dependencies:
- dependency-name: comfy-table
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-12 11:44:32 +00:00
dependabot[bot]
81ea313d4e
build(deps): bump hyper from 0.14.26 to 1.0.1 
Bumps [hyper](https://github.com/hyperium/hyper) from 0.14.26 to 1.0.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/v0.14.26...v1.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-12 11:42:37 +00:00
dependabot[bot]
c7bf84d936
build(deps): bump data-encoding from 2.4.0 to 2.5.0 
Bumps [data-encoding](https://github.com/ia0/data-encoding) from 2.4.0 to 2.5.0.
- [Commits](https://github.com/ia0/data-encoding/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-12 11:42:04 +00:00
dependabot[bot]
f602bec096
build(deps): bump uuid from 1.4.1 to 1.6.1 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.4.1 to 1.6.1.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.4.1...1.6.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-12 11:41:50 +00:00
dependabot[bot]
73162adcd7
build(deps): bump strum from 0.24.1 to 0.25.0 
Bumps [strum](https://github.com/Peternator7/strum) from 0.24.1 to 0.25.0.
- [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Peternator7/strum/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 11:17:18 +00:00
Byron Hambly
dcf9f24b77
build(deps): bump pem to 3.0 
replaces #1415

also fixes the `seed_from_pem_fails_for_long_seed` unit test, which was
"passing" but not actually testing what it meant to.
 2023-10-23 11:21:04 +02:00
pokkst
fd344c53a0
Merge branch 'upstream.master' into bugfix/bob-xmrlocked-redeemed 2023-09-29 11:06:14 -05:00
pokkst
5182b4f53a
Update lock timeout to 10 min 2023-09-29 08:08:25 -05:00
COMIT Botty McBotface
7824078975 Prepare release 0.12.3 2023-09-20 18:34:50 +00:00
binarybaron
3467523849 Dynamically choose monero daemon to connect to 2023-09-07 19:10:23 +02:00
binarybaron
2e1909685d
Revert "Refresh monero monitoring wallet at startup to ensure daemon is is av…" 2023-09-01 17:36:00 +02:00
binarybaron
844ebc7de3 Refresh monero monitoring wallet at startup to ensure daemon is is available 2023-08-31 00:47:18 +02:00
bors[bot]
d0a35ab21b
Merge #1428 
1428: Fix issue where Windows cannot open ASB wallet to create lock XMR transaction r=delta1 a=pokkst

It seems on Windows that opening an already opened wallet results in an error/crash. This does not seem to be the case for Linux and macOS. Removing this line fixed the issue on Windows, and had no regressions on macOS/Linux from my testing.

Co-authored-by: pokkst <pokkst@protonmail.com>
 2023-08-14 11:38:10 +00:00
pokkst
3359456482
Move check to outside of select, in case Alice redeems the BTC and we saw that before we get confirmation that she received the encrypted signature. 2023-08-14 00:56:39 -05:00
pokkst
0f69d2fbb8
Add safety checks 
(cherry picked from commit 1bd9b6abdca6bb1fbb60835cae58c5c5caad2683)
 2023-08-14 00:54:04 -05:00
binarybaron
2e181dac9c Immediately sync bitcoin tx status upon subscribing 2023-08-13 14:33:49 +02:00
pokkst
b93e84c53f
Add edge case bugfix for our databse not updating correctly when Alice redeems her BTC 2023-08-12 22:20:54 -05:00
pokkst
d7d87d96ac
Maybe fix issue on Windows where the wallet cannot open during XMR locking phase 
(cherry picked from commit 879cb8bc0131b8a059466ca00ae9f7842c4ac018)
 2023-08-08 18:25:30 -05:00