trac-msb 0.0.46 → 0.0.48

package/msb.mjs

@@ -3,7 +3,7 @@ import MainSettlementBus from './src/index.js';
 const opts = {
     stores_directory : 'stores/',
     store_name : typeof process !== "undefined" ? process.argv[2] : Pear.config.args[0],
-    bootstrap: '2cad3a1aeffd0db5eabc8169da8873800f4c2187299b06fffb4059caeddcdd21',
+    bootstrap: '28e0189443903bd066fbddb1276aafd57177340696349534de2b5448eb8b871f',
     channel: '00bptracnetworkmainsettlementbus',
     tx : 'bptracnetworkmainsettlementbustx'
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"

package/src/index.js

@@ -65,10 +65,11 @@ export class MainSettlementBus extends ReadyResource {
                     const postTx = op.value;
                     if (op.type === 'tx') {
                         if (null === await view.get(op.key) &&
-                            sanitizeTransaction(postTx) &&
                             postTx.op === 'post-tx' &&
-                            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
+                            sanitizeTransaction(postTx) &&
+                            hccrypto.verify(b4a.from(postTx.tx + postTx.in, 'utf-8'), b4a.from(postTx.is, 'hex'), b4a.from(postTx.ipk, 'hex')) &&
+                            hccrypto.verify(b4a.from(postTx.tx + postTx.wn, 'utf-8'), b4a.from(postTx.ws, 'hex'), b4a.from(postTx.wp, 'hex')) &&
+                            postTx.tx === await _this.generateTx(postTx.bs, postTx.w, postTx.i, postTx.ipk, postTx.ch, postTx.in) &&
                             b4a.byteLength(JSON.stringify(postTx)) <= 4096
                         ) {
                             await view.put(op.key, op.value);
@@ -171,6 +172,7 @@ export class MainSettlementBus extends ReadyResource {
                             ipk: parsedPreTx.ipk,
                             ch: parsedPreTx.ch,
                             in: parsedPreTx.in,
+                            bs: parsedPreTx.bs,
                             ws: signature.toString('hex'),
                             wp: this.wallet.publicKey,
                             wn : nonce
@@ -276,6 +278,16 @@ export class MainSettlementBus extends ReadyResource {
         }
     }
 
+    async generateTx(bootstrap, validator_writer_key, local_writer_key, local_public_key, content_hash, nonce){
+        let tx = bootstrap + '-' +
+            validator_writer_key + '-' +
+            local_writer_key + '-' +
+            local_public_key + '-' +
+            content_hash + '-' +
+            nonce;
+        return await this.peer.createHash('sha256', await this.peer.createHash('sha256', tx));
+    }
+
     async verifyDag() {
         try {
             console.log('--- DAG Monitoring ---');