Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-20 21:34:29 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,877 Commits 73 Branches 28 Tags 81 MiB
d521815e91
Commit Graph

2877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
9aaa7d358f
build(deps): bump serde_json from 1.0.121 to 1.0.122 
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.121 to 1.0.122.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.121...v1.0.122)

---
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-08-02 11:39:10 +00:00
Byron Hambly
204aa85e59
Merge pull request #1741 from comit-network/dependabot/cargo/mockito-1.5.0 
build(deps): bump mockito from 1.4.0 to 1.5.0
 2024-08-01 20:26:23 +02:00
Byron Hambly
7c509d3ea3
Merge pull request #1742 from comit-network/dependabot/cargo/toml-0.8.19 
build(deps): bump toml from 0.8.17 to 0.8.19
 2024-08-01 20:24:43 +02:00
binarybaron
cc854be8f4
feat: Enhance history command with more swap details (#1725) 2024-08-01 18:35:03 +02:00
dependabot[bot]
af6bc47ed3
build(deps): bump toml from 0.8.17 to 0.8.19 
Bumps [toml](https://github.com/toml-rs/toml) from 0.8.17 to 0.8.19.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.17...toml-v0.8.19)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-08-01 11:39:35 +00:00
dependabot[bot]
587212abc7
build(deps): bump mockito from 1.4.0 to 1.5.0 
Bumps [mockito](https://github.com/lipanski/mockito) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/lipanski/mockito/releases)
- [Commits](https://github.com/lipanski/mockito/compare/1.4.0...1.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-08-01 11:38:09 +00:00
Byron Hambly
b18ba95e8c
Merge pull request #1740 from comit-network/dependabot/cargo/toml-0.8.17 
build(deps): bump toml from 0.8.16 to 0.8.17
 2024-07-31 17:40:25 +02:00
dependabot[bot]
6e09c73cf3
build(deps): bump toml from 0.8.16 to 0.8.17 
Bumps [toml](https://github.com/toml-rs/toml) from 0.8.16 to 0.8.17.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.16...toml-v0.8.17)

---
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-31 11:39:26 +00:00
Byron Hambly
132cfe782c
Merge pull request #1736 from comit-network/dependabot/github_actions/thomaseizinger/keep-a-changelog-new-release-3.1.0 
build(deps): bump thomaseizinger/keep-a-changelog-new-release from 3.0.0 to 3.1.0
 2024-07-29 19:38:20 +02:00
Byron Hambly
3611a1aced
Merge pull request #1737 from comit-network/dependabot/cargo/serde_json-1.0.121 
build(deps): bump serde_json from 1.0.118 to 1.0.121
 2024-07-29 19:37:51 +02:00
Byron Hambly
21f26a5b44
Merge pull request #1738 from comit-network/dependabot/cargo/tokio-socks-0.5.2 
build(deps): bump tokio-socks from 0.5.1 to 0.5.2
 2024-07-29 19:37:28 +02:00
dependabot[bot]
9700d192b2
build(deps): bump tokio-socks from 0.5.1 to 0.5.2 
Bumps [tokio-socks](https://github.com/sticnarf/tokio-socks) from 0.5.1 to 0.5.2.
- [Release notes](https://github.com/sticnarf/tokio-socks/releases)
- [Changelog](https://github.com/sticnarf/tokio-socks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sticnarf/tokio-socks/compare/v0.5.1...v0.5.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-29 12:02:43 +00:00
dependabot[bot]
254874276c
build(deps): bump serde_json from 1.0.118 to 1.0.121 
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.118 to 1.0.121.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.118...v1.0.121)

---
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-07-29 12:00:29 +00:00
dependabot[bot]
011aa0cb9c
build(deps): bump thomaseizinger/keep-a-changelog-new-release 
Bumps [thomaseizinger/keep-a-changelog-new-release](https://github.com/thomaseizinger/keep-a-changelog-new-release) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/thomaseizinger/keep-a-changelog-new-release/releases)
- [Changelog](https://github.com/thomaseizinger/keep-a-changelog-new-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thomaseizinger/keep-a-changelog-new-release/compare/3.0.0...3.1.0)

---
updated-dependencies:
- dependency-name: thomaseizinger/keep-a-changelog-new-release
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-29 11:25:26 +00:00
Byron Hambly
8bf4ea08be
Merge pull request #1735 from comit-network/dependabot/cargo/toml-0.8.16 
build(deps): bump toml from 0.8.15 to 0.8.16
 2024-07-26 14:57:26 +02:00
dependabot[bot]
f3640aceb2
build(deps): bump toml from 0.8.15 to 0.8.16 
Bumps [toml](https://github.com/toml-rs/toml) from 0.8.15 to 0.8.16.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.15...toml-v0.8.16)

---
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-26 12:23:43 +00:00
binarybaron
45e14c5a1e
Revert: 8284bea778 2024-07-26 11:51:33 +02:00
binarybaron
f29bf20e8d
Revert "fix: Reintroduce Dockerfile" 
This reverts commit 77a43ba28c.
 2024-07-26 11:46:27 +02:00
binarybaron
b52e07ace9
Revert "fix: Reintroduce docker build action" 
This reverts commit 49cae19059.
 2024-07-26 11:46:19 +02:00
binarybaron
77a43ba28c
fix: Reintroduce Dockerfile 2024-07-26 11:45:48 +02:00
binarybaron
49cae19059
fix: Reintroduce docker build action 2024-07-26 11:45:22 +02:00
binarybaron
7b5929deb5
Merge pull request #9 from UnstoppableSwap/release/0.13.4 
Release version 0.13.4
 2024-07-26 00:38:02 +02:00
UnstoppableSwap Botty
8284bea778 Prepare release 0.13.4 2024-07-25 22:31:14 +00:00
binarybaron
0ad78e4f30
revert: Update CHANGELOG.md 2024-07-26 00:20:17 +02:00
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 ce8d3afe60, reversing
changes made to 75cfc6b0d4.
 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