Fix up raw transaction tests; use keyfile acct pkey

Author: fselmo

tests/integration/generate_fixtures/go_ethereum.py

@@ -341,6 +341,7 @@ def setup_chain_state(w3):
 
     geth_fixture = {
         "keyfile_account_address": common.KEYFILE_ACCOUNT_ADDRESS,
+        "keyfile_account_pkey": common.KEYFILE_ACCOUNT_PKEY,
         "math_deploy_txn_hash": math_deploy_receipt["transactionHash"],
         "math_address": math_deploy_receipt["contractAddress"],
         "emitter_deploy_txn_hash": emitter_deploy_receipt["transactionHash"],

tests/integration/geth-1.13.11-fixture.zip

@@ -192,6 +192,11 @@ def emitter_contract_address(emitter_contract, address_conversion_func):
     return address_conversion_func(emitter_contract.address)
 
 
+@pytest.fixture(scope="module")
+def keyfile_account_pkey(geth_fixture_data):
+    return geth_fixture_data["keyfile_account_pkey"]
+
+
 @pytest.fixture(scope="module")
 def keyfile_account_address(geth_fixture_data):
     return geth_fixture_data["keyfile_account_address"]

tests/integration/geth-1.13.14-fixture.zip

@@ -151,7 +151,9 @@ def block_with_txn(w3):
             "to": w3.eth.coinbase,
             "value": w3.to_wei(1, "gwei"),
             "gas": 21000,
-            "gasPrice": w3.to_wei(10**9, "gwei"),  # needs to be > base_fee post London
+            "gasPrice": w3.to_wei(
+                10**9, "gwei"
+            ),  # needs to be > base_fee post London
         }
     )
     txn = w3.eth.get_transaction(txn_hash)
@@ -204,6 +206,11 @@ def panic_errors_contract(w3):
     return _deploy_contract(w3, panic_errors_contract_factory)
 
 
+@pytest.fixture(scope="module")
+def keyfile_account_pkey():
+    yield KEYFILE_ACCOUNT_PKEY
+
+
 @pytest.fixture(scope="module")
 def keyfile_account_address():
     yield KEYFILE_ACCOUNT_ADDRESS
@@ -611,15 +618,6 @@ def test_eth_send_transaction_legacy(self, eth_tester, w3, keyfile_account_addre
         super().test_eth_send_transaction_legacy(w3, keyfile_account_address)
 
     def test_eth_send_raw_transaction(self, eth_tester, w3):
-        # fund address 0x6E6d469fa47ab2f6630bAfc03ECca1212c29B114
-        w3.eth.send_transaction(
-            {
-                "from": w3.eth.coinbase,
-                "to": "0x6E6d469fa47ab2f6630bAfc03ECca1212c29B114",
-                "value": w3.to_wei(0.5, "ether"),
-                "gas": 21000,
-            }
-        )
         super().test_eth_send_raw_transaction(w3)
 
     @disable_auto_mine

tests/integration/go_ethereum/conftest.py

@@ -702,22 +702,24 @@ async def test_ExtraDataToPOAMiddleware(
         async_w3.middleware_onion.remove("poa")
 
     @pytest.mark.asyncio
-    async def test_eth_send_raw_transaction(self, async_w3: "AsyncWeb3") -> None:
-        # address 0x6E6d469fa47ab2f6630bAfc03ECca1212c29B114
-        # private key 0x3c2ab4e8f17a7dea191b8c991522660126d681039509dc3bb31af7c9bdb63518
-        # This is an unfunded account, but the transaction has a 0 gas price, so is
-        # valid. It never needs to be mined, we just want the transaction hash back
-        # to confirm.
-        # tx = {'to': '0x0000000000000000000000000000000000000000', 'value': 0,  'nonce': 1, 'gas': 21000, 'gasPrice': 10**9, 'chainId': 131277322940537}  # noqa: E501
-        # NOTE: nonce=1 to make txn unique from the non-async version of this test
-        raw_txn = HexBytes(
-            "0xf86901843b9aca00825208940000000000000000000000000000000000000000808086eecac466e116a00c35ef06cefed3667cb9936ed1ed87177fd37654a86de9c8a7739011348cfc1ba00873e59bc3baf78faf7e526866e59f0b3c44063921790fe3f52862b679cd8c61"  # noqa: E501
-        )
-        expected_hash = HexStr(
-            "0x87638eb356dd219b3c9e3288e7631be2adb619c93f76a9c749112632184eb861"
-        )
-        txn_hash = await async_w3.eth.send_raw_transaction(raw_txn)
-        assert txn_hash == async_w3.to_bytes(hexstr=expected_hash)
+    async def test_async_eth_send_raw_transaction(
+        self, async_w3: "AsyncWeb3", keyfile_account_pkey: HexStr
+    ) -> None:
+        keyfile_account = async_w3.eth.account.from_key(keyfile_account_pkey)
+        txn = {
+            "chainId": 131277322940537,  # the chainId set for the fixture
+            "from": keyfile_account.address,
+            "to": keyfile_account.address,
+            "value": Wei(0),
+            "gas": 21000,
+            "nonce": await async_w3.eth.get_transaction_count(
+                keyfile_account.address, "pending"
+            ),
+            "gasPrice": 1,
+        }
+        signed = keyfile_account.sign_transaction(txn)
+        txn_hash = await async_w3.eth.send_raw_transaction(signed.rawTransaction)
+        assert txn_hash == HexBytes(signed.hash)
 
     @pytest.mark.asyncio
     async def test_GasPriceStrategyMiddleware(
@@ -3701,22 +3703,22 @@ def test_eth_modify_transaction(
         )
         assert modified_txn["maxFeePerGas"] == cast(Wei, txn_params["maxFeePerGas"]) * 2
 
-    def test_eth_send_raw_transaction(self, w3: "Web3") -> None:
-        # address 0x6E6d469fa47ab2f6630bAfc03ECca1212c29B114
-        # private key 0x3c2ab4e8f17a7dea191b8c991522660126d681039509dc3bb31af7c9bdb63518
-        # This is an unfunded account, but the transaction has a 0 gas price, so is
-        # valid. It never needs to be mined, we just want the transaction hash back
-        # to confirm.
-        # tx = {'to': '0x0000000000000000000000000000000000000000', 'value': 0,  'nonce': 0, 'gas': 21000, 'gasPrice': 10**9, 'chainId': 131277322940537}  # noqa: E501
-        # NOTE: nonce=0 to make txn unique from the async version of this test
-        raw_txn = HexBytes(
-            "0xf86980843b9aca00825208940000000000000000000000000000000000000000808086eecac466e115a064c3ae78af36ee5014e3437ad6587966f4b06cd96327bb5dc48b78b0c1cc8ae7a01b1b9ba32935bbf95bc453ad4995a90de10f61879a77b45ca07451a99cd58fd5"  # noqa: E501
-        )
-        expected_hash = HexStr(
-            "0x42c2440fc4425952544c2300f33083c8135c3800de4b4918e1e2f06b7bd74269"
-        )
-        txn_hash = w3.eth.send_raw_transaction(raw_txn)
-        assert txn_hash == w3.to_bytes(hexstr=expected_hash)
+    def test_eth_send_raw_transaction(
+        self, w3: "Web3", keyfile_account_pkey: HexStr
+    ) -> None:
+        keyfile_account = w3.eth.account.from_key(keyfile_account_pkey)
+        txn = {
+            "chainId": 131277322940537,  # the chainId set for the fixture
+            "from": keyfile_account.address,
+            "to": keyfile_account.address,
+            "value": Wei(0),
+            "gas": 21000,
+            "nonce": w3.eth.get_transaction_count(keyfile_account.address, "pending"),
+            "gasPrice": 1,
+        }
+        signed = keyfile_account.sign_transaction(txn)
+        txn_hash = w3.eth.send_raw_transaction(signed.rawTransaction)
+        assert txn_hash == HexBytes(signed.hash)
 
     def test_eth_call(self, w3: "Web3", math_contract: "Contract") -> None:
         coinbase = w3.eth.coinbase