Skip to content

Commit a1960ef

Browse files
Filtering token transfers by contract/token_id/standard (#526)
1 parent 043a029 commit a1960ef

File tree

21 files changed

+1050
-929
lines changed

21 files changed

+1050
-929
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
99
### Added
1010

1111
- index: New index kind `operation_unfiltered`.
12+
- index: New filters for `token_transfer` index.
1213

1314
### Fixed
1415

15-
- cli: Configure package logger in addition to `dipdup` one.
16+
- cli: Fixed missing log messages from `ctx.logger`.
1617
- database: Fixed crash when using F expressions inside versioned transactions.
17-
- project: Fixed options in DipDup version question.
18+
- project: Fixed outdated options in DipDup version question.
1819
- tzkt: Fixed deserializing `EventData` model.
1920

2021
## [6.2.0] - 2022-10-12

demos/demo-tzbtc-transfers/dipdup.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ database:
55
kind: sqlite
66
path: demo-tzbtc-transfers.sqlite3
77

8+
contracts:
9+
tzbtc_mainnet:
10+
address: KT1PWx2mnDueood7fEmfbBDKx1D9BAnnXitn
11+
typename: tzbtc
12+
813
datasources:
914
tzkt:
1015
kind: tzkt
@@ -15,4 +20,5 @@ indexes:
1520
kind: token_transfer
1621
datasource: tzkt
1722
handlers:
18-
- callback: on_token_transfer
23+
- callback: on_token_transfer
24+
contract: tzbtc_mainnet

docs/config/reference.md

Lines changed: 29 additions & 29 deletions
Large diffs are not rendered by default.

poetry.lock

Lines changed: 78 additions & 77 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

requirements.dev.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ coverage[toml]==6.5.0 ; python_version >= "3.10" and python_version < "3.11"
2323
datamodel-code-generator==0.13.1 ; python_version >= "3.10" and python_version < "3.11"
2424
diff-cover==7.0.1 ; python_version >= "3.10" and python_version < "3.11"
2525
dnspython==2.2.1 ; python_version >= "3.10" and python_version < "3.11"
26-
docker==6.0.0 ; python_version >= "3.10" and python_version < "3.11"
26+
docker==6.0.1 ; python_version >= "3.10" and python_version < "3.11"
2727
docutils==0.19 ; python_version >= "3.10" and python_version < "3.11"
2828
email-validator==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
2929
entrypoints==0.4 ; python_version >= "3.10" and python_version < "3.11"
30-
exceptiongroup==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
30+
exceptiongroup==1.0.1 ; python_version >= "3.10" and python_version < "3.11"
3131
execnet==1.9.0 ; python_version >= "3.10" and python_version < "3.11"
3232
flake8-bugbear==22.10.27 ; python_version >= "3.10" and python_version < "3.11"
3333
flake8-comprehensions==3.10.1 ; python_version >= "3.10" and python_version < "3.11"
3434
flake8==4.0.1 ; python_version >= "3.10" and python_version < "3.11"
35-
flakeheaven==3.2.0 ; python_version >= "3.10" and python_version < "3.11"
35+
flakeheaven==3.2.1 ; python_version >= "3.10" and python_version < "3.11"
3636
frozenlist==1.3.1 ; python_version >= "3.10" and python_version < "3.11"
3737
genson==1.2.2 ; python_version >= "3.10" and python_version < "3.11"
3838
html2text==2020.1.16 ; python_version >= "3.10" and python_version < "3.11"
@@ -43,7 +43,7 @@ iniconfig==1.1.1 ; python_version >= "3.10" and python_version < "3.11"
4343
iso8601==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
4444
isort==5.10.1 ; python_version >= "3.10" and python_version < "3.11"
4545
jinja2==3.1.2 ; python_version >= "3.10" and python_version < "3.11"
46-
jsonschema==4.16.0 ; python_version >= "3.10" and python_version < "3.11"
46+
jsonschema==4.17.0 ; python_version >= "3.10" and python_version < "3.11"
4747
markupsafe==2.1.1 ; python_version >= "3.10" and python_version < "3.11"
4848
mccabe==0.6.1 ; python_version >= "3.10" and python_version < "3.11"
4949
msgpack==1.0.4 ; python_version >= "3.10" and python_version < "3.11"
@@ -55,9 +55,9 @@ openapi-spec-validator==0.3.1 ; python_version >= "3.10" and python_version < "3
5555
orjson==3.8.1 ; python_version >= "3.10" and python_version < "3.11"
5656
packaging==21.3 ; python_version >= "3.10" and python_version < "3.11"
5757
pathspec==0.10.1 ; python_version >= "3.10" and python_version < "3.11"
58-
platformdirs==2.5.2 ; python_version >= "3.10" and python_version < "3.11"
58+
platformdirs==2.5.3 ; python_version >= "3.10" and python_version < "3.11"
5959
pluggy==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
60-
prance==0.21.8.0 ; python_version >= "3.10" and python_version < "3.11"
60+
prance==0.22.11.4.0 ; python_version >= "3.10" and python_version < "3.11"
6161
prometheus-client==0.14.1 ; python_version >= "3.10" and python_version < "3.11"
6262
pycodestyle==2.8.0 ; python_version >= "3.10" and python_version < "3.11"
6363
pydantic==1.9.2 ; python_version >= "3.10" and python_version < "3.11"
@@ -68,7 +68,7 @@ pygments==2.13.0 ; python_version >= "3.10" and python_version < "3.11"
6868
pyhumps==3.8.0 ; python_version >= "3.10" and python_version < "3.11"
6969
pyparsing==3.0.9 ; python_version >= "3.10" and python_version < "3.11"
7070
pypika-tortoise==0.1.6 ; python_version >= "3.10" and python_version < "3.11"
71-
pyrsistent==0.19.1 ; python_version >= "3.10" and python_version < "3.11"
71+
pyrsistent==0.19.2 ; python_version >= "3.10" and python_version < "3.11"
7272
pysignalr==0.1.2 ; python_version >= "3.10" and python_version < "3.11"
7373
pysnooper==1.1.1 ; python_version >= "3.10" and python_version < "3.11"
7474
pytest-asyncio==0.20.1 ; python_version >= "3.10" and python_version < "3.11"
@@ -78,14 +78,14 @@ pytest==7.2.0 ; python_version >= "3.10" and python_version < "3.11"
7878
python-dotenv==0.19.2 ; python_version >= "3.10" and python_version < "3.11"
7979
pytz-deprecation-shim==0.1.0.post0 ; python_version >= "3.10" and python_version < "3.11"
8080
pytz==2022.6 ; python_version >= "3.10" and python_version < "3.11"
81-
pywin32==304 ; python_version >= "3.10" and python_version < "3.11" and sys_platform == "win32"
81+
pywin32==305 ; python_version >= "3.10" and python_version < "3.11" and sys_platform == "win32"
8282
pyyaml==6.0 ; python_version >= "3.10" and python_version < "3.11"
8383
requests==2.28.1 ; python_version >= "3.10" and python_version < "3.11"
8484
ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
8585
ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "3.11"
8686
semver==2.13.0 ; python_version >= "3.10" and python_version < "3.11"
8787
sentry-sdk==1.10.1 ; python_version >= "3.10" and python_version < "3.11"
88-
setuptools==65.5.0 ; python_version >= "3.10" and python_version < "3.11"
88+
setuptools==65.5.1 ; python_version >= "3.10" and python_version < "3.11"
8989
six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
9090
sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
9191
snowballstemmer==2.2.0 ; python_version >= "3.10" and python_version < "3.11"
@@ -112,7 +112,7 @@ tzlocal==4.2 ; python_version >= "3.10" and python_version < "3.11"
112112
unify==0.5 ; python_version >= "3.10" and python_version < "3.11"
113113
untokenize==0.1.1 ; python_version >= "3.10" and python_version < "3.11"
114114
urllib3==1.26.12 ; python_version >= "3.10" and python_version < "3.11"
115-
websocket-client==1.4.1 ; python_version >= "3.10" and python_version < "3.11"
115+
websocket-client==1.4.2 ; python_version >= "3.10" and python_version < "3.11"
116116
websockets==10.3 ; python_version >= "3.10" and python_version < "3.11"
117117
yapf==0.32.0 ; python_version >= "3.10" and python_version < "3.11"
118118
yarl==1.8.1 ; python_version >= "3.10" and python_version < "3.11"

requirements.pytezos.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ decorator==5.1.1 ; python_version >= "3.10" and python_version < "3.11"
3434
defusedxml==0.7.1 ; python_version >= "3.10" and python_version < "3.11"
3535
deprecation==2.1.0 ; python_version >= "3.10" and python_version < "3.11"
3636
dnspython==2.2.1 ; python_version >= "3.10" and python_version < "3.11"
37-
docker==6.0.0 ; python_version >= "3.10" and python_version < "3.11"
37+
docker==6.0.1 ; python_version >= "3.10" and python_version < "3.11"
3838
email-validator==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
3939
entrypoints==0.4 ; python_version >= "3.10" and python_version < "3.11"
4040
eth-hash==0.3.3 ; python_version >= "3.10" and python_version < "3.11"
4141
eth-typing==3.2.0 ; python_version >= "3.10" and python_version < "3.11"
4242
eth-utils==2.0.0 ; python_version >= "3.10" and python_version < "3.11"
43-
exceptiongroup==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
43+
exceptiongroup==1.0.1 ; python_version >= "3.10" and python_version < "3.11"
4444
executing==1.2.0 ; python_version >= "3.10" and python_version < "3.11"
4545
fastecdsa==2.2.3 ; python_version >= "3.10" and python_version < "3.11"
4646
fastjsonschema==2.16.2 ; python_version >= "3.10" and python_version < "3.11"
@@ -55,7 +55,7 @@ iso8601==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
5555
isort==5.10.1 ; python_version >= "3.10" and python_version < "3.11"
5656
jedi==0.18.1 ; python_version >= "3.10" and python_version < "3.11"
5757
jinja2==3.1.2 ; python_version >= "3.10" and python_version < "3.11"
58-
jsonschema==4.16.0 ; python_version >= "3.10" and python_version < "3.11"
58+
jsonschema==4.17.0 ; python_version >= "3.10" and python_version < "3.11"
5959
jupyter-client==7.4.4 ; python_version >= "3.10" and python_version < "3.11"
6060
jupyter-core==4.11.2 ; python_version >= "3.10" and python_version < "3.11"
6161
jupyter-server==1.21.0 ; python_version >= "3.10" and python_version < "3.11"
@@ -67,13 +67,13 @@ mnemonic==0.20 ; python_version >= "3.10" and python_version < "3.11"
6767
msgpack==1.0.4 ; python_version >= "3.10" and python_version < "3.11"
6868
multidict==6.0.2 ; python_version >= "3.10" and python_version < "3.11"
6969
mypy-extensions==0.4.3 ; python_version >= "3.10" and python_version < "3.11"
70-
nbclassic==0.4.7 ; python_version >= "3.10" and python_version < "3.11"
70+
nbclassic==0.4.8 ; python_version >= "3.10" and python_version < "3.11"
7171
nbclient==0.7.0 ; python_version >= "3.10" and python_version < "3.11"
7272
nbconvert==7.2.3 ; python_version >= "3.10" and python_version < "3.11"
7373
nbformat==5.7.0 ; python_version >= "3.10" and python_version < "3.11"
7474
nest-asyncio==1.5.6 ; python_version >= "3.10" and python_version < "3.11"
7575
netstruct==1.1.2 ; python_version >= "3.10" and python_version < "3.11"
76-
notebook-shim==0.2.0 ; python_version >= "3.10" and python_version < "3.11"
76+
notebook-shim==0.2.2 ; python_version >= "3.10" and python_version < "3.11"
7777
notebook==6.5.2 ; python_version >= "3.10" and python_version < "3.11"
7878
openapi-schema-validator==0.3.4 ; python_version >= "3.10" and python_version < "3.11"
7979
openapi-spec-validator==0.3.1 ; python_version >= "3.10" and python_version < "3.11"
@@ -85,11 +85,11 @@ pathspec==0.10.1 ; python_version >= "3.10" and python_version < "3.11"
8585
pendulum==2.1.2 ; python_version >= "3.10" and python_version < "3.11"
8686
pexpect==4.8.0 ; python_version >= "3.10" and python_version < "3.11" and sys_platform != "win32"
8787
pickleshare==0.7.5 ; python_version >= "3.10" and python_version < "3.11"
88-
platformdirs==2.5.2 ; python_version >= "3.10" and python_version < "3.11"
88+
platformdirs==2.5.3 ; python_version >= "3.10" and python_version < "3.11"
8989
ply==3.11 ; python_version >= "3.10" and python_version < "3.11"
90-
prance==0.21.8.0 ; python_version >= "3.10" and python_version < "3.11"
90+
prance==0.22.11.4.0 ; python_version >= "3.10" and python_version < "3.11"
9191
prometheus-client==0.14.1 ; python_version >= "3.10" and python_version < "3.11"
92-
prompt-toolkit==3.0.31 ; python_version >= "3.10" and python_version < "3.11"
92+
prompt-toolkit==3.0.32 ; python_version >= "3.10" and python_version < "3.11"
9393
psutil==5.9.3 ; python_version >= "3.10" and python_version < "3.11"
9494
ptyprocess==0.7.0 ; python_version >= "3.10" and python_version < "3.11" and os_name != "nt" or python_version >= "3.10" and python_version < "3.11" and sys_platform != "win32"
9595
pure-eval==0.2.2 ; python_version >= "3.10" and python_version < "3.11"
@@ -103,7 +103,7 @@ pygments==2.13.0 ; python_version >= "3.10" and python_version < "3.11"
103103
pyhumps==3.8.0 ; python_version >= "3.10" and python_version < "3.11"
104104
pyparsing==3.0.9 ; python_version >= "3.10" and python_version < "3.11"
105105
pypika-tortoise==0.1.6 ; python_version >= "3.10" and python_version < "3.11"
106-
pyrsistent==0.19.1 ; python_version >= "3.10" and python_version < "3.11"
106+
pyrsistent==0.19.2 ; python_version >= "3.10" and python_version < "3.11"
107107
pysha3==1.0.2 ; python_version >= "3.10" and python_version < "3.11"
108108
pysignalr==0.1.2 ; python_version >= "3.10" and python_version < "3.11"
109109
pysnooper==1.1.1 ; python_version >= "3.10" and python_version < "3.11"
@@ -114,7 +114,7 @@ python-dotenv==0.19.2 ; python_version >= "3.10" and python_version < "3.11"
114114
pytz-deprecation-shim==0.1.0.post0 ; python_version >= "3.10" and python_version < "3.11"
115115
pytz==2022.6 ; python_version >= "3.10" and python_version < "3.11"
116116
pytzdata==2020.1 ; python_version >= "3.10" and python_version < "3.11"
117-
pywin32==304 ; python_version >= "3.10" and python_version < "3.11" and sys_platform == "win32"
117+
pywin32==305 ; python_version >= "3.10" and python_version < "3.11" and sys_platform == "win32"
118118
pywinpty==2.0.9 ; python_version >= "3.10" and python_version < "3.11" and os_name == "nt"
119119
pyyaml==6.0 ; python_version >= "3.10" and python_version < "3.11"
120120
pyzmq==24.0.1 ; python_version >= "3.10" and python_version < "3.11"
@@ -125,7 +125,7 @@ secp256k1==0.14.0 ; python_version >= "3.10" and python_version < "3.11"
125125
semver==2.13.0 ; python_version >= "3.10" and python_version < "3.11"
126126
send2trash==1.8.0 ; python_version >= "3.10" and python_version < "3.11"
127127
sentry-sdk==1.10.1 ; python_version >= "3.10" and python_version < "3.11"
128-
setuptools==65.5.0 ; python_version >= "3.10" and python_version < "3.11"
128+
setuptools==65.5.1 ; python_version >= "3.10" and python_version < "3.11"
129129
simplejson==3.17.6 ; python_version >= "3.10" and python_version < "3.11"
130130
six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
131131
sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
@@ -151,7 +151,7 @@ tzlocal==4.2 ; python_version >= "3.10" and python_version < "3.11"
151151
urllib3==1.26.12 ; python_version >= "3.10" and python_version < "3.11"
152152
wcwidth==0.2.5 ; python_version >= "3.10" and python_version < "3.11"
153153
webencodings==0.5.1 ; python_version >= "3.10" and python_version < "3.11"
154-
websocket-client==1.4.1 ; python_version >= "3.10" and python_version < "3.11"
154+
websocket-client==1.4.2 ; python_version >= "3.10" and python_version < "3.11"
155155
websockets==10.3 ; python_version >= "3.10" and python_version < "3.11"
156156
wrapt==1.14.1 ; python_version >= "3.10" and python_version < "3.11"
157157
yarl==1.8.1 ; python_version >= "3.10" and python_version < "3.11"

requirements.slim.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pytz==2022.6 ; python_version >= "3.10" and python_version < "3.11"
2828
ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
2929
ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "3.11"
3030
sentry-sdk==1.10.1 ; python_version >= "3.10" and python_version < "3.11"
31-
setuptools==65.5.0 ; python_version >= "3.10" and python_version < "3.11"
31+
setuptools==65.5.1 ; python_version >= "3.10" and python_version < "3.11"
3232
six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
3333
sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
3434
sqlparse==0.4.3 ; python_version >= "3.10" and python_version < "3.11"

requirements.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,25 @@ inflect==5.6.2 ; python_version >= "3.10" and python_version < "3.11"
2525
iso8601==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
2626
isort==5.10.1 ; python_version >= "3.10" and python_version < "3.11"
2727
jinja2==3.1.2 ; python_version >= "3.10" and python_version < "3.11"
28-
jsonschema==4.16.0 ; python_version >= "3.10" and python_version < "3.11"
28+
jsonschema==4.17.0 ; python_version >= "3.10" and python_version < "3.11"
2929
markupsafe==2.1.1 ; python_version >= "3.10" and python_version < "3.11"
3030
msgpack==1.0.4 ; python_version >= "3.10" and python_version < "3.11"
3131
multidict==6.0.2 ; python_version >= "3.10" and python_version < "3.11"
3232
mypy-extensions==0.4.3 ; python_version >= "3.10" and python_version < "3.11"
3333
openapi-schema-validator==0.3.4 ; python_version >= "3.10" and python_version < "3.11"
3434
openapi-spec-validator==0.3.1 ; python_version >= "3.10" and python_version < "3.11"
3535
orjson==3.8.1 ; python_version >= "3.10" and python_version < "3.11"
36+
packaging==21.3 ; python_version >= "3.10" and python_version < "3.11"
3637
pathspec==0.10.1 ; python_version >= "3.10" and python_version < "3.11"
37-
platformdirs==2.5.2 ; python_version >= "3.10" and python_version < "3.11"
38-
prance==0.21.8.0 ; python_version >= "3.10" and python_version < "3.11"
38+
platformdirs==2.5.3 ; python_version >= "3.10" and python_version < "3.11"
39+
prance==0.22.11.4.0 ; python_version >= "3.10" and python_version < "3.11"
3940
prometheus-client==0.14.1 ; python_version >= "3.10" and python_version < "3.11"
4041
pydantic==1.9.2 ; python_version >= "3.10" and python_version < "3.11"
4142
pydantic[email]==1.9.2 ; python_version >= "3.10" and python_version < "3.11"
4243
pyhumps==3.8.0 ; python_version >= "3.10" and python_version < "3.11"
44+
pyparsing==3.0.9 ; python_version >= "3.10" and python_version < "3.11"
4345
pypika-tortoise==0.1.6 ; python_version >= "3.10" and python_version < "3.11"
44-
pyrsistent==0.19.1 ; python_version >= "3.10" and python_version < "3.11"
46+
pyrsistent==0.19.2 ; python_version >= "3.10" and python_version < "3.11"
4547
pysignalr==0.1.2 ; python_version >= "3.10" and python_version < "3.11"
4648
pysnooper==1.1.1 ; python_version >= "3.10" and python_version < "3.11"
4749
python-dotenv==0.19.2 ; python_version >= "3.10" and python_version < "3.11"
@@ -53,7 +55,7 @@ ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python
5355
ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "3.11"
5456
semver==2.13.0 ; python_version >= "3.10" and python_version < "3.11"
5557
sentry-sdk==1.10.1 ; python_version >= "3.10" and python_version < "3.11"
56-
setuptools==65.5.0 ; python_version >= "3.10" and python_version < "3.11"
58+
setuptools==65.5.1 ; python_version >= "3.10" and python_version < "3.11"
5759
six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
5860
sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
5961
sqlparse==0.4.3 ; python_version >= "3.10" and python_version < "3.11"

0 commit comments

Comments
 (0)