Add validator token to config (RIPD-1386)

bin/python/ripple/util/Sign.py

@@ -2,7 +2,7 @@
 
 from __future__ import print_function
 
-import base64, os, random, struct, sys
+import base64, binascii, json, os, random, struct, sys
 import ed25519
 import ecdsa
 import hashlib
@@ -188,9 +188,14 @@ def perform_check(s, print=print):
 
 def perform_sign(
         seq, validation_pk_human, validation_sk_human, master_sk_human, print=print):
-    print('[validation_manifest]')
-    print(wrap(get_signature(
-        int(seq), validation_pk_human, validation_sk_human, master_sk_human)))
+    manifest = get_signature(
+            int(seq), validation_pk_human, validation_sk_human, master_sk_human)
+
+    print('[validator_token]')
+    print(wrap(base64.b64encode(json.dumps({
+        "validation_secret_key": binascii.b2a_hex(Base58.decode_version(validation_sk_human)[1]),
+        "manifest": manifest},
+        separators=(',', ':')))))
 
 def perform_verify(
         seq, validation_pk_human, master_pk_human, signature, print=print):

bin/python/ripple/util/ValidatorManifestTest.py

@@ -104,9 +104,7 @@ n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C    RL3
 n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS    RL4
 n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA    RL5
 
-[validation_seed]
-{validation_seed}
-#vaidation_public_key: {validation_public_key}
+#validation_public_key: {validation_public_key}
 
 # Other rippled's trusting this validator need this key
 [validator_keys]
@@ -119,8 +117,8 @@ n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA    RL5
 expire = 1
 auto_connect = 1
 
-[validation_manifest]
-{validation_manifest}
+[validator_token]
+{validator_token}
 
 [rpc_startup]
 {{ "command": "log_level", "severity": "debug" }}
@@ -201,7 +199,7 @@ def sign_manifest(seq, validation_pk, master_secret):
     result = []
     for l in r.splitlines():
         l.strip()
-        if not l or l == '[validation_manifest]':
+        if not l or l == '[validator_token]':
             continue
         result.append(l)
     return '\n'.join(result)
@@ -430,7 +428,7 @@ def new_config_ephemeral_key(
         if rm_dbs and os.path.exists(db_dir):
             shutil.rmtree(db_dir)
             os.makedirs(db_dir)
-        # replace the validation_manifest section with `signed`
+        # replace the validator_token section with `signed`
         bak = config_file + '.bak'
         if is_windows() and os.path.isfile(bak):
             os.remove(bak)
@@ -440,7 +438,7 @@ def new_config_ephemeral_key(
             with open(config_file, 'w') as out:
                 for l in src:
                     sl = l.strip()
-                    if not in_manifest and sl == '[validation_manifest]':
+                    if not in_manifest and sl == '[validator_token]':
                         in_manifest = True
                     elif in_manifest:
                         if sl.startswith('[') or sl.startswith('#'):
@@ -539,7 +537,7 @@ def get_configs(manifest_seq):
         sibling_ip = '127.0.0.1'
         sibling_port = port_nums[sibling_index][1]
         d = {
-            'validation_manifest': s,
+            'validator_token': s,
             'all_validator_keys': all_validator_keys,
             'node_db_type': node_db_type,
             'node_db_path': node_db_path,

bin/python/ripple/util/test_Sign.py

@@ -141,9 +141,13 @@ class test_Sign(TestCase):
         Sign.perform_sign(self.SEQUENCE, public, private, private, print=self.print)
         self.assertEquals(
             self.results,
-            [[['[validation_manifest]'], {}],
-             [['JAAAABdxIe2DIKUZd9jDjKikknxnDfWCHkSXYZReFenvsmoVCdIw6nMhAnZ2dnZ2dnZ2dnZ2\n'
-               'dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dkYwRAIgXyobHA8sDQxmDJNLE6HIaARlzvcd79/wT068\n'
-               'e113gUkCIHkI540JQT2LHwAD7/y3wFE5X3lEXMfgZRkpLZTxkpticBJAzo5VrUEr0U47sHvu\n'
-               'IjbrINLCTM6pAScA899G9kpMWexbXv1ceIbTP5JH1HyQmsZsROTeHR0irojvYgx7JLaiAA=='],
+            [[['[validator_token]'], {}],
+             [['eyJ2YWxpZGF0aW9uX3ByaXZhdGVfa2V5IjoiNmI2YjZiNmI2YjZiNmI2YjZiNmI2Yj\n'
+               'ZiNmI2YjZiNmI2YjZiNmI2YjZiNmI2YjZiNmI2YjZiNmI2YjZiNmI2YiIsIm1hbmlm\n'
+               'ZXN0IjoiSkFBQUFCZHhJZTJESUtVWmQ5akRqS2lra254bkRmV0NIa1NYWVpSZUZlbn\n'
+               'ZzbW9WQ2RJdzZuTWhBbloyZG5aMmRuWjJkbloyZG5aMmRuWjJkbloyZG5aMmRuWjJk\n'
+               'bloyZG5aMmRrWXdSQUlnWHlvYkhBOHNEUXhtREpOTEU2SElhQVJsenZjZDc5L3dUMD\n'
+               'Y4ZTExM2dVa0NJSGtJNTQwSlFUMkxId0FENy95M3dGRTVYM2xFWE1mZ1pSa3BMWlR4\n'
+               'a3B0aWNCSkF6bzVWclVFcjBVNDdzSHZ1SWpicklOTENUTTZwQVNjQTg5OUc5a3BNV2\n'
+               'V4Ylh2MWNlSWJUUDVKSDFIeVFtc1pzUk9UZUhSMGlyb2p2WWd4N0pMYWlBQT09In0='],
               {}]])