diff --git a/CHANGELOG.md b/CHANGELOG.md index b536b113e..df9d99dfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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]. -## [Unreleased] +## [7.5.3] - 2024-03-28 ### Fixed diff --git a/docs/8.examples/_demos_table.md b/docs/8.examples/_demos_table.md index 246b599e7..8f94ec308 100644 --- a/docs/8.examples/_demos_table.md +++ b/docs/8.examples/_demos_table.md @@ -1,21 +1,21 @@ | name | network | description | source | |-|-|-|-| -| demo_blank | | Empty config for a fresh start | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_blank) | -| demo_evm_events | EVM | ERC-20 token transfers (from event logs) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_evm_events) | -| demo_evm_transactions | EVM | ERC-20 token transfers (from transactions) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_evm_transactions) | -| demo_uniswap | EVM | Uniswap V3 pools, positions, etc. (advanced, uses TimescaleDB) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_uniswap) | -| demo_auction | Tezos | NFT marketplace (TzColors) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_auction) | -| demo_big_maps | Tezos | Indexing specific big maps | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_big_maps) | -| demo_dao | Tezos | DAO registry (Homebase DAO) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_dao) | -| demo_dex | Tezos | DEX balances and liquidity (Quipuswap) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_dex) | -| demo_domains | Tezos | Domain name service (Tezos Domains) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_domains) | -| demo_etherlink | Tezos | Etherlink smart rollup transactions | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_etherlink) | -| demo_events | Tezos | Processing contract events | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_events) | -| demo_factories | Tezos | Example of spawning indexes in runtime | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_factories) | -| demo_head | Tezos | Processing head block metadata (realtime only) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_head) | -| demo_nft_marketplace | Tezos | NFT marketplace (hic at nunc) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_nft_marketplace) | -| demo_raw | Tezos | Process raw operations without filtering and typed payloads | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_raw) | -| demo_token | Tezos | FA1.2 token contract operations | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_token) | -| demo_token_balances | Tezos | FA1.2 token balances | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_token_balances) | -| demo_token_transfers | Tezos | FA1.2 token transfers | [link](https://github.com/dipdup-io/dipdup/tree/7.5.2/src/demo_token_transfers) | +| demo_blank | | Empty config for a fresh start | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_blank) | +| demo_evm_events | EVM | ERC-20 token transfers (from event logs) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_evm_events) | +| demo_evm_transactions | EVM | ERC-20 token transfers (from transactions) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_evm_transactions) | +| demo_uniswap | EVM | Uniswap V3 pools, positions, etc. (advanced, uses TimescaleDB) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_uniswap) | +| demo_auction | Tezos | NFT marketplace (TzColors) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_auction) | +| demo_big_maps | Tezos | Indexing specific big maps | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_big_maps) | +| demo_dao | Tezos | DAO registry (Homebase DAO) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_dao) | +| demo_dex | Tezos | DEX balances and liquidity (Quipuswap) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_dex) | +| demo_domains | Tezos | Domain name service (Tezos Domains) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_domains) | +| demo_etherlink | Tezos | Etherlink smart rollup transactions | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_etherlink) | +| demo_events | Tezos | Processing contract events | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_events) | +| demo_factories | Tezos | Example of spawning indexes in runtime | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_factories) | +| demo_head | Tezos | Processing head block metadata (realtime only) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_head) | +| demo_nft_marketplace | Tezos | NFT marketplace (hic at nunc) | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_nft_marketplace) | +| demo_raw | Tezos | Process raw operations without filtering and typed payloads | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_raw) | +| demo_token | Tezos | FA1.2 token contract operations | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_token) | +| demo_token_balances | Tezos | FA1.2 token balances | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_token_balances) | +| demo_token_transfers | Tezos | FA1.2 token transfers | [link](https://github.com/dipdup-io/dipdup/tree/7.5.3/src/demo_token_transfers) | diff --git a/docs/9.release-notes/_7.5_changelog.md b/docs/9.release-notes/_7.5_changelog.md index 75d471884..49ae4b6ad 100644 --- a/docs/9.release-notes/_7.5_changelog.md +++ b/docs/9.release-notes/_7.5_changelog.md @@ -17,6 +17,7 @@ - evm.node: Respect `http.batch_size` when fetching block headers. - evm.subsquid.transactions: Fixed issue with `node_only` flag ignored. - tezos.tzkt.operations: Fixed crash when handler definition contains optional items. +- tezos.tzkt.operations: Fixed missing operations when handler pattern contains item without entrypoint. ### Performance diff --git a/pdm.lock b/pdm.lock index 376b2a62d..d64cca9a7 100644 --- a/pdm.lock +++ b/pdm.lock @@ -1293,8 +1293,8 @@ files = [ [[package]] name = "pytest-cov" -version = "4.1.0" -requires_python = ">=3.7" +version = "5.0.0" +requires_python = ">=3.8" summary = "Pytest plugin for measuring coverage." groups = ["dev"] dependencies = [ @@ -1302,8 +1302,8 @@ dependencies = [ "pytest>=4.6", ] files = [ - {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"}, - {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"}, + {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"}, + {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"}, ] [[package]] @@ -1544,28 +1544,28 @@ files = [ [[package]] name = "ruff" -version = "0.3.3" +version = "0.3.4" requires_python = ">=3.7" summary = "An extremely fast Python linter and code formatter, written in Rust." groups = ["dev"] files = [ - {file = "ruff-0.3.3-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:973a0e388b7bc2e9148c7f9be8b8c6ae7471b9be37e1cc732f8f44a6f6d7720d"}, - {file = "ruff-0.3.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:cfa60d23269d6e2031129b053fdb4e5a7b0637fc6c9c0586737b962b2f834493"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1eca7ff7a47043cf6ce5c7f45f603b09121a7cc047447744b029d1b719278eb5"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e7d3f6762217c1da954de24b4a1a70515630d29f71e268ec5000afe81377642d"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b24c19e8598916d9c6f5a5437671f55ee93c212a2c4c569605dc3842b6820386"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:5a6cbf216b69c7090f0fe4669501a27326c34e119068c1494f35aaf4cc683778"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:352e95ead6964974b234e16ba8a66dad102ec7bf8ac064a23f95371d8b198aab"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d6ab88c81c4040a817aa432484e838aaddf8bfd7ca70e4e615482757acb64f8"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79bca3a03a759cc773fca69e0bdeac8abd1c13c31b798d5bb3c9da4a03144a9f"}, - {file = "ruff-0.3.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:2700a804d5336bcffe063fd789ca2c7b02b552d2e323a336700abb8ae9e6a3f8"}, - {file = "ruff-0.3.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:fd66469f1a18fdb9d32e22b79f486223052ddf057dc56dea0caaf1a47bdfaf4e"}, - {file = "ruff-0.3.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:45817af234605525cdf6317005923bf532514e1ea3d9270acf61ca2440691376"}, - {file = "ruff-0.3.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:0da458989ce0159555ef224d5b7c24d3d2e4bf4c300b85467b08c3261c6bc6a8"}, - {file = "ruff-0.3.3-py3-none-win32.whl", hash = "sha256:f2831ec6a580a97f1ea82ea1eda0401c3cdf512cf2045fa3c85e8ef109e87de0"}, - {file = "ruff-0.3.3-py3-none-win_amd64.whl", hash = "sha256:be90bcae57c24d9f9d023b12d627e958eb55f595428bafcb7fec0791ad25ddfc"}, - {file = "ruff-0.3.3-py3-none-win_arm64.whl", hash = "sha256:0171aab5fecdc54383993389710a3d1227f2da124d76a2784a7098e818f92d61"}, - {file = "ruff-0.3.3.tar.gz", hash = "sha256:38671be06f57a2f8aba957d9f701ea889aa5736be806f18c0cd03d6ff0cbca8d"}, + {file = "ruff-0.3.4-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:60c870a7d46efcbc8385d27ec07fe534ac32f3b251e4fc44b3cbfd9e09609ef4"}, + {file = "ruff-0.3.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:6fc14fa742e1d8f24910e1fff0bd5e26d395b0e0e04cc1b15c7c5e5fe5b4af91"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d3ee7880f653cc03749a3bfea720cf2a192e4f884925b0cf7eecce82f0ce5854"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cf133dd744f2470b347f602452a88e70dadfbe0fcfb5fd46e093d55da65f82f7"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3f3860057590e810c7ffea75669bdc6927bfd91e29b4baa9258fd48b540a4365"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:986f2377f7cf12efac1f515fc1a5b753c000ed1e0a6de96747cdf2da20a1b369"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fd98e85869603e65f554fdc5cddf0712e352fe6e61d29d5a6fe087ec82b76c"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:64abeed785dad51801b423fa51840b1764b35d6c461ea8caef9cf9e5e5ab34d9"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df52972138318bc7546d92348a1ee58449bc3f9eaf0db278906eb511889c4b50"}, + {file = "ruff-0.3.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:98e98300056445ba2cc27d0b325fd044dc17fcc38e4e4d2c7711585bd0a958ed"}, + {file = "ruff-0.3.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:519cf6a0ebed244dce1dc8aecd3dc99add7a2ee15bb68cf19588bb5bf58e0488"}, + {file = "ruff-0.3.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:bb0acfb921030d00070539c038cd24bb1df73a2981e9f55942514af8b17be94e"}, + {file = "ruff-0.3.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:cf187a7e7098233d0d0c71175375c5162f880126c4c716fa28a8ac418dcf3378"}, + {file = "ruff-0.3.4-py3-none-win32.whl", hash = "sha256:af27ac187c0a331e8ef91d84bf1c3c6a5dea97e912a7560ac0cef25c526a4102"}, + {file = "ruff-0.3.4-py3-none-win_amd64.whl", hash = "sha256:de0d5069b165e5a32b3c6ffbb81c350b1e3d3483347196ffdf86dc0ef9e37dd6"}, + {file = "ruff-0.3.4-py3-none-win_arm64.whl", hash = "sha256:6810563cc08ad0096b57c717bd78aeac888a1bfd38654d9113cb3dc4d3f74232"}, + {file = "ruff-0.3.4.tar.gz", hash = "sha256:f0f4484c6541a99862b693e13a151435a279b271cff20e37101116a21e2a1ad1"}, ] [[package]] diff --git a/pyproject.toml b/pyproject.toml index 12b5d4a85..7ad2285bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "dipdup" description = "Modular framework for creating selective indexers and featureful backends for dapps" -version = "7.5.2" +version = "7.5.3" license = { text = "MIT" } authors = [ { name = "Lev Gorodetskii", email = "dipdup@drsr.io" }, diff --git a/requirements.dev.txt b/requirements.dev.txt index 096961d1a..47be2dc3a 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -76,7 +76,7 @@ pysignalr==1.0.0 pytest==7.4.4 pytest-aiohttp==1.0.5 pytest-asyncio==0.23.6 -pytest-cov==4.1.0 +pytest-cov==5.0.0 pytest-xdist==3.5.0 python-dotenv==1.0.1 pytz==2024.1 @@ -90,7 +90,7 @@ rlp==4.0.0 rpds-py==0.17.1 ruamel-yaml==0.18.6 ruamel-yaml-clib==0.2.8; platform_python_implementation == "CPython" and python_version < "3.13" -ruff==0.3.3 +ruff==0.3.4 sentry-sdk==1.43.0 setuptools==69.2.0 six==1.16.0 diff --git a/src/demo_auction/pyproject.toml b/src/demo_auction/pyproject.toml index 2583c928f..3d6206067 100644 --- a/src/demo_auction/pyproject.toml +++ b/src/demo_auction/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_auction" version = "0.0.1" diff --git a/src/demo_big_maps/pyproject.toml b/src/demo_big_maps/pyproject.toml index 7649d0ab4..8567a923d 100644 --- a/src/demo_big_maps/pyproject.toml +++ b/src/demo_big_maps/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_big_maps" version = "0.0.1" diff --git a/src/demo_blank/pyproject.toml b/src/demo_blank/pyproject.toml index c035e79a6..2dc1b5471 100644 --- a/src/demo_blank/pyproject.toml +++ b/src/demo_blank/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_blank" version = "0.0.1" diff --git a/src/demo_dao/pyproject.toml b/src/demo_dao/pyproject.toml index e3c56036e..bf0f9b59a 100644 --- a/src/demo_dao/pyproject.toml +++ b/src/demo_dao/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_dao" version = "0.0.1" diff --git a/src/demo_dex/handlers/on_fa12_tez_to_token.py b/src/demo_dex/handlers/on_fa12_tez_to_token.py index 45af14b85..28885eb6f 100644 --- a/src/demo_dex/handlers/on_fa12_tez_to_token.py +++ b/src/demo_dex/handlers/on_fa12_tez_to_token.py @@ -22,9 +22,7 @@ async def on_fa12_tez_to_token( token_quantity = Decimal(transfer.parameter.value) / (10**decimals) assert tez_to_token_payment.data.amount is not None tez_quantity = Decimal(tez_to_token_payment.data.amount) / (10**6) - if min_token_quantity > token_quantity: - ctx.logger.warning('output is lower than `min_out` (%s > %s)', min_token_quantity, token_quantity) - return + assert min_token_quantity <= token_quantity, tez_to_token_payment.data.hash trade = models.Trade( symbol=symbol, diff --git a/src/demo_dex/handlers/on_fa12_token_to_tez.py b/src/demo_dex/handlers/on_fa12_token_to_tez.py index 7900c8091..682fcd584 100644 --- a/src/demo_dex/handlers/on_fa12_token_to_tez.py +++ b/src/demo_dex/handlers/on_fa12_token_to_tez.py @@ -24,9 +24,7 @@ async def on_fa12_token_to_tez( token_quantity = Decimal(token_to_tez_payment.parameter.amount) / (10**decimals) assert transaction_0.amount is not None tez_quantity = Decimal(transaction_0.amount) / (10**6) - if min_tez_quantity > tez_quantity: - ctx.logger.warning('output is lower than `min_out` (%s > %s)', min_tez_quantity, tez_quantity) - return + assert min_tez_quantity <= tez_quantity, token_to_tez_payment.data.hash trade = models.Trade( symbol=symbol, diff --git a/src/demo_dex/handlers/on_fa2_tez_to_token.py b/src/demo_dex/handlers/on_fa2_tez_to_token.py index 67d435995..eded4555f 100644 --- a/src/demo_dex/handlers/on_fa2_tez_to_token.py +++ b/src/demo_dex/handlers/on_fa2_tez_to_token.py @@ -22,9 +22,7 @@ async def on_fa2_tez_to_token( assert tez_to_token_payment.data.amount is not None token_quantity = sum(Decimal(tx.amount) for tx in transfer.parameter.__root__[0].txs) / (10**decimals) tez_quantity = Decimal(tez_to_token_payment.data.amount) / (10**6) - if min_token_quantity > token_quantity: - ctx.logger.warning('output is lower than `min_out` (%s > %s)', min_token_quantity, token_quantity) - return + assert min_token_quantity <= token_quantity, tez_to_token_payment.data.hash trade = models.Trade( symbol=symbol, diff --git a/src/demo_dex/handlers/on_fa2_token_to_tez.py b/src/demo_dex/handlers/on_fa2_token_to_tez.py index abb10e37b..d82f09913 100644 --- a/src/demo_dex/handlers/on_fa2_token_to_tez.py +++ b/src/demo_dex/handlers/on_fa2_token_to_tez.py @@ -24,9 +24,7 @@ async def on_fa2_token_to_tez( token_quantity = Decimal(token_to_tez_payment.parameter.amount) / (10**decimals) assert transaction_0.amount is not None tez_quantity = Decimal(transaction_0.amount) / (10**6) - if min_tez_quantity > tez_quantity: - ctx.logger.warning('output is lower than `min_out` (%s > %s)', min_tez_quantity, tez_quantity) - return + assert min_tez_quantity <= tez_quantity, token_to_tez_payment.data.hash trade = models.Trade( symbol=symbol, diff --git a/src/demo_dex/pyproject.toml b/src/demo_dex/pyproject.toml index e7fb0436f..9cc780b31 100644 --- a/src/demo_dex/pyproject.toml +++ b/src/demo_dex/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_dex" version = "0.0.1" diff --git a/src/demo_domains/pyproject.toml b/src/demo_domains/pyproject.toml index ae238ecd2..42163c2a5 100644 --- a/src/demo_domains/pyproject.toml +++ b/src/demo_domains/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_domains" version = "0.0.1" diff --git a/src/demo_etherlink/pyproject.toml b/src/demo_etherlink/pyproject.toml index e7f34f485..99c81f063 100644 --- a/src/demo_etherlink/pyproject.toml +++ b/src/demo_etherlink/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_etherlink" version = "0.0.1" diff --git a/src/demo_events/pyproject.toml b/src/demo_events/pyproject.toml index f14b7afcd..330a51400 100644 --- a/src/demo_events/pyproject.toml +++ b/src/demo_events/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_events" version = "0.0.1" diff --git a/src/demo_evm_events/pyproject.toml b/src/demo_evm_events/pyproject.toml index 73b04c3b5..0b744b369 100644 --- a/src/demo_evm_events/pyproject.toml +++ b/src/demo_evm_events/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_evm_events" version = "0.0.1" diff --git a/src/demo_evm_transactions/pyproject.toml b/src/demo_evm_transactions/pyproject.toml index 3f25de1a5..9d13eeb3b 100644 --- a/src/demo_evm_transactions/pyproject.toml +++ b/src/demo_evm_transactions/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_evm_transactions" version = "0.0.1" diff --git a/src/demo_factories/pyproject.toml b/src/demo_factories/pyproject.toml index 7e86eaa66..f20e9f020 100644 --- a/src/demo_factories/pyproject.toml +++ b/src/demo_factories/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_factories" version = "0.0.1" diff --git a/src/demo_head/pyproject.toml b/src/demo_head/pyproject.toml index 8cd1b9a74..74ef597fc 100644 --- a/src/demo_head/pyproject.toml +++ b/src/demo_head/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_head" version = "0.0.1" diff --git a/src/demo_nft_marketplace/pyproject.toml b/src/demo_nft_marketplace/pyproject.toml index baa2e94b8..0d0e88920 100644 --- a/src/demo_nft_marketplace/pyproject.toml +++ b/src/demo_nft_marketplace/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_nft_marketplace" version = "0.0.1" diff --git a/src/demo_raw/pyproject.toml b/src/demo_raw/pyproject.toml index 3cfc39e1d..bbf0ae2ac 100644 --- a/src/demo_raw/pyproject.toml +++ b/src/demo_raw/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_raw" version = "0.0.1" diff --git a/src/demo_token/pyproject.toml b/src/demo_token/pyproject.toml index 28030473d..4cbad2dd4 100644 --- a/src/demo_token/pyproject.toml +++ b/src/demo_token/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_token" version = "0.0.1" diff --git a/src/demo_token_balances/pyproject.toml b/src/demo_token_balances/pyproject.toml index f91281722..275d43932 100644 --- a/src/demo_token_balances/pyproject.toml +++ b/src/demo_token_balances/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_token_balances" version = "0.0.1" diff --git a/src/demo_token_transfers/pyproject.toml b/src/demo_token_transfers/pyproject.toml index 3f4772436..dd451e0a4 100644 --- a/src/demo_token_transfers/pyproject.toml +++ b/src/demo_token_transfers/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_token_transfers" version = "0.0.1" diff --git a/src/demo_uniswap/pyproject.toml b/src/demo_uniswap/pyproject.toml index 793573929..ccb08f6ac 100644 --- a/src/demo_uniswap/pyproject.toml +++ b/src/demo_uniswap/pyproject.toml @@ -1,4 +1,4 @@ -# Generated by DipDup 7.5.2+editable +# Generated by DipDup 7.5.3+editable [project] name = "demo_uniswap" version = "0.0.1" diff --git a/src/dipdup/indexes/tezos_tzkt_operations/fetcher.py b/src/dipdup/indexes/tezos_tzkt_operations/fetcher.py index d7c32d7f3..ceee95be7 100644 --- a/src/dipdup/indexes/tezos_tzkt_operations/fetcher.py +++ b/src/dipdup/indexes/tezos_tzkt_operations/fetcher.py @@ -90,7 +90,6 @@ async def get_transaction_filters( if code_hash := pattern_config.destination.resolved_code_hash: hashes.add(code_hash) - _logger.info('Fetching transactions from %s addresses and %s code hashes', len(addresses), len(hashes)) return addresses, hashes @@ -127,7 +126,6 @@ async def get_origination_filters( if code_hash := pattern_config.source.resolved_code_hash: raise FrameworkException('Invalid transaction filter `source.code_hash`') - _logger.info('Fetching originations from %s addresses and %s code hashes', len(addresses), len(hashes)) return addresses, hashes diff --git a/src/dipdup/projects/demo_dex/handlers/on_fa12_tez_to_token.py.j2 b/src/dipdup/projects/demo_dex/handlers/on_fa12_tez_to_token.py.j2 index d799088fe..c09a3b478 100644 --- a/src/dipdup/projects/demo_dex/handlers/on_fa12_tez_to_token.py.j2 +++ b/src/dipdup/projects/demo_dex/handlers/on_fa12_tez_to_token.py.j2 @@ -22,9 +22,7 @@ async def on_fa12_tez_to_token( token_quantity = Decimal(transfer.parameter.value) / (10**decimals) assert tez_to_token_payment.data.amount is not None tez_quantity = Decimal(tez_to_token_payment.data.amount) / (10**6) - if min_token_quantity > token_quantity: - ctx.logger.warning('output is lower than `min_out` (%s > %s)', min_token_quantity, token_quantity) - return + assert min_token_quantity <= token_quantity, tez_to_token_payment.data.hash trade = models.Trade( symbol=symbol, diff --git a/src/dipdup/projects/demo_dex/handlers/on_fa12_token_to_tez.py.j2 b/src/dipdup/projects/demo_dex/handlers/on_fa12_token_to_tez.py.j2 index c52771dd6..82b3c1e53 100644 --- a/src/dipdup/projects/demo_dex/handlers/on_fa12_token_to_tez.py.j2 +++ b/src/dipdup/projects/demo_dex/handlers/on_fa12_token_to_tez.py.j2 @@ -24,9 +24,7 @@ async def on_fa12_token_to_tez( token_quantity = Decimal(token_to_tez_payment.parameter.amount) / (10**decimals) assert transaction_0.amount is not None tez_quantity = Decimal(transaction_0.amount) / (10**6) - if min_tez_quantity > tez_quantity: - ctx.logger.warning('output is lower than `min_out` (%s > %s)', min_tez_quantity, tez_quantity) - return + assert min_tez_quantity <= tez_quantity, token_to_tez_payment.data.hash trade = models.Trade( symbol=symbol, diff --git a/src/dipdup/projects/demo_dex/handlers/on_fa2_tez_to_token.py.j2 b/src/dipdup/projects/demo_dex/handlers/on_fa2_tez_to_token.py.j2 index 2d799ecc8..a593570b9 100644 --- a/src/dipdup/projects/demo_dex/handlers/on_fa2_tez_to_token.py.j2 +++ b/src/dipdup/projects/demo_dex/handlers/on_fa2_tez_to_token.py.j2 @@ -22,9 +22,7 @@ async def on_fa2_tez_to_token( assert tez_to_token_payment.data.amount is not None token_quantity = sum(Decimal(tx.amount) for tx in transfer.parameter.__root__[0].txs) / (10**decimals) tez_quantity = Decimal(tez_to_token_payment.data.amount) / (10**6) - if min_token_quantity > token_quantity: - ctx.logger.warning('output is lower than `min_out` (%s > %s)', min_token_quantity, token_quantity) - return + assert min_token_quantity <= token_quantity, tez_to_token_payment.data.hash trade = models.Trade( symbol=symbol, diff --git a/src/dipdup/projects/demo_dex/handlers/on_fa2_token_to_tez.py.j2 b/src/dipdup/projects/demo_dex/handlers/on_fa2_token_to_tez.py.j2 index 7c03de483..6c51d155b 100644 --- a/src/dipdup/projects/demo_dex/handlers/on_fa2_token_to_tez.py.j2 +++ b/src/dipdup/projects/demo_dex/handlers/on_fa2_token_to_tez.py.j2 @@ -24,9 +24,7 @@ async def on_fa2_token_to_tez( token_quantity = Decimal(token_to_tez_payment.parameter.amount) / (10**decimals) assert transaction_0.amount is not None tez_quantity = Decimal(transaction_0.amount) / (10**6) - if min_tez_quantity > tez_quantity: - ctx.logger.warning('output is lower than `min_out` (%s > %s)', min_tez_quantity, tez_quantity) - return + assert min_tez_quantity <= tez_quantity, token_to_tez_payment.data.hash trade = models.Trade( symbol=symbol,