Commit Graph

  • 3cc32002b0
    Refactor out some helper functions to generate blocks after funding Philipp Hoenisch 2020-11-02 18:58:52 +1100
  • 3a34800311
    Refactor into monero helper struct Philipp Hoenisch 2020-11-02 16:00:35 +1100
  • 738c67a421
    Simple fund and send in test Philipp Hoenisch 2020-11-02 14:42:08 +1100
  • f5643a4ea4
    Miner working Philipp Hoenisch 2020-11-02 10:02:28 +1100
  • 0dcb4e56be
    Have monerod running in own container Philipp Hoenisch 2020-10-29 12:52:29 +1100
  • 7b101a9c98
    upgrade testcontainers Philipp Hoenisch 2020-10-29 12:52:00 +1100
  • d5c7afd7f8
    Merge pull request #34 from comit-network/no-config rishflab 2020-11-03 16:46:53 +1100
  • a44303f839 Add monerod to config rishflab 2020-11-03 16:08:46 +1100
  • 7afd316210 Construct tor transport for Bob rishflab 2020-11-03 14:54:36 +1100
  • 3b008c38a6 Remove redundant code and stale comments rishflab 2020-11-03 14:33:48 +1100
  • 249f273d1b Remove stale comments rishflab 2020-11-03 11:05:39 +1100
  • 5971ef1f28 Fix clippy warnings rishflab 2020-11-03 11:00:39 +1100
  • 606c48c752 Format swap crate Cargo.toml rishflab 2020-11-03 10:55:54 +1100
  • 796d0b3439 Extract transport creation and remove tor conditional compile rishflab 2020-10-29 22:18:59 +1100
  • 0ca511bf8a Remove hardcoded configuration rishflab 2020-10-29 14:45:45 +1100
  • 62c9f22b64
    Merge pull request #30 from comit-network/use-execution-in-swap Lucas Soriano 2020-11-03 11:07:12 +1100
  • 92c7e8e84f Run swap e2e test without tor feature Lucas Soriano del Pino 2020-11-02 10:31:53 +1100
  • 792fa351c8 Upgrade bitcoin-harness dependency Lucas Soriano del Pino 2020-10-30 15:55:10 +1100
  • 7fa7641feb Clean up some logs and comments Lucas Soriano del Pino 2020-10-30 15:51:46 +1100
  • 4d4acde476 Bubble up an event when Bob receives message 3 response Tobin C. Harding 2020-10-30 09:26:52 +1100
  • a37f43a1ba wip: Provide enough funds to both parties Lucas Soriano del Pino 2020-10-29 21:17:00 +1100
  • eb6bbe6180 wip: Fix bug where bob was sending two amount request Lucas Soriano del Pino 2020-10-29 14:58:51 +1100
  • 9f32cd988e wip: Use same timelock value for refund and punish Lucas Soriano del Pino 2020-10-29 14:58:34 +1100
  • 62c4501926 wip: Add xmr_btc tracing filter Lucas Soriano del Pino 2020-10-29 14:57:20 +1100
  • ae87c10cae wip: fixed message0 Lucas Soriano del Pino 2020-10-29 14:00:00 +1100
  • 119f2a7c54 Add error logging to request_response Tobin C. Harding 2020-10-29 13:59:57 +1100
  • b8ab4b4eee wip: add env filter Tobin C. Harding 2020-10-29 11:36:57 +1100
  • 3e2f0b74a2 Do not trace events meant for other NBs Tobin C. Harding 2020-10-29 10:22:31 +1100
  • c464555f5e Enable trace output Tobin C. Harding 2020-10-29 09:53:46 +1100
  • 39f86154ce Use serde_cbor instead of serde_json Tobin C. Harding 2020-10-29 09:48:54 +1100
  • 2bd4977fe4 Increase read buffer size Tobin C. Harding 2020-10-29 09:39:55 +1100
  • be37725303 monero-harness: Use tracing Tobin C. Harding 2020-10-28 14:19:47 +1100
  • 9384b0cf3c [WIP] Swap app e2e test Lucas Soriano del Pino 2020-10-28 11:46:45 +1100
  • 9e30bd5151 Generate addresses as late as possible Lucas Soriano del Pino 2020-10-28 10:22:09 +1100
  • 3f43581da7 Implement traits Receive{BitcoinRedeemEncsig, TransferProof} Lucas Soriano del Pino 2020-10-27 17:18:19 +1100
  • a4e4c27bee Execute Bob's on-chain protocol after handshake Lucas Soriano del Pino 2020-10-27 13:26:40 +1100
  • 4ee82a5a2a Execute Alice's on-chain protocol after handshake Lucas Soriano del Pino 2020-10-27 12:11:03 +1100
  • 4cbe1e2615
    Remove descriptor from tx_cancel Philipp Hoenisch 2020-10-29 10:03:22 +1100
  • 1e887f3e5a
    Replace descriptor with Pubkey tuple Philipp Hoenisch 2020-10-29 09:56:02 +1100
  • dbd7f2b0c9
    Merge pull request #27 from comit-network/tor-swap Philipp Hoenisch 2020-10-28 13:28:56 +1100
  • b8fd9a734f
    Use full path imports for dependencies to reduce cfg hell Philipp Hoenisch 2020-10-28 11:18:14 +1100
  • a1351e5461 Do not declare 'port' variable Tobin C. Harding 2020-10-28 10:11:04 +1100
  • 464b699426 Fail if user passes in local port for non-tor usage Tobin C. Harding 2020-10-28 09:45:39 +1100
  • 42d194f758 Use fully qualified path for bail Tobin C. Harding 2020-10-28 09:21:37 +1100
  • 5e35904101 Use an option for the local port Tobin C. Harding 2020-10-28 08:38:10 +1100
  • 7f3aa644a0
    Extre CI flag to run clippy for wihtout all features enabled Philipp Hoenisch 2020-10-27 16:02:32 +1100
  • bcefc89aef Add config file rishflab 2020-10-27 12:49:48 +1100
  • 8811a0a205
    Add Tor to main Philipp Hoenisch 2020-10-26 16:55:53 +1100
  • cf8accf30d
    Merge pull request #28 from comit-network/re-work-swap-functions Lucas Soriano 2020-10-27 13:27:52 +1100
  • b22f265cf3 Send back an empty response to Message2 Tobin C. Harding 2020-10-27 10:13:59 +1100
  • 194a19cf1d Add todos Tobin C. Harding 2020-10-27 10:09:53 +1100
  • 6be5d64c1c Remove stale, ugly, type conversion Tobin C. Harding 2020-10-27 10:05:52 +1100
  • 4cfc603786
    Merge pull request #26 from comit-network/more-on-chain-tests Lucas Soriano 2020-10-27 10:22:12 +1100
  • 58aa2b5a2b
    Merge pull request #23 from comit-network/remove-re-export Lucas Soriano 2020-10-27 10:21:58 +1100
  • 8f5a989ad1 Use 'amounts' for local varibale name Tobin C. Harding 2020-10-27 10:05:20 +1100
  • b8130d23a6 Only break if Bob has requested amounts already Tobin C. Harding 2020-10-27 09:59:30 +1100
  • 5da84a3d48
    Merge pull request #25 from comit-network/unused-assigments Tobin C. Harding 2020-10-27 09:55:32 +1100
  • 36ba504129
    Merge pull request #24 from comit-network/alice-state-3 Tobin C. Harding 2020-10-27 09:13:45 +1100
  • 24104d5d35 Test that Alice punishes if Bob is inactive after locking bitcoin Lucas Soriano del Pino 2020-10-26 16:05:30 +1100
  • ba4ae09cd1 Remove allow(unused_assignments) attribute Lucas Soriano del Pino 2020-10-26 15:20:28 +1100
  • cbccc282ef Send Message2 from Bob to Alice Tobin C. Harding 2020-10-26 14:27:41 +1100
  • 90f6c55290
    Merge pull request #22 from comit-network/on-chain-tests Lucas Soriano 2020-10-26 13:47:37 +1100
  • 0dd01c3a3b Do not re-export curve25519_dalek Lucas Soriano del Pino 2020-10-26 13:06:20 +1100
  • cea1af1e1a Take bitcoin_tx_lock_timeout as argument to action generators Lucas Soriano del Pino 2020-10-26 12:03:14 +1100
  • 1d21ae7e7a Use pin_mut! instead of futures::pin_mut! Lucas Soriano del Pino 2020-10-26 11:36:52 +1100
  • aa2a20916e Include Bob being inactive as a reason for failure Lucas Soriano del Pino 2020-10-26 11:33:51 +1100
  • 41e8c7283c Verify Bob's redeem encsig as Alice Lucas Soriano del Pino 2020-10-26 11:27:35 +1100
  • def3399d1c Use while instead of loop Lucas Soriano del Pino 2020-10-26 11:00:33 +1100
  • c86a82b315 Rename action_generator_alice to action_generator Lucas Soriano del Pino 2020-10-26 10:59:28 +1100
  • e84c56378c Test that both parties refund if Alice does not redeem Lucas Soriano del Pino 2020-10-23 23:05:34 +1100
  • 964640154d
    Merge pull request #18 from comit-network/db-dupe-code rishflab 2020-10-26 12:16:46 +1100
  • ec71f98252 Revert re-imports to qualified paths rishflab 2020-10-26 11:45:27 +1100
  • fea6b29da9 Test monero amount serialisation rishflab 2020-10-26 11:14:03 +1100
  • 28ffe063b7 Remove stale comment rishflab 2020-10-26 11:11:00 +1100
  • 82b092d86e Use consensus encoding for monero private key Franck Royer 2020-10-22 15:33:57 +1100
  • 9ea708b2a5 Remove custom implementation of bitcoin amount serde Franck Royer 2020-10-22 15:06:05 +1100
  • 3b14a0e4b3
    Merge pull request #21 from comit-network/integrate-db rishflab 2020-10-26 11:19:06 +1100
  • c781ee949d Move storage into application crate rishflab 2020-10-23 13:13:17 +1100
  • 11a4a7563b
    Merge pull request #19 from comit-network/move-tor Philipp Hoenisch 2020-10-23 13:32:53 +1100
  • 17b32fed90
    Moving tor into swap Philipp Hoenisch 2020-10-23 10:32:48 +1100
  • da5b4bef75
    Merge pull request #20 from comit-network/monero-harness-ports Philipp Hoenisch 2020-10-23 11:52:29 +1100
  • c0109d12cd
    Use lib to ensure ports are free Philipp Hoenisch 2020-10-23 11:28:58 +1100
  • f7bcfa5e14
    Merge pull request #14 from comit-network/db rishflab 2020-10-22 20:08:56 +1100
  • a29786e175 Use external serialisation implementation rishflab 2020-10-22 19:41:52 +1100
  • 03dee7a3ea Generate temp dir for db rishflab 2020-10-22 19:34:53 +1100
  • 3e82211a82 Add database todos rishflab 2020-10-22 19:27:22 +1100
  • 62bc3c0432 Fix rebase conflicts rishflab 2020-10-22 19:25:54 +1100
  • e3b68a3864 Improve database type safety rishflab 2020-10-22 13:34:01 +1100
  • 8eda051087 Remove redundant serialisation implementation rishflab 2020-10-22 09:52:57 +1100
  • 71e09413aa
    Merge pull request #12 from comit-network/on-chain-protocol Tobin C. Harding 2020-10-22 15:52:41 +1100
  • 79c6c8bbef Sort Cargo.toml lines Tobin C. Harding 2020-10-22 15:02:32 +1100
  • ade0e08db6 Merge branch 'master' into on-chain-protocol Tobin C. Harding 2020-10-22 14:49:55 +1100
  • 97363cb05c Fix build after merge Tobin C. Harding 2020-10-22 14:42:36 +1100
  • f8adf6d7e0 Merge branch 'on-chain-protocol' of github.com:comit-network/xmr-btc-swap into on-chain-protocol Tobin C. Harding 2020-10-22 14:33:16 +1100
  • 19f065575d Do a bunch of cleanups Tobin C. Harding 2020-10-22 14:30:10 +1100
  • 6e34f9c978 Use const TIMEOUT instead of an argument Tobin C. Harding 2020-10-22 14:12:49 +1100
  • cc61079826 Use VerifiedAmounts Tobin C. Harding 2020-10-22 13:55:50 +1100
  • eed5e8e9a4 Move monero serde code to lib Tobin C. Harding 2020-10-22 13:54:13 +1100
  • 30298bdf1f Do some more cleanups Tobin C. Harding 2020-10-22 13:48:30 +1100
  • 2059158dad Bump to libp2p v29 Tobin C. Harding 2020-10-22 13:39:18 +1100