Use BlockCache for RPC/mempool and added TxId()

TxId() uses signbytes

rpc/core/accounts.go

@@ -13,8 +13,8 @@ func GenPrivAccount() (*ResponseGenPrivAccount, error) {
 //-----------------------------------------------------------------------------
 
 func GetAccount(address []byte) (*ResponseGetAccount, error) {
-	state := consensusState.GetState()
-	return &ResponseGetAccount{state.GetAccount(address)}, nil
+	cache := mempoolReactor.Mempool.GetCache()
+	return &ResponseGetAccount{cache.GetAccount(address)}, nil
 }
 
 //-----------------------------------------------------------------------------

rpc/core/mempool.go

@@ -3,7 +3,6 @@ package core
 import (
 	"fmt"
 	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/merkle"
 	"github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
 )
@@ -24,7 +23,7 @@ func BroadcastTx(tx types.Tx) (*ResponseBroadcastTx, error) {
 		return nil, fmt.Errorf("Error broadcasting transaction: %v", err)
 	}
 
-	txHash := merkle.HashFromBinary(tx)
+	txHash := types.TxId(tx)
 	var createsContract uint8
 	var contractAddr []byte
 	// check if creates new contract

rpc/test/json_rpc_test.go

@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/tendermint/tendermint/binary"
+	. "github.com/tendermint/tendermint/common"
 	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/merkle"
 	"github.com/tendermint/tendermint/rpc"
 	"github.com/tendermint/tendermint/rpc/core"
 	"github.com/tendermint/tendermint/types"
@@ -161,8 +161,8 @@ func TestJSONBroadcastTx(t *testing.T) {
 	}
 	tx2 := txs[mempoolCount].(*types.SendTx)
 	mempoolCount += 1
-	if bytes.Compare(merkle.HashFromBinary(tx), merkle.HashFromBinary(tx2)) != 0 {
-		t.Fatal("inconsistent hashes for mempool tx and sent tx")
+	if bytes.Compare(types.TxId(tx), types.TxId(tx2)) != 0 {
+		t.Fatal(Fmt("inconsistent hashes for mempool tx and sent tx: %v vs %v", tx, tx2))
 	}
 
 }