fix: validate with inline keys

Author: jacobheun

packages/ipfs/src/core/ipns/resolver.js

@@ -99,34 +99,7 @@ class IpnsResolver {
       throw errcode(new Error('found ipns record that we couldn\'t convert to a value'), 'ERR_INVALID_RECORD_RECEIVED')
     }
 
-    // if the record has a public key validate it
-    if (ipnsEntry.pubKey) {
-      return this._validateRecord(peerId, ipnsEntry)
-    }
-
-    // Otherwise, try to get the public key from routing
-    let pubKey
-    try {
-      pubKey = await this._routing.get(routingKey.toBuffer())
-    } catch (err) {
-      log.error(err)
-
-      if (err.code === ERR_NOT_FOUND) {
-        throw errcode(new Error(`public key requested for ${name} was not found in the network`), 'ERR_NO_RECORD_FOUND')
-      }
-
-      throw errcode(new Error(`unexpected error getting the public key for the ipns record ${peerId.id}`), 'ERR_UNEXPECTED_ERROR_GETTING_PUB_KEY')
-    }
-
-    try {
-      // Insert it into the peer id, in order to be validated by IPNS validator
-      peerId.pubKey = crypto.keys.unmarshalPublicKey(pubKey)
-    } catch (err) {
-      log.error(err)
-
-      throw errcode(new Error('found public key record that we couldn\'t convert to a value'), 'ERR_INVALID_PUB_KEY_RECEIVED')
-    }
-
+    // We should have the public key by now (inline, or in the entry)
     return this._validateRecord(peerId, ipnsEntry)
   }
 

packages/ipfs/test/core/name-pubsub.js

@@ -18,6 +18,12 @@ const factory = require('../utils/factory')
 const namespace = '/record/'
 const ipfsRef = '/ipfs/QmPFVLPmp9zv5Z5KUqLhe2EivAGccQW2r7M7jhVJGLZoZU'
 
+const daemonsOptions = {
+  ipfsOptions: {
+    EXPERIMENTAL: { ipnsPubsub: true }
+  }
+}
+
 describe('name-pubsub', function () {
   const df = factory()
   // TODO make this work in the browser and between daemon and in-proc in nodes
@@ -33,8 +39,8 @@ describe('name-pubsub', function () {
     this.timeout(40 * 1000)
 
     nodes = await Promise.all([
-      df.spawn({ type: 'proc', ipfsOptions: { pass: nanoid(), EXPERIMENTAL: { ipnsPubsub: true } } }),
-      df.spawn({ type: 'proc', ipfsOptions: { pass: nanoid(), EXPERIMENTAL: { ipnsPubsub: true } } })
+      df.spawn({ ...daemonsOptions }),
+      df.spawn({ ...daemonsOptions })
     ])
 
     nodeA = nodes[0].api