types: bugfix invalid V derivation on tx json unmarshal (ethereum#3594)

vivekanand1101 · Jan 20, 2017 · 0126d01 · 0126d01
1 parent 946db8b
commit 0126d01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/types/transaction.go b/core/types/transaction.go
@@ -198,7 +198,8 @@ func (tx *Transaction) UnmarshalJSON(input []byte) error {
 
 	var V byte
 	if isProtectedV((*big.Int)(dec.V)) {
-		V = byte((new(big.Int).Sub((*big.Int)(dec.V), deriveChainId((*big.Int)(dec.V))).Uint64()) - 35)
+		chainId := deriveChainId((*big.Int)(dec.V)).Uint64()
+		V = byte(dec.V.ToInt().Uint64() - 35 - 2*chainId)
 	} else {
 		V = byte(((*big.Int)(dec.V)).Uint64() - 27)
 	}

diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
@@ -160,7 +160,7 @@ func (s EIP155Signer) PublicKey(tx *Transaction) ([]byte, error) {
 // needs to be in the [R || S || V] format where V is 0 or 1.
 func (s EIP155Signer) WithSignature(tx *Transaction, sig []byte) (*Transaction, error) {
 	if len(sig) != 65 {
-		panic(fmt.Sprintf("wrong size for snature: got %d, want 65", len(sig)))
+		panic(fmt.Sprintf("wrong size for signature: got %d, want 65", len(sig)))
 	}
 
 	cpy := &Transaction{data: tx.data}