diff --git a/tests/core/contracts/contract_sources/Emitter.sol b/tests/core/contracts/contract_sources/Emitter.sol
index 022978118b..5d38445e3a 100644
--- a/tests/core/contracts/contract_sources/Emitter.sol
+++ b/tests/core/contracts/contract_sources/Emitter.sol
@@ -75,16 +75,28 @@ contract Emitter {
         else if (which == WhichEvent.LogQuadrupleWithIndex) emit LogQuadrupleWithIndex(arg0, arg1, arg2, arg3);
         else revert("Didn't match any allowable event index");
     }
+
     function logDynamicArgs(string arg0, string arg1) public {
         emit LogDynamicArgs(arg0, arg1);
     }
+
     function logListArgs(bytes2[] arg0, bytes2[] arg1) public {
         emit LogListArgs(arg0, arg1);
     }
+
     function logAddressIndexedArgs(address arg0, address arg1) public {
         emit LogAddressIndexed(arg0, arg1);
     }
+
     function logAddressNotIndexedArgs(address arg0, address arg1) public {
         emit LogAddressNotIndexed(arg0, arg1);
     }
+
+    function logBytes(bytes v) public {
+        emit LogBytes(v);
+    }
+
+    function logString(string v) public {
+        emit LogString(v);
+    }
 }
diff --git a/tests/core/filtering/conftest.py b/tests/core/filtering/conftest.py
index 83ead8787b..a3f4cf4552 100644
--- a/tests/core/filtering/conftest.py
+++ b/tests/core/filtering/conftest.py
@@ -1,5 +1,4 @@
 import functools
-import json
 import pytest
 
 from eth_utils import (
@@ -9,6 +8,11 @@
 )
 
 from web3 import Web3
+from web3._utils.module_testing.emitter_contract import (
+    CONTRACT_EMITTER_ABI,
+    CONTRACT_EMITTER_CODE,
+    CONTRACT_EMITTER_RUNTIME,
+)
 from web3.middleware import (
     local_filter_middleware,
 )
@@ -40,13 +44,6 @@ def wait_for_mining_start(web3, wait_for_block):
     wait_for_block(web3)
 
 
-CONTRACT_EMITTER_CODE = "608060405234801561001057600080fd5b50610e10806100206000396000f300608060405260043610610099576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806317c0c1801461009e57806320f0256e146100ce57806390b41d8b14610126578063966b50e01461016a5780639c37705314610213578063aa6fd82214610261578063acabb9ed1461029b578063b2ddc4491461034a578063f82ef69e146103ad575b600080fd5b3480156100aa57600080fd5b506100cc600480360381019080803560ff169060200190929190505050610410565b005b3480156100da57600080fd5b50610124600480360381019080803560ff16906020019092919080359060200190929190803590602001909291908035906020019092919080359060200190929190505050610527565b005b34801561013257600080fd5b50610168600480360381019080803560ff169060200190929190803590602001909291908035906020019092919050505061069b565b005b34801561017657600080fd5b506102116004803603810190808035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050610830565b005b34801561021f57600080fd5b5061025f600480360381019080803560ff1690602001909291908035906020019092919080359060200190929190803590602001909291905050506108ef565b005b34801561026d57600080fd5b50610299600480360381019080803560ff16906020019092919080359060200190929190505050610a52565b005b3480156102a757600080fd5b50610348600480360381019080803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290505050610bc8565b005b34801561035657600080fd5b506103ab600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610ccb565b005b3480156103b957600080fd5b5061040e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610d49565b005b6001601081111561041d57fe5b81601081111561042957fe5b1415610460577f1e86022f78f8d04f8e3dfd13a2bdb280403e6632877c0dbee5e4eeb259908a5c60405160405180910390a1610524565b6000601081111561046d57fe5b81601081111561047957fe5b141561048f5760405160405180910390a0610523565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b50565b6005601081111561053457fe5b85601081111561054057fe5b141561059a577ff039d147f23fe975a4254bdf6b1502b8c79132ae1833986b7ccef2638e73fdf9848484846040518085815260200184815260200183815260200182815260200194505050505060405180910390a1610694565b600b60108111156105a757fe5b8560108111156105b357fe5b14156105ff5780827fa30ece802b64cd2b7e57dabf4010aabf5df26d1556977affb07b98a77ad955b58686604051808381526020018281526020019250505060405180910390a3610693565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b5050505050565b600360108111156106a857fe5b8360108111156106b457fe5b14156106fe577fdf0cb1dea99afceb3ea698d62e705b736f1345a7eee9eb07e63d1f8f556c1bc58282604051808381526020018281526020019250505060405180910390a161082b565b6009601081111561070b57fe5b83601081111561071757fe5b141561075a57807f057bc32826fbe161da1c110afcdcae7c109a8b69149f727fc37a603c60ef94ca836040518082815260200191505060405180910390a261082a565b6008601081111561076757fe5b83601081111561077357fe5b14156107955780826040518082815260200191505060405180910390a1610829565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b5b505050565b8160405180828051906020019060200280838360005b83811015610861578082015181840152602081019050610846565b5050505090500191505060405180910390207fdbc4c1d1d2f0d84e58d36ca767ec9ba2ec2f933c055e50e5ccdd57697f7b58b0826040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156108d85780820151818401526020810190506108bd565b505050509050019250505060405180910390a25050565b600460108111156108fc57fe5b84601081111561090857fe5b141561095a577f4a25b279c7c585f25eda9788ac9420ebadae78ca6b206a0e6ab488fd81f5506283838360405180848152602001838152602001828152602001935050505060405180910390a1610a4c565b600a601081111561096757fe5b84601081111561097357fe5b14156109b75780827ff16c999b533366ca5138d78e85da51611089cd05749f098d6c225d4cd42ee6ec856040518082815260200191505060405180910390a3610a4b565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b50505050565b60026010811115610a5f57fe5b826010811115610a6b57fe5b1415610aad577f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040518082815260200191505060405180910390a1610bc4565b60076010811115610aba57fe5b826010811115610ac657fe5b1415610afe57807ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1560405160405180910390a2610bc3565b60066010811115610b0b57fe5b826010811115610b1757fe5b1415610b2e578060405160405180910390a1610bc2565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b5b5050565b816040518082805190602001908083835b602083101515610bfe5780518252602082019150602081019050602083039250610bd9565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207fe77cf33df73da7bc2e253a2dae617e6f15e4e337eaa462a108903af4643d1b75826040518080602001828103825283818151815260200191508051906020019080838360005b83811015610c8d578082015181840152602081019050610c72565b50505050905090810190601f168015610cba5780820380516001836020036101000a031916815260200191505b509250505060405180910390a25050565b8173ffffffffffffffffffffffffffffffffffffffff167ff922c215689548d72c3d2fe4ea8dafb2a30c43312c9b43fe5d10f713181f991c82604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a25050565b7f06029e18f16caae06a69281f35b00ed3fcf47950e6c99dafa1bdd8c4b93479a08282604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019250505060405180910390a150505600a165627a7a723058206b3490a28a048def91b89411c0c79f38d5763996fb4dc8e14e0ee0a965d482830029"  # noqa: E501
-
-CONTRACT_EMITTER_RUNTIME = "608060405260043610610099576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806317c0c1801461009e57806320f0256e146100ce57806390b41d8b14610126578063966b50e01461016a5780639c37705314610213578063aa6fd82214610261578063acabb9ed1461029b578063b2ddc4491461034a578063f82ef69e146103ad575b600080fd5b3480156100aa57600080fd5b506100cc600480360381019080803560ff169060200190929190505050610410565b005b3480156100da57600080fd5b50610124600480360381019080803560ff16906020019092919080359060200190929190803590602001909291908035906020019092919080359060200190929190505050610527565b005b34801561013257600080fd5b50610168600480360381019080803560ff169060200190929190803590602001909291908035906020019092919050505061069b565b005b34801561017657600080fd5b506102116004803603810190808035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050610830565b005b34801561021f57600080fd5b5061025f600480360381019080803560ff1690602001909291908035906020019092919080359060200190929190803590602001909291905050506108ef565b005b34801561026d57600080fd5b50610299600480360381019080803560ff16906020019092919080359060200190929190505050610a52565b005b3480156102a757600080fd5b50610348600480360381019080803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290505050610bc8565b005b34801561035657600080fd5b506103ab600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610ccb565b005b3480156103b957600080fd5b5061040e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610d49565b005b6001601081111561041d57fe5b81601081111561042957fe5b1415610460577f1e86022f78f8d04f8e3dfd13a2bdb280403e6632877c0dbee5e4eeb259908a5c60405160405180910390a1610524565b6000601081111561046d57fe5b81601081111561047957fe5b141561048f5760405160405180910390a0610523565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b50565b6005601081111561053457fe5b85601081111561054057fe5b141561059a577ff039d147f23fe975a4254bdf6b1502b8c79132ae1833986b7ccef2638e73fdf9848484846040518085815260200184815260200183815260200182815260200194505050505060405180910390a1610694565b600b60108111156105a757fe5b8560108111156105b357fe5b14156105ff5780827fa30ece802b64cd2b7e57dabf4010aabf5df26d1556977affb07b98a77ad955b58686604051808381526020018281526020019250505060405180910390a3610693565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b5050505050565b600360108111156106a857fe5b8360108111156106b457fe5b14156106fe577fdf0cb1dea99afceb3ea698d62e705b736f1345a7eee9eb07e63d1f8f556c1bc58282604051808381526020018281526020019250505060405180910390a161082b565b6009601081111561070b57fe5b83601081111561071757fe5b141561075a57807f057bc32826fbe161da1c110afcdcae7c109a8b69149f727fc37a603c60ef94ca836040518082815260200191505060405180910390a261082a565b6008601081111561076757fe5b83601081111561077357fe5b14156107955780826040518082815260200191505060405180910390a1610829565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b5b505050565b8160405180828051906020019060200280838360005b83811015610861578082015181840152602081019050610846565b5050505090500191505060405180910390207fdbc4c1d1d2f0d84e58d36ca767ec9ba2ec2f933c055e50e5ccdd57697f7b58b0826040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156108d85780820151818401526020810190506108bd565b505050509050019250505060405180910390a25050565b600460108111156108fc57fe5b84601081111561090857fe5b141561095a577f4a25b279c7c585f25eda9788ac9420ebadae78ca6b206a0e6ab488fd81f5506283838360405180848152602001838152602001828152602001935050505060405180910390a1610a4c565b600a601081111561096757fe5b84601081111561097357fe5b14156109b75780827ff16c999b533366ca5138d78e85da51611089cd05749f098d6c225d4cd42ee6ec856040518082815260200191505060405180910390a3610a4b565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b50505050565b60026010811115610a5f57fe5b826010811115610a6b57fe5b1415610aad577f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040518082815260200191505060405180910390a1610bc4565b60076010811115610aba57fe5b826010811115610ac657fe5b1415610afe57807ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1560405160405180910390a2610bc3565b60066010811115610b0b57fe5b826010811115610b1757fe5b1415610b2e578060405160405180910390a1610bc2565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7481526020017f20696e646578000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b5b5050565b816040518082805190602001908083835b602083101515610bfe5780518252602082019150602081019050602083039250610bd9565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207fe77cf33df73da7bc2e253a2dae617e6f15e4e337eaa462a108903af4643d1b75826040518080602001828103825283818151815260200191508051906020019080838360005b83811015610c8d578082015181840152602081019050610c72565b50505050905090810190601f168015610cba5780820380516001836020036101000a031916815260200191505b509250505060405180910390a25050565b8173ffffffffffffffffffffffffffffffffffffffff167ff922c215689548d72c3d2fe4ea8dafb2a30c43312c9b43fe5d10f713181f991c82604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a25050565b7f06029e18f16caae06a69281f35b00ed3fcf47950e6c99dafa1bdd8c4b93479a08282604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019250505060405180910390a150505600a165627a7a723058206b3490a28a048def91b89411c0c79f38d5763996fb4dc8e14e0ee0a965d482830029"  # noqa: E501
-
-CONTRACT_EMITTER_ABI = json.loads('[{"constant":false,"inputs":[{"name":"which","type":"uint8"}],"name":"logNoArgs","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"which","type":"uint8"},{"name":"arg0","type":"uint256"},{"name":"arg1","type":"uint256"},{"name":"arg2","type":"uint256"},{"name":"arg3","type":"uint256"}],"name":"logQuadruple","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"which","type":"uint8"},{"name":"arg0","type":"uint256"},{"name":"arg1","type":"uint256"}],"name":"logDouble","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"arg0","type":"bytes2[]"},{"name":"arg1","type":"bytes2[]"}],"name":"logListArgs","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"which","type":"uint8"},{"name":"arg0","type":"uint256"},{"name":"arg1","type":"uint256"},{"name":"arg2","type":"uint256"}],"name":"logTriple","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"which","type":"uint8"},{"name":"arg0","type":"uint256"}],"name":"logSingle","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"arg0","type":"string"},{"name":"arg1","type":"string"}],"name":"logDynamicArgs","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"arg0","type":"address"},{"name":"arg1","type":"address"}],"name":"logAddressIndexedArgs","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"arg0","type":"address"},{"name":"arg1","type":"address"}],"name":"logAddressNotIndexedArgs","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":true,"inputs":[],"name":"LogAnonymous","type":"event"},{"anonymous":false,"inputs":[],"name":"LogNoArguments","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"arg0","type":"uint256"}],"name":"LogSingleArg","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"arg0","type":"uint256"},{"indexed":false,"name":"arg1","type":"uint256"}],"name":"LogDoubleArg","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"arg0","type":"uint256"},{"indexed":false,"name":"arg1","type":"uint256"},{"indexed":false,"name":"arg2","type":"uint256"}],"name":"LogTripleArg","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"arg0","type":"uint256"},{"indexed":false,"name":"arg1","type":"uint256"},{"indexed":false,"name":"arg2","type":"uint256"},{"indexed":false,"name":"arg3","type":"uint256"}],"name":"LogQuadrupleArg","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"v","type":"string"}],"name":"LogString","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"v","type":"bytes"}],"name":"LogBytes","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"arg0","type":"uint256"}],"name":"LogSingleWithIndex","type":"event"},{"anonymous":true,"inputs":[{"indexed":true,"name":"arg0","type":"uint256"}],"name":"LogSingleAnonymous","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"arg0","type":"uint256"},{"indexed":true,"name":"arg1","type":"uint256"}],"name":"LogDoubleWithIndex","type":"event"},{"anonymous":true,"inputs":[{"indexed":false,"name":"arg0","type":"uint256"},{"indexed":true,"name":"arg1","type":"uint256"}],"name":"LogDoubleAnonymous","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"arg0","type":"uint256"},{"indexed":true,"name":"arg1","type":"uint256"},{"indexed":true,"name":"arg2","type":"uint256"}],"name":"LogTripleWithIndex","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"arg0","type":"uint256"},{"indexed":false,"name":"arg1","type":"uint256"},{"indexed":true,"name":"arg2","type":"uint256"},{"indexed":true,"name":"arg3","type":"uint256"}],"name":"LogQuadrupleWithIndex","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"arg0","type":"string"},{"indexed":false,"name":"arg1","type":"string"}],"name":"LogDynamicArgs","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"arg0","type":"bytes2[]"},{"indexed":false,"name":"arg1","type":"bytes2[]"}],"name":"LogListArgs","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"arg0","type":"address"},{"indexed":false,"name":"arg1","type":"address"}],"name":"LogAddressIndexed","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"arg0","type":"address"},{"indexed":false,"name":"arg1","type":"address"}],"name":"LogAddressNotIndexed","type":"event"}]')  # noqa: E501
-
-
 @pytest.fixture()
 def EMITTER_CODE():
     return CONTRACT_EMITTER_CODE
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index d703917b7f..0b50516ceb 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -2,8 +2,8 @@
 import pytest
 
 from web3._utils.module_testing.emitter_contract import (
-    EMITTER_ABI,
-    EMITTER_BYTECODE,
+    CONTRACT_EMITTER_ABI,
+    CONTRACT_EMITTER_CODE,
 )
 from web3._utils.module_testing.math_contract import (
     MATH_ABI,
@@ -19,7 +19,7 @@ def math_contract_factory(web3):
 
 @pytest.fixture(scope="module")
 def emitter_contract_factory(web3):
-    contract_factory = web3.eth.contract(abi=EMITTER_ABI, bytecode=EMITTER_BYTECODE)
+    contract_factory = web3.eth.contract(abi=CONTRACT_EMITTER_ABI, bytecode=CONTRACT_EMITTER_CODE)
     return contract_factory
 
 
diff --git a/web3/_utils/module_testing/emitter_contract.py b/web3/_utils/module_testing/emitter_contract.py
index ccccbc3841..1cf7eb813f 100644
--- a/web3/_utils/module_testing/emitter_contract.py
+++ b/web3/_utils/module_testing/emitter_contract.py
@@ -1,218 +1,652 @@
-
-EMITTER_BYTECODE = (
-    "60606040526104ae806100126000396000f3606060405236156100615760e060020a60003504630b"
-    "b563d6811461006357806317c0c1801461013657806320f0256e1461017057806390b41d8b146101"
-    "ca5780639c37705314610215578063aa6fd82214610267578063e17bf956146102a9575b005b6020"
-    "6004803580820135601f810184900490930260809081016040526060848152610061946024939192"
-    "918401918190838280828437509496505050505050507fa95e6e2a182411e7a6f9ed114a85c3761d"
-    "87f9b8f453d842c71235aa64fff99f81604051808060200182810382528381815181526020019150"
-    "80519060200190808383829060006004602084601f0104600f02600301f150905090810190601f16"
-    "80156101255780820380516001836020036101000a031916815260200191505b5092505050604051"
-    "80910390a15b50565b610061600435600181141561037a577f1e86022f78f8d04f8e3dfd13a2bdb2"
-    "80403e6632877c0dbee5e4eeb259908a5c60006060a1610133565b61006160043560243560443560"
-    "64356084356005851415610392576060848152608084815260a084905260c08390527ff039d147f2"
-    "3fe975a4254bdf6b1502b8c79132ae1833986b7ccef2638e73fdf991a15b5050505050565b610061"
-    "60043560243560443560038314156103d457606082815260808290527fdf0cb1dea99afceb3ea698"
-    "d62e705b736f1345a7eee9eb07e63d1f8f556c1bc590604090a15b505050565b6100616004356024"
-    "356044356064356004841415610428576060838152608083905260a08290527f4a25b279c7c585f2"
-    "5eda9788ac9420ebadae78ca6b206a0e6ab488fd81f550629080a15b50505050565b610061600435"
-    "60243560028214156104655760608181527f56d2ef3c5228bf5d88573621e325a4672ab50e033749"
-    "a601e4f4a5e1dce905d490602090a15b5050565b60206004803580820135601f8101849004909302"
-    "60809081016040526060848152610061946024939192918401918190838280828437509496505050"
-    "505050507f532fd6ea96cfb78bb46e09279a26828b8b493de1a2b8b1ee1face527978a15a5816040"
-    "51808060200182810382528381815181526020019150805190602001908083838290600060046020"
-    "84601f0104600f02600301f150905090810190601f16801561012557808203805160018360200361"
-    "01000a03191681526020019150509250505060405180910390a150565b600081141561038d576000"
-    "6060a0610133565b610002565b600b85141561038d5760608481526080849052819083907fa30ece"
-    "802b64cd2b7e57dabf4010aabf5df26d1556977affb07b98a77ad955b590604090a36101c3565b60"
-    "0983141561040f57606082815281907f057bc32826fbe161da1c110afcdcae7c109a8b69149f727f"
-    "c37a603c60ef94ca90602090a2610210565b600883141561038d5760608281528190602090a16102"
-    "10565b600a84141561038d576060838152819083907ff16c999b533366ca5138d78e85da51611089"
-    "cd05749f098d6c225d4cd42ee6ec90602090a3610261565b600782141561049a57807ff70fe689e2"
-    "90d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1560006060a26102a5565b600682"
-    "141561038d578060006060a16102a556"
+CONTRACT_EMITTER_CODE = (
+    "608060405234801561001057600080fd5b50610aed806100206000396000f300608060405260043"
+    "6106100ae5763ffffffff7c01000000000000000000000000000000000000000000000000000000"
+    "006000350416630bb563d681146100b357806317c0c1801461010e57806320f0256e14610129578"
+    "06390b41d8b14610150578063966b50e0146101715780639c377053146101ff578063aa6fd82214"
+    "610223578063acabb9ed14610241578063b2ddc449146102d8578063e17bf9561461030c578063f"
+    "82ef69e14610365575b600080fd5b3480156100bf57600080fd5b50604080516020600480358082"
+    "0135601f810184900484028501840190955284845261010c9436949293602493928401919081908"
+    "401838280828437509497506103999650505050505050565b005b34801561011a57600080fd5b50"
+    "61010c60ff60043516610435565b34801561013557600080fd5b5061010c60ff600435166024356"
+    "04435606435608435610527565b34801561015c57600080fd5b5061010c60ff6004351660243560"
+    "44356105e4565b34801561017d57600080fd5b50604080516020600480358082013583810280860"
+    "1850190965280855261010c95369593946024949385019291829185019084908082843750506040"
+    "805187358901803560208181028481018201909552818452989b9a9989019892975090820195509"
+    "350839250850190849080828437509497506106b49650505050505050565b34801561020b576000"
+    "80fd5b5061010c60ff6004351660243560443560643561076d565b34801561022f57600080fd5b5"
+    "061010c60ff60043516602435610818565b34801561024d57600080fd5b50604080516020600480"
+    "3580820135601f810184900484028501840190955284845261010c9436949293602493928401919"
+    "0819084018382808284375050604080516020601f89358b01803591820183900483028401830190"
+    "9452808352979a9998810197919650918201945092508291508401838280828437509497506108c"
+    "a9650505050505050565b3480156102e457600080fd5b5061010c73ffffffffffffffffffffffff"
+    "ffffffffffffffff600435811690602435166109bb565b34801561031857600080fd5b506040805"
+    "160206004803580820135601f810184900484028501840190955284845261010c94369492936024"
+    "9392840191908190840183828082843750949750610a0d9650505050505050565b3480156103715"
+    "7600080fd5b5061010c73ffffffffffffffffffffffffffffffffffffffff600435811690602435"
+    "16610a6b565b7fa95e6e2a182411e7a6f9ed114a85c3761d87f9b8f453d842c71235aa64fff99f8"
+    "16040518080602001828103825283818151815260200191508051906020019080838360005b8381"
+    "10156103f85781810151838201526020016103e0565b50505050905090810190601f16801561042"
+    "55780820380516001836020036101000a031916815260200191505b509250505060405180910390"
+    "a150565b600181601181111561044357fe5b1415610477576040517f1e86022f78f8d04f8e3dfd1"
+    "3a2bdb280403e6632877c0dbee5e4eeb259908a5c90600090a1610524565b600081601181111561"
+    "048557fe5b141561049757604051600090a0610524565b604080517f08c379a0000000000000000"
+    "00000000000000000000000000000000000000000815260206004820152602660248201527f4469"
+    "646e2774206d6174636820616e7920616c6c6f7761626c65206576656e7460448201527f20696e6"
+    "4657800000000000000000000000000000000000000000000000000006064820152905190819003"
+    "60840190fd5b50565b600585601181111561053557fe5b141561058757604080518581526020810"
+    "18590528082018490526060810183905290517ff039d147f23fe975a4254bdf6b1502b8c79132ae"
+    "1833986b7ccef2638e73fdf99181900360800190a16105dd565b600b85601181111561059557fe5"
+    "b14156104975780827fa30ece802b64cd2b7e57dabf4010aabf5df26d1556977affb07b98a77ad9"
+    "55b58686604051808381526020018281526020019250505060405180910390a35b5050505050565"
+    "b60038360118111156105f257fe5b141561063857604080518381526020810183905281517fdf0c"
+    "b1dea99afceb3ea698d62e705b736f1345a7eee9eb07e63d1f8f556c1bc5929181900390910190a"
+    "16106af565b600983601181111561064657fe5b14156106875760408051838152905182917f057b"
+    "c32826fbe161da1c110afcdcae7c109a8b69149f727fc37a603c60ef94ca919081900360200190a"
+    "26106af565b600883601181111561069557fe5b1415610497576040805183815290518291819003"
+    "60200190a15b505050565b8160405180828051906020019060200280838360005b838110156106e"
+    "25781810151838201526020016106ca565b5050505090500191505060405180910390207fdbc4c1"
+    "d1d2f0d84e58d36ca767ec9ba2ec2f933c055e50e5ccdd57697f7b58b0826040518080602001828"
+    "103825283818151815260200191508051906020019060200280838360005b838110156107565781"
+    "8101518382015260200161073e565b505050509050019250505060405180910390a25050565b600"
+    "484601181111561077b57fe5b14156107c657604080518481526020810184905280820183905290"
+    "517f4a25b279c7c585f25eda9788ac9420ebadae78ca6b206a0e6ab488fd81f5506291819003606"
+    "00190a1610812565b600a8460118111156107d457fe5b1415610497576040805184815290518291"
+    "84917ff16c999b533366ca5138d78e85da51611089cd05749f098d6c225d4cd42ee6ec918190036"
+    "0200190a35b50505050565b600282601181111561082657fe5b1415610864576040805182815290"
+    "517f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d491819003602"
+    "00190a16108c6565b600782601181111561087257fe5b14156108a85760405181907ff70fe689e2"
+    "90d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1590600090a26108c6565b60068"
+    "260118111156108b657fe5b1415610497576040518190600090a15b5050565b8160405180828051"
+    "90602001908083835b602083106108fa5780518252601f1990920191602091820191016108db565"
+    "b51815160209384036101000a600019018019909216911617905260408051929094018290038220"
+    "81835287518383015287519096507fe77cf33df73da7bc2e253a2dae617e6f15e4e337eaa462a10"
+    "8903af4643d1b7595508794929350839283019185019080838360005b8381101561097d57818101"
+    "5183820152602001610965565b50505050905090810190601f1680156109aa57808203805160018"
+    "36020036101000a031916815260200191505b509250505060405180910390a25050565b60408051"
+    "73ffffffffffffffffffffffffffffffffffffffff83811682529151918416917ff922c21568954"
+    "8d72c3d2fe4ea8dafb2a30c43312c9b43fe5d10f713181f991c9181900360200190a25050565b7f"
+    "532fd6ea96cfb78bb46e09279a26828b8b493de1a2b8b1ee1face527978a15a5816040518080602"
+    "00182810382528381815181526020019150805190602001908083836000838110156103f8578181"
+    "0151838201526020016103e0565b6040805173ffffffffffffffffffffffffffffffffffffffff8"
+    "0851682528316602082015281517f06029e18f16caae06a69281f35b00ed3fcf47950e6c99dafa1"
+    "bdd8c4b93479a0929181900390910190a150505600a165627a7a72305820962bb0d0c7c052407e6"
+    "ad0911da133e939baa8783fbd0220169b97b54160a89e0029"
 )
 
+CONTRACT_EMITTER_RUNTIME = (
+    "6080604052600436106100ae5763ffffffff7c01000000000000000000000000000000000000000"
+    "000000000000000006000350416630bb563d681146100b357806317c0c1801461010e57806320f0"
+    "256e1461012957806390b41d8b14610150578063966b50e0146101715780639c377053146101ff5"
+    "78063aa6fd82214610223578063acabb9ed14610241578063b2ddc449146102d8578063e17bf956"
+    "1461030c578063f82ef69e14610365575b600080fd5b3480156100bf57600080fd5b50604080516"
+    "0206004803580820135601f810184900484028501840190955284845261010c9436949293602493"
+    "928401919081908401838280828437509497506103999650505050505050565b005b34801561011"
+    "a57600080fd5b5061010c60ff60043516610435565b34801561013557600080fd5b5061010c60ff"
+    "60043516602435604435606435608435610527565b34801561015c57600080fd5b5061010c60ff6"
+    "00435166024356044356105e4565b34801561017d57600080fd5b50604080516020600480358082"
+    "0135838102808601850190965280855261010c95369593946024949385019291829185019084908"
+    "082843750506040805187358901803560208181028481018201909552818452989b9a9989019892"
+    "975090820195509350839250850190849080828437509497506106b49650505050505050565b348"
+    "01561020b57600080fd5b5061010c60ff6004351660243560443560643561076d565b3480156102"
+    "2f57600080fd5b5061010c60ff60043516602435610818565b34801561024d57600080fd5b50604"
+    "0805160206004803580820135601f810184900484028501840190955284845261010c9436949293"
+    "6024939284019190819084018382808284375050604080516020601f89358b01803591820183900"
+    "4830284018301909452808352979a99988101979196509182019450925082915084018382808284"
+    "37509497506108ca9650505050505050565b3480156102e457600080fd5b5061010c73fffffffff"
+    "fffffffffffffffffffffffffffffff600435811690602435166109bb565b348015610318576000"
+    "80fd5b506040805160206004803580820135601f810184900484028501840190955284845261010"
+    "c943694929360249392840191908190840183828082843750949750610a0d965050505050505056"
+    "5b34801561037157600080fd5b5061010c73ffffffffffffffffffffffffffffffffffffffff600"
+    "43581169060243516610a6b565b7fa95e6e2a182411e7a6f9ed114a85c3761d87f9b8f453d842c7"
+    "1235aa64fff99f81604051808060200182810382528381815181526020019150805190602001908"
+    "0838360005b838110156103f85781810151838201526020016103e0565b50505050905090810190"
+    "601f1680156104255780820380516001836020036101000a031916815260200191505b509250505"
+    "060405180910390a150565b600181601181111561044357fe5b1415610477576040517f1e86022f"
+    "78f8d04f8e3dfd13a2bdb280403e6632877c0dbee5e4eeb259908a5c90600090a1610524565b600"
+    "081601181111561048557fe5b141561049757604051600090a0610524565b604080517f08c379a0"
+    "0000000000000000000000000000000000000000000000000000000081526020600482015260266"
+    "0248201527f4469646e2774206d6174636820616e7920616c6c6f7761626c65206576656e746044"
+    "8201527f20696e64657800000000000000000000000000000000000000000000000000006064820"
+    "15290519081900360840190fd5b50565b600585601181111561053557fe5b141561058757604080"
+    "51858152602081018590528082018490526060810183905290517ff039d147f23fe975a4254bdf6"
+    "b1502b8c79132ae1833986b7ccef2638e73fdf99181900360800190a16105dd565b600b85601181"
+    "111561059557fe5b14156104975780827fa30ece802b64cd2b7e57dabf4010aabf5df26d1556977"
+    "affb07b98a77ad955b58686604051808381526020018281526020019250505060405180910390a3"
+    "5b5050505050565b60038360118111156105f257fe5b14156106385760408051838152602081018"
+    "3905281517fdf0cb1dea99afceb3ea698d62e705b736f1345a7eee9eb07e63d1f8f556c1bc59291"
+    "81900390910190a16106af565b600983601181111561064657fe5b1415610687576040805183815"
+    "2905182917f057bc32826fbe161da1c110afcdcae7c109a8b69149f727fc37a603c60ef94ca9190"
+    "81900360200190a26106af565b600883601181111561069557fe5b1415610497576040805183815"
+    "29051829181900360200190a15b505050565b816040518082805190602001906020028083836000"
+    "5b838110156106e25781810151838201526020016106ca565b50505050905001915050604051809"
+    "10390207fdbc4c1d1d2f0d84e58d36ca767ec9ba2ec2f933c055e50e5ccdd57697f7b58b0826040"
+    "518080602001828103825283818151815260200191508051906020019060200280838360005b838"
+    "1101561075657818101518382015260200161073e565b5050505090500192505050604051809103"
+    "90a25050565b600484601181111561077b57fe5b14156107c657604080518481526020810184905"
+    "280820183905290517f4a25b279c7c585f25eda9788ac9420ebadae78ca6b206a0e6ab488fd81f5"
+    "50629181900360600190a1610812565b600a8460118111156107d457fe5b1415610497576040805"
+    "18481529051829184917ff16c999b533366ca5138d78e85da51611089cd05749f098d6c225d4cd4"
+    "2ee6ec9181900360200190a35b50505050565b600282601181111561082657fe5b1415610864576"
+    "040805182815290517f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce9"
+    "05d49181900360200190a16108c6565b600782601181111561087257fe5b14156108a8576040518"
+    "1907ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1590600090a2"
+    "6108c6565b60068260118111156108b657fe5b1415610497576040518190600090a15b5050565b8"
+    "16040518082805190602001908083835b602083106108fa5780518252601f199092019160209182"
+    "0191016108db565b51815160209384036101000a600019018019909216911617905260408051929"
+    "09401829003822081835287518383015287519096507fe77cf33df73da7bc2e253a2dae617e6f15"
+    "e4e337eaa462a108903af4643d1b7595508794929350839283019185019080838360005b8381101"
+    "561097d578181015183820152602001610965565b50505050905090810190601f1680156109aa57"
+    "80820380516001836020036101000a031916815260200191505b509250505060405180910390a25"
+    "050565b6040805173ffffffffffffffffffffffffffffffffffffffff8381168252915191841691"
+    "7ff922c215689548d72c3d2fe4ea8dafb2a30c43312c9b43fe5d10f713181f991c9181900360200"
+    "190a25050565b7f532fd6ea96cfb78bb46e09279a26828b8b493de1a2b8b1ee1face527978a15a5"
+    "8160405180806020018281038252838181518152602001915080519060200190808383600083811"
+    "0156103f85781810151838201526020016103e0565b6040805173ffffffffffffffffffffffffff"
+    "ffffffffffffff80851682528316602082015281517f06029e18f16caae06a69281f35b00ed3fcf"
+    "47950e6c99dafa1bdd8c4b93479a0929181900390910190a150505600a165627a7a72305820962b"
+    "b0d0c7c052407e6ad0911da133e939baa8783fbd0220169b97b54160a89e0029"
+)
 
-EMITTER_ABI = [
+CONTRACT_EMITTER_ABI = [
     {
         "constant": False,
-        "inputs": [{"name": "v", "type": "string"}],
+        "inputs": [
+            {
+                "name": "v",
+                "type": "string"
+            }
+        ],
         "name": "logString",
         "outputs": [],
-        "type": "function",
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
     },
     {
         "constant": False,
-        "inputs": [{"name": "which", "type": "uint8"}],
+        "inputs": [
+            {
+                "name": "which",
+                "type": "uint8"
+            }
+        ],
         "name": "logNoArgs",
         "outputs": [],
-        "type": "function",
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
     },
     {
         "constant": False,
         "inputs": [
-            {"name": "which", "type": "uint8"},
-            {"name": "arg0", "type": "uint256"},
-            {"name": "arg1", "type": "uint256"},
-            {"name": "arg2", "type": "uint256"},
-            {"name": "arg3", "type": "uint256"},
+            {
+                "name": "which",
+                "type": "uint8"
+            },
+            {
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "name": "arg1",
+                "type": "uint256"
+            },
+            {
+                "name": "arg2",
+                "type": "uint256"
+            },
+            {
+                "name": "arg3",
+                "type": "uint256"
+            }
         ],
         "name": "logQuadruple",
         "outputs": [],
-        "type": "function",
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
     },
     {
         "constant": False,
         "inputs": [
-            {"name": "which", "type": "uint8"},
-            {"name": "arg0", "type": "uint256"},
-            {"name": "arg1", "type": "uint256"},
+            {
+                "name": "which",
+                "type": "uint8"
+            },
+            {
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "name": "arg1",
+                "type": "uint256"
+            }
         ],
         "name": "logDouble",
         "outputs": [],
-        "type": "function",
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "constant": False,
+        "inputs": [
+            {
+                "name": "arg0",
+                "type": "bytes2[]"
+            },
+            {
+                "name": "arg1",
+                "type": "bytes2[]"
+            }
+        ],
+        "name": "logListArgs",
+        "outputs": [],
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
     },
     {
         "constant": False,
         "inputs": [
-            {"name": "which", "type": "uint8"},
-            {"name": "arg0", "type": "uint256"},
-            {"name": "arg1", "type": "uint256"},
-            {"name": "arg2", "type": "uint256"},
+            {
+                "name": "which",
+                "type": "uint8"
+            },
+            {
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "name": "arg1",
+                "type": "uint256"
+            },
+            {
+                "name": "arg2",
+                "type": "uint256"
+            }
         ],
         "name": "logTriple",
         "outputs": [],
-        "type": "function",
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
     },
     {
         "constant": False,
         "inputs": [
-            {"name": "which", "type": "uint8"},
-            {"name": "arg0", "type": "uint256"},
+            {
+                "name": "which",
+                "type": "uint8"
+            },
+            {
+                "name": "arg0",
+                "type": "uint256"
+            }
         ],
         "name": "logSingle",
         "outputs": [],
-        "type": "function",
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "constant": False,
+        "inputs": [
+            {
+                "name": "arg0",
+                "type": "string"
+            },
+            {
+                "name": "arg1",
+                "type": "string"
+            }
+        ],
+        "name": "logDynamicArgs",
+        "outputs": [],
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
     },
     {
         "constant": False,
-        "inputs": [{"name": "v", "type": "bytes"}],
+        "inputs": [
+            {
+                "name": "arg0",
+                "type": "address"
+            },
+            {
+                "name": "arg1",
+                "type": "address"
+            }
+        ],
+        "name": "logAddressIndexedArgs",
+        "outputs": [],
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "constant": False,
+        "inputs": [
+            {
+                "name": "v",
+                "type": "bytes"
+            }
+        ],
         "name": "logBytes",
         "outputs": [],
-        "type": "function",
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "constant": False,
+        "inputs": [
+            {
+                "name": "arg0",
+                "type": "address"
+            },
+            {
+                "name": "arg1",
+                "type": "address"
+            }
+        ],
+        "name": "logAddressNotIndexedArgs",
+        "outputs": [],
+        "payable": False,
+        "stateMutability": "nonpayable",
+        "type": "function"
     },
     {
         "anonymous": True,
         "inputs": [],
         "name": "LogAnonymous",
-        "type": "event",
+        "type": "event"
     },
     {
         "anonymous": False,
         "inputs": [],
         "name": "LogNoArguments",
-        "type": "event",
+        "type": "event"
     },
     {
         "anonymous": False,
-        "inputs": [{"indexed": False, "name": "arg0", "type": "uint256"}],
+        "inputs": [
+            {
+                "indexed": False,
+                "name": "arg0",
+                "type": "uint256"
+            }
+        ],
         "name": "LogSingleArg",
-        "type": "event",
+        "type": "event"
     },
     {
         "anonymous": False,
         "inputs": [
-            {"indexed": False, "name": "arg0", "type": "uint256"},
-            {"indexed": False, "name": "arg1", "type": "uint256"},
+            {
+                "indexed": False,
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "indexed": False,
+                "name": "arg1",
+                "type": "uint256"
+            }
         ],
         "name": "LogDoubleArg",
-        "type": "event",
+        "type": "event"
     },
     {
         "anonymous": False,
         "inputs": [
-            {"indexed": False, "name": "arg0", "type": "uint256"},
-            {"indexed": False, "name": "arg1", "type": "uint256"},
-            {"indexed": False, "name": "arg2", "type": "uint256"},
+            {
+                "indexed": False,
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "indexed": False,
+                "name": "arg1",
+                "type": "uint256"
+            },
+            {
+                "indexed": False,
+                "name": "arg2",
+                "type": "uint256"
+            }
         ],
         "name": "LogTripleArg",
-        "type": "event",
+        "type": "event"
     },
     {
         "anonymous": False,
         "inputs": [
-            {"indexed": False, "name": "arg0", "type": "uint256"},
-            {"indexed": False, "name": "arg1", "type": "uint256"},
-            {"indexed": False, "name": "arg2", "type": "uint256"},
-            {"indexed": False, "name": "arg3", "type": "uint256"},
+            {
+                "indexed": False,
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "indexed": False,
+                "name": "arg1",
+                "type": "uint256"
+            },
+            {
+                "indexed": False,
+                "name": "arg2",
+                "type": "uint256"
+            },
+            {
+                "indexed": False,
+                "name": "arg3",
+                "type": "uint256"
+            }
         ],
         "name": "LogQuadrupleArg",
-        "type": "event",
+        "type": "event"
     },
     {
-        "anonymous": True,
-        "inputs": [{"indexed": True, "name": "arg0", "type": "uint256"}],
-        "name": "LogSingleAnonymous",
-        "type": "event",
+        "anonymous": False,
+        "inputs": [
+            {
+                "indexed": False,
+                "name": "v",
+                "type": "string"
+            }
+        ],
+        "name": "LogString",
+        "type": "event"
+    },
+    {
+        "anonymous": False,
+        "inputs": [
+            {
+                "indexed": False,
+                "name": "v",
+                "type": "bytes"
+            }
+        ],
+        "name": "LogBytes",
+        "type": "event"
     },
     {
         "anonymous": False,
-        "inputs": [{"indexed": True, "name": "arg0", "type": "uint256"}],
+        "inputs": [
+            {
+                "indexed": True,
+                "name": "arg0",
+                "type": "uint256"
+            }
+        ],
         "name": "LogSingleWithIndex",
-        "type": "event",
+        "type": "event"
     },
     {
         "anonymous": True,
         "inputs": [
-            {"indexed": False, "name": "arg0", "type": "uint256"},
-            {"indexed": True, "name": "arg1", "type": "uint256"},
+            {
+                "indexed": True,
+                "name": "arg0",
+                "type": "uint256"
+            }
         ],
-        "name": "LogDoubleAnonymous",
-        "type": "event",
+        "name": "LogSingleAnonymous",
+        "type": "event"
     },
     {
         "anonymous": False,
         "inputs": [
-            {"indexed": False, "name": "arg0", "type": "uint256"},
-            {"indexed": True, "name": "arg1", "type": "uint256"},
+            {
+                "indexed": False,
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "indexed": True,
+                "name": "arg1",
+                "type": "uint256"
+            }
         ],
         "name": "LogDoubleWithIndex",
-        "type": "event",
+        "type": "event"
+    },
+    {
+        "anonymous": True,
+        "inputs": [
+            {
+                "indexed": False,
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "indexed": True,
+                "name": "arg1",
+                "type": "uint256"
+            }
+        ],
+        "name": "LogDoubleAnonymous",
+        "type": "event"
     },
     {
         "anonymous": False,
         "inputs": [
-            {"indexed": False, "name": "arg0", "type": "uint256"},
-            {"indexed": True, "name": "arg1", "type": "uint256"},
-            {"indexed": True, "name": "arg2", "type": "uint256"},
+            {
+                "indexed": False,
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "indexed": True,
+                "name": "arg1",
+                "type": "uint256"
+            },
+            {
+                "indexed": True,
+                "name": "arg2",
+                "type": "uint256"
+            }
         ],
         "name": "LogTripleWithIndex",
-        "type": "event",
+        "type": "event"
     },
     {
         "anonymous": False,
         "inputs": [
-            {"indexed": False, "name": "arg0", "type": "uint256"},
-            {"indexed": False, "name": "arg1", "type": "uint256"},
-            {"indexed": True, "name": "arg2", "type": "uint256"},
-            {"indexed": True, "name": "arg3", "type": "uint256"},
+            {
+                "indexed": False,
+                "name": "arg0",
+                "type": "uint256"
+            },
+            {
+                "indexed": False,
+                "name": "arg1",
+                "type": "uint256"
+            },
+            {
+                "indexed": True,
+                "name": "arg2",
+                "type": "uint256"
+            },
+            {
+                "indexed": True,
+                "name": "arg3",
+                "type": "uint256"
+            }
         ],
         "name": "LogQuadrupleWithIndex",
-        "type": "event",
+        "type": "event"
     },
     {
         "anonymous": False,
-        "inputs": [{"indexed": False, "name": "v", "type": "bytes"}],
-        "name": "LogBytes",
-        "type": "event",
+        "inputs": [
+            {
+                "indexed": True,
+                "name": "arg0",
+                "type": "string"
+            },
+            {
+                "indexed": False,
+                "name": "arg1",
+                "type": "string"
+            }
+        ],
+        "name": "LogDynamicArgs",
+        "type": "event"
     },
     {
         "anonymous": False,
-        "inputs": [{"indexed": False, "name": "v", "type": "string"}],
-        "name": "LogString",
-        "type": "event",
+        "inputs": [
+            {
+                "indexed": True,
+                "name": "arg0",
+                "type": "bytes2[]"
+            },
+            {
+                "indexed": False,
+                "name": "arg1",
+                "type": "bytes2[]"
+            }
+        ],
+        "name": "LogListArgs",
+        "type": "event"
     },
+    {
+        "anonymous": False,
+        "inputs": [
+            {
+                "indexed": True,
+                "name": "arg0",
+                "type": "address"
+            },
+            {
+                "indexed": False,
+                "name": "arg1",
+                "type": "address"
+            }
+        ],
+        "name": "LogAddressIndexed",
+        "type": "event"
+    },
+    {
+        "anonymous": False,
+        "inputs": [
+            {
+                "indexed": False,
+                "name": "arg0",
+                "type": "address"
+            },
+            {
+                "indexed": False,
+                "name": "arg1",
+                "type": "address"
+            }
+        ],
+        "name": "LogAddressNotIndexed",
+        "type": "event"
+    }
 ]