Add web3.eth.signTransaction test to integration tests

Author: njgheorghita

tests/integration/go_ethereum/common.py

@@ -8,6 +8,8 @@
     Web3ModuleTest,
 )
 
+GETH_EXPECTED = '0xf86a04850430e2340082520894dc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd018086eecac466e115a0b9914e8e1dd060257c6b753035479afa61ee55f9a3220b3366946d4591ee12aaa02ebc5717df48c58eecdc2971ab0baf607c75e0d9a14d95a9b5f7003380201687'  # noqa: E501
+
 
 class GoEthereumTest(Web3ModuleTest):
     def _check_web3_clientVersion(self, client_version):
@@ -59,6 +61,9 @@ def test_eth_estimateGas_with_block(self,
             web3, unlocked_account_dual_type
         )
 
+    # def test_eth_signTransaction(self, web3, unlocked_account):
+        # super().test_eth_signTransaction(web3, unlocked_account, GETH_EXPECTED)
+
 
 class GoEthereumVersionModuleTest(VersionModuleTest):
     pass

tests/integration/test_ethereum_tester.py

@@ -216,6 +216,7 @@ def func_wrapper(self, eth_tester, *args, **kwargs):
 
 class TestEthereumTesterEthModule(EthModuleTest):
     test_eth_sign = not_implemented(EthModuleTest.test_eth_sign, ValueError)
+    test_eth_signTransaction = not_implemented(EthModuleTest.test_eth_signTransaction, ValueError)
 
     @disable_auto_mine
     def test_eth_getTransactionReceipt_unmined(self, eth_tester, web3, unlocked_account):

web3/_utils/module_testing/eth_module.py

@@ -27,6 +27,7 @@
 
 UNKNOWN_ADDRESS = '0xdEADBEeF00000000000000000000000000000000'
 UNKNOWN_HASH = '0xdeadbeef00000000000000000000000000000000000000000000000000000000'
+EXPECTED = '0xf86404850430e2340082520894dc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd01801ca001119d1011fc4d00f2a2dc8fa3557c5a36f4022e5a3cabec52626a1993c3ba42a050148defdd5ebbdef5dcdb88485949c3005f1d401b0fad64bccc21617d5456a4'  # noqa: E501
 
 
 class EthModuleTest:
@@ -196,6 +197,25 @@ def test_eth_sign(self, web3, unlocked_account_dual_type):
         )
         assert new_signature != signature
 
+    def test_eth_signTransaction(self, web3, unlocked_account):
+        txn_params = {
+            'from': unlocked_account,
+            'to': unlocked_account,
+            'value': 1,
+            'gas': 21000,
+            'gasPrice': web3.eth.gasPrice,
+            'nonce': 0,
+        }
+        print(unlocked_account)
+        print('0xdc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd')
+        COINBASE_PK = '0x58d23b55bc9cdce1f18c2500f40ff4ab7245df9a89505e9b1fa4851f623d241d'
+        result = web3.eth.signTransaction(txn_params)
+        actual = web3.eth.account.signTransaction(txn_params, COINBASE_PK)
+        print(result)
+        print('---')
+        print(actual)
+        assert result['raw'] == actual.rawTransaction
+
     def test_eth_sendTransaction_addr_checksum_required(self, web3, unlocked_account):
         non_checksum_addr = unlocked_account.lower()
         txn_params = {

web3/_utils/rpc_abi.py

@@ -50,6 +50,7 @@
     'eth_newFilter': FILTER_PARAMS_ABIS,
     'eth_sendRawTransaction': ['bytes'],
     'eth_sendTransaction': TRANSACTION_PARAMS_ABIS,
+    'eth_signTransaction': TRANSACTION_PARAMS_ABIS,
     'eth_sign': ['address', 'bytes'],
     # personal
     'personal_sendTransaction': TRANSACTION_PARAMS_ABIS,

web3/eth.py

@@ -311,6 +311,11 @@ def sign(self, account, data=None, hexstr=None, text=None):
             "eth_sign", [account, message_hex],
         )
 
+    def signTransaction(self, transaction):
+        return self.web3.manager.request_blocking(
+            "eth_signTransaction", [transaction],
+        )
+
     @apply_to_return_value(HexBytes)
     def call(self, transaction, block_identifier=None):
         # TODO: move to middleware

web3/middleware/pythonic.py

@@ -109,6 +109,14 @@ def to_hexbytes(num_bytes, val, variable_length=False):
 transaction_formatter = apply_formatters_to_dict(TRANSACTION_FORMATTERS)
 
 
+SIGNED_TX_FORMATTER = {
+    'tx': transaction_formatter,
+}
+
+
+signed_tx_formatter = apply_formatters_to_dict(SIGNED_TX_FORMATTER)
+
+
 WHISPER_LOG_FORMATTERS = {
     'sig': to_hexbytes(130),
     'topic': to_hexbytes(8),
@@ -344,6 +352,7 @@ def to_hexbytes(num_bytes, val, variable_length=False):
         ),
         'eth_sendRawTransaction': to_hexbytes(32),
         'eth_sendTransaction': to_hexbytes(32),
+        'eth_signTransaction': apply_formatter_if(is_not_null, signed_tx_formatter),
         'eth_sign': HexBytes,
         'eth_syncing': apply_formatter_if(is_not_false, syncing_formatter),
         # personal

web3/providers/eth_tester/defaults.py

@@ -201,6 +201,7 @@ def personal_send_transaction(eth_tester, params):
         )),
         'getCode': call_eth_tester('get_code'),
         'sign': not_implemented,
+        'signTransaction': not_implemented,
         'sendTransaction': call_eth_tester('send_transaction'),
         'sendRawTransaction': call_eth_tester('send_raw_transaction'),
         'call': call_eth_tester('call'),  # TODO: untested