Upgrade to python3.11

requirements.txt

@@ -56,8 +56,105 @@ pyrsistent==0.16.1 \
 eth-hash==0.3.2 \
     --hash=sha256:3f40cecd5ead88184aa9550afc19d057f103728108c5102f592f8415949b5a76 \
     --hash=sha256:de7385148a8e0237ba1240cddbc06d53f56731140f8593bdb8429306f6b42271
-cytoolz==0.11.2 \
-    --hash=sha256:ea23663153806edddce7e4153d1d407d62357c05120a4e8485bddf1bd5ab22b4
+cytoolz==0.12.1 \
+    --hash=sha256:02975e2b1e61e47e9afa311f4c1783d155136fad37c54a1cebfe991c5a0798a1 \
+    --hash=sha256:03ab22c9aeb1535f8647d23b6520b0c3d41aaa18d04ef42b352dde1931f2e2b1 \
+    --hash=sha256:061387aa39b9c1576c25d0c59142513c09e77a2a07bd5d6211a43c7a758b6f45 \
+    --hash=sha256:06d38a40fe153f23cda0e823413fe9d9ebee89dd461827285316eff929fb121e \
+    --hash=sha256:0d474dacbafbdbb44c7de986bbf71ff56ae62df0d52ab3b6fa966784dc88737a \
+    --hash=sha256:117871f036926e42d3abcee587eafa9dc7383f1064ac53a806d33e76604de311 \
+    --hash=sha256:14f4dbc3f0ec8f6fc68865489af21dcf042ff007d2737c27bfd73296f15db544 \
+    --hash=sha256:1a1eae39656a1685e8b3f433eecfd72015ce5c1d7519e9c8f9402153c68331bb \
+    --hash=sha256:1b6761791973b1e839b8309d5853b40eeb413368e31beaf5f2b6ed44c6fc7cf0 \
+    --hash=sha256:1be368623e46ad3c1ce807e7a436acb119c26001507b31f92ceb21b86e08c386 \
+    --hash=sha256:1c29dd04e282ddfd45b457e3551075beec9128aa9271245e58ce924bf6e055f8 \
+    --hash=sha256:23c3f57c48eb939d2986eba4aeaeedf930ebf94d58c91a42d4e0fc45ed5427dc \
+    --hash=sha256:25ff13c468c06da9ef26651dc389e7e8bb7af548f8c1dfb96305f57f18d398a8 \
+    --hash=sha256:2a48940ff0449ffcf690310bf9228bb57885f7571406ed2fe05c98e299987195 \
+    --hash=sha256:2b245b824f4705aef0e4a03fafef3ad6cb59ef43cc564cdbf683ee28dfc11ad5 \
+    --hash=sha256:2ec296f01c29c809698eaf677211b6255691295c2b35caab2131e1e7eaadfbac \
+    --hash=sha256:2eed428b5e68c28abf2c71195e799850e040d67a27c05f7785319c611665b86a \
+    --hash=sha256:2f32452e833f0605b871626e6c61b71b0cba24233aad0e04accc3240497d4995 \
+    --hash=sha256:3032c0ba42dee5836d6b57a72a569b65df2c29e8ed266cb900d569003cf933a9 \
+    --hash=sha256:30936ae8fa68b6a1ac8ad6c4bacb5a8a00d51bc6c89f9614a1557b0105d09f8a \
+    --hash=sha256:31131b54a0c72efc0eb432dc66df546c6a54f2a7d396c9a34cf65ac1c26b1df8 \
+    --hash=sha256:35fae4eaa0eaf9072a5fe2d244a79e65baae4e5ddbe9cc629c5037af800213a2 \
+    --hash=sha256:37320669c364f7d370392af33cc1034b4563da66c22cd3261e3530f4d30dbe4b \
+    --hash=sha256:37c53f456a1c84566a7d911eec57c4c6280b915ab0600e7671582793cc2769fe \
+    --hash=sha256:3c9a16a5b4f54d5c0a131f56b0ca65998a9a74958b5b36840c280edba4f8b907 \
+    --hash=sha256:3cb95d23defb2322cddf70efb4af6dac191d95edaa343e8c1f58f1afa4f92ecd \
+    --hash=sha256:3d6d0b0075731832343eb88229cea4bf39e96f3fc7acbc449aadbdfec2842703 \
+    --hash=sha256:421b224dc4157a0d66625acb5798cf50858cfa06a5232d39a8bd6cf1fa88aca3 \
+    --hash=sha256:4284120c978fb7039901bf6e66832cb3e82ac1b2a107512e735bdb04fd5533ed \
+    --hash=sha256:42c9e5cd2a48a257b1f2402334b48122501f249b8dcf77082f569f2680f185eb \
+    --hash=sha256:4534cbfad73cdb1a6dad495530d4186d57d73089c01e9cb0558caab50e46cb3b \
+    --hash=sha256:48bc2f30d1b2646d675bb8e7778ab59379bf9edc59fe06fb0e7f85ba1271bf44 \
+    --hash=sha256:49911cb533c96d275e31e7eaeb0742ac3f7afe386a1d8c40937814d75039a0f7 \
+    --hash=sha256:499af2aff04f65b4c23de1df08e1d1484a93b23ddaaa0163e44b5070b68356eb \
+    --hash=sha256:4a0055943074c6c85b77fcc3f42f7c54010a3478daa2ed9d6243d0411c84a4d3 \
+    --hash=sha256:4d700e011156ff112966c6d77faaae125fcaf538f4cec2b9ce8957de82858f0f \
+    --hash=sha256:50db41e875e36aec11881b8b12bc69c6f4836b7dd9e88a9e5bbf26c2cb3ba6cd \
+    --hash=sha256:5158ae6d8dd112d003f677039a3613ca7d2592bfe35d7accf23684edb961fc26 \
+    --hash=sha256:56e1ebf6eb4438b8c45cbe7e7b22fc65df0c9efa97a70d3bf2f51e08b19756a5 \
+    --hash=sha256:59641eb1f41cb688b3cb2f98c9003c493a5024325f76b5c02333d08dd972127c \
+    --hash=sha256:5af43ca7026ead3dd08b261e4f7163cd2cf3ceaa74fa5a81f7b7ea5d445e41d6 \
+    --hash=sha256:5c59bb4ca88e1c69931468bf21f91c8f64d8bf1999eb163b7a2df336f60c304a \
+    --hash=sha256:633f19d1990b1cf9c67dce9c28bf8b5a18e42785d15548607a100e1236384d5d \
+    --hash=sha256:6716855f9c669c9e25a185d88e0f169839bf8553d16496796325acd114607c11 \
+    --hash=sha256:6805b007af3557ee6c20dab491b6e55a8177f5b6845d9e6c653374d540366ba7 \
+    --hash=sha256:695dd8231e4f1bfb9a2363775a6e4e56ad9d2058058f817203a49614f4bfe33b \
+    --hash=sha256:6fa7009c843667868aa8bdb3d68e5ef3d6356dd418b17ed5ca4e1340e82483a5 \
+    --hash=sha256:794cce219bbcb2f36ca220f27d5afd64eaa854e04901bd6f240be156a578b607 \
+    --hash=sha256:7b60caf0fa5f1b49f1062f7dc0f66c7b23e2736bad50fa8296bfb845995e3051 \
+    --hash=sha256:7e903df991f0957e2b271a37bb25d28e0d260c52825ae67507d15ca55a935961 \
+    --hash=sha256:7eb9e6fa8a82c3d2f519f7d3942898a97792e3895569e9501b9431048289b82f \
+    --hash=sha256:816c2038008ebf50d81171ddfae377f1af9e71d504ec609469dcb0906bfcf2ae \
+    --hash=sha256:849f461bffa1e7700ccfcb5186df29cd4cdcc9efdb7199cb8b5681dc37045d72 \
+    --hash=sha256:8506d1863f30d26f577c4ed59d2cfd03d2f39569f9cbaa02a764a9de73d312d5 \
+    --hash=sha256:867bebe6be30ee36a836f9b835790762a74f46be8cc339ea57b68dcecdbc1133 \
+    --hash=sha256:97a24c0d0806fcf9a6e75fc18aeb95adc37eb0baf6451f10a2de23ffd815329d \
+    --hash=sha256:980e7eb7205e01816a92f3290cfc80507957e64656b9271a0dfebb85fe3718c0 \
+    --hash=sha256:9bae431a5985cdb2014be09d37206c288e0d063940cf9539e9769bd2ec26b220 \
+    --hash=sha256:9bebe58f7a160db7838eb70990c704db4bdc2d58bd364290fd69be0587be8bac \
+    --hash=sha256:9e324a94856d88ecf10f34c102d0ded67d7c3cf644153d77e34a29720ce6aa47 \
+    --hash=sha256:a6e63fc67b23830947b51e0a488992e3c904fce825ead565f3904dcf621d05f7 \
+    --hash=sha256:a72440305f634604827f96810e4469877b89f5c060d6852267650a49b0e3768c \
+    --hash=sha256:a734511144309ea6e105406633affb74e303a3df07d8a3954f9b01946e27ecb1 \
+    --hash=sha256:a816bff6bf424753e1ac2441902ceaf37ae6718b745a53f6aa1a60c617fb4f5f \
+    --hash=sha256:a8a7a325b8fe885a6dd91093616c703134f2dacbd869bc519970df3849c2a15b \
+    --hash=sha256:aa61e3da751a2dfe95aeca603f3ef510071a136ba9905f61ae6cb5d0696271ad \
+    --hash=sha256:ac5895d5f78dbd8646fe37266655ba4995f9cfec38a86595282fee69e41787da \
+    --hash=sha256:ac6784cc43aec51a86cf9058a2a343084f8cf46a9281bea5762bfa608127c53b \
+    --hash=sha256:b1bd8017ef0da935a20106272c5f5ff6b1114add1ccb09cfed1ff7ec5cc01c6d \
+    --hash=sha256:b2ac288f27a2689d9e39f4cf4df5437a8eb038eaae515169586c77f9f8fb343a \
+    --hash=sha256:b30cd083ef8af4ba66d9fe5cc75c653ede3f2655f97a032db1a14cc8a006719c \
+    --hash=sha256:b46ebc463bb45f278a2b94e630061c26e10077cb68d4c93583d8f4199699a5ef \
+    --hash=sha256:b575393dd431b8e211de35bd593d831dac870172b16e2b7934f3566b8fc89377 \
+    --hash=sha256:b6569f6038133909cd658dbdcc6fc955f791dc47a7f5b55d2066f742253dcbfe \
+    --hash=sha256:b8b8f88251b84b3877254cdd59c86a1dc6b2b39a03c6c9c067d344ef879562e0 \
+    --hash=sha256:b8eceaa12b7f152b046b67cb053ec2b5b00f73593983de69bc5e63a8aca4a7a8 \
+    --hash=sha256:ba74c239fc6cb6e962eabc420967c7565f3f363b776c89b3df5234caecf1f463 \
+    --hash=sha256:be5a454a95797343d0fb1ed02caecae73a023b1393c112951c84f17ec9f4076c \
+    --hash=sha256:bef934bd3e024d512c6c0ad1c66eb173f61d9ccb4dbca8d75f727a5604f7c2f6 \
+    --hash=sha256:c1964dcb5f250fd13fac210944b20810d61ef4094a17fbbe502ab7a7eaeeace7 \
+    --hash=sha256:c34e69be4429633fc614febe3127fa03aa418a1abb9252f29d9ba5b3394573a5 \
+    --hash=sha256:c576bd63495150385b8d05eaae775387f378be2fd9805d3ffb4d17c87271fbad \
+    --hash=sha256:cb8b10405960a8e6801a4702af98ea640130ec6ecfc1208195762de3f5503ba9 \
+    --hash=sha256:cc3645cf6b9246cb8e179db2803e4f0d148211d2a2cf22d5c9b5219111cd91a0 \
+    --hash=sha256:cd35c0be4c46274129dd1678bb911dd4e93d23968b26f4e39cd55bc7cb3b1bac \
+    --hash=sha256:d540e9c34a61b53b6a374ea108794a48388178f7889d772e364cdbd6df37774c \
+    --hash=sha256:d72415b0110f7958dd3a5ee98a70166f47bd42ede85e3535669c794d06f57406 \
+    --hash=sha256:dbae37d48ef5a0ab90cfaf2b9312d96f034b1c828208a9cbe25377a1b19ba129 \
+    --hash=sha256:e1c5434db53f3a94a37ad8aedb231901e001995d899af6ed1165f3d27fa04a6a \
+    --hash=sha256:e75e287787e6adafed9d8c3d3e7647c0b5eb460221f9f92d7dfe48b45ba77c0d \
+    --hash=sha256:e797c4afb1b7962d3205b1959e1051f7e6bfbba29da44042a9efc2391f1feb38 \
+    --hash=sha256:efd1b2da3ee577fcfa723a214f73186aef9674dd5b28242d90443c7a82722b0f \
+    --hash=sha256:f5b43ce952a5a31441556c55f5f5f5a8e62c28581a0ff2a2c31c04ef992d73bd \
+    --hash=sha256:f7194a22a4a24f3561cb6ad1cca9c9b2f2cf34cc8d4bce6d6a24c80960323fa8 \
+    --hash=sha256:f8101ab6de5aa0b26a2b5032bc488d430010c91863e701812d65836b03a12f61 \
+    --hash=sha256:fc33909397481c90de3cec831bfb88d97e220dc91939d996920202f184b4648e \
+    --hash=sha256:fcc378fa97f02fbcef090b3611305425d72bd1c0afdd13ef4a82dc67d40638b6 \
+    --hash=sha256:ff478682e8ee6dbaa37201bb71bf4a6eee744006ab000e8f5cea05066fc7c845
 toolz==0.11.2 \
     --hash=sha256:6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33 \
     --hash=sha256:a5700ce83414c64514d82d60bcda8aabfde092d1c1a8663f9200c07fdcc6da8f

requirements_test.txt

@@ -64,26 +64,31 @@ mccabe==0.6.1 \
 typing-extensions==4.1.1 \
     --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \
     --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2
-typed-ast==1.5.2 \
-    --hash=sha256:18fe320f354d6f9ad3147859b6e16649a0781425268c4dde596093177660e71a \
-    --hash=sha256:bc2542e83ac8399752bc16e0b35e038bdb659ba237f4222616b4e83fb9654985 \
-    --hash=sha256:74cac86cc586db8dfda0ce65d8bcd2bf17b58668dfcc3652762f3ef0e6677e76 \
-    --hash=sha256:676d051b1da67a852c0447621fdd11c4e104827417bf216092ec3e286f7da596 \
-    --hash=sha256:183b183b7771a508395d2cbffd6db67d6ad52958a5fdc99f450d954003900266 \
-    --hash=sha256:df05aa5b241e2e8045f5f4367a9f6187b09c4cdf8578bb219861c4e27c443db5 \
-    --hash=sha256:42c47c3b43fe3a39ddf8de1d40dbbfca60ac8530a36c9b198ea5b9efac75c09e \
-    --hash=sha256:f290617f74a610849bd8f5514e34ae3d09eafd521dceaa6cf68b3f4414266d4e \
-    --hash=sha256:1098df9a0592dd4c8c0ccfc2e98931278a6c6c53cb3a3e2cf7e9ee3b06153344 \
-    --hash=sha256:33b4a19ddc9fc551ebabca9765d54d04600c4a50eda13893dadf67ed81d9a098 \
-    --hash=sha256:da0a98d458010bf4fe535f2d1e367a2e2060e105978873c04c04212fb20543f7 \
-    --hash=sha256:c29dd9a3a9d259c9fa19d19738d021632d673f6ed9b35a739f48e5f807f264fb \
-    --hash=sha256:58ae097a325e9bb7a684572d20eb3e1809802c5c9ec7108e85da1eb6c1a3331b \
-    --hash=sha256:bbebc31bf11762b63bf61aaae232becb41c5bf6b3461b80a4df7e791fabb3aca \
-    --hash=sha256:90904d889ab8e81a956f2c0935a523cc4e077c7847a836abee832f868d5c26a4 \
-    --hash=sha256:8c08d6625bb258179b6e512f55ad20f9dfef019bbfbe3095247401e053a3ea30 \
-    --hash=sha256:c7407cfcad702f0b6c0e0f3e7ab876cd1d2c13b14ce770e412c0c4b9728a0f88 \
-    --hash=sha256:f30ddd110634c2d7534b2d4e0e22967e88366b0d356b24de87419cc4410c41b7 \
-    --hash=sha256:26a432dc219c6b6f38be20a958cbe1abffcc5492821d7e27f08606ef99e0dffd
+typed-ast==1.5.4 \
+    --hash=sha256:0261195c2062caf107831e92a76764c81227dae162c4f75192c0d489faf751a2 \
+    --hash=sha256:0fdbcf2fef0ca421a3f5912555804296f0b0960f0418c440f5d6d3abb549f3e1 \
+    --hash=sha256:183afdf0ec5b1b211724dfef3d2cad2d767cbefac291f24d69b00546c1837fb6 \
+    --hash=sha256:211260621ab1cd7324e0798d6be953d00b74e0428382991adfddb352252f1d62 \
+    --hash=sha256:267e3f78697a6c00c689c03db4876dd1efdfea2f251a5ad6555e82a26847b4ac \
+    --hash=sha256:2efae9db7a8c05ad5547d522e7dbe62c83d838d3906a3716d1478b6c1d61388d \
+    --hash=sha256:370788a63915e82fd6f212865a596a0fefcbb7d408bbbb13dea723d971ed8bdc \
+    --hash=sha256:39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2 \
+    --hash=sha256:3e123d878ba170397916557d31c8f589951e353cc95fb7f24f6bb69adc1a8a97 \
+    --hash=sha256:4879da6c9b73443f97e731b617184a596ac1235fe91f98d279a7af36c796da35 \
+    --hash=sha256:4e964b4ff86550a7a7d56345c7864b18f403f5bd7380edf44a3c1fb4ee7ac6c6 \
+    --hash=sha256:639c5f0b21776605dd6c9dbe592d5228f021404dafd377e2b7ac046b0349b1a1 \
+    --hash=sha256:669dd0c4167f6f2cd9f57041e03c3c2ebf9063d0757dc89f79ba1daa2bfca9d4 \
+    --hash=sha256:6778e1b2f81dfc7bc58e4b259363b83d2e509a65198e85d5700dfae4c6c8ff1c \
+    --hash=sha256:683407d92dc953c8a7347119596f0b0e6c55eb98ebebd9b23437501b28dcbb8e \
+    --hash=sha256:79b1e0869db7c830ba6a981d58711c88b6677506e648496b1f64ac7d15633aec \
+    --hash=sha256:7d5d014b7daa8b0bf2eaef684295acae12b036d79f54178b92a2b6a56f92278f \
+    --hash=sha256:98f80dee3c03455e92796b58b98ff6ca0b2a6f652120c263efdba4d6c5e58f72 \
+    --hash=sha256:a94d55d142c9265f4ea46fab70977a1944ecae359ae867397757d836ea5a3f47 \
+    --hash=sha256:a9916d2bb8865f973824fb47436fa45e1ebf2efd920f2b9f99342cb7fab93f72 \
+    --hash=sha256:c542eeda69212fa10a7ada75e668876fdec5f856cd3d06829e6aa64ad17c8dfe \
+    --hash=sha256:cf4afcfac006ece570e32d6fa90ab74a17245b83dfd6655a6f68568098345ff6 \
+    --hash=sha256:ebd9d7f80ccf7a82ac5f88c521115cc55d84e35bf8b446fcd7836eb6b98929a3 \
+    --hash=sha256:ed855bbe3eb3715fca349c80174cfcfd699c2f9de574d40527b8429acae23a66
 packaging==21.3 \
     --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
     --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="staking_deposit",
-    version='2.5.0',
+    version='2.5.2',
     py_modules=["staking_deposit"],
     packages=find_packages(exclude=('tests', 'docs')),
     python_requires=">=3.8,<4",

staking_deposit/key_handling/keystore.py

@@ -61,9 +61,9 @@ class KeystoreModule(BytesDataclass):
 
 @dataclass
 class KeystoreCrypto(BytesDataclass):
-    kdf: KeystoreModule = KeystoreModule()
-    checksum: KeystoreModule = KeystoreModule()
-    cipher: KeystoreModule = KeystoreModule()
+    kdf: KeystoreModule = dataclass_field(default_factory=lambda: KeystoreModule())
+    checksum: KeystoreModule = dataclass_field(default_factory=lambda: KeystoreModule())
+    cipher: KeystoreModule = dataclass_field(default_factory=lambda: KeystoreModule())
 
     @classmethod
     def from_json(cls, json_dict: Dict[Any, Any]) -> 'KeystoreCrypto':
@@ -81,7 +81,7 @@ class Keystore(BytesDataclass):
 
     Ref: https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2335.md
     """
-    crypto: KeystoreCrypto = KeystoreCrypto()
+    crypto: KeystoreCrypto = dataclass_field(default_factory=lambda: KeystoreCrypto())
     description: str = ''
     pubkey: str = ''
     path: str = ''
@@ -164,7 +164,7 @@ def decrypt(self, password: str) -> bytes:
 
 @dataclass
 class Pbkdf2Keystore(Keystore):
-    crypto: KeystoreCrypto = KeystoreCrypto(
+    crypto: KeystoreCrypto = dataclass_field(default_factory=lambda: KeystoreCrypto(
         kdf=KeystoreModule(
             function='pbkdf2',
             params={
@@ -179,12 +179,12 @@ class Pbkdf2Keystore(Keystore):
         cipher=KeystoreModule(
             function='aes-128-ctr',
         )
-    )
+    ))
 
 
 @dataclass
 class ScryptKeystore(Keystore):
-    crypto: KeystoreCrypto = KeystoreCrypto(
+    crypto: KeystoreCrypto = dataclass_field(default_factory=lambda: KeystoreCrypto(
         kdf=KeystoreModule(
             function='scrypt',
             params={
@@ -200,4 +200,4 @@ class ScryptKeystore(Keystore):
         cipher=KeystoreModule(
             function='aes-128-ctr',
         )
-    )
+    ))

staking_deposit/settings.py

@@ -1,7 +1,7 @@
 from typing import Dict, NamedTuple
 from eth_utils import decode_hex
 
-DEPOSIT_CLI_VERSION = '2.5.0'
+DEPOSIT_CLI_VERSION = '2.5.2'
 
 
 class BaseChainSetting(NamedTuple):