aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-07-06 16:43:06 +0800
committerFelix Lange <fjl@twurst.com>2015-07-06 16:45:45 +0800
commitec9620fb2f375379d3404a834a3350089702648a (patch)
tree5de517a64b15acfdbff500aa0a32d85cd6001703 /core
parent9c3db1be1dd24c366a58a7ced22adfa0b0839efe (diff)
downloaddexon-ec9620fb2f375379d3404a834a3350089702648a.tar
dexon-ec9620fb2f375379d3404a834a3350089702648a.tar.gz
dexon-ec9620fb2f375379d3404a834a3350089702648a.tar.bz2
dexon-ec9620fb2f375379d3404a834a3350089702648a.tar.lz
dexon-ec9620fb2f375379d3404a834a3350089702648a.tar.xz
dexon-ec9620fb2f375379d3404a834a3350089702648a.tar.zst
dexon-ec9620fb2f375379d3404a834a3350089702648a.zip
core/types, xeth: separate tx hash and tx signature hash
Diffstat (limited to 'core')
-rw-r--r--core/types/transaction.go18
-rw-r--r--core/types/transaction_test.go6
2 files changed, 16 insertions, 8 deletions
diff --git a/core/types/transaction.go b/core/types/transaction.go
index 95deac36e..c381fc5f3 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -116,11 +116,21 @@ func (tx *Transaction) To() *common.Address {
}
}
+// Hash hashes the RLP encoding of tx.
+// It uniquely identifies the transaction.
func (tx *Transaction) Hash() common.Hash {
if hash := tx.hash.Load(); hash != nil {
return hash.(common.Hash)
}
- v := rlpHash([]interface{}{
+ v := rlpHash(tx)
+ tx.hash.Store(v)
+ return v
+}
+
+// SigHash returns the hash to be signed by the sender.
+// It does not uniquely identify the transaction.
+func (tx *Transaction) SigHash() common.Hash {
+ return rlpHash([]interface{}{
tx.data.AccountNonce,
tx.data.Price,
tx.data.GasLimit,
@@ -128,8 +138,6 @@ func (tx *Transaction) Hash() common.Hash {
tx.data.Amount,
tx.data.Payload,
})
- tx.hash.Store(v)
- return v
}
func (tx *Transaction) Size() common.StorageSize {
@@ -180,7 +188,7 @@ func (tx *Transaction) publicKey() ([]byte, error) {
sig[64] = tx.data.V - 27
// recover the public key from the signature
- hash := tx.Hash()
+ hash := tx.SigHash()
pub, err := crypto.Ecrecover(hash[:], sig)
if err != nil {
glog.V(logger.Error).Infof("Could not get pubkey from signature: ", err)
@@ -204,7 +212,7 @@ func (tx *Transaction) WithSignature(sig []byte) (*Transaction, error) {
}
func (tx *Transaction) SignECDSA(prv *ecdsa.PrivateKey) (*Transaction, error) {
- h := tx.Hash()
+ h := tx.SigHash()
sig, err := crypto.Sign(h[:], prv)
if err != nil {
return nil, err
diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go
index dd9c5e87b..c9da4b73b 100644
--- a/core/types/transaction_test.go
+++ b/core/types/transaction_test.go
@@ -34,11 +34,11 @@ var (
)
)
-func TestTransactionHash(t *testing.T) {
- if emptyTx.Hash() != common.HexToHash("c775b99e7ad12f50d819fcd602390467e28141316969f4b57f0626f74fe3b386") {
+func TestTransactionSigHash(t *testing.T) {
+ if emptyTx.SigHash() != common.HexToHash("c775b99e7ad12f50d819fcd602390467e28141316969f4b57f0626f74fe3b386") {
t.Errorf("empty transaction hash mismatch, got %x", emptyTx.Hash())
}
- if rightvrsTx.Hash() != common.HexToHash("fe7a79529ed5f7c3375d06b26b186a8644e0e16c373d7a12be41c62d6042b77a") {
+ if rightvrsTx.SigHash() != common.HexToHash("fe7a79529ed5f7c3375d06b26b186a8644e0e16c373d7a12be41c62d6042b77a") {
t.Errorf("RightVRS transaction hash mismatch, got %x", rightvrsTx.Hash())
}
}