Stricter rules for custom user agent

Makefile.am

@@ -40,6 +40,7 @@ libhsk_la_SOURCES = src/addr.c                   \
                     src/error.c                  \
                     src/hash.c                   \
                     src/header.c                 \
+                    src/hesiod.c                 \
                     src/map.c                    \
                     src/msg.c                    \
                     src/poly1305/poly1305.c      \
@@ -52,6 +53,7 @@ libhsk_la_SOURCES = src/addr.c                   \
                     src/sha3.c                   \
                     src/sig0.c                   \
                     src/siphash.c                \
+                    src/store.c                  \
                     src/timedata.c               \
                     src/utils.c                  \
                     src/secp256k1/secp256k1.c
@@ -79,6 +81,7 @@ noinst_PROGRAMS = test_hnsd
 
 test_hnsd_SOURCES = test/hnsd-test.c     \
                     test/base32-test.c   \
+                    test/dns-test.c      \
                     test/resource-test.c
 
 test_hnsd_LDFLAGS = -static

README.md

@@ -304,6 +304,16 @@ and some of them are reqired to be installed manually.
 $ hnsd [options]
 ```
 
+**Reccomended usage:**
+
+```sh
+mkdir ~/.hnsd
+hnsd -t -x ~/.hnsd
+```
+
+This will start hnsd sync from the hard-coded checkpoint and continue to save
+its own checkpoints to disk to ensure rapid chain sync on future boots.
+
 ### Options
 
 ```
@@ -336,6 +346,15 @@ $ hnsd [options]
 -l, --log-file <filename>
   Redirect output to a log file.
 
+-a, --user-agent <string>
+  Add supplemental user agent string in p2p version message.
+
+-t, --checkpoint
+  Start chain sync from checkpoint.
+
+-x, --prefix <directory name>
+  Write/read state to/from disk in given directory.
+
 -d, --daemon
   Fork and background the process.
 

integration/package.json

@@ -1,5 +1,7 @@
 {
   "name": "hnsd_integration_test",
+  "meta": "!! version must match hnsd version in Makefile.am !!",
+  "version": "1.0.0", 
   "scripts": {
     "test": "bmocha --reporter spec test/*.js",
     "test-file": "bmocha --reporter spec"

integration/test-util.js

@@ -1,13 +1,15 @@
 
 'use strict';
 
+const assert = require('bsert');
 const {spawn} = require('child_process');
 const path = require('path');
-const {FullNode} = require('hsd');
+const {FullNode, packets} = require('hsd');
+const wire = require('bns/lib/wire');
 const StubResolver = require('bns/lib/resolver/stub');
 
 class TestUtil {
-  constructor() {
+  constructor(options) {
     this.node = new FullNode({
       memory: true,
       network: 'regtest',
@@ -17,45 +19,76 @@ class TestUtil {
       plugins: [require('hsd/lib/wallet/plugin')]
     });
 
+    this.packets = {};
+    this.node.pool.on('packet', (packet) => {
+      const type = packets.typesByVal[packet.type];
+      if (!this.packets[type])
+        this.packets[type] = [packet];
+      else
+        this.packets[type].push(packet);
+    });
+
     this.wallet = null;
 
     this.resolver = new StubResolver();
     this.resolver.setServers(['127.0.0.1:25349']);
 
     this.hnsd = null;
     this.hnsdHeight = 0;
+    this.hnsdArgsBase = ['-s', '127.0.0.1:10000'];
+    this.hnsdArgs = this.hnsdArgsBase;
+  }
+
+  extraArgs(args) {
+    assert(Array.isArray(args));
+    this.hnsdArgs = this.hnsdArgs.concat(args);
   }
 
   async open() {
+    await this.resolver.open();
     await this.node.open();
     await this.node.connect();
 
     this.wallet = this.node.plugins.walletdb;
 
-    this.hnsd = spawn(
-      path.join(__dirname, '..', 'hnsd'),
-      ['-s', '127.0.0.1:10000']
-    );
-
-    this.hnsd.stdout.on('data', (data) => {
-      // TODO: `data` is always 8192 bytes and output gets cut off, why?
-      const chunk = data.toString('ascii');
-      const lines = chunk.split(/\n/);
-
-      for (const line of lines) {
-        const words = line.split(/\s+/);
+    return this.openHNSD();
+  }
 
-        if (words[0] !== 'chain' || words.length < 2)
-          continue;
+  async close() {
+    this.closeHNSD();
+    await this.node.close();
+  }
 
-        this.hnsdHeight = parseInt(words[1].slice(1, -2));
-      }
+  async openHNSD() {
+    return new Promise((resolve, reject) => {
+      this.hnsd = spawn(
+        path.join(__dirname, '..', 'hnsd'),
+        this.hnsdArgs,
+        {stdio: 'ignore'} // pro tip: switch to 'inherit' to see hnsd output
+      );
+
+      this.hnsd.on('spawn', () => resolve(this.hnsd));
+      this.hnsd.on('error', e => reject(e));
     });
   }
 
-  async close() {
+  closeHNSD() {
+    if (!this.hnsd)
+      return;
+
     this.hnsd.kill('SIGKILL');
-    await this.node.close();
+    this.hnsd = null;
+  }
+
+  async restartHNSD(args) {
+    this.closeHNSD();
+
+    if (args) {
+      assert(Array.isArray(args));
+      this.hnsdArgs = this.hnsdArgsBase.concat(args);
+    }
+
+    return this.openHNSD();
   }
 
   async getWalletAddress() {
@@ -88,21 +121,38 @@ class TestUtil {
     await this.generate(12); // safe root
   }
 
-  waitForSync() {
-    return new Promise((resolve, reject) => {
-      // Hack
-      setTimeout(() => {
-        resolve();
-      }, 5000);
-
-    // // TODO: Fix hnsd stdout parsing for chain height
-    //   setTimeout(() => {
-    //     reject(new Error('Timeout waiting for sync'));
-    //   }, 5000);
-    //   setInterval(() => {
-    //     if (this.hnsdHeight === this.node.chain.height)
-    //       resolve();
-    //   }, 100);
+  async resolveHS(name) {
+    const qs = wire.Question.fromJSON({
+      name,
+      class: 'HS',
+      type: 'TXT'
+    });
+
+    const {answer} = await this.resolver.resolve(qs);
+    assert(answer && answer.length);
+    return answer[0].data.txt[0];
+  }
+
+  async getHeights() {
+    const hnsd = this.hnsd
+                 ? await this.resolveHS('height.tip.chain.hnsd.')
+                 : 0;
+
+    return {
+      hnsd: parseInt(hnsd),
+      hsd: this.node.chain.height
+    };
+  }
+
+  async waitForSync() {
+    const {hsd, hnsd} = await this.getHeights();
+    if (hsd === hnsd)
+      return hnsd;
+
+    return new Promise(async (resolve) => {
+      setTimeout(async () => {
+        resolve(this.waitForSync());
+      }, 100);
     });
   }
 }