Fix multi-transactions per block gas usage & cumulative gas usage (#191)

When multiple transactions occur in a block, each transaction's `.gasUsed` should reflect the gas used in that transaction alone and the `cumulativeGas` should equal the `totalGasUsed` at the time of the transaction instead of total `gasUsed` in the block. This PR should fix the `gasUsed` and `cumulativeGasUsed` values to accurately reflect their respective values.


Resolves #445.

lib/blockchain_double.js

@@ -588,7 +588,8 @@ BlockchainDouble.prototype.processBlock = function(block, commit, callback) {
         }
       }
 
-      receipts.push(new Receipt(tx, block, tx_logs, receipt.gasUsed, result.createdAddress, receipt.status, to.hex(result.bloom.bitvector)));
+      let rcpt = new Receipt(tx, block, tx_logs, result.gasUsed.toArrayLike(Buffer), receipt.gasUsed, result.createdAddress, receipt.status, to.hex(result.bloom.bitvector));
+      receipts.push(rcpt);
     }
 
     function commmitIfNeeded(cb) {

lib/database/receiptserializer.js

@@ -25,7 +25,7 @@ ReceiptSerializer.prototype.decode = function(json, done) {
       }, function(err, result) {
         if (err) return done(err);
 
-        done(null, new Receipt(tx, result.block, result.logs, json.gasUsed, json.contractAddress, json.status, json.logsBloom));
+        done(null, new Receipt(tx, result.block, result.logs, json.gasUsed, json.cumulativeGasUsed, json.contractAddress, json.status, json.logsBloom));
       });
     });
   });

lib/utils/forkedblockchain.js

@@ -391,8 +391,7 @@ ForkedBlockchain.prototype.getTransactionReceipt = function(hash, callback) {
         var logs = receipt_json.logs.map(function(log) {
           return new Log(log);
         });
-
-        var receipt = new Receipt(result.tx, result.block, logs, receipt_json.cumulativeGasUsed,
+        var receipt = new Receipt(result.tx, result.block, logs, receipt_json.gasUsed, receipt_json.cumulativeGasUsed,
           receipt_json.contractAddress, receipt_json.status, to.hex(receipt_json.logsBloom));
 
         callback(null, receipt);

lib/utils/receipt.js

@@ -1,13 +1,15 @@
 var to = require("./to");
 
-function Receipt(tx, block, logs, gasUsed, contractAddress, status, logsBloom) {
+function Receipt(tx, block, logs, gasUsed, cumulativeGasUsed, contractAddress, status, logsBloom) {
   this.tx = tx;
   this.block = block;
   this.logs = logs;
   this.gasUsed = gasUsed;
+  this.cumulativeGasUsed = cumulativeGasUsed;
   this.contractAddress = contractAddress;
   this.status = status;
   this.logsBloom = logsBloom;
+
 
   this.transactionIndex = 0;
 
@@ -30,7 +32,7 @@ Receipt.prototype.toJSON = function() {
     blockHash: to.rpcDataHexString(this.block.hash()),
     blockNumber: to.rpcQuantityHexString(this.block.header.number),
     gasUsed: to.rpcQuantityHexString(this.gasUsed),
-    cumulativeGasUsed: to.rpcQuantityHexString(this.block.header.gasUsed),
+    cumulativeGasUsed: to.rpcQuantityHexString(this.cumulativeGasUsed),
     contractAddress: this.contractAddress != null ? to.rpcDataHexString(this.contractAddress) : null,
     logs: this.logs.map(function(log) {return log.toJSON()}),
     status: to.rpcQuantityHexString(this.status),

lib/webSocketServer.js

@@ -54,6 +54,7 @@ ConnectionManager.prototype.manageConnection = function (connection) {
   });
 
   connection.on('close', function () {
+    console.log(`handling connection close: id ${connection.id}`)
     // remove subscriptions
     Object.keys(self.connections[connection.id].subscriptions).forEach((subscriptionId) => {
       self.provider.send({
@@ -68,6 +69,8 @@ ConnectionManager.prototype.manageConnection = function (connection) {
 
     delete self.connections[ connection.id ];
   });
+
+  console.log(`opened connection: id ${connection.id}`)
 };
 
 
@@ -86,6 +89,7 @@ ConnectionManager.prototype._handleRequest = function (connection, payload) {
       });
       break;
     case 'eth_unsubscribe':
+      console.log(`handling unsubscribe: id ${connection.id}, ${payload.params[0]}`)
       self.provider.send(payload, function (err, result) {
         if (err || result.error) {
           if (connection && connection.send) {
@@ -94,7 +98,6 @@ ConnectionManager.prototype._handleRequest = function (connection, payload) {
           return
         }
 
-        connection = self.connectionsBySubscriptionId[payload.params[0]];
         delete self.connections[connection.id].subscriptions[payload.params[0]]
         delete self.connectionsBySubscriptionId[payload.params[0]];