Merge pull request #348 from lightninglabs/loop-0-17-no-btcec-v2

mod+itest: bump loop and lnd dependencies

Author: guggero

README.md

@@ -70,6 +70,7 @@ Lightning Terminal is backwards compatible with `lnd` back to version v0.13.3-be
 
 | LiT              | LND          |
 |------------------| ------------ |
+| **v0.6.6-alpha** | v0.13.3-beta |
 | **v0.6.5-alpha** | v0.13.3-beta |
 | **v0.6.4-alpha** | v0.13.3-beta |
 | **v0.6.3-alpha** | v0.13.3-beta |
@@ -113,8 +114,9 @@ The following table shows the supported combinations:
 
 ## Daemon Versions packaged with LiT
 
-| LiT              | LND          | Loop        | Faraday      | Pool         |
-|------------------|--------------| ----------- | ------------ |--------------|
+| LiT              | LND          | Loop         | Faraday      | Pool         |
+|------------------|--------------|--------------| ------------ |--------------|
+| **v0.6.6-alpha** | v0.14.3-beta | v0.18.0-beta | v0.2.7-alpha | v0.5.6-alpha |
 | **v0.6.5-alpha** | v0.14.2-beta | v0.15.1-beta | v0.2.7-alpha | v0.5.5-alpha |
 | **v0.6.4-alpha** | v0.14.2-beta | v0.15.1-beta | v0.2.7-alpha | v0.5.4-alpha |
 | **v0.6.3-alpha** | v0.14.2-beta | v0.15.1-beta | v0.2.7-alpha | v0.5.4-alpha |
@@ -132,5 +134,5 @@ The following table shows the supported combinations:
 | **v0.3.1-alpha** | v0.11.1-beta | v0.11.1-beta | v0.2.2-alpha | v0.3.3-alpha |
 | **v0.3.0-alpha** | v0.11.1-beta | v0.11.0-beta | v0.2.2-alpha | v0.3.2-alpha |
 | **v0.2.0-alpha** | v0.11.1-beta | v0.10.0-beta | v0.2.1-alpha | n/a          |
-| **v0.1.1-alpha** | v0.11.0-beta | v0.8.1-beta | v0.2.0-alpha | n/a          |
-| **v0.1.0-alpha** | v0.10.3-beta | v0.6.5-beta | v0.2.0-alpha | n/a          |
+| **v0.1.1-alpha** | v0.11.0-beta | v0.8.1-beta  | v0.2.0-alpha | n/a          |
+| **v0.1.0-alpha** | v0.10.3-beta | v0.6.5-beta  | v0.2.0-alpha | n/a          |

app/scripts/build-protos.js

@@ -42,7 +42,8 @@ const protoSources = async () => {
   return {
     lnd: `lightningnetwork/lnd/${lndVersion[1]}/lnrpc/lightning.proto`,
     loop: `lightninglabs/loop/${loopVersion[1]}/looprpc/client.proto`,
-    common: `lightninglabs/loop/${loopVersion[1]}/looprpc/common.proto`,
+    'swapserverrpc/server': `lightninglabs/loop/${loopVersion[1]}/swapserverrpc/server.proto`,
+    'swapserverrpc/common': `lightninglabs/loop/${loopVersion[1]}/swapserverrpc/common.proto`,
     trader: `lightninglabs/pool/${poolVersion[1]}/poolrpc/trader.proto`,
     'auctioneerrpc/auctioneer': `lightninglabs/pool/${poolVersion[1]}/auctioneerrpc/auctioneer.proto`,
   };
@@ -58,7 +59,11 @@ const filePatches = {
     patch: 'looprpc: {}',
     folder: 'proto',
   },
-  common: {
+  'swapserverrpc/common': {
+    patch: 'looprpc: {}',
+    folder: 'proto'
+  },
+  'swapserverrpc/server': {
     patch: 'looprpc: {}',
     folder: 'proto',
   },
@@ -109,12 +114,15 @@ const sanitize = async () => {
   );
   for (path of filePaths) {
     let content = (await fs.readFile(path)).toString();
-    content = content.replace(/^\s*(repeated)? u?int64 ((?!jstype).)*$/gm, match => {
-      // add the jstype descriptor
-      return /^.*];$/.test(match)
-        ? match.replace(/\s*];$/, `, jstype = JS_STRING];`)
-        : match.replace(/;$/, ` [jstype = JS_STRING];`);
-    });
+    content = content.replace(
+        /^(\s*)(repeated )?(u?int64) (\S+) = (\d+);$/gm, 
+        '$1$2$3 $4 = $5 [jstype = JS_STRING];'
+    );
+    content = content.replace(
+        /^(\s*)(repeated )?(u?int64) (\S+) = (\d+) \[((?!jstype).*)];$/gm, 
+        '$1$2$3 $4 = $5 [$6, jstype = JS_STRING];'
+    );
+    content = content.replace("import \"common.proto\"", "import \"swapserverrpc/common.proto\"")
     await fs.writeFile(path, content);
   }
 };