@leofcoin/peernet 0.11.15 → 0.11.16

package/dist/commonjs/{http-f3ec9531.js → http-20a16cac.js}

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 var Koa__default = /*#__PURE__*/_interopDefaultLegacy(Koa);
 
-var version = "0.11.14";
+var version = "0.11.15";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),

package/dist/commonjs/peernet.js

@@ -12,7 +12,7 @@ var response = require('./response.js');
 var fetch = require('node-fetch');
 var codec = require('./codec-45796010.js');
 var hash = require('./hash.js');
-var generateAccount = require('@leofcoin/generate-account');
+var MultiWallet$1 = require('@leofcoin/multi-wallet');
 var bs58check = require('bs58check');
 var bip32 = require('bip32');
 var createKeccakHash = require('keccak');
@@ -48,7 +48,7 @@ function _interopNamespace(e) {
 var LeofcoinStorage__default = /*#__PURE__*/_interopDefaultLegacy(LeofcoinStorage);
 var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
 var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
-var generateAccount__default = /*#__PURE__*/_interopDefaultLegacy(generateAccount);
+var MultiWallet__default = /*#__PURE__*/_interopDefaultLegacy(MultiWallet$1);
 var bs58check__default = /*#__PURE__*/_interopDefaultLegacy(bs58check);
 var bs58check__namespace = /*#__PURE__*/_interopNamespace(bs58check);
 var bip32__namespace = /*#__PURE__*/_interopNamespace(bip32);
@@ -1049,6 +1049,43 @@ class DhtEarth {
   }
 }
 
+/**
+ * @params {String} network
+ * @return {object} { identity, accounts, config }
+ */
+var generateAccount = async network => {
+    let wallet = new MultiWallet__default["default"](network);
+    /**
+     * @type {string}
+     */
+    const mnemonic = await wallet.generate();
+
+    wallet = new MultiWallet__default["default"](network);
+    await wallet.recover(mnemonic, network);
+    /**
+     * @type {object}
+     */
+    const account = wallet.account(0);
+    /**
+     * @type {object}
+     */
+    const external = account.external(0);
+    const internal = account.internal(0);
+
+    return {
+      identity: {
+        mnemonic,
+        // multiWIF: wallet.export(),
+        publicKey: external.publicKey,
+        privateKey: external.privateKey,
+        walletId: external.id
+      },
+      accounts: [['main account', external.address, internal.address]]
+      // config: {
+      //  }
+    }
+  };
+
 var testnets = {
   'leofcoin:olivia': {
   	messagePrefix: '\u0019Leofcoin Signed Message:',
@@ -1552,7 +1589,8 @@ class MessageHandler {
     let identity = await walletStore.get('identity');
     identity = JSON.parse(new TextDecoder().decode(identity));
     const wallet = new MultiWallet(this.network);
-    wallet.import(identity.multiWIF);
+    console.log(identity);
+    wallet.recover(identity.mnemonic);
     return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
   }
 
@@ -1758,7 +1796,7 @@ class Peernet {
 					protocol: 'peernet-v0.1.0', host: '127.0.0.1', port: options.port
 				});
 			} else {
-				const http = await Promise.resolve().then(function () { return require('./http-f3ec9531.js'); });
+				const http = await Promise.resolve().then(function () { return require('./http-20a16cac.js'); });
 	      if (environment !== 'browser') http.default(options);
 	    }
 
@@ -1771,7 +1809,7 @@ class Peernet {
       this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
     } catch (e) {
       if (e.code === 'ERR_NOT_FOUND') {
-        const {identity, accounts, config} = await generateAccount__default["default"](this.network);
+        const {identity, accounts, config} = await generateAccount(this.network);
         walletStore.put('version', new TextEncoder().encode(1));
         walletStore.put('accounts', new TextEncoder().encode(accounts));
         walletStore.put('identity', new TextEncoder().encode(JSON.stringify(identity)));
@@ -1860,7 +1898,7 @@ class Peernet {
         const data = new dhtResponse({hash, has});
         const node = await this.prepareMessage(from, data.encoded);
 
-        sendMessage(peer, id, node.encoded);
+        this.sendMessage(peer, id, node.encoded);
       } else if (proto.name === 'peernet-data') {
         let { hash, store } = proto.decoded;
         let data;
@@ -1876,7 +1914,7 @@ class Peernet {
             data = new DataMessageResponse({hash, data});
 
             const node = await this.prepareMessage(from, data.encoded);
-            sendMessage(peer, id, node.encoded);
+            this.sendMessage(peer, id, node.encoded);
           }
         }
 
@@ -1885,7 +1923,7 @@ class Peernet {
         if (method) {
           const data = await method();
           const node = await this.prepareMessage(from, data.encoded);
-          sendMessage(peer, id, node.encoded);
+          this.sendMessage(peer, id, node.encoded);
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
         globalSub.publish(new TextDecoder().decode(proto.decoded.topic), proto.decoded.data);
@@ -2157,7 +2195,7 @@ class Peernet {
     for (const peer of this.connections) {
       if (peer.peerId !== this.peerId) {
         const node = await this.prepareMessage(peer.peerId, data.encoded);
-        sendMessage(peer, id, node.encoded);
+        this.sendMessage(peer, id, node.encoded);
       }
       // TODO: if peer subscribed
     }

package/dist/module/peernet.js

@@ -6,7 +6,7 @@ import bs58 from '@vandeurenglenn/base58';
 import isHex from '@vandeurenglenn/is-hex';
 import varint from 'varint';
 import createKeccakHash from 'keccak';
-import generateAccount from '@leofcoin/generate-account';
+import MultiWallet$1 from '@leofcoin/multi-wallet';
 import * as bs58check from 'bs58check';
 import bs58check__default from 'bs58check';
 import * as bip32 from 'bip32';
@@ -1645,6 +1645,43 @@ class DhtEarth {
   }
 }
 
+/**
+ * @params {String} network
+ * @return {object} { identity, accounts, config }
+ */
+var generateAccount = async network => {
+    let wallet = new MultiWallet$1(network);
+    /**
+     * @type {string}
+     */
+    const mnemonic = await wallet.generate();
+
+    wallet = new MultiWallet$1(network);
+    await wallet.recover(mnemonic, network);
+    /**
+     * @type {object}
+     */
+    const account = wallet.account(0);
+    /**
+     * @type {object}
+     */
+    const external = account.external(0);
+    const internal = account.internal(0);
+
+    return {
+      identity: {
+        mnemonic,
+        // multiWIF: wallet.export(),
+        publicKey: external.publicKey,
+        privateKey: external.privateKey,
+        walletId: external.id
+      },
+      accounts: [['main account', external.address, internal.address]]
+      // config: {
+      //  }
+    }
+  };
+
 var testnets = {
   'leofcoin:olivia': {
   	messagePrefix: '\u0019Leofcoin Signed Message:',
@@ -2148,7 +2185,8 @@ class MessageHandler {
     let identity = await walletStore.get('identity');
     identity = JSON.parse(new TextDecoder().decode(identity));
     const wallet = new MultiWallet(this.network);
-    wallet.import(identity.multiWIF);
+    console.log(identity);
+    wallet.recover(identity.mnemonic);
     return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
   }
 
@@ -2448,7 +2486,7 @@ class Peernet {
         const data = new DHTMessageResponse({hash, has});
         const node = await this.prepareMessage(from, data.encoded);
 
-        sendMessage(peer, id, node.encoded);
+        this.sendMessage(peer, id, node.encoded);
       } else if (proto.name === 'peernet-data') {
         let { hash, store } = proto.decoded;
         let data;
@@ -2464,7 +2502,7 @@ class Peernet {
             data = new DataMessageResponse({hash, data});
 
             const node = await this.prepareMessage(from, data.encoded);
-            sendMessage(peer, id, node.encoded);
+            this.sendMessage(peer, id, node.encoded);
           }
         }
 
@@ -2473,7 +2511,7 @@ class Peernet {
         if (method) {
           const data = await method();
           const node = await this.prepareMessage(from, data.encoded);
-          sendMessage(peer, id, node.encoded);
+          this.sendMessage(peer, id, node.encoded);
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
         globalSub.publish(new TextDecoder().decode(proto.decoded.topic), proto.decoded.data);
@@ -2745,7 +2783,7 @@ class Peernet {
     for (const peer of this.connections) {
       if (peer.peerId !== this.peerId) {
         const node = await this.prepareMessage(peer.peerId, data.encoded);
-        sendMessage(peer, id, node.encoded);
+        this.sendMessage(peer, id, node.encoded);
       }
       // TODO: if peer subscribed
     }

package/index.html

@@ -11,7 +11,7 @@
     <script>
 
       (async () => {
-        const peernet = await new Peernet.default()
+        const peernet = await new Peernet()
         peernet.addRequestHandler('lastBlock', () => new peernet.protos['peernet-response']({response: new TextEncoder().encode(100)}))
       })()
     </script>

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.15",
+  "version": "0.11.16",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",
   "browser": "dist/browser/peernet.js",
   "scripts": {
-    "build": "webpack",
+    "build": "npm run c && webpack",
     "test": "node test/index.js",
     "server": "discovery-swarm-webrtc --port=4000",
     "demo": "jsproject --serve ./ --port 6868",

package/src/handlers/message.js

@@ -21,7 +21,7 @@ export default class MessageHandler {
     let identity = await walletStore.get('identity')
     identity = JSON.parse(new TextDecoder().decode(identity))
     const wallet = new MultiWallet(this.network)
-    wallet.import(identity.multiWIF)
+    wallet.recover(identity.mnemonic)
     return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
   }
 

package/src/peernet.js

@@ -18,7 +18,7 @@ import DHT from './dht/dht.js'
 import Hash from './hash/hash'
 import codecs from './codec/codecs'
 import { protoFor, target } from './utils/utils.js'
-import generateAccount from '@leofcoin/generate-account'
+import generateAccount from './../node_modules/@leofcoin/generate-account/dist/module/generate-account'
 import MessageHandler from './handlers/message.js'
 import { encapsulatedError, dhtError,
   nothingFoundError } from './errors/errors.js'
@@ -283,7 +283,7 @@ export default class Peernet {
         const data = new DHTMessageResponse({hash, has})
         const node = await this.prepareMessage(from, data.encoded)
 
-        sendMessage(peer, id, node.encoded)
+        this.sendMessage(peer, id, node.encoded)
       } else if (proto.name === 'peernet-data') {
         let { hash, store } = proto.decoded
         let data
@@ -299,7 +299,7 @@ export default class Peernet {
             data = new DataMessageResponse({hash, data});
 
             const node = await this.prepareMessage(from, data.encoded)
-            sendMessage(peer, id, node.encoded)
+            this.sendMessage(peer, id, node.encoded)
           }
         } else {
           // ban (trying to access private st)
@@ -310,7 +310,7 @@ export default class Peernet {
         if (method) {
           const data = await method()
           const node = await this.prepareMessage(from, data.encoded)
-          sendMessage(peer, id, node.encoded)
+          this.sendMessage(peer, id, node.encoded)
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
         globalSub.publish(new TextDecoder().decode(proto.decoded.topic), proto.decoded.data)
@@ -583,7 +583,7 @@ export default class Peernet {
     for (const peer of this.connections) {
       if (peer.peerId !== this.peerId) {
         const node = await this.prepareMessage(peer.peerId, data.encoded)
-        sendMessage(peer, id, node.encoded)
+        this.sendMessage(peer, id, node.encoded)
       }
       // TODO: if peer subscribed
     }

package/webpack.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const webpack = require('webpack');
 module.exports = [{
-  entry: './src/peernet.js',
+  entry: './dist/browser/peernet.js',
   mode: 'production',
   plugins: [
     // Work around for Buffer is undefined:

package/dist/browser/326.peernet.js

@@ -1,29 +0,0 @@
-"use strict";
-(self["webpackChunkPeernet"] = self["webpackChunkPeernet"] || []).push([[326],{
-
-/***/ 9326:
-/***/ (function(__unused_webpack_module, exports) {
-
-
-
-exports.MediaStream = window.MediaStream;
-exports.MediaStreamTrack = window.MediaStreamTrack;
-exports.RTCDataChannel = window.RTCDataChannel;
-exports.RTCDataChannelEvent = window.RTCDataChannelEvent;
-exports.RTCDtlsTransport = window.RTCDtlsTransport;
-exports.RTCIceCandidate = window.RTCIceCandidate;
-exports.RTCIceTransport = window.RTCIceTransport;
-exports.RTCPeerConnection = window.RTCPeerConnection;
-exports.RTCPeerConnectionIceEvent = window.RTCPeerConnectionIceEvent;
-exports.RTCRtpReceiver = window.RTCRtpReceiver;
-exports.RTCRtpSender = window.RTCRtpSender;
-exports.RTCRtpTransceiver = window.RTCRtpTransceiver;
-exports.RTCSctpTransport = window.RTCSctpTransport;
-exports.RTCSessionDescription = window.RTCSessionDescription;
-exports.getUserMedia = window.getUserMedia;
-exports.mediaDevices = navigator.mediaDevices;
-
-
-/***/ })
-
-}]);