trac-msb 0.0.23 → 0.0.25

package/msb.mjs

@@ -3,8 +3,8 @@ const opts = {
     stores_directory : 'stores/',
     store_name : process.argv[2],
     bootstrap: '8e192d111aee4a29497f2967a4126fdabc2071dc7885a62a82bdfc97b4e4a2e3',
-    channel: Buffer.alloc(32).fill('00botracnetworkmainsettlementbus'),
-    tx : Buffer.alloc(32).fill('botracnetworkmainsettlementbustx')
+    channel: Buffer.alloc(32).fill('00bptracnetworkmainsettlementbus'),
+    tx : Buffer.alloc(32).fill('bptracnetworkmainsettlementbustx')
 };
 
 const msb = new MainSettlementBus(opts);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "src/index.js",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -12,7 +12,7 @@
     "test": "brittle test/*.test.js"
   },
   "dependencies": {
-    "autobase": "7.0.45",
+    "autobase": "7.1.1",
     "b4a": "1.6.7",
     "bare-fs": "4.0.1",
     "brittle": "3.0.0",

package/src/index.js

@@ -67,8 +67,8 @@ export class MainSettlementBus extends ReadyResource {
                         if (null === await view.get(op.key) &&
                             sanitizeTransaction(postTx) &&
                             postTx.op === 'post-tx' &&
-                            crypto.verify(Buffer.from(postTx.tx + postTx.in, 'utf-8'), Buffer.from(postTx.is, 'hex'), Buffer.from(postTx.ipk, 'hex')) &&// sender verification
-                            crypto.verify(Buffer.from(postTx.tx + postTx.wn, 'utf-8'), Buffer.from(postTx.ws, 'hex'), Buffer.from(postTx.wp, 'hex')) &&// writer verification
+                            crypto.verify(Buffer.from(postTx.tx, 'utf-8'), Buffer.from(postTx.is, 'hex'), Buffer.from(postTx.ipk, 'hex')) &&// sender verification
+                            crypto.verify(Buffer.from(postTx.tx, 'utf-8'), Buffer.from(postTx.ws, 'hex'), Buffer.from(postTx.wp, 'hex')) &&// writer verification
                             Buffer.byteLength(JSON.stringify(postTx)) <= 4096
                         ) {
                             await view.put(op.key, op.value);
@@ -116,9 +116,7 @@ export class MainSettlementBus extends ReadyResource {
 
     async updater(){
         while(true){
-            if(this.base.writable){
-                await this.base.append(null);
-            }
+            await this.base.append(null);
             await this.sleep(10_000);
         }
     }
@@ -140,8 +138,6 @@ export class MainSettlementBus extends ReadyResource {
 
             connection.on('data', async (msg) => {
 
-                console.log(Buffer.byteLength(msg));
-
                 if(_this.base.isIndexer) return;
 
                 // TODO: decide if a tx rejection should be responded with
@@ -158,12 +154,11 @@ export class MainSettlementBus extends ReadyResource {
 
                     if (sanitizeTransaction(parsedPreTx) &&
                         parsedPreTx.op === 'pre-tx' &&
-                        crypto.verify(Buffer.from(parsedPreTx.tx + parsedPreTx.in, 'utf-8'), Buffer.from(parsedPreTx.is, 'hex'), Buffer.from(parsedPreTx.ipk, 'hex')) &&
+                        crypto.verify(Buffer.from(parsedPreTx.tx, 'utf-8'), Buffer.from(parsedPreTx.is, 'hex'), Buffer.from(parsedPreTx.ipk, 'hex')) &&
                         parsedPreTx.w === _this.writerLocalKey &&
                         null === await _this.base.view.get(parsedPreTx.tx)
                     ) {
-                        const nonce = Math.random() + '-' + Date.now();
-                        const signature = crypto.sign(Buffer.from(parsedPreTx.tx + nonce, 'utf-8'), Buffer.from(this.wallet.secretKey, 'hex'));
+                        const signature = crypto.sign(Buffer.from(parsedPreTx.tx, 'utf-8'), Buffer.from(this.wallet.secretKey, 'hex'));
                         const append_tx = {
                             op: 'post-tx',
                             tx: parsedPreTx.tx,
@@ -174,7 +169,6 @@ export class MainSettlementBus extends ReadyResource {
                             ch: parsedPreTx.ch,
                             in: parsedPreTx.in,
                             ws: signature.toString('hex'),
-                            wn : nonce,
                             wp: this.wallet.publicKey,
                         };
                         _this.tx_pool.push({ tx: parsedPreTx.tx, append_tx : append_tx });