trac-peer 0.0.82 → 0.0.84

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.0.82",
+  "version": "0.0.84",
   "type": "module",
   "dependencies": {
     "autobase": "7.0.45",
@@ -23,7 +23,7 @@
     "ready-resource": "^1.0.0",
     "safety-catch": "1.0.2",
     "sodium-native": "^4.3.3",
-    "trac-wallet": "^0.0.29",
+    "trac-wallet": "^0.0.31",
     "xache": "1.2.0",
     "bare-assert": "^1.0.2",
     "bare-buffer": "^3.1.2",

package/src/functions.js

@@ -1,5 +1,3 @@
-import {Buffer} from "buffer"
-
 export function resolveNumberString(number, decimals){
     number = number + '';
     decimals = isNaN(decimals) ? 18 : parseInt(decimals);

package/src/index.js

@@ -3,12 +3,10 @@ import Autobase from 'autobase';
 import Hyperswarm from 'hyperswarm';
 import ReadyResource from 'ready-resource';
 import b4a from 'b4a';
-import {Buffer} from "buffer"
 import Hyperbee from 'hyperbee';
 import readline from 'readline';
 import tty from 'tty'
 import Corestore from 'corestore';
-import {createHash} from "crypto";
 import w from 'protomux-wakeup';
 const wakeup = new w();
 import {addWriter, addAdmin, setAutoAddWriters, setChatStatus, setMod, deleteMessage,
@@ -90,7 +88,7 @@ export class Peer extends ReadyResource {
                         if (null !== str_dispatch &&
                             null === await batch.get('tx/'+op.key) &&
                             post_tx.value.tx === op.key &&
-                            post_tx.value.ch === createHash('sha256').update(str_dispatch).digest('hex') &&
+                            post_tx.value.ch === await _this.createHash('sha256', str_dispatch) &&
                             false !== await _this.contract_instance.execute(op, node, batch)) {
                             let len = await batch.get('txl');
                             if(null === len) {
@@ -509,6 +507,30 @@ export class Peer extends ReadyResource {
         return new Promise(resolve => setTimeout(resolve, ms));
     }
 
+    async createHash(type, message){
+        let createHash = null;
+        console.log(message.toLowerCase());
+        if(typeof crypto.subtle !== '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.');
+            }
+            const encoder = new TextEncoder();
+            const data = encoder.encode(message);
+            const hash = await crypto.subtle.digest(_type, data);
+            const hashArray = Array.from(new Uint8Array(hash));
+            return hashArray
+                .map((b) => b.toString(16).padStart(2, "0"))
+                .join("");
+        } else {
+            return createHash(type).update(message).digest('hex')
+        }
+    }
+
     async _replicate() {
         if (!this.swarm) {
             const keyPair = await this.store.createKeyPair('hyperswarm');

package/src/protocol.js

@@ -1,5 +1,4 @@
 import { formatNumberString, resolveNumberString } from "./functions.js";
-import {createHash} from "crypto";
 
 class Protocol{
     constructor(options = {}) {
@@ -70,14 +69,14 @@ class Protocol{
         {
             this.nonce = Math.random() + '-' + Date.now();
             const MSBwriter = writer;
-            const content_hash = createHash('sha256').update(JSON.stringify(obj)).digest('hex');
-            let tx = createHash('sha256').update(
+            const content_hash = await this.peer.createHash('sha256', JSON.stringify(obj));
+            let tx = await this.peer.createHash('sha256',
                 MSBwriter + '-' +
                 this.peer.writerLocalKey + '-' +
                 this.peer.wallet.publicKey + '-' +
                 content_hash + '-' +
-                this.nonce).digest('hex');
-            tx = createHash('sha256').update(tx).digest('hex');
+                this.nonce);
+            tx = await this.peer.createHash('sha256', tx);
             const signature = this.peer.wallet.sign(tx + this.nonce);
             this.peer.emit('tx', {
                 op: 'pre-tx',