trac-msb 0.0.44 → 0.0.45

package/msb.mjs

@@ -4,8 +4,8 @@ const opts = {
     stores_directory : 'stores/',
     store_name : typeof process !== "undefined" ? process.argv[2] : Pear.config.args[0],
     bootstrap: 'e442c6aadc8419c2439552ebecc79ffdc993dd816f9d2d6f562eef56e71ab9ba',
-    channel: Buffer.alloc(32).fill('00bptracnetworkmainsettlementbus'),
-    tx : Buffer.alloc(32).fill('bptracnetworkmainsettlementbustx')
+    channel: '00bptracnetworkmainsettlementbus',
+    tx : 'bptracnetworkmainsettlementbustx'
 };
 
 const msb = new MainSettlementBus(opts);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.0.44",
+  "version": "0.0.45",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -12,6 +12,7 @@
     "test": "brittle test/*.test.js"
   },
   "dependencies": {
+    "trac-wallet": "^0.0.33",
     "autobase": "7.0.45",
     "b4a": "1.6.7",
     "bare": "^1.17.1",
@@ -28,12 +29,11 @@
     "protomux-wakeup": "^2.2.1",
     "ready-resource": "^1.0.0",
     "safety-catch": "1.0.2",
-    "trac-wallet": "^0.0.32",
     "xache": "1.2.0",
     "bare-assert": "^1.0.2",
     "bare-buffer": "^3.1.2",
     "bare-console": "^6.0.1",
-    "bare-crypto": "^1.4.1",
+    "bare-crypto": "^1.4.2",
     "bare-events": "^2.5.4",
     "bare-fs": "^4.0.2",
     "bare-http1": "^4.0.2",
@@ -49,22 +49,23 @@
     "bare-subprocess": "^5.0.3",
     "bare-timers": "^3.0.1",
     "bare-tls": "^2.0.2",
-    "bare-tty": "^5.0.2",
+    "bare-tty": "^3.2.0",
     "bare-url": "^2.1.4",
     "bare-utils": "^1.2.0",
     "bare-worker": "^3.0.0",
     "bare-zlib": "^1.2.5",
+    "worker_threads": "npm:bare-node-worker-threads",
+    "crypto": "npm:bare-node-crypto",
     "assert": "npm:bare-node-assert",
     "buffer": "npm:bare-node-buffer",
     "child_process": "npm:bare-node-child-process",
     "console": "npm:bare-node-console",
-    "crypto": "npm:bare-node-crypto",
     "events": "npm:bare-node-events",
     "fs": "npm:bare-node-fs",
     "http": "npm:bare-node-http",
     "https": "npm:bare-node-https",
-    "inspector": "npm:bare-node-inspector",
     "module": "npm:bare-node-module",
+    "inspector": "npm:bare-node-inspector",
     "os": "npm:bare-node-os",
     "path": "npm:bare-node-path",
     "process": "npm:bare-node-process",
@@ -76,7 +77,6 @@
     "tty": "npm:bare-node-tty",
     "url": "npm:bare-node-url",
     "util": "npm:bare-node-util",
-    "worker_threads": "npm:bare-node-worker-threads",
     "zlib": "npm:bare-node-zlib"
   },
   "publishConfig": {

package/src/index.js

@@ -11,6 +11,8 @@ import w from 'protomux-wakeup';
 import PeerWallet from "trac-wallet"
 import Corestore from 'corestore';
 import tty from 'tty'
+// removed until PEAR desktop bare-crypto package is fixed
+//import crypto from 'crypto'
 
 const wakeup = new w();
 
@@ -22,14 +24,14 @@ export class MainSettlementBus extends ReadyResource {
         this.KEY_PAIR_PATH = `${this.STORES_DIRECTORY}${options.store_name}/db/keypair.json`
         this.store = new Corestore(this.STORES_DIRECTORY + options.store_name);
         this.swarm = null;
-        this.tx = options.tx || null;
+        this.tx = b4a.alloc(32).fill(options.tx) || null;
         this.tx_pool = [];
         this.enable_txchannel = typeof options.enable_txchannel !== "undefined" && options.enable_txchannel === false ? false : true;
         this.enable_wallet = typeof options.enable_wallet !== "undefined" && options.enable_wallet === false ? false : true;
         this.enable_updater = typeof options.enable_updater !== "undefined" && options.enable_updater === false ? false : true;
         this.base = null;
         this.key = null;
-        this.channel = options.channel || null;
+        this.channel = b4a.alloc(32).fill(options.channel) || null;
         this.connectedNodes = 1;
         this.replicate = options.replicate !== false;
         this.writerLocalKey = null;
@@ -67,9 +69,9 @@ export class MainSettlementBus extends ReadyResource {
                         if (null === await view.get(op.key) &&
                             sanitizeTransaction(postTx) &&
                             postTx.op === 'post-tx' &&
-                            hccrypto.verify(Buffer.from(postTx.tx + postTx.in, 'utf-8'), Buffer.from(postTx.is, 'hex'), Buffer.from(postTx.ipk, 'hex')) &&// sender verification
-                            hccrypto.verify(Buffer.from(postTx.tx + postTx.wn, 'utf-8'), Buffer.from(postTx.ws, 'hex'), Buffer.from(postTx.wp, 'hex')) &&// writer verification
-                            Buffer.byteLength(JSON.stringify(postTx)) <= 4096
+                            hccrypto.verify(b4a.from(postTx.tx + postTx.in, 'utf-8'), b4a.from(postTx.is, 'hex'), b4a.from(postTx.ipk, 'hex')) &&// sender verification
+                            hccrypto.verify(b4a.from(postTx.tx + postTx.wn, 'utf-8'), b4a.from(postTx.ws, 'hex'), b4a.from(postTx.wp, 'hex')) &&// writer verification
+                            b4a.byteLength(JSON.stringify(postTx)) <= 4096
                         ) {
                             await view.put(op.key, op.value);
                             console.log(`TX: ${op.key} appended. Signed length: `,  _this.base.view.core.signedLength);
@@ -96,7 +98,7 @@ export class MainSettlementBus extends ReadyResource {
         }
         console.log('View Length:', this.base.view.core.length);
         console.log('View Signed Length:', this.base.view.core.signedLength);
-        console.log('MSB Key:', new Buffer(this.base.view.core.key).toString('hex'));
+        console.log('MSB Key:', b4a.toString(this.base.view.core.key, 'hex'));
         this.writerLocalKey = b4a.toString(this.base.local.key, 'hex');
         if (this.replicate) await this._replicate();
         if (this.enable_txchannel) {
@@ -148,7 +150,7 @@ export class MainSettlementBus extends ReadyResource {
                     return
                 }
 
-                if(Buffer.byteLength(msg) > 3072) return;
+                if(b4a.byteLength(msg) > 3072) return;
 
                 try {
 
@@ -156,12 +158,12 @@ export class MainSettlementBus extends ReadyResource {
 
                     if (sanitizeTransaction(parsedPreTx) &&
                         parsedPreTx.op === 'pre-tx' &&
-                        hccrypto.verify(Buffer.from(parsedPreTx.tx + parsedPreTx.in, 'utf-8'), Buffer.from(parsedPreTx.is, 'hex'), Buffer.from(parsedPreTx.ipk, 'hex')) &&
+                        hccrypto.verify(b4a.from(parsedPreTx.tx + parsedPreTx.in, 'utf-8'), b4a.from(parsedPreTx.is, 'hex'), b4a.from(parsedPreTx.ipk, 'hex')) &&
                         parsedPreTx.w === _this.writerLocalKey &&
                         null === await _this.base.view.get(parsedPreTx.tx)
                     ) {
                         const nonce = Math.random() + '-' + Date.now();
-                        const signature = hccrypto.sign(Buffer.from(parsedPreTx.tx + nonce, 'utf-8'), Buffer.from(this.wallet.secretKey, 'hex'));
+                        const signature = hccrypto.sign(b4a.from(parsedPreTx.tx + nonce, 'utf-8'), b4a.from(this.wallet.secretKey, 'hex'));
                         const append_tx = {
                             op: 'post-tx',
                             tx: parsedPreTx.tx,
@@ -250,13 +252,16 @@ export class MainSettlementBus extends ReadyResource {
     }
 
     async createHash(type, message){
+        if(type === 'sha256'){
+            const out = b4a.alloc(sodium.crypto_hash_sha256_BYTES);
+            sodium.crypto_hash_sha256(out, b4a.from(message));
+            return b4a.toString(out, 'hex');
+        }
         let createHash = null;
-        console.log(message.toLowerCase());
-        if(typeof crypto.subtle !== 'undefined'){
+        if(global.Pear !== undefined){
             let _type = '';
             switch(type.toLowerCase()){
                 case 'sha1': _type = 'SHA-1'; break;
-                case 'sha256': _type = 'SHA-256'; break;
                 case 'sha384': _type = 'SHA-384'; break;
                 case 'sha512': _type = 'SHA-512'; break;
                 default: throw new Error('Unsupported algorithm.');
@@ -269,7 +274,7 @@ export class MainSettlementBus extends ReadyResource {
                 .map((b) => b.toString(16).padStart(2, "0"))
                 .join("");
         } else {
-            return createHash(type).update(message).digest('hex')
+            return crypto.createHash(type).update(message).digest('hex')
         }
     }