From d27cf9234d7db9aa51600802a055a7a22691dc1f Mon Sep 17 00:00:00 2001 From: kilrau <19181985+kilrau@users.noreply.github.com> Date: Sat, 23 May 2020 17:57:57 +0200 Subject: [PATCH 1/4] fix: karl review --- 02-peer-protocol.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02-peer-protocol.md b/02-peer-protocol.md index 24f363f..8b2eaec 100644 --- a/02-peer-protocol.md +++ b/02-peer-protocol.md @@ -164,13 +164,13 @@ The `NodeStateUpdate` message is used to tell a peer about a change in the node The sender's list of trading pair symbols, constructed with the base currency first, followed by a '/' separator and the quote currency (e.g., [“LTC/BTC”, “DAI/BTC”]) `string connext_address = 3` - The sender's connext address + The sender's connext public key (e.g. `indra123abc`) `map lnd_pub_keys = 4` The sender's list of LND public keys `map token_identifiers = 5` - Mapping between currency symbols to token identifiers such as LND chains or connext token contract address (e.g., { BTC: 'bitcoin-mainnet', LTC: 'litecoin-mainnet' }) + Mapping between currency symbols and chain identifiers or ETH-ERC20 token contract addresses (e.g., { BTC: 'bitcoin-mainnet', LTC: 'litecoin-mainnet', ETH:,'0x0000000000000000000000000000000000000000' }) `map lnd_uris = 6` Mapping between currency symbols to LND listening URIs (should be reachable from the internet e.g., { BTC: ['2w526cyown43ovsvsojdowheqmukbykrexzyccp6v6j4pm5ve3hjzrid.onion:9735'], LTC: '['lndltc.kilrau.com:9735', 'qiyibtczmuhutusmygvc2injxl7v4yfcodwj3pft63edycud5gr3giad.onion:10735']' }) From 3c46af0d649e155437ddebfeaabaa5e1f1ba4148 Mon Sep 17 00:00:00 2001 From: kilrau <19181985+kilrau@users.noreply.github.com> Date: Mon, 25 May 2020 10:52:00 +0200 Subject: [PATCH 2/4] fix: remove opendex lightning node --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 1163550..fcf06f3 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,3 @@ ## Support & Community * [Contribute](Contribute.md) * Chat with us on [Discord](https://discord.gg/RnXFHpn) -* Open a BTC ⚡-channel with us: -``` -03be58f20b39b40775ac06058bf94250575e8606c72b58f71baf6af35683acc879@yjpkcnfkn73xtnmunbxwhxdmcp25cjvqq4veoefdeapp7h7qtrfskfid.onion:9735 -``` From ee9c8bea159066e4c32ec06ae5882f07b8c8659b Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 25 May 2020 15:25:52 +0000 Subject: [PATCH 3/4] replaced reference to raiden with connext --- 02-peer-protocol.md | 4 ++-- 04-swap-protocol.md | 2 +- README.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/02-peer-protocol.md b/02-peer-protocol.md index cc224b5..ae49019 100644 --- a/02-peer-protocol.md +++ b/02-peer-protocol.md @@ -163,8 +163,8 @@ The `NodeStateUpdate` message is used to tell a peer about a change in the node `repeated string pairs = 2` The sender's list of trading pair symbols, constructed with the base currency first, followed by a '/' separator and the quote currency (e.g., [“LTC/BTC”, “DAI/BTC”]) - `string raiden_address = 3` - The sender's Raiden address + `string connext_address = 3` + The sender's Connext address `map lnd_pub_keys = 4` The sender's list of LND public keys diff --git a/04-swap-protocol.md b/04-swap-protocol.md index 6a78c94..49107f3 100644 --- a/04-swap-protocol.md +++ b/04-swap-protocol.md @@ -2,7 +2,7 @@ ## Overview -Once an order match is found in the taker’s order book, the swap protocol should be initiated. The current swap protocol assumes that the taker and maker are connected via a payment channel network (e.g. the [Lightning](http://lightning.network/) or [Raiden Network](https://raiden.network/)) with sufficient balance available for the swap. The following is the swap protocol's "happy" flow: +Once an order match is found in the taker’s order book, the swap protocol should be initiated. The current swap protocol assumes that the taker and maker are connected via a payment channel network (e.g. the [Lightning](http://lightning.network/) or [Connext Network](https://connext.network/)) with sufficient balance available for the swap. The following is the swap protocol's "happy" flow: 1. Taker finds a match, e.g. buying 1 BTC for 10k DAI 2. Taker creates the private `r_preimage` and the public `r_hash` for the atomic swap diff --git a/README.md b/README.md index b0e6ccd..7ea545d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![](/images/OpenDEX_Full_Transparent.png) -**OpenDEX is a global network for unstoppable P2P trading of cryptocurrencies and tokens.** It is built on top of the [Lightning](https://lightning.network/) and [Raiden](https://raiden.network/) network and at its core, it is a set of open protocol specifications, called **BOLD**. BOLD stands for: Basis of L3 DEX. The naming is intentionally derived from [BOLT](https://github.com/lightningnetwork/lightning-rfc), the Lightning Network specifications and role model of OpenDEX. These specifications ensure that OpenDEX nodes remain compatible and users of different software implementations are able to trade with each other. **OpenDEX is not a company** or any other sort of legal entity, it is an open community of motivated individuals maintaining the BOLD specifications. OpenDEX was started because we believe there should be only one DEX, **one global trading network**, not hundreds. Find the slides from the first public announcement at #hcpp19 in Prague [here](201901005_hcpp19.pdf) and the video recording [here](https://www.youtube.com/watch?v=euSr9A6tI90). +**OpenDEX is a global network for unstoppable P2P trading of cryptocurrencies and tokens.** It is built on top of the [Lightning](https://lightning.network/) and [Connext](https://connext.network/) networks and at its core, it is a set of open protocol specifications, called **BOLD**. BOLD stands for: Basis of L3 DEX. The naming is intentionally derived from [BOLT](https://github.com/lightningnetwork/lightning-rfc), the Lightning Network specifications and role model of OpenDEX. These specifications ensure that OpenDEX nodes remain compatible and users of different software implementations are able to trade with each other. **OpenDEX is not a company** or any other sort of legal entity, it is an open community of motivated individuals maintaining the BOLD specifications. OpenDEX was started because we believe there should be only one DEX, **one global trading network**, not hundreds. Find the slides from the first public announcement at #hcpp19 in Prague [here](201901005_hcpp19.pdf) and the video recording [here](https://www.youtube.com/watch?v=euSr9A6tI90). ## Get Started -> [Read the BOLD specifications](00-introduction.md) @@ -20,7 +20,7 @@ * Direct, peer-to-peer trading. * Order book locally aggregates orders from peers in the network. * Own orders are matched locally with peer orders. -* Instant order settlement via atomic swaps on lightning/raiden. +* Instant order settlement via atomic swaps on Lightning/Connext. * User has complete control over private keys. * [Tor](https://www.torproject.org/) by default preserves privacy. * Supports individual traders, market makers, exchanges, anyone. From 659cea9113664522e2eef85b1b6d18a537cd084b Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 25 May 2020 15:34:17 +0000 Subject: [PATCH 4/4] wording --- 04-swap-protocol.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/04-swap-protocol.md b/04-swap-protocol.md index 49107f3..15602ac 100644 --- a/04-swap-protocol.md +++ b/04-swap-protocol.md @@ -2,7 +2,7 @@ ## Overview -Once an order match is found in the taker’s order book, the swap protocol should be initiated. The current swap protocol assumes that the taker and maker are connected via a payment channel network (e.g. the [Lightning](http://lightning.network/) or [Connext Network](https://connext.network/)) with sufficient balance available for the swap. The following is the swap protocol's "happy" flow: +Once an order match is found in the taker’s order book, the swap protocol should be initiated. The current swap protocol assumes that the taker and maker are connected via a payment channel network (e.g. [Lightning](http://lightning.network/) or [Connext](https://connext.network/)) with sufficient balance available for the swap. The following is the swap protocol's "happy" flow: 1. Taker finds a match, e.g. buying 1 BTC for 10k DAI 2. Taker creates the private `r_preimage` and the public `r_hash` for the atomic swap