Fixes to get tx gas to work correctly (ethereum#148)

Author: smartcontracts

core/state_transition.go

@@ -247,6 +247,7 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo
 		if msg.L1MessageSender() != nil {
 			l1MessageSender = msg.L1MessageSender().Hex()
 		}
+		st.gas = msg.Gas()
 		log.Debug("Applying transaction", "from", sender.Address().Hex(), "to", to, "nonce", msg.Nonce(), "l1MessageSender", l1MessageSender, "data", hexutil.Encode(msg.Data()))
 	}
 

core/state_transition_ovm.go

@@ -30,7 +30,7 @@ func toExecutionManagerRun(evm *vm.EVM, msg Message) (Message, error) {
 		uint8(msg.QueueOrigin().Uint64()),
 		*msg.L1MessageSender(),
 		*msg.To(),
-		big.NewInt(int64(msg.Gas())),
+		big.NewInt(int64(evm.Context.GasLimit)),
 		msg.Data(),
 	}
 

internal/ethapi/api.go

@@ -903,7 +903,7 @@ func DoEstimateGas(ctx context.Context, b Backend, args CallArgs, blockNrOrHash
 		return 0, err
 	}
 	// For now always return the gas limit
-	return hexutil.Uint64(block.GasLimit() - 1), nil
+	return hexutil.Uint64(block.GasLimit() - 2000000), nil
 }
 
 // EstimateGas returns an estimate of the amount of gas needed to execute the