From 4204fd5ad60aeec5312153a06908be3d3027e4a0 Mon Sep 17 00:00:00 2001
From: Bhargavasomu <somubhargava97@gmail.com>
Date: Mon, 8 Apr 2019 21:15:42 +0530
Subject: [PATCH] Add support for eth_signTypedData, personal_signTypedData RPC
 call

---
 docs/web3.eth.rst                             |  21 ++-
 docs/web3.geth.rst                            |   3 +-
 docs/web3.parity.rst                          |  19 +-
 tests/integration/go_ethereum/common.py       |  16 ++
 tests/integration/parity/common.py            |  16 ++
 tests/integration/parity/test_parity_http.py  |   2 +
 tests/integration/parity/test_parity_ipc.py   |   2 +
 tests/integration/parity/test_parity_ws.py    |   2 +
 tests/integration/test_ethereum_tester.py     |   1 +
 web3/_utils/module_testing/eth_module.py      |  99 ++++++++++
 web3/_utils/module_testing/personal_module.py | 170 ++++++++++++++++++
 web3/_utils/personal.py                       |   6 +
 web3/_utils/rpc_abi.py                        |   2 +
 web3/eth.py                                   |   5 +
 web3/geth.py                                  |   2 +
 web3/middleware/exception_retry_request.py    |   4 +-
 web3/middleware/pythonic.py                   |   2 +
 web3/parity.py                                |   2 +
 18 files changed, 364 insertions(+), 10 deletions(-)

diff --git a/docs/web3.eth.rst b/docs/web3.eth.rst
index 6646f6abe5..ceb3b912de 100644
--- a/docs/web3.eth.rst
+++ b/docs/web3.eth.rst
@@ -654,6 +654,19 @@ The following methods are available on the ``web3.eth`` namespace.
         '0x1a8bbe6eab8c72a219385681efefe565afd3accee35f516f8edf5ae82208fbd45a58f9f9116d8d88ba40fcd29076d6eada7027a3b412a9db55a0164547810cc401'
 
 
+.. py:method:: Eth.signTypedData(account, jsonMessage)
+
+    * Delegates to ``eth_signTypedData`` RPC Method
+
+    Please note that the ``jsonMessage`` argument is the loaded JSON Object
+    and **NOT** the JSON String itself.
+
+    Signs the ``Structured Data`` (or ``Typed Data``) with the private key of the given ``account``.
+    The account must be unlocked.
+
+    ``account`` may be a hex address or an ENS name
+
+
 .. py:method:: Eth.call(transaction, block_identifier=web3.eth.defaultBlock)
 
     * Delegates to ``eth_call`` RPC Method
@@ -864,8 +877,8 @@ with the filtering API.
     * Delegates to ``eth_submitHashrate`` RPC Method
 
     .. code-block:: python
-     
-       >>> node_id = '59daa26581d0acd1fce254fb7e85952f4c09d0915afd33d3886cd914bc7d283c' 
+
+       >>> node_id = '59daa26581d0acd1fce254fb7e85952f4c09d0915afd33d3886cd914bc7d283c'
        >>> web3.eth.submitHashrate(5000, node_id)
        True
 
@@ -875,14 +888,14 @@ with the filtering API.
     * Delegates to ``eth_submitWork`` RPC Method.
 
     .. code-block:: python
-      
+
        >>> web3.eth.submitWork(
                1,
                '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
                '0xD1FE5700000000000000000000000000D1FE5700000000000000000000000000',
            )
        True
-  
+
 
 Contracts
 ---------
diff --git a/docs/web3.geth.rst b/docs/web3.geth.rst
index 181a66c718..dbf4883405 100644
--- a/docs/web3.geth.rst
+++ b/docs/web3.geth.rst
@@ -251,6 +251,7 @@ The following methods are available on the ``web3.geth.personal`` namespace.
         >>> web3.geth.personal.unlockAccount('0xd3cda913deb6f67967b99d67acdfa1712c293601', 'the-passphrase')
         True
 
+
 .. py:method:: sendTransaction(self, transaction, passphrase)
 
     * Delegates to ``personal_sendTransaction`` RPC Method
@@ -502,7 +503,7 @@ Full documentation for Geth-supported endpoints can be found `here <https://gith
 
 .. py:method:: Shh.newMessageFilter(self, criteria)
 
-    * Create a new filter id. This filter id can be used with ``ShhFilter`` to poll for new messages that match the set of criteria. 
+    * Create a new filter id. This filter id can be used with ``ShhFilter`` to poll for new messages that match the set of criteria.
 
     * Parameters:
         * ``symKeyID``: When using symmetric key encryption, holds the symmetric key ID.
diff --git a/docs/web3.parity.rst b/docs/web3.parity.rst
index 46b0f0592b..99c9583ed5 100644
--- a/docs/web3.parity.rst
+++ b/docs/web3.parity.rst
@@ -64,6 +64,7 @@ The following methods are available on the ``web3.parity.personal`` namespace.
         >>> web3.parity.personal.unlockAccount('0xd3cda913deb6f67967b99d67acdfa1712c293601', 'the-passphrase')
         True
 
+
 .. py:method:: sendTransaction(self, transaction, passphrase)
 
     * Delegates to ``personal_sendTransaction`` RPC Method
@@ -71,6 +72,16 @@ The following methods are available on the ``web3.parity.personal`` namespace.
     Sends the transaction.
 
 
+.. py:method:: signTypedData(self, jsonMessage, account, passphrase)
+
+    * Delegates to ``personal_signTypedData`` RPC Method
+
+    Please note that the ``jsonMessage`` argument is the loaded JSON Object
+    and **NOT** the JSON String itself.
+
+    Signs the ``Structured Data`` (or ``Typed Data``) with the passphrase of the given ``account``
+
+
 ParityShh
 ---------
 
@@ -121,14 +132,14 @@ Full documentation for Parity-supported endpoints can be found `here <https://wi
 
 .. py:method:: Shh.newMessageFilter(self, criteria)
 
-    * Return the filter ID that can be used with ``ShhFilter`` to poll for new messages that match the set of criteria. 
+    * Return the filter ID that can be used with ``ShhFilter`` to poll for new messages that match the set of criteria.
 
     * Parameters:
 		* ``decryptWith``: 32 bytes - Identity of key used for description. Null if listening for broadcasts.
 		* ``from``: 64 bytes - If present, only accept messages signed by this key.
         * ``topics``: Array of possible topics (or partial topics). Should be non-empty.
- 
-    * Returns the newly created filter id. 
+
+    * Returns the newly created filter id.
 
     .. code-block:: python
 
@@ -176,7 +187,7 @@ Full documentation for Parity-supported endpoints can be found `here <https://wi
 		True
 
 .. py:method:: Shh.unsubscribe(self, filter_id)
-	
+
 	* Close a subscribed filter.
 
     * Returns ``True`` if the filter subscription was sucesfully closed, otherwise ``False``
diff --git a/tests/integration/go_ethereum/common.py b/tests/integration/go_ethereum/common.py
index e1db920c20..0be57d54e5 100644
--- a/tests/integration/go_ethereum/common.py
+++ b/tests/integration/go_ethereum/common.py
@@ -71,6 +71,22 @@ def test_eth_chainId(self, web3):
             pytest.xfail('eth_chainId not implemented in geth 1.7.2')
         super().test_eth_chainId(web3)
 
+    def test_eth_signTypedData(self,
+                               web3,
+                               unlocked_account_dual_type):
+        pytest.xfail('eth_signTypedData JSON RPC call has not been released in geth')
+        super().test_eth_signTypedData(
+            web3, unlocked_account_dual_type
+        )
+
+    def test_invalid_eth_signTypedData(self,
+                                       web3,
+                                       unlocked_account_dual_type):
+        pytest.xfail('eth_signTypedData JSON RPC call has not been released in geth')
+        super().test_invalid_eth_signTypedData(
+            web3, unlocked_account_dual_type
+        )
+
 
 class GoEthereumVersionModuleTest(VersionModuleTest):
     pass
diff --git a/tests/integration/parity/common.py b/tests/integration/parity/common.py
index 167f2bfb87..a277c5d49e 100644
--- a/tests/integration/parity/common.py
+++ b/tests/integration/parity/common.py
@@ -168,6 +168,22 @@ def test_eth_getLogs_without_logs(self, web3, block_with_txn_with_log):
         result = web3.eth.getLogs(filter_params)
         assert len(result) == 0
 
+    def test_eth_signTypedData(self,
+                               web3,
+                               unlocked_account_dual_type):
+        pytest.xfail('eth_signTypedData JSON RPC call has not been released in parity')
+        super().test_eth_signTypedData(
+            web3, unlocked_account_dual_type
+        )
+
+    def test_invalid_eth_signTypedData(self,
+                                       web3,
+                                       unlocked_account_dual_type):
+        pytest.xfail('eth_signTypedData JSON RPC call has not been released in parity')
+        super().test_invalid_eth_signTypedData(
+            web3, unlocked_account_dual_type
+        )
+
 
 class ParityTraceModuleTest(TraceModuleTest):
     pass
diff --git a/tests/integration/parity/test_parity_http.py b/tests/integration/parity/test_parity_http.py
index 0765e2636f..2b58ed677e 100644
--- a/tests/integration/parity/test_parity_http.py
+++ b/tests/integration/parity/test_parity_http.py
@@ -49,6 +49,7 @@ def parity_command_arguments(
         '--password', passwordfile,
         '--jsonrpc-port', rpc_port,
         '--jsonrpc-apis', 'all',
+        '--jsonrpc-experimental',
         '--no-ipc',
         '--no-ws',
         '--whisper',
@@ -65,6 +66,7 @@ def parity_import_blocks_command(parity_binary, rpc_port, datadir, passwordfile)
         '--password', passwordfile,
         '--jsonrpc-port', str(rpc_port),
         '--jsonrpc-apis', 'all',
+        '--jsonrpc-experimental',
         '--no-ipc',
         '--no-ws',
         '--tracing', 'on',
diff --git a/tests/integration/parity/test_parity_ipc.py b/tests/integration/parity/test_parity_ipc.py
index a41b2e82c6..5a204d0469 100644
--- a/tests/integration/parity/test_parity_ipc.py
+++ b/tests/integration/parity/test_parity_ipc.py
@@ -47,6 +47,7 @@ def parity_command_arguments(
         '--unlock', author,
         '--password', passwordfile,
         '--ipc-apis', 'all',
+        '--jsonrpc-experimental',
         '--no-jsonrpc',
         '--no-ws',
         '--whisper',
@@ -63,6 +64,7 @@ def parity_import_blocks_command(parity_binary, ipc_path, datadir, passwordfile)
         '--base-path', datadir,
         '--password', passwordfile,
         '--ipc-apis', 'all',
+        '--jsonrpc-experimental',
         '--no-jsonrpc',
         '--no-ws',
         '--tracing', 'on',
diff --git a/tests/integration/parity/test_parity_ws.py b/tests/integration/parity/test_parity_ws.py
index baf8ef3648..a0e06f4384 100644
--- a/tests/integration/parity/test_parity_ws.py
+++ b/tests/integration/parity/test_parity_ws.py
@@ -51,6 +51,7 @@ def parity_command_arguments(
         '--ws-port', ws_port,
         '--ws-origins', '*',
         '--ws-apis', 'all',
+        '--jsonrpc-experimental',
         '--no-ipc',
         '--no-jsonrpc',
         '--whisper',
@@ -68,6 +69,7 @@ def parity_import_blocks_command(parity_binary, ws_port, datadir, passwordfile):
         '--ws-port', str(ws_port),
         '--ws-origins', '*',
         '--ws-apis', 'all',
+        '--jsonrpc-experimental',
         '--no-ipc',
         '--no-jsonrpc',
         '--tracing', 'on',
diff --git a/tests/integration/test_ethereum_tester.py b/tests/integration/test_ethereum_tester.py
index 48f7487930..fe4932d5f1 100644
--- a/tests/integration/test_ethereum_tester.py
+++ b/tests/integration/test_ethereum_tester.py
@@ -220,6 +220,7 @@ def func_wrapper(self, eth_tester, *args, **kwargs):
 
 class TestEthereumTesterEthModule(EthModuleTest):
     test_eth_sign = not_implemented(EthModuleTest.test_eth_sign, ValueError)
+    test_eth_signTypedData = not_implemented(EthModuleTest.test_eth_signTypedData, ValueError)
     test_eth_signTransaction = not_implemented(EthModuleTest.test_eth_signTransaction, ValueError)
     test_eth_submitHashrate = not_implemented(EthModuleTest.test_eth_submitHashrate, ValueError)
     test_eth_submitWork = not_implemented(EthModuleTest.test_eth_submitWork, ValueError)
diff --git a/web3/_utils/module_testing/eth_module.py b/web3/_utils/module_testing/eth_module.py
index dc96dd01be..11044afa51 100644
--- a/web3/_utils/module_testing/eth_module.py
+++ b/web3/_utils/module_testing/eth_module.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import json
 import pytest
 
 from eth_abi import (
@@ -202,6 +203,104 @@ def test_eth_sign(self, web3, unlocked_account_dual_type):
         )
         assert new_signature != signature
 
+    def test_eth_signTypedData(self, web3, unlocked_account_dual_type, skip_if_testrpc):
+        validJSONMessage = '''
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ],
+                    "Mail": [
+                        {"name": "from", "type": "Person"},
+                        {"name": "to", "type": "Person"},
+                        {"name": "contents", "type": "string"}
+                    ]
+                },
+                "primaryType": "Mail",
+                "domain": {
+                    "name": "Ether Mail",
+                    "version": "1",
+                    "chainId": "0x01",
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "from": {
+                        "name": "Cow",
+                        "wallet": "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                    },
+                    "to": {
+                        "name": "Bob",
+                        "wallet": "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
+                    },
+                    "contents": "Hello, Bob!"
+                }
+            }
+        '''
+        skip_if_testrpc(web3)
+        signature = HexBytes(web3.eth.signTypedData(
+            unlocked_account_dual_type,
+            json.loads(validJSONMessage)
+        ))
+        assert len(signature) == 32 + 32 + 1
+
+    def test_invalid_eth_signTypedData(self,
+                                       web3,
+                                       unlocked_account_dual_type,
+                                       skip_if_testrpc):
+        skip_if_testrpc(web3)
+        invalid_typed_message = '''
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ],
+                    "Mail": [
+                        {"name": "from", "type": "Person"},
+                        {"name": "to", "type": "Person[2]"},
+                        {"name": "contents", "type": "string"}
+                    ]
+                },
+                "primaryType": "Mail",
+                "domain": {
+                    "name": "Ether Mail",
+                    "version": "1",
+                    "chainId": "0x01",
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "from": {
+                        "name": "Cow",
+                        "wallet": "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                    },
+                    "to": [{
+                        "name": "Bob",
+                        "wallet": "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
+                    }],
+                    "contents": "Hello, Bob!"
+                }
+            }
+        '''
+        with pytest.raises(ValueError) as e:
+            web3.eth.signTypedData(
+                unlocked_account_dual_type,
+                json.loads(invalid_typed_message)
+            )
+        assert "Expected 2 items for array type Person[2], got 1 items" in str(e.value)
+
     def test_eth_signTransaction(self, web3, unlocked_account):
         txn_params = {
             'from': unlocked_account,
diff --git a/web3/_utils/module_testing/personal_module.py b/web3/_utils/module_testing/personal_module.py
index 82a54f7821..d9c891a1ed 100644
--- a/web3/_utils/module_testing/personal_module.py
+++ b/web3/_utils/module_testing/personal_module.py
@@ -1,3 +1,4 @@
+import json
 import pytest
 
 from eth_utils import (
@@ -5,6 +6,9 @@
     is_list_like,
     is_same_address,
 )
+from hexbytes import (
+    HexBytes,
+)
 
 PRIVATE_KEY_HEX = '0x56ebb41875ceedd42e395f730e03b5c44989393c9f0484ee6bc05f933673458f'
 PASSWORD = 'web3-testing'
@@ -89,6 +93,64 @@ def test_personal_sign_and_ecrecover(self,
         signer = web3.geth.personal.ecRecover(message, signature)
         assert is_same_address(signer, unlockable_account_dual_type)
 
+    @pytest.mark.xfail(reason="personal_signTypedData JSON RPC call has not been released in geth")
+    def test_personal_sign_typed_data(self,
+                                      web3,
+                                      unlockable_account_dual_type,
+                                      unlockable_account_pw):
+        typed_message = '''
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ],
+                    "Mail": [
+                        {"name": "from", "type": "Person"},
+                        {"name": "to", "type": "Person"},
+                        {"name": "contents", "type": "string"}
+                    ]
+                },
+                "primaryType": "Mail",
+                "domain": {
+                    "name": "Ether Mail",
+                    "version": "1",
+                    "chainId": "0x01",
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "from": {
+                        "name": "Cow",
+                        "wallet": "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                    },
+                    "to": {
+                        "name": "Bob",
+                        "wallet": "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
+                    },
+                    "contents": "Hello, Bob!"
+                }
+            }
+        '''
+        signature = HexBytes(web3.geth.personal.signTypedData(
+            json.loads(typed_message),
+            unlockable_account_dual_type,
+            unlockable_account_pw
+        ))
+
+        expected_signature = HexBytes(
+            "0xc8b56aaeefd10ab4005c2455daf28d9082af661ac347cd"
+            "b612d5b5e11f339f2055be831bf57a6e6cb5f6d93448fa35"
+            "c1bd56fe1d745ffa101e74697108668c401c"
+        )
+        assert signature == expected_signature
+        assert len(signature) == 32 + 32 + 1
+
 
 class ParityPersonalModuleTest():
     def test_personal_listAccounts(self, web3):
@@ -169,3 +231,111 @@ def test_personal_sign_and_ecrecover(self,
         )
         signer = web3.parity.personal.ecRecover(message, signature)
         assert is_same_address(signer, unlockable_account_dual_type)
+
+    def test_personal_sign_typed_data(self,
+                                      web3,
+                                      unlockable_account_dual_type,
+                                      unlockable_account_pw):
+        typed_message = '''
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ],
+                    "Mail": [
+                        {"name": "from", "type": "Person"},
+                        {"name": "to", "type": "Person"},
+                        {"name": "contents", "type": "string"}
+                    ]
+                },
+                "primaryType": "Mail",
+                "domain": {
+                    "name": "Ether Mail",
+                    "version": "1",
+                    "chainId": "0x01",
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "from": {
+                        "name": "Cow",
+                        "wallet": "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                    },
+                    "to": {
+                        "name": "Bob",
+                        "wallet": "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
+                    },
+                    "contents": "Hello, Bob!"
+                }
+            }
+        '''
+        signature = HexBytes(web3.parity.personal.signTypedData(
+            json.loads(typed_message),
+            unlockable_account_dual_type,
+            unlockable_account_pw
+        ))
+
+        expected_signature = HexBytes(
+            "0xc8b56aaeefd10ab4005c2455daf28d9082af661ac347cd"
+            "b612d5b5e11f339f2055be831bf57a6e6cb5f6d93448fa35"
+            "c1bd56fe1d745ffa101e74697108668c401c"
+        )
+        assert signature == expected_signature
+        assert len(signature) == 32 + 32 + 1
+
+    def test_invalid_personal_sign_typed_data(self,
+                                              web3,
+                                              unlockable_account_dual_type,
+                                              unlockable_account_pw):
+        invalid_typed_message = '''
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ],
+                    "Mail": [
+                        {"name": "from", "type": "Person"},
+                        {"name": "to", "type": "Person[2]"},
+                        {"name": "contents", "type": "string"}
+                    ]
+                },
+                "primaryType": "Mail",
+                "domain": {
+                    "name": "Ether Mail",
+                    "version": "1",
+                    "chainId": "0x01",
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "from": {
+                        "name": "Cow",
+                        "wallet": "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                    },
+                    "to": [{
+                        "name": "Bob",
+                        "wallet": "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
+                    }],
+                    "contents": "Hello, Bob!"
+                }
+            }
+        '''
+        with pytest.raises(ValueError) as e:
+            web3.parity.personal.signTypedData(
+                json.loads(invalid_typed_message),
+                unlockable_account_dual_type,
+                unlockable_account_pw
+            )
+        assert "Expected 2 items for array type Person[2], got 1 items" in str(e.value)
diff --git a/web3/_utils/personal.py b/web3/_utils/personal.py
index 43ffbd32ca..7796483e39 100644
--- a/web3/_utils/personal.py
+++ b/web3/_utils/personal.py
@@ -45,6 +45,12 @@
 )
 
 
+signTypedData = Method(
+    "personal_signTypedData",
+    mungers=[default_root_munger],
+)
+
+
 ecRecover = Method(
     "personal_ecRecover",
     mungers=[default_root_munger],
diff --git a/web3/_utils/rpc_abi.py b/web3/_utils/rpc_abi.py
index 880a57e69e..5ca058083c 100644
--- a/web3/_utils/rpc_abi.py
+++ b/web3/_utils/rpc_abi.py
@@ -52,6 +52,7 @@
     'eth_sendTransaction': TRANSACTION_PARAMS_ABIS,
     'eth_signTransaction': TRANSACTION_PARAMS_ABIS,
     'eth_sign': ['address', 'bytes'],
+    'eth_signTypedData': ['address', None],
     'eth_submitHashrate': ['uint', 'bytes32'],
     'eth_submitWork': ['bytes8', 'bytes32', 'bytes32'],
     # personal
@@ -59,6 +60,7 @@
     'personal_lockAccount': ['address'],
     'personal_unlockAccount': ['address', None, None],
     'personal_sign': [None, 'address', None],
+    'personal_signTypedData': [None, 'address', None],
     'trace_call': TRACE_PARAMS_ABIS,
     # parity
     'parity_listStorageKeys': ['address', None, None, None],
diff --git a/web3/eth.py b/web3/eth.py
index b8f442aaa3..79f874e478 100644
--- a/web3/eth.py
+++ b/web3/eth.py
@@ -320,6 +320,11 @@ def signTransaction(self, transaction):
             "eth_signTransaction", [transaction],
         )
 
+    def signTypedData(self, account, jsonMessage):
+        return self.web3.manager.request_blocking(
+            "eth_signTypedData", [account, jsonMessage],
+        )
+
     @apply_to_return_value(HexBytes)
     def call(self, transaction, block_identifier=None):
         # TODO: move to middleware
diff --git a/web3/geth.py b/web3/geth.py
index 8b6d926761..41a8185706 100644
--- a/web3/geth.py
+++ b/web3/geth.py
@@ -30,6 +30,7 @@
     newAccount,
     sendTransaction,
     sign,
+    signTypedData,
     unlockAccount,
 )
 from web3._utils.txpool import (
@@ -58,6 +59,7 @@ class GethPersonal(ModuleV2):
     newAccount = newAccount
     sendTransaction = sendTransaction
     sign = sign
+    signTypedData = signTypedData
     unlockAccount = unlockAccount
 
 
diff --git a/web3/middleware/exception_retry_request.py b/web3/middleware/exception_retry_request.py
index 56210648f5..dbe575ff9f 100644
--- a/web3/middleware/exception_retry_request.py
+++ b/web3/middleware/exception_retry_request.py
@@ -47,6 +47,7 @@
     'eth_getCompilers',
     'eth_getWork',
     'eth_sign',
+    'eth_signTypedData',
     'eth_sendRawTransaction',
     'personal_importRawKey',
     'personal_newAccount',
@@ -54,7 +55,8 @@
     'personal_lockAccount',
     'personal_unlockAccount',
     'personal_ecRecover',
-    'personal_sign'
+    'personal_sign',
+    'personal_signTypedData',
 ]
 
 
diff --git a/web3/middleware/pythonic.py b/web3/middleware/pythonic.py
index 7296c0a2d0..b66330ce20 100644
--- a/web3/middleware/pythonic.py
+++ b/web3/middleware/pythonic.py
@@ -355,11 +355,13 @@ def to_hexbytes(num_bytes, val, variable_length=False):
         'eth_sendTransaction': to_hexbytes(32),
         'eth_signTransaction': apply_formatter_if(is_not_null, signed_tx_formatter),
         'eth_sign': HexBytes,
+        'eth_signTypedData': HexBytes,
         'eth_syncing': apply_formatter_if(is_not_false, syncing_formatter),
         # personal
         'personal_importRawKey': to_checksum_address,
         'personal_listAccounts': apply_formatter_to_array(to_checksum_address),
         'personal_newAccount': to_checksum_address,
+        'personal_signTypedData': HexBytes,
         'personal_sendTransaction': to_hexbytes(32),
         # SHH
         'shh_getFilterMessages': apply_formatter_to_array(whisper_log_formatter),
diff --git a/web3/parity.py b/web3/parity.py
index 6ff23cd09c..f660fa00e6 100644
--- a/web3/parity.py
+++ b/web3/parity.py
@@ -12,6 +12,7 @@
     newAccount,
     sendTransaction,
     sign,
+    signTypedData,
     unlockAccount,
 )
 from web3._utils.toolz import (
@@ -54,6 +55,7 @@ class ParityPersonal(ModuleV2):
     newAccount = newAccount
     sendTransaction = sendTransaction
     sign = sign
+    signTypedData = signTypedData
     unlockAccount = unlockAccount