Merge #233

233: Fix auto-accept r=D4nte a=D4nte

Upgrade to comit-sdk 0.7.1 to:
- Fix auto-accept issue
- Use swap search by id in negotiation protocol

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]
 
+## Fixed
+- Upgrade `separate_apps` example to comit-sdk 0.7.0 to fix maker auto-accept.
+
 ## [0.5.0] - 2019-11-28
 
 ## Changed

new_project/examples/separate_apps/package.json

@@ -23,7 +23,7 @@
     "dependencies": {
         "@types/express": "^4.17.2",
         "axios": "^0.19.0",
-        "comit-sdk": "^0.7.0",
+        "comit-sdk": "^0.7.1",
         "dotenv": "^8.1.0",
         "express": "^4.17.1",
         "moment": "^2.24.0",

new_project/examples/separate_apps/src/maker.ts

@@ -49,8 +49,6 @@ function createOrder(): Order {
     console.log("[Maker] peer id:", peerId);
     console.log("[Maker] address hint:", addressHint);
 
-    const tryParams: TryParams = { maxTimeoutSecs: 100, tryIntervalSecs: 1 };
-
     // start negotiation protocol handler so that a taker can take the order and receives the latest rate
 
     const makerNegotiator = new MakerNegotiator(
@@ -68,7 +66,7 @@ function createOrder(): Order {
                 ethereum: { network: "regtest" },
             },
         },
-        tryParams
+        { maxTimeoutSecs: 1000, tryIntervalSecs: 0.1 }
     );
 
     const makerHttpApi = new MakerHttpApi(makerNegotiator);
@@ -83,7 +81,7 @@ function createOrder(): Order {
     let swapHandle;
     while (!swapHandle) {
         await new Promise(r => setTimeout(r, 1000));
-        swapHandle = await maker.comitClient.getNewSwaps().then(swaps => {
+        swapHandle = await maker.comitClient.getOngoingSwaps().then(swaps => {
             if (swaps) {
                 return swaps[0];
             } else {
@@ -95,15 +93,6 @@ function createOrder(): Order {
     const swap = await swapHandle.fetchDetails();
     const swapParams = swap.properties!.parameters;
 
-    // only accept a request if it fits to the created order above
-    if (isValid(swapParams, order)) {
-        console.log("Requested order is invalid");
-        await swapHandle.decline(tryParams);
-        process.exit();
-    }
-    console.log("Requested order is still valid");
-    await swapHandle.accept(tryParams);
-
     console.log(
         "Swap started! Swapping %d Ether for %d %s",
         formatEther(swapParams.alpha_asset.quantity),
@@ -113,6 +102,8 @@ function createOrder(): Order {
 
     readLineSync.question("2. Continue?");
 
+    const tryParams: TryParams = { maxTimeoutSecs: 100, tryIntervalSecs: 1 };
+
     console.log(
         "Bitcoin HTLC funded! TXID: ",
         await swapHandle.fund(tryParams)
@@ -132,11 +123,3 @@ function createOrder(): Order {
     );
     process.exit();
 })();
-
-function isValid(swapParams: any, order: Order) {
-    return (
-        swapParams.alpha_asset.name !== order.ask.asset ||
-        swapParams.beta_asset.name !== order.bid.asset ||
-        order.validUntil < moment().unix()
-    );
-}

new_project/examples/separate_apps/yarn.lock

@@ -538,10 +538,10 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-comit-sdk@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.7.0.tgz#08cef516247e130a4eb310698a372635f584e08e"
-  integrity sha512-KTf6H4xJ2cpRh3UwgJFSSE8AGad1cwV6MR8rrYix9Xhr9w600+ShkHMpESk0diIRXdWttRSZkbaBlNXe5fODpg==
+comit-sdk@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.7.1.tgz#1853baef36067214868b289d51af2be7aaaa6994"
+  integrity sha512-M8j6iUf8G9zf7we0aBXSZQz7dvYuUkSUtEPMxlAWinpW+Ll5vAGsAVGlVC7rDFW+k//wk1XmcnQYGQx7omNPdw==
   dependencies:
     axios "^0.19.0"
     bcoin "https://github.com/bcoin-org/bcoin#2496acc7a98a43f00a7b5728eb256877c1bbf001"