Commit Graph

  • ca68ec9a93
    Merge branch 'master' into master binarybaron 2024-07-09 22:07:52 +0200
  • 58e60fab26 improve help a little Einliterflasche 2024-07-09 21:59:52 +0200
  • 57e3005c9e Fix typo, fix bug Einliterflasche 2024-07-09 21:54:43 +0200
  • 2af22c1aba
    build(deps): bump uuid from 1.9.1 to 1.10.0 dependabot[bot] 2024-07-09 11:08:29 +0000
  • e2198d49a0
    Merge pull request #1704 from comit-network/dependabot/cargo/qrcode-0.14.1 Byron Hambly 2024-07-09 09:03:58 +0200
  • f0abb4396d
    Merge pull request #1705 from comit-network/dependabot/cargo/serde-1.0.204 Byron Hambly 2024-07-09 09:03:48 +0200
  • 537672df08
    Merge pull request #1706 from comit-network/dependabot/cargo/async-trait-0.1.81 Byron Hambly 2024-07-09 09:03:37 +0200
  • 5779bf74bd add --refund-to-internal-wallet flag for buy-xmr. Einliterflasche 2024-07-08 15:43:33 +0200
  • cd29870e11
    build(deps): bump async-trait from 0.1.80 to 0.1.81 dependabot[bot] 2024-07-08 11:04:55 +0000
  • ab1001a18c
    build(deps): bump serde from 1.0.203 to 1.0.204 dependabot[bot] 2024-07-08 11:04:38 +0000
  • 294b658f43
    build(deps): bump qrcode from 0.14.0 to 0.14.1 dependabot[bot] 2024-07-08 11:04:18 +0000
  • 3c12880a9c Update tauri.conf.json binarybaron 2024-07-06 21:36:26 +0200
  • bc188870af Initial commit binarybaron 2024-07-06 21:34:33 +0200
  • 2824ebc893 Update swap.rs binarybaron 2024-07-03 20:39:49 +0200
  • 07f788eb81 Update swap.rs binarybaron 2024-07-03 20:14:09 +0200
  • ef75019ac6 Update swap.rs binarybaron 2024-07-03 20:12:22 +0200
  • 26e66ce9b9 Update swap.rs binarybaron 2024-07-03 20:02:04 +0200
  • d7b649b7a6 feat: Allow for cooperative Monero redeem after Bitcoin punish has happened pr/1676 binarybaron 2024-07-03 19:47:45 +0200
  • ba130311de
    build(deps): bump serde_json from 1.0.118 to 1.0.120 dependabot[bot] 2024-07-02 11:32:20 +0000
  • 3b7319c69a
    build(deps): bump hyper from 1.3.1 to 1.4.0 dependabot[bot] 2024-07-02 11:31:42 +0000
  • c5aa7edb6b
    chore: Fix typo (#1701) binarybaron 2024-07-02 12:03:56 +0200
  • 3fa403d88f
    chore: Fix typo binarybaron 2024-07-02 12:03:41 +0200
  • 5c9185876d
    Prepare release 0.13.2 (#1700) 0.13.2 COMIT Botty McBotface 2024-07-02 10:11:36 +1000
  • 0968bf0614 Prepare release 0.13.2 COMIT Botty McBotface 2024-07-02 00:11:00 +0000
  • 6c1b85e408
    Revert "Prepare release 0.13.2 (#1694)" (#1699) binarybaron 2024-07-02 01:53:57 +0200
  • dc2014f1ef
    Revert "Prepare release 0.13.2 (#1694)" binarybaron 2024-07-02 01:53:47 +0200
  • 26109d6d8a
    Revert "Prepare release 0.13.2 (#1697)" (#1698) binarybaron 2024-07-02 01:51:58 +0200
  • 0724eccac9
    Revert "Prepare release 0.13.2 (#1697)" binarybaron 2024-07-02 01:51:46 +0200
  • 5e735ef4f7
    Prepare release 0.13.2 (#1697) COMIT Botty McBotface 2024-07-02 09:28:07 +1000
  • 58883542d0 Prepare release 0.13.2 COMIT Botty McBotface 2024-07-01 23:27:50 +0000
  • aa9b3c4687
    fix: Add a new migration script for creating the buffered_transfer_proofs table (#1695) binarybaron 2024-07-02 01:20:20 +0200
  • 293a0bd49b fix: Add a new migration script for creating the buffered_transfer_proofs table binarybaron 2024-07-02 01:19:37 +0200
  • 415323e4fc
    Prepare release 0.13.2 (#1694) COMIT Botty McBotface 2024-07-02 07:27:00 +1000
  • 5d2af54f8f Prepare release 0.13.2 COMIT Botty McBotface 2024-07-01 21:25:26 +0000
  • 173d077751
    feat (Cli): Display reason for failed cancel-refund operation to the user (#1668) patrini32 2024-07-01 21:14:44 +0000
  • c3b8186c26 Update CHANGELOG.md binarybaron 2024-07-01 23:14:21 +0200
  • 17dc573a5d
    Merge branch 'master' into master binarybaron 2024-07-01 16:21:57 +0200
  • 3fb08be449
    build(deps): bump serde_json from 1.0.118 to 1.0.119 dependabot[bot] 2024-07-01 11:47:00 +0000
  • c6004052dd Send offer duration from ASB to CLI Ian McKenzie 2024-06-29 13:41:52 -0700
  • 23a27680a4
    feat (Bob): Buffer transfer proof to database when we are running a different swap (#1669) binarybaron 2024-06-28 21:39:30 +0200
  • bb0d0a3216 Merge branch 'master' of https://github.com/patrini32/xmr-btc-swap into pr/1668 binarybaron 2024-06-28 21:02:43 +0200
  • 715c2c917b Update alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs binarybaron 2024-06-28 21:02:41 +0200
  • 74c89aa1f7
    Merge branch 'master' into bob-buffer-transfer-proofs binarybaron 2024-06-28 20:33:45 +0200
  • eb7b16a307
    Fix error patrini32 2024-06-28 17:03:07 +0000
  • 7f80851c4c
    Fix test patrini32 2024-06-28 16:59:26 +0000
  • 532831ee79
    Fix lint patrini32 2024-06-28 16:47:31 +0000
  • 2952d9812b
    Fix lint patrini32 2024-06-28 16:42:36 +0000
  • 7d7e3d5472
    Fix lint patrini32 2024-06-28 16:21:42 +0000
  • 32251240a5 Merge branch 'master' of https://github.com/patrini32/xmr-btc-swap into pr/1668 binarybaron 2024-06-28 17:49:16 +0200
  • ee45beafa8 Update alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs binarybaron 2024-06-28 17:49:08 +0200
  • dbad286042 Update event_loop.rs binarybaron 2024-06-28 17:29:44 +0200
  • 996c278956 Update event_loop.rs binarybaron 2024-06-28 17:27:42 +0200
  • c574e5dd30 Delete concurrent_bobs_before_xmr_lock_proof_sent.txt binarybaron 2024-06-28 17:21:10 +0200
  • 50cca967d1 fix binarybaron 2024-06-28 16:40:37 +0200
  • b4c962bd47 Update event_loop.rs binarybaron 2024-06-28 15:39:46 +0200
  • fee0692b9a Update concurrent_bobs_before_xmr_lock_proof_sent.rs binarybaron 2024-06-28 15:13:34 +0200
  • 661bf6f493 Update concurrent_bobs_before_xmr_lock_proof_sent.rs binarybaron 2024-06-28 15:12:43 +0200
  • 048cf024ee Update concurrent_bobs_before_xmr_lock_proof_sent.rs binarybaron 2024-06-28 15:12:38 +0200
  • b04e32ab86
    Merge branch 'master' into master binarybaron 2024-06-28 15:04:52 +0200
  • a985ca504c fix clippy errors binarybaron 2024-06-27 17:30:41 +0200
  • a6d8a2930c Update cancel_and_refund.rs binarybaron 2024-06-27 17:23:31 +0200
  • 9460b2a732 Update cancel_and_refund.rs binarybaron 2024-06-27 16:14:50 +0200
  • 1532add65c print entire error chain binarybaron 2024-06-27 16:02:10 +0200
  • b98445f9a8 Update cancel_and_refund.rs binarybaron 2024-06-27 15:45:27 +0200
  • fa65984e00 Update cancel_and_refund.rs binarybaron 2024-06-27 15:44:33 +0200
  • bf82781cbf Update cancel_and_refund.rs binarybaron 2024-06-27 15:15:57 +0200
  • 8e6c1febbd Merge branch 'master' of https://github.com/patrini32/xmr-btc-swap into pr/1668 binarybaron 2024-06-27 14:27:10 +0200
  • 6d45d86562 Update sqlx-data.json binarybaron 2024-06-27 14:26:19 +0200
  • 43ea066e3a fix dprint fmt binarybaron 2024-06-27 14:25:40 +0200
  • 4c9d1e8d8d
    Reduce check interval for Monero watch_for_transfer (#1670) binarybaron 2024-06-27 14:24:27 +0200
  • d5a10b1c57
    build(deps): bump jsonrpsee-core from 0.16.2 to 0.23.2 dependabot[bot] 2024-06-26 11:06:42 +0000
  • bb7b4e1563 better log message patrini32 2024-06-15 15:45:57 +0300
  • cf50f90500 remove dot patrini32 2024-06-13 20:54:22 +0300
  • a1a0a79154 fix typo patrini32 2024-06-12 23:25:30 +0300
  • d415959097 fix lint patrini32 2024-06-12 23:23:17 +0300
  • bbe1ad0c57 fix formatting patrini32 2024-06-12 23:21:12 +0300
  • 02e7625bf6 fix test patrini32 2024-06-12 23:19:49 +0300
  • 3b53d36b0b fix typo patrini32 2024-06-12 23:15:20 +0300
  • 8cf2f1f22b fix typo patrini32 2024-06-12 23:13:59 +0300
  • e8ed4250f2 fix typo patrini32 2024-06-12 23:12:29 +0300
  • a2f7de24ac fix error patrini32 2024-06-12 23:10:51 +0300
  • 3b575a37b8 fix error patrini32 2024-06-12 23:10:37 +0300
  • 075db8164e fix error patrini32 2024-06-12 23:08:01 +0300
  • af5dad585a Better error messages patrini32 2024-06-12 22:59:24 +0300
  • 3beb41c25c Throw appealing error in case that cancel timelock hasnt expired yet patrini32 2024-06-10 12:21:47 +0300
  • b80cc820f7 fix formatting patrini32 2024-06-09 19:53:06 +0300
  • 6f1a4e7fbe better log messages patrini32 2024-06-09 19:48:52 +0300
  • 64fb090eea beautify comments patrini32 2024-06-09 19:45:01 +0300
  • 60b548282b beautify log message patrini32 2024-06-09 14:39:56 +0300
  • 92757ac919 more fitting log message patrini32 2024-06-09 14:31:52 +0300
  • b57678b036 remove changes to punish.rs patrini32 2024-06-09 14:29:57 +0300
  • d84edabcd0 remove changes from state.rs patrini32 2024-06-09 14:24:42 +0300
  • 0d40179a65 remove changes from state.rs patrini32 2024-06-09 14:24:06 +0300
  • f5f8af92a0 check for punish timelock in fn refund, not yet expired timelock in cancel and remove breaking database changes patrini32 2024-06-09 14:19:11 +0300
  • 0caf678192 better comments patrini32 2024-06-09 13:44:52 +0300
  • f2973bf5cc remove missleading comment patrini32 2024-06-09 13:16:16 +0300
  • f66c16a381 provide better comments patrini32 2024-06-09 09:25:08 +0300
  • 08a97ba1b7 provide better comments patrini32 2024-06-09 09:22:49 +0300
  • 2c37e6e4f4 Revert "Reimplement tx_punish check without breaking database changes" patrini32 2024-06-08 21:32:41 +0300
  • 1f9ac64166 Revert "fix formatting" patrini32 2024-06-08 21:32:06 +0300