Commit Graph

  • 96e984794d
    Merge pull request #42 from comit-network/xmr-btc-user-interface-definition Daniel Karzel 2020-11-23 13:36:32 +11:00
  • e7b681526e Work in review comments Daniel Karzel 2020-11-23 11:00:21 +11:00
  • 075e17029e
    Apply suggestions from code review Daniel Karzel 2020-11-23 10:28:39 +11:00
  • 2548283c13
    Apply suggestions from code review Daniel Karzel 2020-11-20 18:17:22 +11:00
  • f1da5126fa Tables for mapping validation criteria to protoype Daniel Karzel 2020-11-20 17:23:08 +11:00
  • 978a72f113 Apply review comments Daniel Karzel 2020-11-20 10:57:46 +11:00
  • d7abdeba2a
    Apply suggestions from code review Daniel Karzel 2020-11-20 10:46:39 +11:00
  • 7a8ee6e6f3 Collect questions that we would like to answer Daniel Karzel 2020-11-19 23:18:38 +11:00
  • 2de8093659 Re-word the CORS header issue and add some fixes Daniel Karzel 2020-11-19 16:50:05 +11:00
  • 4b6f914409 XMR<>BTC user interface prototype details Daniel Karzel 2020-11-17 20:09:18 +11:00
  • 9542f162f6
    Merge pull request #35 from comit-network/no-transfer-proof rishflab 2020-11-13 14:30:58 +11:00
  • 379aff50cf Fix rebase conflicts rishflab 2020-11-13 13:33:36 +11:00
  • 620216a596 Remove need to send Monero transfer proof from Alice to Bob Lucas Soriano del Pino 2020-11-04 20:16:54 +11:00
  • 0288e004c5 Make Alice watch for Monero lock transaction without transfer proof Lucas Soriano del Pino 2020-11-04 17:06:17 +11:00
  • 7371dfb055 Test that a watch only wallet can be loaded from address + view key Lucas Soriano del Pino 2020-11-04 16:05:08 +11:00
  • e7682a42a4
    Merge pull request #36 from comit-network/recovery rishflab 2020-11-12 14:39:39 +11:00
  • 483c819e17 Correctly re-export types from bitcoin and monero modules Lucas Soriano del Pino 2020-11-07 06:57:35 +11:00
  • f5ff50157e Some more fixes and comments after testing Alice's recovery Lucas Soriano del Pino 2020-11-06 18:05:49 +11:00
  • bea99185ed Use correct default values for monerod_url* Lucas Soriano del Pino 2020-11-06 15:41:55 +11:00
  • 5930af3587 Move some things around in recover module Lucas Soriano del Pino 2020-11-06 15:40:56 +11:00
  • 33b36c98fa Configure binary tracing level for xmr_btc and monero_harness Lucas Soriano del Pino 2020-11-06 15:39:42 +11:00
  • 5dede0f361 Add more logging to recovery Lucas Soriano del Pino 2020-11-06 13:17:33 +11:00
  • 11a7963081 Fix bugs rishflab 2020-11-06 11:31:08 +11:00
  • f0d90130ad Add recovery command Lucas Soriano del Pino 2020-11-06 11:10:22 +11:00
  • 09773dd15b Re-introduce history command Lucas Soriano del Pino 2020-11-05 16:55:30 +11:00
  • 0f1a77fa21 Fix Alice's btc redeem recovery path rishflab 2020-11-06 10:13:10 +11:00
  • 6db40dce2a Implement swap recover function for Bob Lucas Soriano del Pino 2020-11-05 15:48:31 +11:00
  • 28225f8643 Implement swap recover function for Alice Lucas Soriano del Pino 2020-11-03 17:08:31 +11:00
  • b989e94322 Remove stale TODO Lucas Soriano del Pino 2020-11-03 16:54:16 +11:00
  • 33a111d879 Move Swap state out of storage Lucas Soriano del Pino 2020-11-03 16:53:28 +11:00
  • ac2cfd7f65 Print swap history on --history flag Lucas Soriano del Pino 2020-11-03 16:44:04 +11:00
  • ecbfed9c11 Add Database API to fetch all swaps Lucas Soriano del Pino 2020-11-03 15:49:00 +11:00
  • f9cfc2abe3 Remove generics from Database Lucas Soriano del Pino 2020-11-03 15:26:47 +11:00
  • 02075c2a1d Support saving multiple swaps Lucas Soriano del Pino 2020-11-03 14:23:03 +11:00
  • 823add218e Remove temporary test tracing guards Lucas Soriano del Pino 2020-11-02 17:44:53 +11:00
  • a26890001b Fix swap e2e test Lucas Soriano del Pino 2020-11-02 17:37:46 +11:00
  • 934ddb366a Save state for Alice at specific points in the swap Lucas Soriano del Pino 2020-11-02 17:14:56 +11:00
  • ea08778b2f Save state for Bob at specific points in the swap rishflab 2020-11-02 16:00:10 +11:00
  • 5cb2f451d0
    Merge pull request #40 from comit-network/attach-bins rishflab 2020-11-12 11:33:20 +11:00
  • 9ebacd8ccb
    Attach binaries when doing CI run Franck Royer 2020-11-10 15:50:25 +11:00
  • b7651e8653
    Merge pull request #39 from comit-network/fix-compile-times Lucas Soriano 2020-11-09 14:22:07 +11:00
  • 4790d701e5 Update cross-curve-dleq dependency Lucas Soriano del Pino 2020-11-09 11:07:06 +11:00
  • 57bf525ee2
    Remove dleq proof from message0 Philipp Hoenisch 2020-11-06 16:24:21 +11:00
  • 3a432e8233
    Use if instead of match for boolean Philipp Hoenisch 2020-11-05 16:13:57 +11:00
  • e4046e6791
    Add Tor test Philipp Hoenisch 2020-11-05 16:09:43 +11:00
  • 3da6e76c33
    Make Tor more configurable Philipp Hoenisch 2020-11-05 16:09:33 +11:00
  • 713658244d
    Merge pull request #33 from comit-network/monerod Philipp Hoenisch 2020-11-03 17:43:02 +11:00
  • bca439ada5
    Use random prefix Philipp Hoenisch 2020-11-03 12:25:22 +11:00
  • 981fcacc95
    Make swap e2e test work with new monerod lib Philipp Hoenisch 2020-11-03 12:13:18 +11:00
  • 70d64f74ae
    Testcontainers upgrade Philipp Hoenisch 2020-11-03 11:56:13 +11:00
  • 1a38bf57f2
    Rename inner to client Philipp Hoenisch 2020-11-03 11:49:53 +11:00
  • f0fbe785c8
    Remove Alice and Bob from utility struct Philipp Hoenisch 2020-11-03 11:46:25 +11:00
  • 306176b3e6
    PR feedback: Philipp Hoenisch 2020-11-03 11:21:44 +11:00
  • a04f04f1a5
    Fix failing test due to uninitialized miner Philipp Hoenisch 2020-11-03 11:00:05 +11:00
  • 0b9e8c145e
    Update xmr-btc lib to use new monero-harness Philipp Hoenisch 2020-11-02 21:12:38 +11:00
  • 2d064f305f
    Re-enable other builds Philipp Hoenisch 2020-11-02 19:01:28 +11:00
  • 3cc32002b0
    Refactor out some helper functions to generate blocks after funding Philipp Hoenisch 2020-11-02 18:58:52 +11:00
  • 3a34800311
    Refactor into monero helper struct Philipp Hoenisch 2020-11-02 16:00:35 +11:00
  • 738c67a421
    Simple fund and send in test Philipp Hoenisch 2020-11-02 14:42:08 +11:00
  • f5643a4ea4
    Miner working Philipp Hoenisch 2020-11-02 10:02:28 +11:00
  • 0dcb4e56be
    Have monerod running in own container Philipp Hoenisch 2020-10-29 12:52:29 +11:00
  • 7b101a9c98
    upgrade testcontainers Philipp Hoenisch 2020-10-29 12:52:00 +11:00
  • d5c7afd7f8
    Merge pull request #34 from comit-network/no-config rishflab 2020-11-03 16:46:53 +11:00
  • a44303f839 Add monerod to config rishflab 2020-11-03 16:08:46 +11:00
  • 7afd316210 Construct tor transport for Bob rishflab 2020-11-03 14:54:36 +11:00
  • 3b008c38a6 Remove redundant code and stale comments rishflab 2020-11-03 14:33:48 +11:00
  • 249f273d1b Remove stale comments rishflab 2020-11-03 11:05:39 +11:00
  • 5971ef1f28 Fix clippy warnings rishflab 2020-11-03 11:00:39 +11:00
  • 606c48c752 Format swap crate Cargo.toml rishflab 2020-11-03 10:55:54 +11:00
  • 796d0b3439 Extract transport creation and remove tor conditional compile rishflab 2020-10-29 22:18:59 +11:00
  • 0ca511bf8a Remove hardcoded configuration rishflab 2020-10-29 14:45:45 +11:00
  • 62c9f22b64
    Merge pull request #30 from comit-network/use-execution-in-swap Lucas Soriano 2020-11-03 11:07:12 +11:00
  • 92c7e8e84f Run swap e2e test without tor feature Lucas Soriano del Pino 2020-11-02 10:31:53 +11:00
  • 792fa351c8 Upgrade bitcoin-harness dependency Lucas Soriano del Pino 2020-10-30 15:55:10 +11:00
  • 7fa7641feb Clean up some logs and comments Lucas Soriano del Pino 2020-10-30 15:51:46 +11:00
  • 4d4acde476 Bubble up an event when Bob receives message 3 response Tobin C. Harding 2020-10-30 09:26:52 +11:00
  • a37f43a1ba wip: Provide enough funds to both parties Lucas Soriano del Pino 2020-10-29 21:17:00 +11:00
  • eb6bbe6180 wip: Fix bug where bob was sending two amount request Lucas Soriano del Pino 2020-10-29 14:58:51 +11:00
  • 9f32cd988e wip: Use same timelock value for refund and punish Lucas Soriano del Pino 2020-10-29 14:58:34 +11:00
  • 62c4501926 wip: Add xmr_btc tracing filter Lucas Soriano del Pino 2020-10-29 14:57:20 +11:00
  • ae87c10cae wip: fixed message0 Lucas Soriano del Pino 2020-10-29 14:00:00 +11:00
  • 119f2a7c54 Add error logging to request_response Tobin C. Harding 2020-10-29 13:59:57 +11:00
  • b8ab4b4eee wip: add env filter Tobin C. Harding 2020-10-29 11:36:57 +11:00
  • 3e2f0b74a2 Do not trace events meant for other NBs Tobin C. Harding 2020-10-29 10:22:31 +11:00
  • c464555f5e Enable trace output Tobin C. Harding 2020-10-29 09:53:46 +11:00
  • 39f86154ce Use serde_cbor instead of serde_json Tobin C. Harding 2020-10-29 09:48:54 +11:00
  • 2bd4977fe4 Increase read buffer size Tobin C. Harding 2020-10-29 09:39:55 +11:00
  • be37725303 monero-harness: Use tracing Tobin C. Harding 2020-10-28 14:19:47 +11:00
  • 9384b0cf3c [WIP] Swap app e2e test Lucas Soriano del Pino 2020-10-28 11:46:45 +11:00
  • 9e30bd5151 Generate addresses as late as possible Lucas Soriano del Pino 2020-10-28 10:22:09 +11:00
  • 3f43581da7 Implement traits Receive{BitcoinRedeemEncsig, TransferProof} Lucas Soriano del Pino 2020-10-27 17:18:19 +11:00
  • a4e4c27bee Execute Bob's on-chain protocol after handshake Lucas Soriano del Pino 2020-10-27 13:26:40 +11:00
  • 4ee82a5a2a Execute Alice's on-chain protocol after handshake Lucas Soriano del Pino 2020-10-27 12:11:03 +11:00
  • 4cbe1e2615
    Remove descriptor from tx_cancel Philipp Hoenisch 2020-10-29 10:03:22 +11:00
  • 1e887f3e5a
    Replace descriptor with Pubkey tuple Philipp Hoenisch 2020-10-29 09:56:02 +11:00
  • dbd7f2b0c9
    Merge pull request #27 from comit-network/tor-swap Philipp Hoenisch 2020-10-28 13:28:56 +11:00
  • b8fd9a734f
    Use full path imports for dependencies to reduce cfg hell Philipp Hoenisch 2020-10-28 11:18:14 +11:00
  • a1351e5461 Do not declare 'port' variable Tobin C. Harding 2020-10-28 10:11:04 +11:00
  • 464b699426 Fail if user passes in local port for non-tor usage Tobin C. Harding 2020-10-28 09:45:39 +11:00
  • 42d194f758 Use fully qualified path for bail Tobin C. Harding 2020-10-28 09:21:37 +11:00