Fix picking incorrect substrate event ABI (#1261)

* Fix picking incorrect substrate event ABI

* publish image for branch

* add git to build image

* Fix event decoding by adjusting block range and using previous level's spec version

* lint, changelog

* fix substrate subsquid datasource

* revert

* alternative fix

* switch aiosubstrate, lint

* log parsing errors

* lock, remove branch from build.yml

---------

Co-authored-by: Wizard1209 <[email protected]>

Author: droserasprout

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 Releases prior to 7.0 has been removed from this file to declutter search results; see the [archived copy](https://github.com/dipdup-io/dipdup/blob/8.0.0b5/CHANGELOG.md) for the full list.
 
+## [Unreleased]
+
+### Fixed
+
+- substrate.events: Fixed crash caused by choosing incorrect runtime metadata for decoding.
+
 ## [8.4.0] - 2025-05-20
 
 ### Added

Dockerfile

@@ -2,7 +2,7 @@
 FROM python:3.12-slim-bookworm AS compile-image
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN apt update && \
-    apt install -y build-essential && \
+    apt install -y build-essential git && \
     python -m venv --without-pip --system-site-packages /opt/dipdup && \
     mkdir -p /opt/dipdup/src/dipdup/ && \
     touch /opt/dipdup/src/dipdup/__init__.py && \

pyproject.toml

@@ -68,16 +68,16 @@ dependencies = [
     "pyhumps~=3.8",
     "pysignalr~=1.0",
     "python-dotenv~=1.0",
-    "python-json-logger~=2.0",  # pinned
+    "python-json-logger~=2.0", # pinned
     "ruamel.yaml~=0.18.6",
     "ruff>=0.11.2",
     "sentry-sdk~=2.16",
     "sqlparse~=0.5",
-    "starknet-py~=0.27.0",  # pinned
+    "starknet-py~=0.27.0", # pinned
     "strict-rfc3339~=0.7",
     "survey~=5.4",
     "tabulate~=0.9",
-    "tortoise-orm==0.25.0",  # pinned
+    "tortoise-orm==0.25.0", # pinned
     "uvloop~=0.20",
     "web3~=7.2",
 ]

requirements.txt

@@ -7,23 +7,23 @@ aerich==0.9.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
 aiohappyeyeballs==2.6.1 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:c3f9d0113123803ccadfdf3f0faa505bc78e6a72d1cc4806cbd719826e943558 \
     --hash=sha256:f349ba8f4b75cb25c99c5c2d84e997e485204d2902a9597802b0371f09331fb8
-aiohttp==3.12.1 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:00b17b19802e1900c6bd42c21f8c3a1668a069882ee182686b210f422f3d75b2 \
-    --hash=sha256:03fcc6a08b322f69cd3c4e2f0358a5323ba075bff3af3f02640feaef1c9ca9c5 \
-    --hash=sha256:0c18006fce18be8bc431f8178f24d3d8f0a1ea5c9b9d9cbdc9361158c81579da \
-    --hash=sha256:222fb161b3890b613184ef8d61c088d4ff3036c3687fcefb3ce54a1b2b41cf25 \
-    --hash=sha256:284b3b9458b53c28a8ea273be8b63b320d9a7b55b3856c707421f05ea47f4930 \
-    --hash=sha256:324bae9dcad6245f8aa2dbbea2daeae92cff757dab12ec438761462149cf74c0 \
-    --hash=sha256:5fa5e3029a251b88e69033fedeb3fb6df05817df60d2725fdf6b4665f9076efe \
-    --hash=sha256:6482fabe5947c109adb6646d1ebd1bbe79cf634d80c11b19b7a56b7d1d628487 \
-    --hash=sha256:82552cf0d12e47e2976c59e1fba12a712f8ec321e759b9c48ce61a28b4449f26 \
-    --hash=sha256:8475e731b69063da96a92519bd78710c949c8ea26434507e957006e52c027d27 \
-    --hash=sha256:85b8256d911ae4462cdd39a2ad2fd95ec6d7cc97af8f159d29fa69ad0844f6bb \
-    --hash=sha256:8b7f3ce2f86255b7245f6e2e15b1dc6f6473237bbdd5c0d2eee3c7ca66b556dc \
-    --hash=sha256:974d533968a574f6ce27b53b3662b4c1d895237fd151c2a1fff22b94214f0995 \
-    --hash=sha256:9f988e07a4d3a5c0ee73ba2a7a2dea8de71ea0e6ebcf19d87d5daefc8ff63566 \
-    --hash=sha256:db35689970e62cc2e39f8e39fc45d6943ad623a14f601ba5f0bdfee87a8ba638 \
-    --hash=sha256:e583f988286f3d1b36b030c91008172561b88fa02c81bccda93442d6ff2f9c18
+aiohttp==3.12.7 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:08bf55b216c779eddb6e41c1841c17d7ddd12776c7d7b36051c0a292a9ca828e \
+    --hash=sha256:3091b4883f405dbabeb9ea821a25dec16d03a51c3e0d2752fc3ab48b652bf196 \
+    --hash=sha256:3a5938973105cd5ff17176e8cb36bc19cac7c82ae7c58c0dbd7e023972d0c708 \
+    --hash=sha256:3c9f52149d8249566e72c50c7985c2345521b3b78f84aa86f6f492cd50b14793 \
+    --hash=sha256:410e96cc6824fc4ced9703fb2ac2d06c6190d21fc6f5b588f62b1918628449c1 \
+    --hash=sha256:43e93987fe9df4349db8deae7c391695538c35e4ba893133c7e823234f6e4537 \
+    --hash=sha256:4a46fe4a4c66b2712059e48a8384eb93565fbe3251af4844860fed846ef4ca75 \
+    --hash=sha256:94f98e0e5a49f89b252e115844f756c04fc8050f38252a32a3dd994ce8121f10 \
+    --hash=sha256:97fd97abd4cf199eff4041d0346a7dc68b60deab177f01de87283be513ffc3ab \
+    --hash=sha256:9b9345918f5b5156a5712c37d1d331baf320df67547ea032a49a609b773c3606 \
+    --hash=sha256:ad01793164661af70918490ef8efc2c09df7a3c686b6c84ca90a2d69cdbc3911 \
+    --hash=sha256:b780b402e6361c4cfcec252580f5ecdd86cb68376520ac34748d3f8b262dd598 \
+    --hash=sha256:cb3f3dcb59f3e16819a1c7d3fa32e7b87255b661c1e139a1b5940bde270704ab \
+    --hash=sha256:cf981bbfb7ff2ebc1b3bfae49d2efe2c51ca1cf3d90867f47c310df65398e85e \
+    --hash=sha256:e506ae5c4c05d1a1e87edd64b994cea2d49385d41d32e1c6be8764f31cf2245c \
+    --hash=sha256:e85c6833be3f49cead2e7bc79080e5c18d6dab9af32226ab5a01dc20c523e7d9
 aiolimiter==1.2.1 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:d3f249e9059a20badcb56b61601a83556133655c11d1eb3dd3e04ff069e5f3c7 \
     --hash=sha256:e02a37ea1a855d9e832252a105420ad4d15011505512a1a1d814647451b5cca9
@@ -33,9 +33,9 @@ aiosignal==1.3.2 ; sys_platform == 'darwin' or sys_platform == 'linux' \
 aiosqlite==0.21.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:131bb8056daa3bc875608c631c678cda73922a2d4ba8aec373b19f18c17e7aa3 \
     --hash=sha256:2549cf4057f95f53dcba16f2b64e8e2791d7e1adedb13197dd8ed77bb226d7d0
-aiosubstrate==0.1.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:364ecbad23bd71c9cb1ef6a82cfd700c0a98ab141eeb328cab5052d5f032875e \
-    --hash=sha256:ae9b80b0ae49684a39f60ea82488d691c2f4be219ae4306e67f4d18a1be62797
+aiosubstrate==0.1.1 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:79fc16d6aafcfe4f04c15f72fe3b7e0d44af16e5c94aae3e5be475b58ec9211a \
+    --hash=sha256:ce4cfbb784340d8bcd9e3a23d059ae9143de5960f5304e074dad22aca1312d85
 annotated-types==0.7.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
@@ -271,9 +271,9 @@ marshmallow-dataclass==8.7.1 ; sys_platform == 'darwin' or sys_platform == 'linu
 marshmallow-oneofschema==3.2.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:19c87e6124ef05e2831e5c631168c909a50a8fe399921b9841b75fef3785be8c \
     --hash=sha256:c06c8d9f14d51ffff152d66d85bd5f27d55cff10752a3b1f8c1f948bf5f597a0
-mcp==1.9.1 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:19879cd6dde3d763297617242888c2f695a95dfa854386a6a68676a646ce75e4 \
-    --hash=sha256:2900ded8ffafc3c8a7bfcfe8bc5204037e988e753ec398f371663e6a06ecd9a9
+mcp==1.9.2 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:3c7651c053d635fd235990a12e84509fe32780cd359a5bbef352e20d4d963c05 \
+    --hash=sha256:bc29f7fd67d157fef378f89a4210384f5fecf1168d0feb12d22929818723f978
 more-itertools==10.7.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:9fddd5403be01a94b204faadcff459ec3568cf110265d3c54323e1e866ad29d3 \
     --hash=sha256:d43980384673cb07d2f7d2d918c616b30c659c089ee23953f601d6609c67510e
@@ -351,9 +351,9 @@ poseidon-py==0.1.5 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:acfa0f79176505226dc79c27e1a6a55e1184753920463826101a2f1c2dd2fbf6 \
     --hash=sha256:cbd1ed7d8567e057cc181542aff18dc0b11cf2c67593243830cc2fedb73b112f \
     --hash=sha256:f09faa440ff5f10099a3e667bb5f8781d27a7bc719f45119d08d12574a4d9281
-prometheus-client==0.22.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:18da1d2241ac2d10c8d2110f13eedcd5c7c0c8af18c926e8731f04fc10cd575c \
-    --hash=sha256:c8951bbe64e62b96cd8e8f5d917279d1b9b91ab766793f33d4dce6c228558713
+prometheus-client==0.22.1 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28 \
+    --hash=sha256:cca895342e308174341b2cbf99a56bef291fbc0ef7b9e5412a0f26d653ba7094
 propcache==0.3.1 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:050b571b2e96ec942898f8eb46ea4bfbb19bd5502424747e83badc2d4a99a44e \
     --hash=sha256:09400e98545c998d57d10035ff623266927cb784d13dd2b31fd33b8a5316b85b \
@@ -455,9 +455,9 @@ requests==2.32.3 ; sys_platform == 'darwin' or sys_platform == 'linux' \
 rlp==4.1.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:8eca394c579bad34ee0b937aecb96a57052ff3716e19c7a578883e767bc5da6f \
     --hash=sha256:be07564270a96f3e225e2c107db263de96b5bc1f27722d2855bd3459a08e95a9
-ruamel-yaml==0.18.11 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:b586a3416676566ed45bf679a0909719f7ea7b58c03a9b6e03f905a1e2cd5076 \
-    --hash=sha256:eca06c9fce6ee3220845c4c54e58376586e041a6127e4d1958e12a3142084897
+ruamel-yaml==0.18.12 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:5a38fd5ce39d223bebb9e3a6779e86b9427a03fb0bf9f270060f8b149cffe5e2 \
+    --hash=sha256:790ba4c48b6a6e6b12b532a7308779eb12d2aaab3a80fdb8389216f28ea2b287
 ruamel-yaml-clib==0.2.12 ; (platform_python_implementation == 'CPython' and sys_platform == 'darwin') or (platform_python_implementation == 'CPython' and sys_platform == 'linux') \
     --hash=sha256:20b0f8dc160ba83b6dcc0e256846e1a02d044e13f7ea74a3d1d56ede4e48c632 \
     --hash=sha256:32621c177bbf782ca5a18ba4d7af0f1082a3f6e517ac2a18b3974d4edf349680 \
@@ -467,22 +467,22 @@ ruamel-yaml-clib==0.2.12 ; (platform_python_implementation == 'CPython' and sys_
     --hash=sha256:95c3829bb364fdb8e0332c9931ecf57d9be3519241323c5274bd82f709cebc0c \
     --hash=sha256:b82a7c94a498853aa0b272fd5bc67f29008da798d4f93a2f9f289feb8426a58d \
     --hash=sha256:bf165fef1f223beae7333275156ab2022cffe255dcc51c27f066b4370da81e31
-ruff==0.11.11 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:1b5ab797fcc09121ed82e9b12b6f27e34859e4227080a42d090881be888755d4 \
-    --hash=sha256:6224076c344a7694c6fbbb70d4f2a7b730f6d47d2a9dc1e7f9d9bb583faf390b \
-    --hash=sha256:64ac6f885e3ecb2fdbb71de2701d4e34526651f1e8503af8fb30d4915a3fe345 \
-    --hash=sha256:7774173cc7c1980e6bf67569ebb7085989a78a103922fb83ef3dfe230cd0687d \
-    --hash=sha256:7885d9a5e4c77b24e8c88aba8c80be9255fa22ab326019dac2356cff42089fc6 \
-    --hash=sha256:882821fcdf7ae8db7a951df1903d9cb032bbe838852e5fc3c2b6c3ab54e39875 \
-    --hash=sha256:9263f9e5aa4ff1dec765e99810f1cc53f0c868c5329b69f13845f699fe74f639 \
-    --hash=sha256:9924e5ae54125ed8958a4f7de320dab7380f6e9fa3195e3dc3b137c6842a0092 \
-    --hash=sha256:99c28505ecbaeb6594701a74e395b187ee083ee26478c1a795d35084d53ebd81 \
-    --hash=sha256:a97c9babe1d4081037a90289986925726b802d180cca784ac8da2bbbc335f709 \
-    --hash=sha256:c8a93276393d91e952f790148eb226658dd275cddfde96c6ca304873f11d2ae4 \
-    --hash=sha256:d6e333dbe2e6ae84cdedefa943dfd6434753ad321764fd937eef9d6b62022bcd \
-    --hash=sha256:d8c4ddcbe8a19f59f57fd814b8b117d4fcea9bee7c0492e6cf5fdc22cfa563c8 \
-    --hash=sha256:dcec2d50756463d9df075a26a85a6affbc1b0148873da3997286caf1ce03cae1 \
-    --hash=sha256:e231ff3132c1119ece836487a02785f099a43992b95c2f62847d29bace3c75ac
+ruff==0.11.12 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:08033320e979df3b20dba567c62f69c45e01df708b0f9c83912d7abd3e0801cd \
+    --hash=sha256:2635c2a90ac1b8ca9e93b70af59dfd1dd2026a40e2d6eebaa3efb0465dd9cf02 \
+    --hash=sha256:2cad64843da9f134565c20bcc430642de897b8ea02e2e79e6e02a76b8dcad7c3 \
+    --hash=sha256:3cc3a3690aad6e86c1958d3ec3c38c4594b6ecec75c1f531e84160bd827b2012 \
+    --hash=sha256:43cf7f69c7d7c7d7513b9d59c5d8cafd704e05944f978614aa9faff6ac202603 \
+    --hash=sha256:4d47afa45e7b0eaf5e5969c6b39cbd108be83910b5c74626247e366fd7a36a13 \
+    --hash=sha256:692bf9603fe1bf949de8b09a2da896f05c01ed7a187f4a386cdba6760e7f61be \
+    --hash=sha256:74adf84960236961090e2d1348c1a67d940fd12e811a33fb3d107df61eef8fc7 \
+    --hash=sha256:7de4a73205dc5756b8e09ee3ed67c38312dce1aa28972b93150f5751199981b5 \
+    --hash=sha256:929b7706584f5bfd61d67d5070f399057d07c70585fa8c4491d78ada452d3bef \
+    --hash=sha256:9b6886b524a1c659cee1758140138455d3c029783d1b9e643f3624a5ee0cb0aa \
+    --hash=sha256:b56697e5b8bcf1d61293ccfe63873aba08fdbcbbba839fc046ec5926bdb25a3a \
+    --hash=sha256:c7680aa2f0d4c4f43353d1e72123955c7a2159b8646cd43402de6d4a3a25d7cc \
+    --hash=sha256:d05d6a78a89166f03f03a198ecc9d18779076ad0eec476819467acb401028c0c \
+    --hash=sha256:f97fdbc2549f456c65b3b0048560d44ddd540db1f27c778a938371424b49fe4a
 scalecodec==1.2.11 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:99a2cdbfccdcaf22bd86b86da55a730a2855514ad2309faef4a4a93ac6cbeb8d \
     --hash=sha256:d15c94965f617caa25096f83a45f5f73031d05e6ee08d6039969f0a64fc35de1
@@ -498,14 +498,14 @@ sniffio==1.3.1 ; sys_platform == 'darwin' or sys_platform == 'linux' \
 sqlparse==0.5.3 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:09f67787f56a0b16ecdbde1bfc7f5d9c3371ca683cfeaa8e6ff60b4807ec9272 \
     --hash=sha256:cf2196ed3418f3ba5de6af7e82c694a9fbdbfecccdfc72e281548517081f16ca
-sse-starlette==2.3.5 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:228357b6e42dcc73a427990e2b4a03c023e2495ecee82e14f07ba15077e334b2 \
-    --hash=sha256:251708539a335570f10eaaa21d1848a10c42ee6dc3a9cf37ef42266cdb1c52a8
+sse-starlette==2.3.6 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:0382336f7d4ec30160cf9ca0518962905e1b69b72d6c1c995131e0a703b436e3 \
+    --hash=sha256:d49a8285b182f6e2228e2609c350398b2ca2c36216c2675d875f81e93548f760
 starknet-py==0.27.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:18f1408a230b8a8bfdd88c8ec734c784b3dfc5e327205c467f8be1d883923085
-starlette==0.46.2 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:595633ce89f8ffa71a015caed34a5b2dc1c0cdb3f0f1fbd1e69339cf2abeec35 \
-    --hash=sha256:7f7361f34eed179294600af672f565727419830b54b7b084efe44bb82d2fccd5
+starlette==0.47.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:1f64887e94a447fed5f23309fb6890ef23349b7e478faa7b24a851cd4eb844af \
+    --hash=sha256:9d052d4933683af40ffd47c7465433570b4949dc937e20ad1d73b34e72f10c37
 strict-rfc3339==0.7 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277
 survey==5.4.2 ; sys_platform == 'darwin' or sys_platform == 'linux' \
@@ -526,12 +526,12 @@ tortoise-orm==0.25.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
 typeguard==4.4.2 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:77a78f11f09777aeae7fa08585f33b5f4ef0e7335af40005b0c422ed398ff48c \
     --hash=sha256:a6f1065813e32ef365bc3b3f503af8a96f9dd4e0033a02c28c4a4983de8c6c49
-types-requests==2.32.0.20250515 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:09c8b63c11318cb2460813871aaa48b671002e59fda67ca909e9883777787581 \
-    --hash=sha256:f8eba93b3a892beee32643ff836993f15a785816acca21ea0ffa006f05ef0fb2
-typing-extensions==4.13.2 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c \
-    --hash=sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef
+types-requests==2.32.0.20250602 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:ee603aeefec42051195ae62ca7667cd909a2f8128fdf8aad9e8a5219ecfab3bf \
+    --hash=sha256:f4f335f87779b47ce10b8b8597b409130299f6971ead27fead4fe7ba6ea3e726
+typing-extensions==4.14.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4 \
+    --hash=sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af
 typing-inspect==0.9.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:9ee6fc59062311ef8547596ab6b955e1b8aa46242d854bfc78f4f6b0eff35f9f \
     --hash=sha256:b23fc42ff6f6ef6954e4852c1fb512cdd18dbea03134f91f856a95ccc9461f78
@@ -544,9 +544,9 @@ tzlocal==5.3.1 ; sys_platform == 'darwin' or sys_platform == 'linux' \
 urllib3==2.4.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:414bc6535b787febd7567804cc015fee39daab8ad86268f1310a9250697de466 \
     --hash=sha256:4e16665048960a0900c702d4a66415956a584919c03361cac9f1df5c5dd7e813
-uvicorn==0.34.2 ; sys_platform == 'darwin' or sys_platform == 'linux' \
-    --hash=sha256:0e929828f6186353a80b58ea719861d2629d766293b6d19baf086ba31d4f3328 \
-    --hash=sha256:deb49af569084536d269fe0a6d67e3754f104cf03aba7c11c40f01aadf33c403
+uvicorn==0.34.3 ; sys_platform == 'darwin' or sys_platform == 'linux' \
+    --hash=sha256:16246631db62bdfbf069b0645177d6e8a77ba950cfedbfd093acef9444e4d885 \
+    --hash=sha256:35919a9a979d7a59334b6b10e05d77c1d0d574c50e0fc98b8b1a0f165708b55a
 uvloop==0.21.0 ; sys_platform == 'darwin' or sys_platform == 'linux' \
     --hash=sha256:183aef7c8730e54c9a3ee3227464daed66e37ba13040bb3f350bc2ddc040f22f \
     --hash=sha256:359ec2c888397b9e592a889c4d72ba3d6befba8b2bb01743f72fffbde663b59c \

src/dipdup/config/starknet_events.py

@@ -11,8 +11,8 @@
 from dipdup.config.starknet import StarknetContractConfig
 from dipdup.config.starknet import StarknetDatasourceConfigU
 from dipdup.config.starknet import StarknetIndexConfig
-from dipdup.subscriptions.starknet import StarknetSubscription
 from dipdup.subscriptions import Subscription
+from dipdup.subscriptions.starknet import StarknetSubscription
 from dipdup.utils import pascal_to_snake
 from dipdup.utils import snake_to_pascal
 

src/dipdup/datasources/substrate_node.py

@@ -4,7 +4,6 @@
 from asyncio import Queue
 from collections.abc import Awaitable
 from collections.abc import Callable
-from contextlib import suppress
 from copy import copy
 from dataclasses import dataclass
 from dataclasses import field
@@ -234,13 +233,7 @@ async def get_full_block(self, hash: str) -> dict[str, Any]:
         return await self._jsonrpc_request('chain_getBlock', [hash])  # type: ignore[no-any-return]
 
     async def get_events(self, block_hash: str) -> tuple[_SubstrateNodeEventResponse, ...]:
-        # FIXME: aiosubstrate bug, fix asap
-        while True:
-            with suppress(AttributeError):
-                events = await self._interface.get_events(block_hash)
-                break
-            await asyncio.sleep(0.1)
-
+        events = await self._interface.get_events(block_hash)
         result: list[_SubstrateNodeEventResponse] = []
         for index, raw_event in enumerate(events):
             event: dict[str, Any] = raw_event.decode()

src/dipdup/models/starknet.py

@@ -2,21 +2,17 @@
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import Generic
-from typing import Literal
 from typing import Self
 from typing import TypeVar
 
 from pydantic import BaseModel
 
 from dipdup.fetcher import HasLevel
-from dipdup.subscriptions import Subscription
 
 if TYPE_CHECKING:
     from starknet_py.net.client_models import EmittedEvent
 
 
-
-
 @dataclass(frozen=True)
 class StarknetTransactionData(HasLevel):
     level: int