Commit Graph

  • 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
  • ad006fae6a Do a bunch of cleanups Tobin C. Harding 2020-10-22 13:30:07 +1100
  • 0f17ec076c Add message1 Tobin C. Harding 2020-10-22 13:23:12 +1100
  • 5395303a99 Test on-chain protocol happy path Lucas Soriano del Pino 2020-10-22 10:57:42 +1100
  • 04edbc48e3
    Toml format Philipp Hoenisch 2020-10-22 11:49:03 +1100
  • 590834ca24
    A simple clie proposal Philipp Hoenisch 2020-10-22 11:44:13 +1100
  • a0987ee2b8 Use upstream serder for dleq Proof Tobin C. Harding 2020-10-22 11:19:43 +1100
  • ad0d8d5713 Emit message0 out of NB (both parties) Tobin C. Harding 2020-10-22 11:04:49 +1100
  • ad0d563d93 Use Normal secp256k1::Point Tobin C. Harding 2020-10-22 10:37:06 +1100
  • 0ffd6ba96d
    Merge pull request #13 from comit-network/tor Philipp Hoenisch 2020-10-22 10:17:38 +1100
  • fce0ca3dd2 Merge branch 'on-chain-protocol' of github.com:comit-network/xmr-btc-swap into on-chain-protocol Tobin C. Harding 2020-10-22 10:10:37 +1100
  • bb94643943 Remove data from message until Message0 impl serde Tobin C. Harding 2020-10-22 09:58:22 +1100
  • 7dffe4cf5f Implement Clone on states Tobin C. Harding 2020-10-22 09:18:57 +1100
  • 2a07113074 Fix buld after merge of db branch Tobin C. Harding 2020-10-22 08:28:51 +1100
  • 3e0b40c248 Merge branch 'db' into on-chain-protocol Tobin C. Harding 2020-10-22 08:17:54 +1100
  • ae1ea08bb2
    Make it work on CI Philipp Hoenisch 2020-10-21 17:53:49 +1100
  • e1d8a1c39b
    PR feedback integrated Philipp Hoenisch 2020-10-21 09:55:47 +1100
  • e67e940768
    Split authenticated struct into unauthenticated struct to make it usage more obvious Philipp Hoenisch 2020-10-20 16:36:47 +1100
  • a73f1fcc6f
    Start tor from test Philipp Hoenisch 2020-10-20 16:14:10 +1100
  • 39afb4196b Save and recover protocol state from disk rishflab 2020-10-14 09:32:25 +1100
  • 295216a8ee
    Add Tor feature flag and only run test if enabled Philipp Hoenisch 2020-10-20 14:33:32 +1100
  • 5e19949d71
    Add library to create a Tor service via Tor control port Philipp Hoenisch 2020-10-20 11:43:13 +1100
  • ea064c95b4
    Merge pull request #16 from comit-network/update-deps Lucas Soriano 2020-10-21 16:33:35 +1100
  • d3a7689059 Update comment about minimum stack size Lucas Soriano del Pino 2020-10-21 16:10:20 +1100
  • e5ddec76f7 Increase Rust minimum stack size in CI Lucas Soriano del Pino 2020-10-21 15:52:51 +1100
  • 917aabcc03 Increase Rust minimum stack size a lot more Lucas Soriano del Pino 2020-10-21 16:04:41 +1100
  • 8b48191e1c Increase Rust minimum stack size in CI Lucas Soriano del Pino 2020-10-21 15:55:20 +1100
  • a4ed4321b2 Test CI - Do not merge Tobin C. Harding 2020-10-21 15:27:46 +1100
  • 5250e16b64 Update dependency to cross-curve-dleq and ecdsa_fun Lucas Soriano del Pino 2020-10-21 15:28:50 +1100
  • 04e1dca16a Fix dependency to cross-curve-dleq and ecdsa_fun Lucas Soriano del Pino 2020-10-21 15:14:31 +1100
  • e7504de76c Add state0 -> state1 messages Tobin C. Harding 2020-10-21 14:41:50 +1100
  • f22729c5da Derive Clone/ on initial states and messages Tobin C. Harding 2020-10-21 15:02:37 +1100
  • 08ec776daa Move monero/bitcoin modules to files Tobin C. Harding 2020-10-21 13:01:10 +1100
  • aaf1363c05 Refine peer tracker and amounts protocol Tobin C. Harding 2020-10-20 10:10:28 +1100
  • 47eaa44f76 Remove unneeded From<Never> impl Tobin C. Harding 2020-10-16 12:46:47 +1100
  • 40e97ffdc3 Add todo to check amounts calculation Tobin C. Harding 2020-10-16 12:44:53 +1100
  • 50ed74319f Simplify xmr-btc/tests Monero wallet Lucas Soriano del Pino 2020-10-20 12:18:27 +1100
  • 55629838f4 Implement test function that calls action_generator_alice Lucas Soriano del Pino 2020-10-19 10:44:25 +1100
  • 7c99415cff Write action_generator_alice Lucas Soriano del Pino 2020-10-16 17:04:03 +1100
  • 55ea8f23e2 s/{monero,bitcoin}_ledger/{monero,bitcoin}_client/g Lucas Soriano del Pino 2020-10-16 14:17:10 +1100
  • 9d64f3fd29 Watch the blockchain during Bitcoin refund Lucas Soriano del Pino 2020-10-16 14:16:06 +1100
  • 969ca63081 Split RefundBitcoin into CancelBitcoin and RefundBitcoin Lucas Soriano del Pino 2020-10-16 14:06:25 +1100
  • d813957c5a Rename InsufficientXMR to InsufficientXmr Lucas Soriano del Pino 2020-10-16 14:02:47 +1100
  • bae391ff9c Bubble up unrecoverable errors instead of expecting Lucas Soriano del Pino 2020-10-16 11:43:24 +1100
  • 1251681cfd Calculate amounts from BTC Tobin C. Harding 2020-10-16 12:42:47 +1100
  • e457130b6c Bubble up unrecoverable errors instead of expecting Lucas Soriano del Pino 2020-10-16 11:43:24 +1100
  • 369770488f Document Reason enum Lucas Soriano del Pino 2020-10-16 11:31:16 +1100
  • 7d307e581a Fail the swap early if Bitcoin TxLock is never published Lucas Soriano del Pino 2020-10-16 11:25:41 +1100
  • 9f1bf72c7b Only generate refund action after Bitcoin lock Lucas Soriano del Pino 2020-10-16 11:18:02 +1100
  • c1f6adc8ed Refund if Alice takes too long to prove that Monero has been locked Lucas Soriano del Pino 2020-10-16 10:54:12 +1100
  • 176b2195e3 Make ReceiveTransferProof async and take &mut self Lucas Soriano del Pino 2020-10-16 10:49:34 +1100
  • 3492c46e71 Verify amounts with user Tobin C. Harding 2020-10-16 10:43:32 +1100
  • 05766d3146 Add swap/ Tobin C. Harding 2020-10-16 09:14:39 +1100
  • 4723626fc0 Suppress compiler noise in tests folder Lucas Soriano del Pino 2020-10-15 21:53:55 +1100