Revert "plumb through dohash; fix client section"

This reverts commit 3363b5c.

CHANGELOG.md

@@ -1,7 +1,3 @@
-## 2.3.19 (2020-02-21)
-
-- the client field was in the wrong place and didn't agree with Go
-
 ## 2.3.18 (2020-02-05)
 
 - rename WoT attest -> vouch

package.json

@@ -27,7 +27,7 @@
     "iced-error": ">=0.0.9",
     "iced-lock": "^1.0.1",
     "iced-runtime": ">=0.0.1",
-    "kbpgp": ">=2.1.12",
+    "kbpgp": ">=2.1.7",
     "pgp-utils": ">=0.0.22",
     "purepack": "^1.0.4",
     "triplesec": ">=3.0.16"
@@ -36,4 +36,4 @@
     "iced-coffee-script": "^108.0.11",
     "iced-test": "0.0.22"
   }
-}
+}

src/base.iced

@@ -542,7 +542,7 @@ class Base
 
     ret.high_skip = @high_skip if @high_skip?
 
-    ret.client = @client if @client?
+    ret.body.client = @client if @client?
     ret.body.merkle_root = @merkle_root if @merkle_root?
     ret.body.revoke = @revoke if @has_revoke()
 
@@ -574,10 +574,9 @@ class Base
 
   #------
 
-  generate_v2 : (cb, {dohash} = {}) ->
+  generate_v2 : (cb) ->
     # If @seq_type isn't specified, then default to public
     @seq_type or= constants.seq_types.PUBLIC
-    dohash or= false
 
     esc = make_esc cb, "generate"
     out = null
@@ -586,17 +585,17 @@ class Base
     await @generate_json opts, esc defer s, o, expansions
     inner = { str : s, obj : o }
     await @generate_outer { inner }, esc defer outer
-    await @sig_eng.box outer, esc(defer({pgp, raw, armored})), { dohash }
+    await @sig_eng.box outer, esc defer {pgp, raw, armored}
     {short_id, id} = make_ids raw
     out = { pgp, id, short_id, raw, armored, inner, outer, expansions }
     cb null, out
 
   #------
 
-  generate_versioned : ({version, dohash}, cb) ->
+  generate_versioned : ({version}, cb) ->
     switch version
-      when constants.versions.sig_v2 then @generate_v2(cb, {dohash})
-      else @generate(cb, {dohash})
+      when constants.versions.sig_v2 then @generate_v2 cb
+      else @generate cb
 
   #------