trac-peer 0.1.39 → 0.1.41

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "type": "module",
   "dependencies": {
     "assert": "npm:bare-node-assert",
@@ -26,7 +26,7 @@
     "bare-stream": "^2.6.5",
     "bare-subprocess": "^5.0.3",
     "bare-timers": "^3.0.1",
-    "bare-tls": "^2.0.2",
+    "bare-tls": "^2.0.4",
     "bare-tty": "^5.0.2",
     "bare-url": "^2.1.4",
     "bare-utils": "^1.2.0",
@@ -68,7 +68,7 @@
     "stream": "npm:bare-node-stream",
     "timers": "npm:bare-node-timers",
     "tls": "npm:bare-node-tls",
-    "trac-wallet": "^0.0.40",
+    "trac-wallet": "^0.0.42",
     "tty": "npm:bare-node-tty",
     "url": "npm:bare-node-url",
     "util": "npm:bare-node-util",

package/src/feature.js

@@ -20,7 +20,7 @@ class Feature {
     }
 
     async append(key, value){
-        const nonce = Math.random() + '-' + Date.now();
+        const nonce = this.peer.protocol_instance.generateNonce();
         const hash = this.peer.wallet.sign(JSON.stringify(value) + nonce);
         await this.peer.base.append({ type: 'feature', key: this.key + '_' + key, value : {
                 dispatch : {

package/src/functions.js

@@ -125,7 +125,7 @@ export async function setWhitelistStatus(input, peer){
     const splitted = peer.protocol_instance.parseArgs(input)
     const value = ''+splitted.user;
     const status = parseInt(splitted.status) === 1;
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     const signature = { dispatch : {
             type : 'setWhitelistStatus',
             user: value,
@@ -139,7 +139,7 @@ export async function setWhitelistStatus(input, peer){
 export async function enableWhitelist(input, peer){
     const splitted = peer.protocol_instance.parseArgs(input)
     const value = splitted.enabled === 1;
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     const signature = { dispatch : {
             type : 'enableWhitelist',
             enabled: value,
@@ -154,7 +154,7 @@ export async function pinMessage(input, peer){
     const splitted = peer.protocol_instance.parseArgs(input)
     const value = parseInt(splitted.id);
     const pinned = parseInt(splitted.pin) === 1;
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     const signature = { dispatch : {
             type : 'pinMessage',
             id: value,
@@ -169,7 +169,7 @@ export async function deleteMessage(input, peer){
     let address = null;
     const splitted = peer.protocol_instance.parseArgs(input)
     const value = parseInt(splitted.id);
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     const signature = { dispatch : {
             type : 'deleteMessage',
             id: value,
@@ -182,7 +182,7 @@ export async function deleteMessage(input, peer){
 export async function updateAdmin(input, peer){
     const splitted = peer.protocol_instance.parseArgs(input)
     const value = ''+splitted.address === 'null' ? null : ''+splitted.address;
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     const signature = { dispatch : {
             type : 'updateAdmin',
             admin: value,
@@ -196,7 +196,7 @@ export async function setMod(input, peer){
     const splitted = peer.protocol_instance.parseArgs(input)
     const value = ''+splitted.user;
     const mod = parseInt(splitted.mod) === 1;
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     const signature = { dispatch : {
             type : 'setMod',
             user: value,
@@ -211,7 +211,7 @@ export async function muteStatus(input, peer){
     const splitted = peer.protocol_instance.parseArgs(input)
     const value = ''+splitted.user;
     const muted = parseInt(splitted.muted) === 1;
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     const signature = { dispatch : {
             type : 'muteStatus',
             user: value,
@@ -229,7 +229,7 @@ export async function setNick(input, peer){
     if(splitted.user !== undefined){
         user = ''+splitted.user;
     }
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     const signature = { dispatch : {
             type : 'setNick',
             nick: value,
@@ -245,7 +245,7 @@ export async function postMessage(input, peer){
     if(typeof splitted.message === "boolean" || splitted.message === undefined) throw new Error('Empty message not allowed');
     const reply_to = splitted.reply_to !== undefined ? parseInt(splitted.reply_to) : null;
     const value = '' + splitted.message;
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     const signature = { dispatch : {
             type : 'msg',
             msg: value,
@@ -263,7 +263,7 @@ export async function postMessage(input, peer){
 export async function setChatStatus(input, peer){
     const splitted = peer.protocol_instance.parseArgs(input)
     const value = parseInt(splitted.enabled) === 1 ? 'on' : 'off';
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     if(value !== 'on' && value !== 'off') throw new Error('setChatStatus: use on and off values.');
     const msg = { type: 'setChatStatus', key: value }
     const signature = {
@@ -276,7 +276,7 @@ export async function setChatStatus(input, peer){
 export async function setAutoAddWriters(input, peer){
     const splitted = peer.protocol_instance.parseArgs(input)
     const value = parseInt(splitted.enabled) === 1 ? 'on' : 'off';
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     if(value !== 'on' && value !== 'off') throw new Error('setAutoAddWriters: use on and off values.');
     const msg = { type: 'setAutoAddWriters', key: value }
     const signature = {
@@ -295,7 +295,7 @@ export async function addAdmin(input, peer){
 export async function addWriter(input, peer){
     const splitted = input.split(' ');
     const parsed = peer.protocol_instance.parseArgs(input)
-    const nonce = Math.random() + '-' + Date.now();
+    const nonce = peer.protocol_instance.generateNonce();
     if(splitted[0] === '/add_indexer'){
         const msg = { type: 'addIndexer', key: ''+parsed.key }
         const signature = {

package/src/index.js

@@ -217,7 +217,7 @@ export class Peer extends ReadyResource {
                             if(true === verified) {
                                 await _this.contract_instance.execute(op, batch);
                                 await batch.put('sh/'+op.value.dispatch.hash, '');
-                                console.log(`Feature ${op.key} appended`);
+                                //console.log(`Feature ${op.key} appended`);
                             }
                         }
                     } else if (op.type === 'addIndexer') {
@@ -655,7 +655,7 @@ export class Peer extends ReadyResource {
                     msb_tx['msbsl'] = msbsl;
                     msb_tx['ipk'] = this.wallet.publicKey;
                     msb_tx['wp'] = this.validator;
-                    msb_tx['nonce'] = Math.random() + '-' + Date.now();
+                    msb_tx['nonce'] = this.protocol_instance.generateNonce();
                     msb_tx['hash'] = this.wallet.sign(tx + await this.createHash('sha256', jsonStringify(msb_tx['dispatch'])) + msb_tx['nonce']);
                     delete this.tx_pool[tx];
                     delete this.protocol_instance.prepared_transactions_content[tx];

package/src/protocol.js

@@ -1,5 +1,6 @@
 import { formatNumberString, resolveNumberString, jsonStringify, jsonParse, safeClone } from "./functions.js";
 import {ProtocolApi} from './api.js';
+import Wallet from 'trac-wallet';
 
 class Protocol{
     constructor(options = {}) {
@@ -32,6 +33,10 @@ class Protocol{
         return 8_192;
     }
 
+    generateNonce(){
+        return Wallet.generateNonce().toString('hex');
+    }
+
     safeBigInt(value) {
         try{
             return BigInt(value);
@@ -100,7 +105,7 @@ class Protocol{
     async simulateTransaction(obj){
         const storage = new SimStorage(this.peer);
         const null_hex = '0000000000000000000000000000000000000000000000000000000000000000';
-        let nonce = Math.random() + '-' + Date.now();
+        let nonce = this.generateNonce();
         const content_hash = await this.peer.createHash('sha256', JSON.stringify(obj));
         let tx = await this.generateTx(this.peer.bootstrap, this.peer.msb.bootstrap, null_hex,
             this.peer.writerLocalKey, this.peer.wallet.publicKey, content_hash, nonce);
@@ -129,7 +134,7 @@ class Protocol{
             obj.type !== undefined &&
             obj.value !== undefined)
         {
-            this.nonce = Math.random() + '-' + Date.now();
+            this.nonce = this.generateNonce();
             const content_hash = await this.peer.createHash('sha256', JSON.stringify(obj));
             let tx = await this.generateTx(this.peer.bootstrap, this.peer.msb.bootstrap, validator_pub_key,
                 this.peer.writerLocalKey, this.peer.wallet.publicKey, content_hash, this.nonce);