Commit Graph

2804 Commits (0ad78e4f30562b87942fc3357e1caf4669dcdd14)
 

Author SHA1 Message Date
binarybaron 0ad78e4f30
revert: Update CHANGELOG.md 3 months ago
binarybaron fc6bb336c8
Merge branch 'comit-network:master' into master 3 months ago
COMIT Botty McBotface 33ad3c374a
Prepare release 0.13.4 (#1734) 3 months ago
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
3 months ago
binarybaron 2eda2476eb
Revert "Merge branch 'master' into master" (#1730)
This reverts commit ce8d3afe60, reversing
changes made to 75cfc6b0d4.
3 months ago
binarybaron aaa52e9559
Merge pull request #8 from comit-network/master
Merge parent repository
3 months ago
binarybaron ce8d3afe60
Merge branch 'master' into master 3 months ago
binarybaron 75cfc6b0d4
fix(cli): allow bitcoin-change-address to be omitted when making request to rpc server (#1728) 3 months ago
binarybaron c80bdb2d8c
fix(asb): Allow history command to be run while asb is running (#1724)
Co-authored-by: einliterflasche <einliterflasche@pm.me>
3 months ago
binarybaron ef49b471d8 docs: add binarybaron.asc 3 months ago
binarybaron cf87f19e82
Merge pull request #7 from UnstoppableSwap/release/0.13.3
Release version 0.13.3
3 months ago
UnstoppableSwap Botty 410fcf2117 Prepare release 0.13.3 3 months ago
binarybaron 8ba8e3bd5c
fix: Revert 0.13.3 release 3 months ago
binarybaron eef78cddb2
CI: Exclude preview releases from "latest" docker release tag 3 months ago
binarybaron f24c11f0a3
Merge branch 'comit-network:master' into master 3 months ago
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
3 months ago
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
3 months ago
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>
3 months ago
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>
3 months ago
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
3 months ago
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>
3 months ago
binarybaron 97788e6f54
Merge branch 'comit-network:master' into master 3 months ago
binarybaron 85c4db1d75
fix: Format cooperative redeem reject using thiserror (#1716) 3 months ago
binarybaron 612784b3e0
Merge pull request #6 from UnstoppableSwap/release/0.13.3
Release version 0.13.3
3 months ago
UnstoppableSwap Botty 7c54fb2848 Prepare release 0.13.3 3 months ago
binarybaron f5bda640a0
fix: Remove duplicate entry from CHANGELOG.md 3 months ago
binarybaron d8f84cbad9
Merge pull request #5 from UnstoppableSwap/release/0.13.3
Release version 0.13.3
3 months ago
UnstoppableSwap Botty c430e89502 Prepare release 0.13.3 3 months ago
binarybaron eab4b00478
feat: Release Docker image on build 3 months ago
binarybaron d55c6e8c1a
fix(Dockerfile): Use local repo 3 months ago
binarybaron 60a3177710
feat: Dockerfile for asb 3 months ago
COMIT Botty McBotface 1f322b78c8
Prepare release 0.13.3 (#1714) 3 months ago
Byron Hambly 12b9ceebcf
Merge pull request #1676 from patrini32/cooperative-release-of-funds
Allow for cooperative release of funds
3 months ago
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
3 months ago
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>
3 months ago
patrini32 845b9428b7
remove whitespaces 3 months ago
patrini32 ee04ff8a3b
fix formatting 3 months ago
binarybaron f8c3276642 Merge branch 'cooperative-release-of-funds' of https://github.com/patrini32/xmr-btc-swap into pr/1676 3 months ago
binarybaron 073baa9752 Update swap.rs 3 months ago
binarybaron f72005312c
Merge branch 'master' into cooperative-release-of-funds 3 months ago
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>
3 months ago
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
3 months ago
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
3 months ago
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>
3 months ago
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>
3 months ago
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
3 months ago
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>
3 months ago
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
3 months ago
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
3 months ago
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
3 months ago