fix equihash usage, minor test fixes

lilyannehall · Nov 20, 2024 · d673dce · d673dce
1 parent 64e1d06
commit d673dce
Show file tree

Hide file tree

Showing 10 changed files with 1,492 additions and 954 deletions.
diff --git a/bin/kadence.js b/bin/kadence.js
@@ -183,13 +183,20 @@ async function _init() {
   );
 
   // If identity is not solved yet, start trying to solve it
-//  if (!identity.validate()) {
-    logger.warn('eclipse plugin is busted , equihash bindings are old and incompatible with gcc-11')
-    // logger.warn(`identity proof not yet solved, this can take a while`);
-    // await identity.solve();
-    // fs.writeFileSync(config.IdentityNoncePath, identity.nonce.toString());
-    // fs.writeFileSync(config.IdentityProofPath, identity.proof);
-//  }
+  let identityHasValidProof = false;
+
+  try {
+    identityHasValidProof = await identity.validate();
+  } catch (err) {
+    logger.error(err.message);
+  }
+
+  if (!identityHasValidProof) {
+    logger.warn(`identity proof not yet solved, this can take a while`);
+    await identity.solve();
+    fs.writeFileSync(config.IdentityNoncePath, identity.nonce.toString());
+    fs.writeFileSync(config.IdentityProofPath, identity.proof);
+  }
 
   init();
 }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,6 @@ services:
       - ./bin:/root/kadence/bin
       - ./lib:/root/kadence/lib
       - ./index.js:/root/kadence/index.js
-      - ./node_modules:/root/kadence/node_modules
       - ./package.json:/root/kadence/package.json
     ports:
       - "6274:5274"
@@ -32,7 +31,6 @@ services:
       - ./bin:/root/kadence/bin
       - ./lib:/root/kadence/lib
       - ./index.js:/root/kadence/index.js
-      - ./node_modules:/root/kadence/node_modules
       - ./package.json:/root/kadence/package.json
   kadence-3:
     build:
@@ -47,7 +45,6 @@ services:
       - ./bin:/root/kadence/bin
       - ./lib:/root/kadence/lib
       - ./index.js:/root/kadence/index.js
-      - ./node_modules:/root/kadence/node_modules
       - ./package.json:/root/kadence/package.json
   kadence-4:
     build:
@@ -62,7 +59,6 @@ services:
       - ./bin:/root/kadence/bin
       - ./lib:/root/kadence/lib
       - ./index.js:/root/kadence/index.js
-      - ./node_modules:/root/kadence/node_modules
       - ./package.json:/root/kadence/package.json
   kadence-5:
     build:
@@ -77,5 +73,4 @@ services:
       - ./bin:/root/kadence/bin
       - ./lib:/root/kadence/lib
       - ./index.js:/root/kadence/index.js
-      - ./node_modules:/root/kadence/node_modules
       - ./package.json:/root/kadence/package.json
diff --git a/lib/plugin-eclipse.js b/lib/plugin-eclipse.js
@@ -53,7 +53,7 @@ class EclipseIdentity extends EventEmitter {
 
   /**
    * Validates the
-   * @returns {boolean}
+   * @returns {Promise<boolean>}
    */
   validate() {
     return utils.eqverify(utils.hash256(this.pubkey),

diff --git a/lib/plugin-traverse.js b/lib/plugin-traverse.js
@@ -80,8 +80,13 @@ class TraversePlugin {
    * @private
    */
   _testIfReachable(callback) {
-    if (!ip.isPublic(this.node.contact.hostname)) {
-      this.node.logger.warn('traversal strategy failed, not reachable');
+    try {
+      if (!ip.isPublic(this.node.contact.hostname)) {
+        this.node.logger.warn('traversal strategy failed, not reachable');
+        return callback(null, false);
+      }
+    } catch (err) {
+      this.node.logger.warn(err.message);
       return callback(null, false);
     }
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -14,6 +14,7 @@ const assert = require('node:assert');
 const { randomBytes, createHash } = crypto;
 const ms = require('ms');
 const equihash = require('@tacticalchihuahua/equihash');
+const onionRegex = require('onion-regex');
 
 
 /**
@@ -327,7 +328,8 @@ module.exports.isValidContact = function(contact, loopback) {
   const [, info] = contact;
   const isValidAddr = ip.isV4Format(info.hostname) ||
                       ip.isV6Format(info.hostname) ||
-                      ip.isPublic(info.hostname);
+                      ip.isPublic(info.hostname) ||
+                      onionRegex.v3({ exact: true }).test(info.hostname);
   const isValidPort = info.port > 0;
   const isAllowedAddr = ip.isLoopback(info.hostname) ? !!loopback : true;