Support tendermint 0.31

A few small changes.

Fix create_empty_blocks and make sure we do not
submit duplicate validator (pubKey) entries to abci.

Related #184

lotion/lib/abci-app.js

@@ -59,7 +59,8 @@ async function runTx(
 
 function updateAndDiffValidators(validators, newValidators) {
   const diffs = [];
-  const push = validator => {
+  const pubKeys = {};
+  const push = (validator) => {
     diffs.push({
       pubKey: {
         type: validator.pubKey.type,
@@ -70,17 +71,31 @@ function updateAndDiffValidators(validators, newValidators) {
   };
 
   for (const key in newValidators) {
-    if (validators[key] === undefined) {
-      validators[key] = newValidators[key];
-      push(validators[key]);
-    } else if (
-      typeof newValidators[key] === 'number' &&
-      validators[key].power !== newValidators[key]
+    const numberOrObj = newValidators[key];
+    let validator = validators[key];
+
+    if (
+      typeof numberOrObj === 'number' &&
+      validator &&
+      validator.power !== numberOrObj
     ) {
-      validators[key].power = newValidators[key];
-      push(validators[key]);
+      validator.power = numberOrObj;
+    } else {
+      validator = numberOrObj;
+      validators[key] = validator;
+    }
+
+    // can also be 0
+    if (validator) {
+      pubKeys[validator.pubKey.data] = validator;
     }
   }
+
+  // why do we have different validator addrs with the same pubKey?
+  for (const key in pubKeys) {
+    push(pubKeys[key]);
+  }
+
   return diffs;
 }
 

lotion/lib/node-info.js

@@ -3,7 +3,7 @@ const { join } = require('path');
 
 module.exports = lotionPath => {
   const validatorKeyInfo = JSON.parse(
-    fs.readFileSync(join(lotionPath, 'config/priv_validator.json'))
+    fs.readFileSync(join(lotionPath, 'config/priv_validator_key.json'))
   );
 
   const pubkeyAminoPrefix = Buffer.from('1624DE6220', 'hex');

lotion/lib/tendermint.js

@@ -28,7 +28,7 @@ module.exports = async ({
     );
   }
   if (keys) {
-    const validatorJsonPath = join(lotionPath, 'config', 'priv_validator.json');
+    const validatorJsonPath = join(lotionPath, 'config', 'priv_validator_key.json');
     const generatedValidatorJson = JSON.parse(
       fs.readFileSync(validatorJsonPath, { encoding: 'utf8' })
     );
@@ -62,7 +62,7 @@ module.exports = async ({
   }
   opts.consensus = {};
   if (createEmptyBlocks === false) {
-    opts.consensus.createEmptyBlocks = false;
+    opts.consensus.create_empty_blocks = false;
   }
 
   if (!logTendermint) {

src/api/methods/getAddress.js

@@ -8,7 +8,7 @@ module.exports = async (bridgeState, app) => {
   const validatorKeyPath = path.join(
     app.lotionPath(),
     'config',
-    'priv_validator.json'
+    'priv_validator_key.json'
   );
   const validatorKey = JSON.parse(await readFile(validatorKeyPath, 'utf-8'));
   const validatorID = Buffer.from(

src/utils/cleanupLotion.js

@@ -15,7 +15,7 @@ module.exports = async app => {
   const lotionPath = app.lotionPath();
   if (await exists(lotionPath)) {
     const configPath = path.join(lotionPath, 'config');
-    const privValidatorPath = path.join(configPath, 'priv_validator.json');
+    const privValidatorPath = path.join(configPath, 'priv_validator_key.json');
     const privValidator = JSON.parse(await readFile(privValidatorPath));
     await writeFile(
       privValidatorPath,

src/utils/printStartupInfo.js

@@ -27,7 +27,7 @@ module.exports = async (params, bridgeState) => {
   const validatorKeyPath = path.join(
     params.lotionPath,
     'config',
-    'priv_validator.json'
+    'priv_validator_key.json'
   );
 
   const validatorKey = JSON.parse(await readFile(validatorKeyPath, 'utf-8'));