Skip to content

Commit

Permalink
Fix filtering transfers by token_id (#876)
Browse files Browse the repository at this point in the history
  • Loading branch information
@droserasprout
droserasprout authored Oct 20, 2023
1 parent 800ea85 commit 1832fa0
Show file tree
Hide file tree
Showing 9 changed files with 206 additions and 200 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog], and this project adheres to [Semantic Versioning].

## [6.5.14] - 2023-10-20

### Fixed

- token_transfer: Fixed filtering transfers by token_id.

## [6.5.13] - 2023-10-10

### Fixed
Expand Down Expand Up @@ -1062,7 +1068,9 @@ This release contains no changes except for the version number.
[semantic versioning]: https://semver.org/spec/v2.0.0.html

<!-- Versions -->
[Unreleased]: https://github.com/dipdup-io/dipdup/compare/6.5.12...HEAD
[Unreleased]: https://github.com/dipdup-io/dipdup/compare/6.5.14...HEAD
[6.5.14]: https://github.com/dipdup-io/dipdup/compare/6.5.13...6.5.14
[6.5.13]: https://github.com/dipdup-io/dipdup/compare/6.5.12...6.5.13
[6.5.12]: https://github.com/dipdup-io/dipdup/compare/6.5.11...6.5.12
[6.5.11]: https://github.com/dipdup-io/dipdup/compare/6.5.10...6.5.11
[6.5.10]: https://github.com/dipdup-io/dipdup/compare/6.5.9...6.5.10
Expand Down
330 changes: 164 additions & 166 deletions poetry.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool.poetry]
name = "dipdup"
description = "Modular framework for creating selective indexers and featureful backends for dapps"
version = "6.5.13"
version = "6.5.14"
license = "MIT"
authors = [
"Lev Gorodetskiy <[email protected]>",
Expand Down Expand Up @@ -31,7 +31,7 @@ packages = [
python = ">=3.10,<3.11"

asyncpg = "^0.28.0"
datamodel-code-generator = "^0.21.1"
datamodel-code-generator = "^0.22.0"
pydantic = "^1.10.11"
tortoise-orm = "0.19.3"

Expand Down
18 changes: 9 additions & 9 deletions requirements.dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ asyncclick==8.1.3.4 ; python_version >= "3.10" and python_version < "3.11"
asyncpg==0.28.0 ; python_version >= "3.10" and python_version < "3.11"
attrs==21.4.0 ; python_version >= "3.10" and python_version < "3.11"
babel==2.13.0 ; python_version >= "3.10" and python_version < "3.11"
black==23.9.1 ; python_version >= "3.10" and python_version < "3.11"
black==23.10.0 ; python_version >= "3.10" and python_version < "3.11"
certifi==2023.7.22 ; python_version >= "3.10" and python_version < "3.11"
chardet==5.2.0 ; python_version >= "3.10" and python_version < "3.11"
charset-normalizer==3.3.0 ; python_version >= "3.10" and python_version < "3.11"
click==8.1.7 ; python_version >= "3.10" and python_version < "3.11"
colorama==0.4.6 ; python_version >= "3.10" and python_version < "3.11" and (platform_system == "Windows" or sys_platform == "win32")
coverage[toml]==7.3.2 ; python_version >= "3.10" and python_version < "3.11"
datamodel-code-generator==0.21.5 ; python_version >= "3.10" and python_version < "3.11"
diff-cover==7.7.0 ; python_version >= "3.10" and python_version < "3.11"
datamodel-code-generator==0.22.1 ; python_version >= "3.10" and python_version < "3.11"
diff-cover==8.0.0 ; python_version >= "3.10" and python_version < "3.11"
dnspython==2.4.2 ; python_version >= "3.10" and python_version < "3.11"
docker==6.1.3 ; python_version >= "3.10" and python_version < "3.11"
docutils==0.20.1 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -42,10 +42,10 @@ markupsafe==2.1.3 ; python_version >= "3.10" and python_version < "3.11"
msgpack==1.0.7 ; python_version >= "3.10" and python_version < "3.11"
multidict==6.0.4 ; python_version >= "3.10" and python_version < "3.11"
mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
mypy==1.6.0 ; python_version >= "3.10" and python_version < "3.11"
mypy==1.6.1 ; python_version >= "3.10" and python_version < "3.11"
openapi-schema-validator==0.4.4 ; python_version >= "3.10" and python_version < "3.11"
openapi-spec-validator==0.5.7 ; python_version >= "3.10" and python_version < "3.11"
orjson==3.9.8 ; python_version >= "3.10" and python_version < "3.11"
orjson==3.9.9 ; python_version >= "3.10" and python_version < "3.11"
packaging==23.2 ; python_version >= "3.10" and python_version < "3.11"
pathable==0.4.3 ; python_version >= "3.10" and python_version < "3.11"
pathspec==0.11.2 ; python_version >= "3.10" and python_version < "3.11"
Expand Down Expand Up @@ -73,9 +73,9 @@ pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "3.11"
requests==2.31.0 ; python_version >= "3.10" and python_version < "3.11"
rfc3339-validator==0.1.4 ; python_version >= "3.10" and python_version < "3.11"
ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
ruamel-yaml==0.17.35 ; python_version >= "3.10" and python_version < "3.11"
ruff==0.0.292 ; python_version >= "3.10" and python_version < "3.11"
sentry-sdk==1.31.0 ; python_version >= "3.10" and python_version < "3.11"
ruamel-yaml==0.17.40 ; python_version >= "3.10" and python_version < "3.11"
ruff==0.1.1 ; python_version >= "3.10" and python_version < "3.11"
sentry-sdk==1.32.0 ; python_version >= "3.10" and python_version < "3.11"
six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
snowballstemmer==2.2.0 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -98,7 +98,7 @@ types-tabulate==0.9.0.3 ; python_version >= "3.10" and python_version < "3.11"
typing-extensions==4.8.0 ; python_version >= "3.10" and python_version < "3.11"
tzdata==2023.3 ; python_version >= "3.10" and python_version < "3.11" and platform_system == "Windows"
tzlocal==5.1 ; python_version >= "3.10" and python_version < "3.11"
urllib3==2.0.6 ; python_version >= "3.10" and python_version < "3.11"
urllib3==2.0.7 ; python_version >= "3.10" and python_version < "3.11"
websocket-client==1.6.4 ; python_version >= "3.10" and python_version < "3.11"
websockets==10.4 ; python_version >= "3.10" and python_version < "3.11"
yarl==1.9.2 ; python_version >= "3.10" and python_version < "3.11"
20 changes: 10 additions & 10 deletions requirements.pytezos.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ attrs==21.4.0 ; python_version >= "3.10" and python_version < "3.11"
backcall==0.2.0 ; python_version >= "3.10" and python_version < "3.11"
base58==2.1.1 ; python_version >= "3.10" and python_version < "3.11"
beautifulsoup4==4.12.2 ; python_version >= "3.10" and python_version < "3.11"
black==23.9.1 ; python_version >= "3.10" and python_version < "3.11"
black==23.10.0 ; python_version >= "3.10" and python_version < "3.11"
bleach==6.1.0 ; python_version >= "3.10" and python_version < "3.11"
cached-property==1.5.2 ; python_version >= "3.10" and python_version < "3.11"
cattrs==22.2.0 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -30,7 +30,7 @@ colorama==0.4.6 ; python_version >= "3.10" and python_version < "3.11" and (plat
comm==0.1.4 ; python_version >= "3.10" and python_version < "3.11"
cryptography==41.0.4 ; python_version >= "3.10" and python_version < "3.11"
cytoolz==0.12.2 ; python_version >= "3.10" and python_version < "3.11" and implementation_name == "cpython"
datamodel-code-generator==0.21.5 ; python_version >= "3.10" and python_version < "3.11"
datamodel-code-generator==0.22.1 ; python_version >= "3.10" and python_version < "3.11"
debugpy==1.8.0 ; python_version >= "3.10" and python_version < "3.11"
decorator==5.1.1 ; python_version >= "3.10" and python_version < "3.11"
defusedxml==0.7.1 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -40,7 +40,7 @@ docker==6.1.3 ; python_version >= "3.10" and python_version < "3.11"
email-validator==2.0.0.post2 ; python_version >= "3.10" and python_version < "3.11"
eth-hash==0.5.2 ; python_version >= "3.10" and python_version < "3.11"
eth-typing==3.5.0 ; python_version >= "3.10" and python_version < "3.11"
eth-utils==2.2.1 ; python_version >= "3.10" and python_version < "3.11"
eth-utils==2.2.2 ; python_version >= "3.10" and python_version < "3.11"
exceptiongroup==1.1.3 ; python_version >= "3.10" and python_version < "3.11"
executing==2.0.0 ; python_version >= "3.10" and python_version < "3.11"
fastecdsa==2.3.0 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -62,11 +62,11 @@ jsonpointer==2.4 ; python_version >= "3.10" and python_version < "3.11"
jsonschema-spec==0.1.6 ; python_version >= "3.10" and python_version < "3.11"
jsonschema==4.17.3 ; python_version >= "3.10" and python_version < "3.11"
jsonschema[format-nongpl]==4.17.3 ; python_version >= "3.10" and python_version < "3.11"
jupyter-client==8.3.1 ; python_version >= "3.10" and python_version < "3.11"
jupyter-client==8.4.0 ; python_version >= "3.10" and python_version < "3.11"
jupyter-core==5.4.0 ; python_version >= "3.10" and python_version < "3.11"
jupyter-events==0.6.3 ; python_version >= "3.10" and python_version < "3.11"
jupyter-server-terminals==0.4.4 ; python_version >= "3.10" and python_version < "3.11"
jupyter-server==2.7.3 ; python_version >= "3.10" and python_version < "3.11"
jupyter-server==2.8.0 ; python_version >= "3.10" and python_version < "3.11"
jupyterlab-pygments==0.2.2 ; python_version >= "3.10" and python_version < "3.11"
lazy-object-proxy==1.9.0 ; python_version >= "3.10" and python_version < "3.11"
markupsafe==2.1.3 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -86,7 +86,7 @@ notebook-shim==0.2.3 ; python_version >= "3.10" and python_version < "3.11"
notebook==6.5.4 ; python_version >= "3.10" and python_version < "3.11"
openapi-schema-validator==0.4.4 ; python_version >= "3.10" and python_version < "3.11"
openapi-spec-validator==0.5.7 ; python_version >= "3.10" and python_version < "3.11"
orjson==3.9.8 ; python_version >= "3.10" and python_version < "3.11"
orjson==3.9.9 ; python_version >= "3.10" and python_version < "3.11"
overrides==7.4.0 ; python_version >= "3.10" and python_version < "3.11"
packaging==23.2 ; python_version >= "3.10" and python_version < "3.11"
pandocfilters==1.5.0 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -100,7 +100,7 @@ ply==3.11 ; python_version >= "3.10" and python_version < "3.11"
prance==23.6.21.0 ; python_version >= "3.10" and python_version < "3.11"
prometheus-client==0.16.0 ; python_version >= "3.10" and python_version < "3.11"
prompt-toolkit==3.0.39 ; python_version >= "3.10" and python_version < "3.11"
psutil==5.9.5 ; python_version >= "3.10" and python_version < "3.11"
psutil==5.9.6 ; python_version >= "3.10" and python_version < "3.11"
ptyprocess==0.7.0 ; python_version >= "3.10" and python_version < "3.11" and (os_name != "nt" or sys_platform != "win32")
pure-eval==0.2.2 ; python_version >= "3.10" and python_version < "3.11"
py-ecc==6.0.0 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -127,10 +127,10 @@ requests==2.31.0 ; python_version >= "3.10" and python_version < "3.11"
rfc3339-validator==0.1.4 ; python_version >= "3.10" and python_version < "3.11"
rfc3986-validator==0.1.1 ; python_version >= "3.10" and python_version < "3.11"
ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
ruamel-yaml==0.17.35 ; python_version >= "3.10" and python_version < "3.11"
ruamel-yaml==0.17.40 ; python_version >= "3.10" and python_version < "3.11"
secp256k1==0.14.0 ; python_version >= "3.10" and python_version < "3.11"
send2trash==1.8.2 ; python_version >= "3.10" and python_version < "3.11"
sentry-sdk==1.31.0 ; python_version >= "3.10" and python_version < "3.11"
sentry-sdk==1.32.0 ; python_version >= "3.10" and python_version < "3.11"
setuptools==67.8.0 ; python_version >= "3.10" and python_version < "3.11"
simple-bson==0.0.3 ; python_version >= "3.10" and python_version < "3.11"
simplejson==3.19.2 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -156,7 +156,7 @@ typing-extensions==4.8.0 ; python_version >= "3.10" and python_version < "3.11"
tzdata==2023.3 ; python_version >= "3.10" and python_version < "3.11" and platform_system == "Windows"
tzlocal==5.1 ; python_version >= "3.10" and python_version < "3.11"
uri-template==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
urllib3==2.0.6 ; python_version >= "3.10" and python_version < "3.11"
urllib3==2.0.7 ; python_version >= "3.10" and python_version < "3.11"
wcwidth==0.2.8 ; python_version >= "3.10" and python_version < "3.11"
webcolors==1.13 ; python_version >= "3.10" and python_version < "3.11"
webencodings==0.5.1 ; python_version >= "3.10" and python_version < "3.11"
Expand Down
8 changes: 4 additions & 4 deletions requirements.slim.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ idna==3.4 ; python_version >= "3.10" and python_version < "3.11"
iso8601==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
msgpack==1.0.7 ; python_version >= "3.10" and python_version < "3.11"
multidict==6.0.4 ; python_version >= "3.10" and python_version < "3.11"
orjson==3.9.8 ; python_version >= "3.10" and python_version < "3.11"
orjson==3.9.9 ; python_version >= "3.10" and python_version < "3.11"
prometheus-client==0.16.0 ; python_version >= "3.10" and python_version < "3.11"
pydantic==1.10.13 ; python_version >= "3.10" and python_version < "3.11"
pyhumps==3.8.0 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -26,8 +26,8 @@ pysignalr==0.2.0 ; python_version >= "3.10" and python_version < "3.11"
python-dotenv==0.19.2 ; python_version >= "3.10" and python_version < "3.11"
pytz==2023.3.post1 ; python_version >= "3.10" and python_version < "3.11"
ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
ruamel-yaml==0.17.35 ; python_version >= "3.10" and python_version < "3.11"
sentry-sdk==1.31.0 ; python_version >= "3.10" and python_version < "3.11"
ruamel-yaml==0.17.40 ; python_version >= "3.10" and python_version < "3.11"
sentry-sdk==1.32.0 ; python_version >= "3.10" and python_version < "3.11"
six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
sqlparse==0.4.4 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -36,6 +36,6 @@ tortoise-orm==0.19.3 ; python_version >= "3.10" and python_version < "3.11"
typing-extensions==4.8.0 ; python_version >= "3.10" and python_version < "3.11"
tzdata==2023.3 ; python_version >= "3.10" and python_version < "3.11" and platform_system == "Windows"
tzlocal==5.1 ; python_version >= "3.10" and python_version < "3.11"
urllib3==2.0.6 ; python_version >= "3.10" and python_version < "3.11"
urllib3==2.0.7 ; python_version >= "3.10" and python_version < "3.11"
websockets==10.4 ; python_version >= "3.10" and python_version < "3.11"
yarl==1.9.2 ; python_version >= "3.10" and python_version < "3.11"
12 changes: 6 additions & 6 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ async-timeout==4.0.3 ; python_version >= "3.10" and python_version < "3.11"
asyncclick==8.1.3.4 ; python_version >= "3.10" and python_version < "3.11"
asyncpg==0.28.0 ; python_version >= "3.10" and python_version < "3.11"
attrs==21.4.0 ; python_version >= "3.10" and python_version < "3.11"
black==23.9.1 ; python_version >= "3.10" and python_version < "3.11"
black==23.10.0 ; python_version >= "3.10" and python_version < "3.11"
certifi==2023.7.22 ; python_version >= "3.10" and python_version < "3.11"
chardet==5.2.0 ; python_version >= "3.10" and python_version < "3.11"
charset-normalizer==3.3.0 ; python_version >= "3.10" and python_version < "3.11"
click==8.1.7 ; python_version >= "3.10" and python_version < "3.11"
colorama==0.4.6 ; python_version >= "3.10" and python_version < "3.11" and platform_system == "Windows"
datamodel-code-generator==0.21.5 ; python_version >= "3.10" and python_version < "3.11"
datamodel-code-generator==0.22.1 ; python_version >= "3.10" and python_version < "3.11"
dnspython==2.4.2 ; python_version >= "3.10" and python_version < "3.11"
email-validator==2.0.0.post2 ; python_version >= "3.10" and python_version < "3.11"
exceptiongroup==1.1.3 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -35,7 +35,7 @@ multidict==6.0.4 ; python_version >= "3.10" and python_version < "3.11"
mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
openapi-schema-validator==0.4.4 ; python_version >= "3.10" and python_version < "3.11"
openapi-spec-validator==0.5.7 ; python_version >= "3.10" and python_version < "3.11"
orjson==3.9.8 ; python_version >= "3.10" and python_version < "3.11"
orjson==3.9.9 ; python_version >= "3.10" and python_version < "3.11"
packaging==23.2 ; python_version >= "3.10" and python_version < "3.11"
pathable==0.4.3 ; python_version >= "3.10" and python_version < "3.11"
pathspec==0.11.2 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -55,8 +55,8 @@ pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "3.11"
requests==2.31.0 ; python_version >= "3.10" and python_version < "3.11"
rfc3339-validator==0.1.4 ; python_version >= "3.10" and python_version < "3.11"
ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
ruamel-yaml==0.17.35 ; python_version >= "3.10" and python_version < "3.11"
sentry-sdk==1.31.0 ; python_version >= "3.10" and python_version < "3.11"
ruamel-yaml==0.17.40 ; python_version >= "3.10" and python_version < "3.11"
sentry-sdk==1.32.0 ; python_version >= "3.10" and python_version < "3.11"
six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
sqlparse==0.4.4 ; python_version >= "3.10" and python_version < "3.11"
Expand All @@ -67,6 +67,6 @@ tortoise-orm==0.19.3 ; python_version >= "3.10" and python_version < "3.11"
typing-extensions==4.8.0 ; python_version >= "3.10" and python_version < "3.11"
tzdata==2023.3 ; python_version >= "3.10" and python_version < "3.11" and platform_system == "Windows"
tzlocal==5.1 ; python_version >= "3.10" and python_version < "3.11"
urllib3==2.0.6 ; python_version >= "3.10" and python_version < "3.11"
urllib3==2.0.7 ; python_version >= "3.10" and python_version < "3.11"
websockets==10.4 ; python_version >= "3.10" and python_version < "3.11"
yarl==1.9.2 ; python_version >= "3.10" and python_version < "3.11"
2 changes: 1 addition & 1 deletion src/dipdup/datasources/tzkt/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class TokenTransferSubscription(Subscription):
def get_request(self) -> list[dict[str, Any]]:
request: dict[str, Any] = {}
if self.token_id:
request['token_id'] = self.token_id
request['tokenId'] = self.token_id
if self.contract:
request['contract'] = self.contract
if self.from_:
Expand Down
2 changes: 1 addition & 1 deletion src/dipdup/install.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
GitHub: https://github.com/dipdup-io/dipdup
Discord: https://discord.gg/aG8XKuwsQd
"""
DIPDUP_LTS_VERSION = '6.5.12'
DIPDUP_LTS_VERSION = '6.5.14'


class Colors:
Expand Down

0 comments on commit 1832fa0

Please sign in to comment.