trac-msb 0.0.82 → 0.0.83

package/Whitelist/pubkeys.csv

@@ -2,4 +2,5 @@ e247a9ceefb8a83e28d3c5845055910bc61e0b418c7578d297354708f276af04
 580c44d7827fbeeb7778e4d2dce660b30f3ca3baa4de254ecd556dfb5b60fc35
 a3590854889d059927fed4dfdf329b75447bc9f5885b6a843b317d1c2d38258a
 dd2f83c9cb1d146c8be6c1d98822cbbb3f631a0659b765c9e4564960acf6e228
-726b2885e551a98c20b37675b113476390f57321768a303e1b6c029ffca509a9
+726b2885e551a98c20b37675b113476390f57321768a303e1b6c029ffca509a9
+7da7f48e1c805b551fd69a2b6e59b99c00740dea699c66e10b88bd1efb932815

package/package.json

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

package/src/network.js

@@ -64,32 +64,33 @@ class Network {
         try{
             dhtServer.on('connection', function (connection) {
                 connection.on('message', async (msg) =>  {
-                    msg = b4a.toString(msg, 'utf-8');
-                    msg = JSON.parse(msg);
-                    if(msg === 'get_writer_key'){
-                        await connection.send(b4a.from(JSON.stringify({op:'writer_key', key : writingKey})));
-                    } else if(msg.op !== undefined && msg.message !== undefined && msg.op === 'add_writer'){
-                        const adminEntry = await msb.getSigned(EntryType.ADMIN);
-                        const nodeEntry = await msb.getSigned(msg.message.pk);
-                        const isAlreadyWriter = !!(nodeEntry && nodeEntry.isWriter);
-                        const isAllowedToRequestRole = await msb.isAllowedToRequestRole(msg.message.pk, adminEntry);
-                        const canAddWriter = !!(!base.writable && !isAlreadyWriter && isAllowedToRequestRole);
-                        if(null !== adminEntry && adminEntry.tracPublicKey === wallet.publicKey
-                            && msg.message.pk !== wallet.publicKey && canAddWriter){
-                            await base.append(msg.message);
-                        }
-                    } else {
-                        if (base.isIndexer || !base.writable) return;
+                    try{
+                        msg = b4a.toString(msg, 'utf-8');
+                        msg = JSON.parse(msg);
+                        if(msg === 'get_writer_key'){
+                            await connection.send(b4a.from(JSON.stringify({op:'writer_key', key : writingKey})));
+                        } else if(msg.op !== undefined && msg.message !== undefined && msg.op === 'add_writer'){
+                            msg = msg.value;
+                            const adminEntry = await msb.getSigned(EntryType.ADMIN);
+                            const nodeEntry = await msb.getSigned(msg.message.pub);
+                            const isAlreadyWriter = !!(nodeEntry && nodeEntry.isWriter);
+                            const isAllowedToRequestRole = await msb.isAllowedToRequestRole(msg.message.pub, adminEntry);
+                            const canAddWriter = !!(!base.writable && !isAlreadyWriter && isAllowedToRequestRole);
+                            if(null !== adminEntry && adminEntry.tracPublicKey === wallet.publicKey
+                                && msg.message.pub !== wallet.publicKey && canAddWriter){
+                                await base.append(msg.message);
+                            }
+                        } else {
+                            if (base.isIndexer || !base.writable) return;
 
-                        // TODO: decide if a tx rejection should be responded with
-                        if (networkInstance.tx_pool.length >= 1000) {
-                            console.log('pool full');
-                            return
-                        }
+                            // TODO: decide if a tx rejection should be responded with
+                            if (networkInstance.tx_pool.length >= 1000) {
+                                console.log('pool full');
+                                return
+                            }
 
-                        if (b4a.byteLength(msg) > 3072) return;
+                            if (b4a.byteLength(msg) > 3072) return;
 
-                        try {
                             const parsedPreTx = msg;
 
                             if (networkInstance.check.sanitizePreTx(parsedPreTx) &&
@@ -116,11 +117,11 @@ class Network {
                                 };
                                 networkInstance.tx_pool.push({ tx: parsedPreTx.tx, append_tx: append_tx });
                             }
-                        } catch (e) {
-                            console.log(e)
                         }
+                        //await connection.destroy();
+                    }catch(e){
+                        console.log(e);
                     }
-                    //await connection.destroy();
                 });
                 connection.on('close', () => { });
                 connection.on('error', (error) => { });

package/src/utils/check.js

@@ -69,7 +69,7 @@ class Check {
             value: {
                 $$strict: true,
                 $$type: "object",
-                pk: { type: 'is_hex_string', length: 64, required: true },
+                pub: { type: 'is_hex_string', length: 64, required: true },
                 wk: { type: 'is_hex_string', length: 64, required: true },
                 nonce: { type: 'string', min: 1, max: 256, required: true },
                 sig: { type: 'is_hex_string', length: 128, required: true },

package/src/utils/msgUtils.js

@@ -39,7 +39,7 @@ class MsgUtils {
                 msg = this.createMessage(wallet.publicKey, keyParam, nonce, operationType);
                 hash = await createHash('sha256', msg);
                 value = {
-                    pk : wallet.publicKey,
+                    pub : wallet.publicKey,
                     wk: keyParam,
                     nonce: nonce,
                     sig: wallet.sign(hash)