binarybaron
fc6bb336c8
Merge branch 'comit-network:master' into master
2024-07-26 00:19:41 +02:00
COMIT Botty McBotface
33ad3c374a
Prepare release 0.13.4 ( #1734 )
2024-07-25 23:14:31 +02:00
Einliterflasche
2fe428779a
feat(asb): Retry locking Monero ( #1731 )
...
We retry to lock the Monero wallet until we succeed or until the cancel timelock expires.
This is necessary because the monero-wallet-rpc can sometimes error out due to various reasons, such as
- no connection to the daemon
- "failed to get output distribution"
See https://github.com/comit-network/xmr-btc-swap/issues/1726
2024-07-25 23:06:50 +02:00
binarybaron
2eda2476eb
Revert "Merge branch 'master' into master" ( #1730 )
...
This reverts commit ce8d3afe6075cfc6b0d4
2024-07-25 15:01:12 +02:00
binarybaron
aaa52e9559
Merge pull request #8 from comit-network/master
...
Merge parent repository
2024-07-25 14:04:14 +02:00
binarybaron
ce8d3afe60
Merge branch 'master' into master
2024-07-25 14:03:47 +02:00
binarybaron
75cfc6b0d4
fix(cli): allow bitcoin-change-address to be omitted when making request to rpc server ( #1728 )
2024-07-25 00:13:15 +02:00
binarybaron
c80bdb2d8c
fix(asb): Allow history command to be run while asb is running ( #1724 )
...
Co-authored-by: einliterflasche <einliterflasche@pm.me>
2024-07-23 14:52:01 +02:00
binarybaron
ef49b471d8
docs: add binarybaron.asc
2024-07-23 14:12:44 +02:00
binarybaron
cf87f19e82
Merge pull request #7 from UnstoppableSwap/release/0.13.3
...
Release version 0.13.3
2024-07-22 16:57:18 +02:00
UnstoppableSwap Botty
410fcf2117
Prepare release 0.13.3
2024-07-22 14:40:59 +00:00
binarybaron
8ba8e3bd5c
fix: Revert 0.13.3 release
2024-07-22 16:32:04 +02:00
binarybaron
eef78cddb2
CI: Exclude preview releases from "latest" docker release tag
2024-07-22 16:27:56 +02:00
binarybaron
f24c11f0a3
Merge branch 'comit-network:master' into master
2024-07-22 16:18:41 +02:00
Byron Hambly
8e6d1e37e8
Merge pull request #1719 from comit-network/dependabot/cargo/toml-0.8.15
...
build(deps): bump toml from 0.8.14 to 0.8.15
2024-07-18 13:54:04 +02:00
Byron Hambly
f4630fa9d1
Merge pull request #1720 from comit-network/dependabot/cargo/thiserror-1.0.63
...
build(deps): bump thiserror from 1.0.62 to 1.0.63
2024-07-18 13:53:56 +02:00
dependabot[bot]
cb85439905
build(deps): bump thiserror from 1.0.62 to 1.0.63
...
Bumps [thiserror](https://github.com/dtolnay/thiserror ) from 1.0.62 to 1.0.63.
- [Release notes](https://github.com/dtolnay/thiserror/releases )
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.62...1.0.63 )
---
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-18 11:24:34 +00:00
dependabot[bot]
74af379f80
build(deps): bump toml from 0.8.14 to 0.8.15
...
Bumps [toml](https://github.com/toml-rs/toml ) from 0.8.14 to 0.8.15.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.14...toml-v0.8.15 )
---
updated-dependencies:
- dependency-name: toml
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-07-18 11:24:12 +00:00
Byron Hambly
b3813f3769
Merge pull request #1718 from comit-network/dependabot/cargo/tokio-1.38.1
...
build(deps): bump tokio from 1.38.0 to 1.38.1
2024-07-18 09:57:48 +02:00
dependabot[bot]
7c9af191bc
build(deps): bump tokio from 1.38.0 to 1.38.1
...
Bumps [tokio](https://github.com/tokio-rs/tokio ) from 1.38.0 to 1.38.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases )
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.0...tokio-1.38.1 )
---
updated-dependencies:
- dependency-name: tokio
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-07-17 11:08:57 +00:00
binarybaron
97788e6f54
Merge branch 'comit-network:master' into master
2024-07-17 00:08:37 +02:00
binarybaron
85c4db1d75
fix: Format cooperative redeem reject using thiserror ( #1716 )
2024-07-16 20:13:58 +02:00
binarybaron
612784b3e0
Merge pull request #6 from UnstoppableSwap/release/0.13.3
...
Release version 0.13.3
2024-07-16 11:45:00 +02:00
UnstoppableSwap Botty
7c54fb2848
Prepare release 0.13.3
2024-07-16 09:40:03 +00:00
binarybaron
f5bda640a0
fix: Remove duplicate entry from CHANGELOG.md
2024-07-16 11:31:18 +02:00
binarybaron
d8f84cbad9
Merge pull request #5 from UnstoppableSwap/release/0.13.3
...
Release version 0.13.3
2024-07-16 11:25:43 +02:00
UnstoppableSwap Botty
c430e89502
Prepare release 0.13.3
2024-07-16 09:25:28 +00:00
binarybaron
eab4b00478
feat: Release Docker image on build
2024-07-16 11:19:56 +02:00
binarybaron
d55c6e8c1a
fix(Dockerfile): Use local repo
2024-07-16 11:11:40 +02:00
binarybaron
60a3177710
feat: Dockerfile for asb
2024-07-16 10:43:47 +02:00
COMIT Botty McBotface
1f322b78c8
Prepare release 0.13.3 ( #1714 )
2024-07-15 16:45:19 +02:00
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
