fix: RPC msg.from is now binary

package.json

@@ -54,6 +54,7 @@
   },
   "dependencies": {
     "async": "^2.6.0",
+    "bs58": "^4.0.1",
     "debug": "^3.1.0",
     "length-prefixed-stream": "^1.5.1",
     "libp2p-crypto": "~0.10.3",

src/index.js

@@ -93,7 +93,6 @@ class FloodSub extends EventEmitter {
     peer.attachConnection(conn)
 
     // Immediately send my own subscriptions to the newly established conn
-    console.log('subs', this.subscriptions)
     peer.sendSubscriptions(this.subscriptions)
     setImmediate(() => callback())
   }
@@ -138,7 +137,7 @@ class FloodSub extends EventEmitter {
     const msgs = rpc.msgs
 
     if (msgs && msgs.length) {
-      this._processRpcMessages(rpc.msgs)
+      this._processRpcMessages(utils.normalizeInRpcMessages(rpc.msgs))
     }
 
     if (subs && subs.length) {
@@ -206,7 +205,7 @@ class FloodSub extends EventEmitter {
         return
       }
 
-      peer.sendMessages(messages)
+      peer.sendMessages(utils.normalizeOutRpcMessages(messages))
 
       log('publish msgs on topics', topics, peer.info.id.toB58String())
     })

src/message/rpc.proto.js

@@ -10,7 +10,7 @@ message RPC {
   }
 
   message Message {
-    optional string from = 1;
+    optional bytes from = 1;
     optional bytes data = 2;
     optional bytes seqno = 3;
     repeated string topicCIDs = 4; // CID of topic descriptor object

src/utils.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const crypto = require('libp2p-crypto')
+const bs58 = require('bs58')
 
 exports = module.exports
 
@@ -66,3 +67,29 @@ exports.ensureArray = (maybeArray) => {
 
   return maybeArray
 }
+
+exports.normalizeInRpcMessages = (messages) => {
+  if (!messages) {
+    return messages;
+  }
+  return messages.map((msg) => {
+    const m = Object.assign({}, msg)
+    if (Buffer.isBuffer(msg.from)) {
+      m.from = bs58.encode(msg.from)
+    }
+    return m;
+  })
+}
+
+exports.normalizeOutRpcMessages = (messages) => {
+  if (!messages) {
+    return messages;
+  }
+  return messages.map((msg) => {
+    const m = Object.assign({}, msg)
+    if (typeof msg.from === 'string' || msg.from instanceof String) {
+      m.from = bs58.decode(msg.from)
+    }
+    return m;
+  })
+}

test/utils.spec.js

@@ -40,4 +40,32 @@ describe('utils', () => {
     expect(utils.ensureArray('hello')).to.be.eql(['hello'])
     expect(utils.ensureArray([1, 2])).to.be.eql([1, 2])
   })
+
+  it('converts an IN msg.from to b58', () => {
+    let binaryId = Buffer.from('1220e2187eb3e6c4fb3e7ff9ad4658610624a6315e0240fc6f37130eedb661e939cc', 'hex')
+    let stringId = 'QmdZEWgtaWAxBh93fELFT298La1rsZfhiC2pqwMVwy3jZM'
+    const m = [
+      { from: binaryId },
+      { from: stringId }
+    ]
+    const expected = [
+      { from: stringId },
+      { from: stringId }
+    ];
+    expect(utils.normalizeInRpcMessages(m)).to.deep.eql(expected)
+  })
+
+  it('converts an OUT msg.from to binary', () => {
+    let binaryId = Buffer.from('1220e2187eb3e6c4fb3e7ff9ad4658610624a6315e0240fc6f37130eedb661e939cc', 'hex')
+    let stringId = 'QmdZEWgtaWAxBh93fELFT298La1rsZfhiC2pqwMVwy3jZM'
+    const m = [
+      { from: binaryId },
+      { from: stringId }
+    ]
+    const expected = [
+      { from: binaryId },
+      { from: binaryId }
+    ];
+    expect(utils.normalizeOutRpcMessages(m)).to.deep.eql(expected)
+  })
 })