Master

.gitignore

@@ -5,3 +5,4 @@ TODO
 .tern-project
 .DS_Store
 .tern-port
+yarn.lock

Dockerfile

@@ -1,4 +1,4 @@
-FROM mhart/alpine-node:6.9.2
+FROM mhart/alpine-node:7.9.0
 
 RUN apk add --no-cache make gcc g++ python git bash
 COPY package.json /src/package.json

README.md

@@ -167,7 +167,7 @@ There’s also special non-standard methods that aren’t included within the or
 
 # Docker
 
-The Simplest way to get stared with the Docker image:
+The Simplest way to get started with the Docker image:
 
 ```Bash
 docker run -d -p 8545:8545 ethereumjs/testrpc:latest

lib/blockchain_double.js

@@ -638,6 +638,10 @@ BlockchainDouble.prototype.processTransactionTrace = function(hash, params, call
   this.getTransactionReceipt(target_hash, function(err, receipt) {
     if (err) return callback(err);
 
+    if (!receipt) {
+      return callback(new Error("Unknown transaction " + target_hash));
+    }
+
     var targetBlock = receipt.block;
 
     // Get the parent of the target block

lib/statemanager.js

@@ -412,8 +412,8 @@ StateManager.prototype.printTransactionReceipt = function(tx_hash, error, callba
         self.logger.log("  Contract created: " + receipt.contractAddress);
       }
 
-      self.logger.log("  Gas usage: " + receipt.gasUsed);
-      self.logger.log("  Block Number: " + receipt.blockNumber);
+      self.logger.log("  Gas usage: " + parseInt(receipt.gasUsed, 16));
+      self.logger.log("  Block Number: " + parseInt(receipt.blockNumber, 16));
       self.logger.log("  Block Time: " + new Date(to.number(block.header.timestamp) * 1000).toString());
 
       if (error) {

lib/subproviders/geth_api_double.js

@@ -129,7 +129,13 @@ GethApiDouble.prototype.eth_getCode = function(address, block_number, callback)
 
 GethApiDouble.prototype.eth_getBlockByNumber = function(block_number, include_full_transactions, callback) {
   this.state.blockchain.getBlock(block_number, function(err, block) {
-    if (err) return callback(err);
+    if (err) {
+      if (err.message && err.message.indexOf("index out of range") >= 0) {
+        return callback(null, null);
+      } else {
+        return callback(err);
+      }
+    }
 
     callback(null, {
       number: to.hex(block.header.number),
@@ -345,9 +351,12 @@ GethApiDouble.prototype.evm_mine = function(callback) {
 };
 
 GethApiDouble.prototype.debug_traceTransaction = function(tx_hash, params, callback) {
+  if (typeof params == "function") {
+    callback = params;
+    params = [];
+  }
+
   this.state.queueTransactionTrace(tx_hash, params, callback);
 };
 
-
-
 module.exports = GethApiDouble;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ganache-core",
-  "version": "0.0.1",
+  "version": "1.0.1",
   "main": "./index.js",
   "directories": {
     "lib": "./lib"
@@ -15,7 +15,7 @@
     "chai": "^3.5.0",
     "ethereumjs-account": "~2.0.4",
     "ethereumjs-block": "~1.2.2",
-    "ethereumjs-tx": "1.1.2",
+    "ethereumjs-tx": "^1.3.0",
     "ethereumjs-util": "~5.1.0",
     "ethereumjs-vm": "~2.0.1",
     "ethereumjs-wallet": "~0.6.0",

test/requests.js

@@ -184,6 +184,15 @@ var tests = function(web3) {
       });
     });
 
+    it("should return null given a future block number", function(done) {
+      web3.eth.getBlock(10000, true, function(err, block) {
+        if (err) return done(err);
+
+        assert.deepEqual(block, null);
+        done();
+      });
+    });
+
     it("should return transactions in the block as well", function(done) {
       web3.eth.sendTransaction({
         from: accounts[0],