Merge pull request #89 from nguyenphuminh/minor-fix

Minor fix

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jechain",
-  "version": "0.30.1",
+  "version": "0.30.2",
   "description": "Node for JeChain - an experimental smart contract blockchain network",
   "main": "./index.js",
   "scripts": {

src/consensus/consensus.js

@@ -1,3 +1,5 @@
+"use strict";
+
 const crypto = require("crypto"), SHA256 = message => crypto.createHash("sha256").update(message).digest("hex");
 const Block = require("../core/block");
 const { log16 } = require("../utils/utils");

src/core/block.js

@@ -224,7 +224,7 @@ class Block {
         // Finalize state and contract storage into DB
 
         for (const address in storage) {
-            const storageDB = new Level(__dirname + "/../../log/accountStore/" + address);
+            const storageDB = new Level("./log/accountStore/" + address);
             const keys = Object.keys(storage[address]);
 
             states[address].storageRoot = Merkle.buildTxTrie(keys.map(key => key + " " + storage[address][key]), false).root;

src/core/genesis.js

@@ -1,10 +1,6 @@
 "use strict";
 
-const EC = require("elliptic").ec, ec = new EC("secp256k1");
-const crypto = require("crypto"), SHA256 = message => crypto.createHash("sha256").update(message).digest("hex");
-
 const Block = require("./block");
-const Transaction = require("./transaction");
 const { FIRST_ACCOUNT } = require("../config.json");
 
 function generateGenesisBlock() {

src/core/runtime.js

@@ -2,7 +2,7 @@
 
 const { Level } = require('level');
 
-const { bigIntable, isHex, deserializeState, serializeState } = require("../utils/utils");
+const { bigIntable, isHex, deserializeState } = require("../utils/utils");
 const Transaction = require("./transaction");
 
 const { EMPTY_HASH } = require("../config.json");
@@ -21,7 +21,7 @@ async function jelscript(input, originalState = {}, gas, stateDB, block, txInfo,
 
 
 	// Get contract state and storage
-	const storageDB = new Level(__dirname + "/../../log/accountStore/" + contractInfo.address);
+	const storageDB = new Level("./log/accountStore/" + contractInfo.address);
 
 	for (const key of (await storageDB.keys().all())) {
 		storage[key] = await storageDB.get(key);
@@ -88,7 +88,11 @@ async function jelscript(input, originalState = {}, gas, stateDB, block, txInfo,
 				break;
 
 			case "mod": // Modulo
-				setMem(c, "0x" + (a % b).toString(16));
+				if (b === 0n) {
+					setMem(c, "0x0");
+				} else {
+					setMem(c, "0x" + (a % b).toString(16));
+				}
 
 				break;
 

src/core/state.js

@@ -2,7 +2,6 @@
 
 const { Level } = require('level');
 const crypto = require("crypto"), SHA256 = message => crypto.createHash("sha256").update(message).digest("hex");
-const EC = require("elliptic").ec, ec = new EC("secp256k1");
 
 const Merkle = require("./merkle");
 const jelscript = require("./runtime");
@@ -67,7 +66,7 @@ async function changeState(newBlock, stateDB, codeDB, enableLogging = false) { /
 
                 const [ newState, newStorage ] = await jelscript(await codeDB.get(dataFromRecipient.codeHash), {}, BigInt(tx.additionalData.contractGas || 0), stateDB, newBlock, tx, contractInfo, enableLogging);
 
-                const storageDB = new Level(__dirname + "/../../log/accountStore/" + tx.recipient);
+                const storageDB = new Level("./log/accountStore/" + tx.recipient);
                 const keys = Object.keys(newStorage);
 
                 newState[tx.recipient].storageRoot = Merkle.buildTxTrie(keys.map(key => key + " " + newStorage[key]), false).root;

src/core/transaction.js

@@ -1,12 +1,11 @@
 "use strict";
 
 const BN = require("bn.js");
-const { isNumber, deserializeState, serializeState } = require("../utils/utils");
 const crypto = require("crypto"), SHA256 = message => crypto.createHash("sha256").update(message).digest("hex");
 const EC = require("elliptic").ec, ec = new EC("secp256k1");
 
 const { EMPTY_HASH, CONTRACT_FLAG } = require("../config.json");
-const { serialize } = require("v8");
+const { deserializeState } = require("../utils/utils");
 
 class Transaction {
     constructor(recipient = "", amount = "0", gas = "1000000000000", additionalData = {}, nonce = 0) {
@@ -172,7 +171,7 @@ class Transaction {
 
     static async isValid(tx, stateDB) {
         let txSenderPubkey;
-        
+
         // If recovering public key fails, then transaction is not valid.
         try {
             txSenderPubkey = Transaction.getPubKey(tx);
@@ -189,7 +188,6 @@ class Transaction {
         const dataFromSender = deserializeState(await stateDB.get(txSenderAddress));
 
         // If sender is a contract address, then it's not supposed to be used to send money, so return false if it is.
-
         if (dataFromSender.codeHash !== EMPTY_HASH) return false;
 
         return true;

src/core/txPool.js

@@ -1,13 +1,10 @@
 "use strict";
 
 const crypto = require("crypto"), SHA256 = message => crypto.createHash("sha256").update(message).digest("hex");
-const EC = require("elliptic").ec, ec = new EC("secp256k1");
 
 const Transaction = require("./transaction");
-const jelscript = require("./runtime");
-
 const { BLOCK_GAS_LIMIT } = require("../config.json");
-const { deserializeState, serializeState } = require("../utils/utils");
+const { deserializeState } = require("../utils/utils");
 
 async function addTransaction(transaction, chainInfo, stateDB) {
     try {

src/node/message.js

@@ -1,3 +1,5 @@
+"use strict";
+
 function produceMessage(type, data) {
     // Produce a JSON message
     return JSON.stringify({ type, data });

src/node/server.js

@@ -25,7 +25,7 @@ const opened    = [];  // Addresses and sockets from connected nodes.
 const connected = [];  // Addresses from connected nodes.
 let connectedNodes = 0;
 
-let worker = fork(`${__dirname}/../miner/worker.js`); // Worker thread (for PoW mining).
+let worker = fork(`./src/miner/worker.js`); // Worker thread (for PoW mining).
 let mined = false; // This will be used to inform the node that another node has already mined before it.
 
 
@@ -40,11 +40,11 @@ const chainInfo = {
     difficulty: 1
 };
 
-const stateDB = new Level(__dirname + "/../../log/stateStore", { valueEncoding: "buffer" });
-const blockDB = new Level(__dirname + "/../../log/blockStore", { valueEncoding: "buffer" });
-const bhashDB = new Level(__dirname + "/../../log/bhashStore", { valueEncoding: "buffer" });
-const txhashDB = new Level(__dirname + "/../../log/txhashStore");
-const codeDB = new Level(__dirname + "/../../log/codeStore");
+const stateDB = new Level("./log/stateStore", { valueEncoding: "buffer" });
+const blockDB = new Level("./log/blockStore", { valueEncoding: "buffer" });
+const bhashDB = new Level("./log/bhashStore", { valueEncoding: "buffer" });
+const txhashDB = new Level("./log/txhashStore");
+const codeDB = new Level("./log/codeStore");
 
 async function startServer(options) {
     const PORT                 = options.PORT || 3000;                        // Node's PORT
@@ -115,7 +115,7 @@ async function startServer(options) {
 
                                 worker.kill(); // Stop the worker thread
 
-                                worker = fork(`${__dirname}/../miner/worker.js`); // Renew
+                                worker = fork(`./src/miner/worker.js`); // Renew
                             }
 
                             await updateDifficulty(newBlock, chainInfo, blockDB); // Update difficulty
@@ -566,7 +566,7 @@ async function mine(publicKey, ENABLE_LOGGING) {
 
                 // Transit state
                 for (const address in storage) {
-                    const storageDB = new Level(__dirname + "/../../log/accountStore/" + address);
+                    const storageDB = new Level("./log/accountStore/" + address);
                     const keys = Object.keys(storage[address]);
 
                     states[address].storageRoot = Merkle.buildTxTrie(keys.map(key => key + " " + storage[address][key]), false).root;
@@ -597,7 +597,7 @@ async function mine(publicKey, ENABLE_LOGGING) {
             // Re-create the worker thread
             worker.kill();
 
-            worker = fork(`${__dirname}/../miner/worker.js`);
+            worker = fork(`./src/miner/worker.js`);
         })
         .catch(err => console.log(`\x1b[31mERROR\x1b[0m [${(new Date()).toISOString()}] Error at mining child process`, err));
 }

src/rpc/rpc.js

@@ -1,5 +1,3 @@
-// Bad RPC server implementation, will be updated soon.
-
 "use strict";
 
 const crypto = require("crypto"), SHA256 = message => crypto.createHash("sha256").update(message).digest("hex");
@@ -20,7 +18,7 @@ function rpc(PORT, client, transactionHandler, keyPair, stateDB, blockDB, bhashD
 
             reply.send({
                 success: false,
-                payload: null,
+                payload,
                 error: { message }
             });
         }
@@ -224,7 +222,7 @@ function rpc(PORT, client, transactionHandler, keyPair, stateDB, blockDB, bhashD
                 ) {
                     throwError("Invalid request.", 400);
                 } else {
-                    const storageDB = new Level(__dirname + "/../../log/accountStore/" + contractInfo.address);
+                    const storageDB = new Level("./log/accountStore/" + contractInfo.address);
 
                     respond({ storage: await storageDB.get(req.body.params.key) });
 
@@ -240,7 +238,7 @@ function rpc(PORT, client, transactionHandler, keyPair, stateDB, blockDB, bhashD
                 ) {
                     throwError("Invalid request.", 400);
                 } else {
-                    const storageDB = new Level(__dirname + "/../../log/accountStore/" + contractInfo.address);
+                    const storageDB = new Level("./log/accountStore/" + contractInfo.address);
 
                     respond({ storage: await storageDB.keys().all() });
                 }

src/utils/utils.js

@@ -4,10 +4,6 @@ function log16(x) {
     return Math.log(x) / Math.log(16);
 }
 
-function isNumber(str) {
-    return str.split("").every(char => "0123456789".includes(char));
-}
-
 function isHex(str) {
     return (
         str.startsWith("0x") &&
@@ -74,4 +70,4 @@ function deserializeState(stateInBytes) {
     return stateHeader;
 }
 
-module.exports = { log16, isNumber, isHex, parseJSON, bigIntable, numToBuffer, serializeState, deserializeState };
+module.exports = { log16, isHex, parseJSON, bigIntable, numToBuffer, serializeState, deserializeState };

utils/keygen.js

@@ -1,3 +1,5 @@
+"use strict";
+
 const crypto = require("crypto"), SHA256 = message => crypto.createHash("sha256").update(message).digest("hex");
 
 const EC = require("elliptic").ec, ec = new EC("secp256k1");