Merge #208

208: Replace local negotiation protocol with the comit-sdk one r=D4nte a=D4nte

See comit-network/comit-js-sdk#60 for the SDK changes.
To be finalised once sdk changes are released.

Resolves #128

Co-authored-by: Franck Royer <franck@coblox.tech>

Author: bors[bot]

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Changed
+- `separate_apps` example now uses the negotiation protocol provided by comit-sdk.
+
 ## [0.4.0] - 2019-11-20
 
 ### Fixed

new_project/examples/separate_apps/src/maker.ts

@@ -1,26 +1,28 @@
+import {
+    MakerHttpApi,
+    MakerNegotiator,
+} from "comit-sdk/dist/src/negotiation/maker_negotiator";
+import { Order } from "comit-sdk/dist/src/negotiation/order";
 import { formatEther } from "ethers/utils";
 import moment from "moment";
 import readLineSync from "readline-sync";
 import { toBitcoin } from "satoshi-bitcoin-ts";
 import { checkEnvFile, startClient } from "./lib";
-import { NegotiationProtocolHandler, Order } from "./negotiation";
 
 function createOrder(): Order {
     return {
         id: "123",
-        key: "ETH-BTC",
+        tradingPair: "ETH-BTC",
         valid_until: moment().unix() + 300,
         ask: {
             amount: "9000000000000000000",
             asset: "ether",
             ledger: "ethereum",
-            network: "regtest",
         },
         bid: {
             amount: "100000000",
             asset: "bitcoin",
             ledger: "bitcoin",
-            network: "regtest",
         },
     };
 }
@@ -48,25 +50,29 @@ function createOrder(): Order {
 
     // start negotiation protocol handler so that a taker can take the order and receives the latest rate
 
-    const negotiationProtocolHandler = new NegotiationProtocolHandler(
+    const makerNegotiator = new MakerNegotiator(
+        maker.comitClient,
         {
-            connection_info: {
+            peer: {
                 peer_id: peerId,
                 address_hint: addressHint,
             },
-            expiries: {
-                ask_expiry: moment().unix() + 7200,
-                bid_expiry: moment().unix() + 3600,
+            alpha_expiry: moment().unix() + 7200,
+            beta_expiry: moment().unix() + 3600,
+            ledgers: {
+                bitcoin: { network: "regtest" },
+                // TODO: It should be possible to use the chain_id
+                ethereum: { network: "regtest" },
             },
-            role: "alice",
-            swap_id: "SOME_RANDOM_ID",
         },
-        2318
-    ); // CoBloX Founding Date 🚀
+        { timeout: 100000, tryInterval: 1000 }
+    );
+
+    const makerHttpApi = new MakerHttpApi(makerNegotiator);
 
-    negotiationProtocolHandler.start();
+    makerHttpApi.listen(2318);
     const order = createOrder();
-    negotiationProtocolHandler.addOrder(order);
+    makerNegotiator.addOrder(order);
 
     const invitationDetails = `http://localhost:2318/orders/ETH-BTC`;
     console.log(`Waiting for someone taking my order at: ${invitationDetails}`);

new_project/examples/separate_apps/src/negotiation.ts

@@ -1,13 +1,11 @@
-import { SwapRequest } from "comit-sdk";
+import {
+    MakerClient,
+    TakerNegotiator,
+} from "comit-sdk/dist/src/negotiation/taker_negotiator";
 import { formatEther } from "ethers/utils";
 import readLineSync from "readline-sync";
 import { toBitcoin } from "satoshi-bitcoin-ts";
-import { Actor, checkEnvFile, startClient } from "./lib";
-import {
-    ExecutionParams,
-    NegotiationProtocolClient,
-    Order,
-} from "./negotiation";
+import { checkEnvFile, startClient } from "./lib";
 
 (async function main() {
     checkEnvFile(process.env.DOTENV_CONFIG_PATH!);
@@ -24,16 +22,25 @@ import {
 
     readLineSync.question("0. Ready?");
 
+    const takerNegotiator = new TakerNegotiator();
+    const makerClient = new MakerClient("http://localhost:2318/");
+
     // take an order from a maker
-    const negotiationProtocolClient = new NegotiationProtocolClient();
-    const {
-        order,
-        execution_params,
-    } = await negotiationProtocolClient.startNegotiation(
-        "http://localhost:2318/orders",
-        "ETH-BTC"
+    // Accept any order
+    const isOrderAcceptable = () => true;
+    const { order, swap } = await takerNegotiator.negotiateAndSendRequest(
+        taker.comitClient,
+        makerClient,
+        "ETH-BTC",
+        isOrderAcceptable
     );
 
+    if (!swap) {
+        throw new Error("Could not find an order or something else went wrong");
+    }
+
+    const swapMessage = await swap.getEntity();
+    const swapParameters = swapMessage.properties!.parameters;
     const ether = formatEther(order.ask.amount);
     const bitcoin = toBitcoin(order.bid.amount);
     console.log(
@@ -44,33 +51,23 @@ import {
         bitcoin
     );
 
-    const swapMessage = createSwap(taker, order, execution_params);
-
-    const swapHandle = await taker.comitClient.sendSwap(swapMessage);
-
     const actionConfig = { timeout: 100000, tryInterval: 1000 };
 
     console.log(
         "Swap started! Swapping %d %s for %d %s",
-        formatEther(swapMessage.alpha_asset.quantity),
-        swapMessage.alpha_asset.name,
-        toBitcoin(swapMessage.beta_asset.quantity),
-        swapMessage.beta_asset.name
+        formatEther(swapParameters.alpha_asset.quantity),
+        swapParameters.alpha_asset.name,
+        toBitcoin(swapParameters.beta_asset.quantity),
+        swapParameters.beta_asset.name
     );
 
     readLineSync.question("1. Continue?");
 
-    console.log(
-        "Ethereum HTLC funded! TXID: ",
-        await swapHandle.fund(actionConfig)
-    );
+    console.log("Ethereum HTLC funded! TXID: ", await swap.fund(actionConfig));
 
     readLineSync.question("3. Continue?");
 
-    console.log(
-        "Bitcoin redeemed! TXID: ",
-        await swapHandle.redeem(actionConfig)
-    );
+    console.log("Bitcoin redeemed! TXID: ", await swap.redeem(actionConfig));
 
     console.log("Swapped!");
     console.log(
@@ -82,37 +79,3 @@ import {
     );
     process.exit();
 })();
-
-function createSwap(
-    actor: Actor,
-    order: Order,
-    executionParams: ExecutionParams
-): SwapRequest {
-    const refundAddress = actor.ethereumWallet.getAccount();
-
-    return {
-        alpha_ledger: {
-            name: order.ask.ledger,
-            network: order.ask.network,
-        },
-        beta_ledger: {
-            name: order.bid.ledger,
-            network: order.bid.network,
-        },
-        alpha_asset: {
-            name: order.ask.asset,
-            quantity: order.ask.amount,
-        },
-        beta_asset: {
-            name: order.bid.asset,
-            quantity: order.bid.amount,
-        },
-        alpha_ledger_refund_identity: refundAddress,
-        alpha_expiry: executionParams.expiries.ask_expiry,
-        beta_expiry: executionParams.expiries.bid_expiry,
-        peer: {
-            peer_id: executionParams.connection_info.peer_id,
-            address_hint: executionParams.connection_info.address_hint,
-        },
-    };
-}