Commit Graph

  • aaa52e9559
    Merge pull request #8 from comit-network/master binarybaron 2024-07-25 14:04:14 +02:00
  • ce8d3afe60
    Merge branch 'master' into master binarybaron 2024-07-25 14:03:47 +02:00
  • 75cfc6b0d4
    fix(cli): allow bitcoin-change-address to be omitted when making request to rpc server (#1728) binarybaron 2024-07-25 00:13:15 +02:00
  • ed314c4c09
    fix: dprint binarybaron 2024-07-25 00:10:46 +02:00
  • 2ad3d6c4b2
    feat: enhance history output for cli binarybaron 2024-07-24 23:27:00 +02:00
  • 7fdd654d39
    fix: clippy binarybaron 2024-07-24 22:57:14 +02:00
  • 799fdfc363
    fix: dprint binarybaron 2024-07-24 22:46:25 +02:00
  • 9ede610958
    fix: Allow bitcoin change address to be omitted when making a request to RPC server binarybaron 2024-07-24 19:18:32 +02:00
  • f70696e70c
    fix: Allow bitcoin change address to be omitted when making a request to RPC server fix/allow-change-bitcoin-omitted-rpc-server binarybaron 2024-07-24 19:18:32 +02:00
  • 5d31c27890
    fix: explicit log message binarybaron 2024-07-24 11:40:03 +02:00
  • 769a30c239
    fix: add is_complete to table, refactor binarybaron 2024-07-24 11:30:23 +02:00
  • c3fd7fb879
    fix: clippy binarybaron 2024-07-24 11:23:55 +02:00
  • 31d4086692
    fix: dprint binarybaron 2024-07-23 21:25:36 +02:00
  • 99852907c6
    fix: Unit tests binarybaron 2024-07-23 21:23:17 +02:00
  • e364f4eecd
    Merge branch 'master' into asb_history_command_improvement binarybaron 2024-07-23 21:17:20 +02:00
  • 97920628e5
    feat(asb): History command display start datetime, btc amount, xmr amount, exchange rate and peer id of trading partner binarybaron 2024-07-23 21:16:04 +02:00
  • 5228bc2f74
    Merge branch 'master' into binarybaron-gpg-key binarybaron-gpg-key binarybaron 2024-07-23 14:52:14 +02:00
  • c80bdb2d8c
    fix(asb): Allow history command to be run while asb is running (#1724) binarybaron 2024-07-23 14:52:01 +02:00
  • ab273ee3f2
    docs: add binarybaron.asc binarybaron-gpg-new-2 binarybaron 2024-07-23 14:19:19 +02:00
  • ef49b471d8 docs: add binarybaron.asc binarybaron 2024-07-23 14:12:44 +02:00
  • 4e9ce0b703
    Merge branch 'master' into sqlite-readonly-history binarybaron 2024-07-23 14:08:24 +02:00
  • 315ee29b1b
    docs: add binarybaron.asc binarybaron 2024-07-23 14:01:15 +02:00
  • 5b94850e94
    Allow history command to be executed while asb is running by opening database in read-only mode (#1722) sqlite-readonly-history Einliterflasche 2024-07-23 00:24:41 +02:00
  • 75674c3e61 Merge remote-tracking branch 'binarybaron/sqlite-readonly-history' into sqlite-readonly-history Einliterflasche 2024-07-23 00:23:39 +02:00
  • 10726c4fdc Update CHANGELOG.md binarybaron 2024-07-23 00:22:08 +02:00
  • 94f63468d8 Update changelog Einliterflasche 2024-07-23 00:19:39 +02:00
  • cf87f19e82
    Merge pull request #7 from UnstoppableSwap/release/0.13.3 binarybaron 2024-07-22 16:57:18 +02:00
  • 410fcf2117 Prepare release 0.13.3 UnstoppableSwap Botty 2024-07-22 14:40:59 +00:00
  • 8ba8e3bd5c
    fix: Revert 0.13.3 release binarybaron 2024-07-22 16:32:04 +02:00
  • eef78cddb2
    CI: Exclude preview releases from "latest" docker release tag binarybaron 2024-07-22 16:27:56 +02:00
  • f24c11f0a3
    Merge branch 'comit-network:master' into master binarybaron 2024-07-22 16:18:41 +02:00
  • 6ee18ca52b Refactor to AccessMode enum einliterflasche 2024-07-20 18:59:40 +02:00
  • 757183e857 feat: Add xmr-btc-swap repo in subdirectory binarybaron 2024-07-19 00:01:34 +02:00
  • 462f3b2e6f feat: Prototype connecting frontend and backend binarybaron 2024-07-18 23:59:33 +02:00
  • f2d8d91584 feat: Prototype connecting between frontend and backend binarybaron 2024-07-18 23:58:54 +02:00
  • 8e6d1e37e8
    Merge pull request #1719 from comit-network/dependabot/cargo/toml-0.8.15 Byron Hambly 2024-07-18 13:54:04 +02:00
  • f4630fa9d1
    Merge pull request #1720 from comit-network/dependabot/cargo/thiserror-1.0.63 Byron Hambly 2024-07-18 13:53:56 +02:00
  • cb85439905
    build(deps): bump thiserror from 1.0.62 to 1.0.63 dependabot[bot] 2024-07-18 11:24:34 +00:00
  • 74af379f80
    build(deps): bump toml from 0.8.14 to 0.8.15 dependabot[bot] 2024-07-18 11:24:12 +00:00
  • b3813f3769
    Merge pull request #1718 from comit-network/dependabot/cargo/tokio-1.38.1 Byron Hambly 2024-07-18 09:57:48 +02:00
  • 7c9af191bc
    build(deps): bump tokio from 1.38.0 to 1.38.1 dependabot[bot] 2024-07-17 11:08:57 +00:00
  • 97788e6f54
    Merge branch 'comit-network:master' into master binarybaron 2024-07-17 00:08:37 +02:00
  • 85c4db1d75
    fix: Format cooperative redeem reject using thiserror (#1716) binarybaron 2024-07-16 20:13:58 +02:00
  • 85fb8d6f88 fix: Format cooperative redeem reject using thiserror binarybaron 2024-07-16 15:33:35 +02:00
  • 3d637fe0a1 fix(asb): Allow history command to be run while asb is running binarybaron 2024-07-16 15:30:50 +02:00
  • 612784b3e0
    Merge pull request #6 from UnstoppableSwap/release/0.13.3 binarybaron 2024-07-16 11:45:00 +02:00
  • 7c54fb2848 Prepare release 0.13.3 UnstoppableSwap Botty 2024-07-16 09:40:03 +00:00
  • f5bda640a0
    fix: Remove duplicate entry from CHANGELOG.md binarybaron 2024-07-16 11:31:18 +02:00
  • d8f84cbad9
    Merge pull request #5 from UnstoppableSwap/release/0.13.3 binarybaron 2024-07-16 11:25:43 +02:00
  • c430e89502 Prepare release 0.13.3 UnstoppableSwap Botty 2024-07-16 09:25:28 +00:00
  • eab4b00478
    feat: Release Docker image on build binarybaron 2024-07-16 11:19:56 +02:00
  • d55c6e8c1a
    fix(Dockerfile): Use local repo binarybaron 2024-07-16 11:11:40 +02:00
  • 60a3177710
    feat: Dockerfile for asb binarybaron 2024-07-16 10:43:47 +02:00
  • 1f322b78c8
    Prepare release 0.13.3 (#1714) 0.13.3 COMIT Botty McBotface 2024-07-16 00:45:19 +10:00
  • 13db556f99 Prepare release 0.13.3 COMIT Botty McBotface 2024-07-15 14:44:59 +00:00
  • 12b9ceebcf
    Merge pull request #1676 from patrini32/cooperative-release-of-funds Byron Hambly 2024-07-15 10:00:44 +02:00
  • 77f7222f71
    Merge pull request #1712 from comit-network/dependabot/cargo/thiserror-1.0.62 Byron Hambly 2024-07-15 09:38:24 +02:00
  • 31d76cbdf4
    build(deps): bump thiserror from 1.0.61 to 1.0.62 dependabot[bot] 2024-07-12 11:25:56 +00:00
  • 55f1c887ff
    build(deps): bump jsonrpsee-core from 0.16.2 to 0.24.0 dependabot[bot] 2024-07-12 11:24:29 +00:00
  • 845b9428b7
    remove whitespaces patrini32 2024-07-11 11:02:23 +03:00
  • ee04ff8a3b
    fix formatting patrini32 2024-07-11 10:58:07 +03:00
  • f8c3276642 Merge branch 'cooperative-release-of-funds' of https://github.com/patrini32/xmr-btc-swap into pr/1676 binarybaron 2024-07-11 09:30:49 +02:00
  • 073baa9752 Update swap.rs binarybaron 2024-07-11 09:30:48 +02:00
  • f72005312c
    Merge branch 'master' into cooperative-release-of-funds binarybaron 2024-07-11 09:23:38 +02:00
  • 4115a452e3
    allow --change-address to be omitted and default to internal wallet address (#1709) Einliterflasche 2024-07-11 09:19:41 +02:00
  • a18aa82c42
    Merge branch 'master' into master binarybaron 2024-07-11 09:19:10 +02:00
  • e801499550 update changelog and docs Einliterflasche 2024-07-10 17:17:25 +02:00
  • e1e47a6ead
    Update swap/src/cli/command.rs binarybaron 2024-07-10 15:33:24 +02:00
  • c385059138
    Merge pull request #1710 from comit-network/dependabot/cargo/hyper-1.4.1 Byron Hambly 2024-07-10 15:25:03 +02:00
  • c283d6a911
    Merge pull request #1711 from comit-network/dependabot/cargo/vergen-8.3.2 Byron Hambly 2024-07-10 15:24:45 +02:00
  • 5d89d61d22 rename variable Einliterflasche 2024-07-10 14:30:58 +02:00
  • dcb4edf585
    build(deps): bump vergen from 8.3.1 to 8.3.2 dependabot[bot] 2024-07-10 11:19:33 +00:00
  • 47f8a65209
    build(deps): bump hyper from 1.3.1 to 1.4.1 dependabot[bot] 2024-07-10 11:19:16 +00:00
  • 0b5889e817
    Merge 82178afa0447666619242c0180186164d2b2d99f into bf9abd4101df36fb3b48cdba44ed228c3f02e13c dependabot[bot] 2024-07-10 11:18:09 +00:00
  • c0a2957c37 Remove flag and make behaviour implicit Einliterflasche 2024-07-10 12:14:42 +02:00
  • bf9abd4101
    Merge pull request #1707 from comit-network/dependabot/cargo/uuid-1.10.0 Byron Hambly 2024-07-10 09:23:25 +02:00
  • 0ae91a4a68 Added a logging message to notify users that BTC will be refunded to the internal wallet incase of a refund when they pass --refund-to-internal-wallet Einliterflasche 2024-07-10 01:34:23 +02:00
  • b95b733e64 Merge remote-tracking branch 'refs/remotes/origin/master' Einliterflasche 2024-07-09 22:19:22 +02:00
  • be31ed7a7d Make clippy happy :) Einliterflasche 2024-07-09 22:19:08 +02:00
  • ca68ec9a93
    Merge branch 'master' into master binarybaron 2024-07-09 22:07:52 +02:00
  • 58e60fab26 improve help a little Einliterflasche 2024-07-09 21:59:52 +02:00
  • 57e3005c9e Fix typo, fix bug Einliterflasche 2024-07-09 21:54:43 +02:00
  • 2af22c1aba
    build(deps): bump uuid from 1.9.1 to 1.10.0 dependabot[bot] 2024-07-09 11:08:29 +00:00
  • e2198d49a0
    Merge pull request #1704 from comit-network/dependabot/cargo/qrcode-0.14.1 Byron Hambly 2024-07-09 09:03:58 +02:00
  • f0abb4396d
    Merge pull request #1705 from comit-network/dependabot/cargo/serde-1.0.204 Byron Hambly 2024-07-09 09:03:48 +02:00
  • 537672df08
    Merge pull request #1706 from comit-network/dependabot/cargo/async-trait-0.1.81 Byron Hambly 2024-07-09 09:03:37 +02:00
  • 5779bf74bd add --refund-to-internal-wallet flag for buy-xmr. Einliterflasche 2024-07-08 15:43:33 +02:00
  • cd29870e11
    build(deps): bump async-trait from 0.1.80 to 0.1.81 dependabot[bot] 2024-07-08 11:04:55 +00:00
  • ab1001a18c
    build(deps): bump serde from 1.0.203 to 1.0.204 dependabot[bot] 2024-07-08 11:04:38 +00:00
  • 294b658f43
    build(deps): bump qrcode from 0.14.0 to 0.14.1 dependabot[bot] 2024-07-08 11:04:18 +00:00
  • 3c12880a9c Update tauri.conf.json binarybaron 2024-07-06 21:36:26 +02:00
  • bc188870af Initial commit binarybaron 2024-07-06 21:34:33 +02:00
  • 2824ebc893 Update swap.rs binarybaron 2024-07-03 20:39:49 +02:00
  • 07f788eb81 Update swap.rs binarybaron 2024-07-03 20:14:09 +02:00
  • ef75019ac6 Update swap.rs binarybaron 2024-07-03 20:12:22 +02:00
  • 26e66ce9b9 Update swap.rs binarybaron 2024-07-03 20:02:04 +02:00
  • d7b649b7a6 feat: Allow for cooperative Monero redeem after Bitcoin punish has happened pr/1676 binarybaron 2024-07-03 19:47:45 +02:00
  • ba130311de
    build(deps): bump serde_json from 1.0.118 to 1.0.120 dependabot[bot] 2024-07-02 11:32:20 +00:00
  • 3b7319c69a
    build(deps): bump hyper from 1.3.1 to 1.4.0 dependabot[bot] 2024-07-02 11:31:42 +00:00
  • c5aa7edb6b
    chore: Fix typo (#1701) binarybaron 2024-07-02 12:03:56 +02:00