Audit the use of 0x, 0x0, and quantity and fix (#197)

Fixes #579
Fixes #582
Fixes #907
Fixes #59
Fixes #425

lib/blockchain_double.js

@@ -360,7 +360,7 @@ BlockchainDouble.prototype.getQueuedNonce = function(address, callback) {
     //tx.from==address
     if (to.hex(tx.from) != to.hex(address)) return;
 
-    var pending_nonce = to.number(tx.nonce);
+    var pending_nonce = to.number(tx.nonce) || 0;
     //If this is the first queued nonce for this address we found,
     //or it's higher than the previous highest, note it.
     if (nonce===null || pending_nonce > nonce) {
@@ -370,7 +370,7 @@ BlockchainDouble.prototype.getQueuedNonce = function(address, callback) {
 
   //If we found a queued transaction nonce, return one higher
   //than the highest we found
-  if (nonce!=null) return callback(null, nonce+1);
+  if (nonce!=null) return callback(null, Buffer.from([nonce + 1]));
 
   this.stateTrie.get(address, function(err, val) {
     if (err) return callback(err);

lib/statemanager.js

@@ -267,7 +267,7 @@ StateManager.prototype.queueRawTransaction = function(rawTx, callback) {
     gasPrice: tx.gasPrice.toString('hex'),
     value:    tx.value.toString('hex'),
     data:     tx.data.toString('hex'),
-    nonce:    tx.nonce.toString('hex'),
+    nonce:    tx.nonce.toString('hex')
   }
 
   if (tx.v && tx.v.length > 0 &&
@@ -620,7 +620,7 @@ StateManager.prototype.processCall = function (from, rawTx, blockNumber, callbac
         return callback(err);
       }
 
-      var result = '0x0'
+      var result = '0x'
       if (!results.error && results.vm.return) {
         result = to.hex(results.vm.return);
       } else if (results.error) {
@@ -642,7 +642,7 @@ StateManager.prototype.processGasEstimate = function (from, rawTx, blockNumber,
       if (err) {
         return callback(err);
       }
-      var result = '0x0'
+      var result = '0x'
       if (!results.error) {
         result = results.gasRefund ? to.hex(results.gasUsed.add(results.gasRefund)) : to.hex(results.gasUsed);
       } else {
@@ -874,10 +874,10 @@ StateManager.prototype.createFakeTransactionWithCorrectNonce = function(rawTx, f
       // account for transactions waiting in the tx queue
       tx.nonce = to.hex(expectedNonce);
     } else {
-      if (to.number(rawTx.nonce) !== to.number(expectedNonce)) {
+      if (!tx.nonce.equals(expectedNonce)) {
         return callback(new TXRejectedError(`the tx doesn't have the correct nonce. ` +
-        `account has nonce of: ${to.number(expectedNonce)} ` +
-        `tx has nonce of: ${to.number(tx.nonce)}`))
+        `account has nonce of: ${to.number(expectedNonce) || 0} ` +
+        `tx has nonce of: ${to.number(tx.nonce) || 0}`))
       }
     }
     callback(null, tx)

lib/utils/forkedblockchain.js

@@ -420,7 +420,7 @@ ForkedBlockchain.prototype.fetchAccountFromFallback = function(address, block_nu
       balance: balance
     });
 
-    account.exists = code != "0x0" || balance != "0x0" || nonce != "0x0";
+    account.exists = code != "0x" || balance != "0x0" || nonce != "0x0";
 
     // This puts the code on the trie, keyed by the hash of the code.
     // It does not actually link an account to code in the trie.

lib/utils/to.js

@@ -4,8 +4,8 @@ module.exports = {
   // Note: Do not use to.hex() when you really mean utils.addHexPrefix().
   hex: function(val) {
     if (typeof val == "string") {
-      if (val.indexOf("0x") == 0) {
-        return val;
+      if (val.indexOf("0x") === 0) {
+        return val.trim();
       } else {
         val = new utils.BN(val);
       }
@@ -32,7 +32,8 @@ module.exports = {
     val = this.hex(val);
     val = "0x" + val.replace("0x", "").replace(/^0+/, "");
 
-    if (val == "0x") {
+    // RPC Quantities must represent `0` as `0x0`
+    if (val === "0x") {
       val = "0x0";
     }
 
@@ -57,6 +58,11 @@ module.exports = {
     return "0x" + val;
   },
 
+  nullableRpcDataHexString: function(val, length) {
+    const rpcDataHex = this.rpcDataHexString(val, length);
+    return rpcDataHex === "0x" ? null : rpcDataHex;
+  },
+
   hexWithZeroPadding: function(val) {
     val = this.hex(val);
     const digits = val.replace("0x", "");
@@ -71,10 +77,11 @@ module.exports = {
       return val;
     }
     if (typeof val == "string") {
-      if (val.indexOf('0x') != 0) {
-        return parseInt(val)
+      if (val.indexOf('0x') !== 0) {
+        return parseInt(val, 10)
       }
     }
-    return utils.bufferToInt(utils.toBuffer(val));
+    var bufVal = utils.toBuffer(val);
+    return utils.bufferToInt(bufVal);
   }
 };

lib/utils/txhelper.js

@@ -13,17 +13,17 @@ module.exports = {
       }
     }
     var resultJSON = {
-      hash: to.rpcDataHexString(tx.hash()),
+      hash: to.nullableRpcDataHexString(tx.hash()),
       nonce: to.rpcQuantityHexString(tx.nonce),
-      blockHash: to.rpcDataHexString(block.hash()),
+      blockHash: to.nullableRpcDataHexString(block.hash()),
       blockNumber: to.rpcQuantityHexString(block.header.number),
       transactionIndex: to.rpcQuantityHexString(transactionIndex),
-      from: to.rpcDataHexString(tx.from),
-      to: to.rpcDataHexString(tx.to),
+      from: to.nullableRpcDataHexString(tx.from),
+      to: to.nullableRpcDataHexString(tx.to),
       value: to.rpcQuantityHexString(tx.value),
       gas: to.rpcQuantityHexString(tx.gasLimit),
       gasPrice: to.rpcQuantityHexString(tx.gasPrice),
-      input: to.rpcDataHexString(tx.data),
+      input: to.nullableRpcDataHexString(tx.data),
     };
 
     if (tx.v && tx.v.length > 0 &&