fix for chain id extraction from EIP155 signed transactions

ethereum · Oct 19, 2017 · 700097f · 700097f
1 parent 9d124f8
commit 700097f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/evm/utils/transactions.py b/evm/utils/transactions.py
@@ -28,7 +28,7 @@ def is_eip_155_signed_transaction(transaction):
 
 def extract_chain_id(v):
     if is_even(v):
-        return (v - EIP155_CHAIN_ID_OFFSET) // 2
+        return (v - EIP155_CHAIN_ID_OFFSET - 1) // 2
     else:
         return (v - EIP155_CHAIN_ID_OFFSET) // 2
 

diff --git a/evm/vm/forks/spurious_dragon/transactions.py b/evm/vm/forks/spurious_dragon/transactions.py
@@ -38,7 +38,10 @@ def create_unsigned_transaction(cls, nonce, gas_price, gas, to, value, data):
 
     @property
     def chain_id(self):
-        return extract_chain_id(self)
+        if is_eip_155_signed_transaction(self):
+            return extract_chain_id(self.v)
+        else:
+            return None
 
 
 class SpuriousDragonUnsignedTransaction(HomesteadUnsignedTransaction):

diff --git a/tests/core/transaction-utils/test_transaction_signature_validation.py b/tests/core/transaction-utils/test_transaction_signature_validation.py
@@ -112,3 +112,4 @@ def test_unsigned_to_eip155_signed_transaction(txn_fixture, transaction_class):
     signed_txn = unsigned_txn.as_signed_transaction(key, chain_id=txn_fixture['chainId'])
 
     assert is_same_address(signed_txn.sender, key.public_key.to_canonical_address())
+    assert signed_txn.chain_id == txn_fixture['chainId']
Original file line number	Diff line number	Diff line change
Expand Up		@@ -112,3 +112,4 @@ def test_unsigned_to_eip155_signed_transaction(txn_fixture, transaction_class):
		signed_txn = unsigned_txn.as_signed_transaction(key, chain_id=txn_fixture['chainId'])

		assert is_same_address(signed_txn.sender, key.public_key.to_canonical_address())
		assert signed_txn.chain_id == txn_fixture['chainId']