Relax Click requirement (#444)

* Update post-shanghai test cases

Cases were based on Goerli while awaiting the mainnet upgrade.

* Relax Click requirement

setup.py

@@ -11,7 +11,7 @@ def read(fname):
 
 setup(
     name='ethereum-etl',
-    version='2.2.0',
+    version='2.2.1',
     author='Evgeny Medvedev',
     author_email='[email protected]',
     description='Tools for exporting Ethereum blockchain data to CSV or JSON',
@@ -36,7 +36,7 @@ def read(fname):
         'eth-abi>=2.2.0,<3.0.0',
         # TODO: This has to be removed when "ModuleNotFoundError: No module named 'eth_utils.toolz'" is fixed at eth-abi
         'python-dateutil>=2.8.0,<3',
-        'click==8.0.4',
+        'click>=8.0.4,<9',
         'ethereum-dasm==0.1.4',
         'base58',
         'requests'

tests/ethereumetl/job/test_export_blocks_job.py

@@ -44,9 +44,8 @@ def read_resource(resource_group, file_name):
     skip_if_slow_tests_disabled((0, 0, 1, 'block_without_transactions', 'infura', 'csv')),
     skip_if_slow_tests_disabled((483920, 483920, 1, 'block_with_logs', 'infura', 'csv')),
     skip_if_slow_tests_disabled((47218, 47219, 2, 'blocks_with_transactions', 'infura', 'csv')),
-    # TODO: Update these tests after Shanghai:
-    skip_if_slow_tests_disabled((8656134, 8656135, 2, 'blocks_with_transactions_goerli', 'goerli', 'csv')),
-    skip_if_slow_tests_disabled((8656134, 8656135, 2, 'blocks_with_transactions_goerli', 'goerli', 'json')),
+    skip_if_slow_tests_disabled((17173049, 17173050, 2, 'blocks_with_transactions_and_withdrawals', 'infura', 'csv')),
+    skip_if_slow_tests_disabled((17173049, 17173050, 2, 'blocks_with_transactions_and_withdrawals', 'infura', 'json')),
 ])
 def test_export_blocks_job(tmpdir, start_block, end_block, batch_size, resource_group, web3_provider_type, format):
     blocks_output_file = str(tmpdir.join(f'actual_blocks.{format}'))

tests/ethereumetl/streaming/test_stream.py

@@ -45,8 +45,7 @@ def read_resource(resource_group, file_name):
     skip_if_slow_tests_disabled([1755634, 1755635, 1, 'blocks_1755634_1755635', EntityType.ALL_FOR_INFURA, 'infura']),
     (508110, 508110, 1, 'blocks_508110_508110', ['trace', 'contract', 'token'], 'mock'),
     (2112234, 2112234, 1, 'blocks_2112234_2112234', ['trace', 'contract', 'token'], 'mock'),
-    # TODO: Update these tests after Shanghai:
-    skip_if_slow_tests_disabled([8656134, 8656135, 1, 'blocks_8656134_8656135_goerli', EntityType.ALL_FOR_INFURA, 'goerli']),
+    skip_if_slow_tests_disabled([17173049, 17173050, 1, 'blocks_17173049_17173050', EntityType.ALL_FOR_INFURA, 'infura']),
 ])
 def test_stream(tmpdir, start_block, end_block, batch_size, resource_group, entity_types, provider_type):
     try:

tests/resources/test_export_blocks_job/blocks_with_transactions_and_withdrawals/expected_blocks.csv

@@ -0,0 +1,3 @@
+number,hash,parent_hash,nonce,sha3_uncles,logs_bloom,transactions_root,state_root,receipts_root,miner,difficulty,total_difficulty,size,extra_data,gas_limit,gas_used,timestamp,transaction_count,base_fee_per_gas,withdrawals_root,withdrawals
+17173049,0xaa5ab9bb22d8020d438496a7edb4eff508b1c5128b0dc01fdecf57f96aac1bb3,0x918a700a8e7a9f3fe0b3ccb176c810ded08729331ceef8d6375af5d1eeeaa6c0,0x0000000000000000,0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347,0x08250395474322020574642cc6015023580f858a4a4d9f8303a111212828240199011a8212001061cb0229c80c0103b05709c4009c02a2d2c350d0f0902a3ea568068a18e2040da97928420be83050a3e0bab31665428901a804064188e42633d68261e2631e4a861d6db84408412c445b181846e338e462b2540858181b52070a00e04090233d0400c920222d428f01c0d62c892180b20942859066e777ac288f289566348074c56834508150192c856440484d9480108a88c0c80e1381801fd8dcc0a31002c02b2021ec2a84755ad4644c270ead618c3669041faf01a6b8680432f24a41da23100204a4091c025809a8b29604e718274cc1326830d804b427,0xc51fa84d50977d84a8c29155036937620f9c6f629bab758532f97fb64dfaeaa2,0xf552aeaa9dcbc79c78bdae2be0f62ee788c059eab790ee20e7d8a14d2c6d1dda,0x483ff52a982981f3efa42685fd46f5437cb430924fb8bf2204cd97b6c125d7f7,0x1f9090aae28b8a3dceadf281b0f12828e676c326,0,58750003716598352816469,40573,0x7273796e632d6275696c6465722e78797a,30000000,9755040,1683029999,116,80869370967,0x062c83ae15778644bec99605c108058158bbee3e943dc64015ef9180e3710b9e,"{""index"":2210752,""validator_index"":540230,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":45762059},{""index"":2210753,""validator_index"":540231,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12420714},{""index"":2210754,""validator_index"":540232,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12341211},{""index"":2210755,""validator_index"":540233,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12404660},{""index"":2210756,""validator_index"":540234,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12405613},{""index"":2210757,""validator_index"":540235,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12384528},{""index"":2210758,""validator_index"":540236,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12378314},{""index"":2210759,""validator_index"":540237,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12414494},{""index"":2210760,""validator_index"":540238,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12390519},{""index"":2210761,""validator_index"":540239,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12402133},{""index"":2210762,""validator_index"":540240,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12396186},{""index"":2210763,""validator_index"":540241,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12381528},{""index"":2210764,""validator_index"":540242,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12405469},{""index"":2210765,""validator_index"":540243,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12433893},{""index"":2210766,""validator_index"":540244,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12387723},{""index"":2210767,""validator_index"":540245,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12384451}"
+17173050,0x5699ffb9477f70ec736463b144614356eb051936da75fcccec73d648f2e91de4,0xaa5ab9bb22d8020d438496a7edb4eff508b1c5128b0dc01fdecf57f96aac1bb3,0x0000000000000000,0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347,0x216d67114318612e11434c10ec5940113ad7543fe93a9eae35b19d6afc2025877c11d98af06c2961cd41d784c26285540a855079bf236e6a2553438b04ae201d48aaee6cd5408faffb32f16a92904d70a0e94297a5542876bda105c1ca57f8e3de4740905b856986cb3458388ca6bc77e2b70a230510fcb0c60404d2d99a1663889383521068d58c61693a0f5a7396737e015781abc0e219cf28d2c268751b75b7a95d8ea166ed7f178241f008de1d931640abbe9c12983e4cb02b379cb4b07b7dd8d5930a400d732c10faae40d5d5d0636ca3421de894dd5f6f93071d3de8738071b31a85faac4c2a8fa7a449e5394d2c90241c77cf16c6f8d55f479096fd45,0x4ae3ff591956137e92b0acd1073a9caa96c8f83531dfe63f66146ef6a5bd3b01,0x5cb1f9cd9d7d9c0aa9bdb621c93dcc844c06aa184412a6c797750a3384af3dfe,0xbc3fa27cfdb9386ba431f768538211f4d057c8a248738373f6cfa51a00eec01f,0x388c818ca8b9251b393131c08a736a67ccb19297,0,58750003716598352816469,77412,0x6265617665726275696c642e6f7267,30000000,15491478,1683030011,182,77334732501,0xf08609a1eb745920f13ab5ea72d729d8262d51da59c7ed3c81bc1a53a25933dc,"{""index"":2210768,""validator_index"":540246,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12421682},{""index"":2210769,""validator_index"":540247,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12433938},{""index"":2210770,""validator_index"":540248,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12437139},{""index"":2210771,""validator_index"":540249,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12405080},{""index"":2210772,""validator_index"":540250,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12414641},{""index"":2210773,""validator_index"":540251,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12393415},{""index"":2210774,""validator_index"":540252,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12414525},{""index"":2210775,""validator_index"":540253,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12346076},{""index"":2210776,""validator_index"":540254,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12432815},{""index"":2210777,""validator_index"":540255,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12359763},{""index"":2210778,""validator_index"":540256,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12378756},{""index"":2210779,""validator_index"":540257,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12429927},{""index"":2210780,""validator_index"":540258,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12280353},{""index"":2210781,""validator_index"":540259,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12378111},{""index"":2210782,""validator_index"":540260,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12420878},{""index"":2210783,""validator_index"":540261,""address"":""0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f"",""amount"":12407790}"

tests/resources/test_export_blocks_job/blocks_with_transactions_and_withdrawals/expected_blocks.json

@@ -0,0 +1,2 @@
+{"number": 17173049, "hash": "0xaa5ab9bb22d8020d438496a7edb4eff508b1c5128b0dc01fdecf57f96aac1bb3", "parent_hash": "0x918a700a8e7a9f3fe0b3ccb176c810ded08729331ceef8d6375af5d1eeeaa6c0", "nonce": "0x0000000000000000", "sha3_uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "logs_bloom": "0x08250395474322020574642cc6015023580f858a4a4d9f8303a111212828240199011a8212001061cb0229c80c0103b05709c4009c02a2d2c350d0f0902a3ea568068a18e2040da97928420be83050a3e0bab31665428901a804064188e42633d68261e2631e4a861d6db84408412c445b181846e338e462b2540858181b52070a00e04090233d0400c920222d428f01c0d62c892180b20942859066e777ac288f289566348074c56834508150192c856440484d9480108a88c0c80e1381801fd8dcc0a31002c02b2021ec2a84755ad4644c270ead618c3669041faf01a6b8680432f24a41da23100204a4091c025809a8b29604e718274cc1326830d804b427", "transactions_root": "0xc51fa84d50977d84a8c29155036937620f9c6f629bab758532f97fb64dfaeaa2", "state_root": "0xf552aeaa9dcbc79c78bdae2be0f62ee788c059eab790ee20e7d8a14d2c6d1dda", "receipts_root": "0x483ff52a982981f3efa42685fd46f5437cb430924fb8bf2204cd97b6c125d7f7", "miner": "0x1f9090aae28b8a3dceadf281b0f12828e676c326", "difficulty": 0, "total_difficulty": 58750003716598352816469, "size": 40573, "extra_data": "0x7273796e632d6275696c6465722e78797a", "gas_limit": 30000000, "gas_used": 9755040, "timestamp": 1683029999, "transaction_count": 116, "base_fee_per_gas": 80869370967, "withdrawals_root": "0x062c83ae15778644bec99605c108058158bbee3e943dc64015ef9180e3710b9e", "withdrawals": [{"index": 2210752, "validator_index": 540230, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 45762059}, {"index": 2210753, "validator_index": 540231, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12420714}, {"index": 2210754, "validator_index": 540232, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12341211}, {"index": 2210755, "validator_index": 540233, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12404660}, {"index": 2210756, "validator_index": 540234, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12405613}, {"index": 2210757, "validator_index": 540235, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12384528}, {"index": 2210758, "validator_index": 540236, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12378314}, {"index": 2210759, "validator_index": 540237, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12414494}, {"index": 2210760, "validator_index": 540238, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12390519}, {"index": 2210761, "validator_index": 540239, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12402133}, {"index": 2210762, "validator_index": 540240, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12396186}, {"index": 2210763, "validator_index": 540241, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12381528}, {"index": 2210764, "validator_index": 540242, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12405469}, {"index": 2210765, "validator_index": 540243, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12433893}, {"index": 2210766, "validator_index": 540244, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12387723}, {"index": 2210767, "validator_index": 540245, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12384451}]}
+{"number": 17173050, "hash": "0x5699ffb9477f70ec736463b144614356eb051936da75fcccec73d648f2e91de4", "parent_hash": "0xaa5ab9bb22d8020d438496a7edb4eff508b1c5128b0dc01fdecf57f96aac1bb3", "nonce": "0x0000000000000000", "sha3_uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "logs_bloom": "0x216d67114318612e11434c10ec5940113ad7543fe93a9eae35b19d6afc2025877c11d98af06c2961cd41d784c26285540a855079bf236e6a2553438b04ae201d48aaee6cd5408faffb32f16a92904d70a0e94297a5542876bda105c1ca57f8e3de4740905b856986cb3458388ca6bc77e2b70a230510fcb0c60404d2d99a1663889383521068d58c61693a0f5a7396737e015781abc0e219cf28d2c268751b75b7a95d8ea166ed7f178241f008de1d931640abbe9c12983e4cb02b379cb4b07b7dd8d5930a400d732c10faae40d5d5d0636ca3421de894dd5f6f93071d3de8738071b31a85faac4c2a8fa7a449e5394d2c90241c77cf16c6f8d55f479096fd45", "transactions_root": "0x4ae3ff591956137e92b0acd1073a9caa96c8f83531dfe63f66146ef6a5bd3b01", "state_root": "0x5cb1f9cd9d7d9c0aa9bdb621c93dcc844c06aa184412a6c797750a3384af3dfe", "receipts_root": "0xbc3fa27cfdb9386ba431f768538211f4d057c8a248738373f6cfa51a00eec01f", "miner": "0x388c818ca8b9251b393131c08a736a67ccb19297", "difficulty": 0, "total_difficulty": 58750003716598352816469, "size": 77412, "extra_data": "0x6265617665726275696c642e6f7267", "gas_limit": 30000000, "gas_used": 15491478, "timestamp": 1683030011, "transaction_count": 182, "base_fee_per_gas": 77334732501, "withdrawals_root": "0xf08609a1eb745920f13ab5ea72d729d8262d51da59c7ed3c81bc1a53a25933dc", "withdrawals": [{"index": 2210768, "validator_index": 540246, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12421682}, {"index": 2210769, "validator_index": 540247, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12433938}, {"index": 2210770, "validator_index": 540248, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12437139}, {"index": 2210771, "validator_index": 540249, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12405080}, {"index": 2210772, "validator_index": 540250, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12414641}, {"index": 2210773, "validator_index": 540251, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12393415}, {"index": 2210774, "validator_index": 540252, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12414525}, {"index": 2210775, "validator_index": 540253, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12346076}, {"index": 2210776, "validator_index": 540254, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12432815}, {"index": 2210777, "validator_index": 540255, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12359763}, {"index": 2210778, "validator_index": 540256, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12378756}, {"index": 2210779, "validator_index": 540257, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12429927}, {"index": 2210780, "validator_index": 540258, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12280353}, {"index": 2210781, "validator_index": 540259, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12378111}, {"index": 2210782, "validator_index": 540260, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12420878}, {"index": 2210783, "validator_index": 540261, "address": "0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f", "amount": 12407790}]}