Skip to content

Commit 55e6d1e

Browse files
Fix setting index state level, TzKT getters, single-level rollbacks (#320)
* Fix setting index state level, fix TzKT getters * Fixed crash when no block with the same level arrived after a single-level rollback * Remove useless check
1 parent b33e02e commit 55e6d1e

File tree

3 files changed

+128
-114
lines changed

3 files changed

+128
-114
lines changed

CHANGELOG.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
# Changelog
22

3+
## [unreleased]
4+
5+
### Fixed
6+
7+
* tzkt: Fixed inconsistent behavior of `first_level`/`last_level` arguments in different getter methods.
8+
* index: Fixed crash when no block with the same level arrived after a single-level rollback.
9+
* index: Fixed setting initial index level when `IndexConfig.first_level` is set.
10+
311
## 5.0.2 - 2022-04-21
412

513
### Fixed
614

715
* context: Fixed reporting incorrect reindexing reason.
8-
* exceptions: Fixed crash with `FrozenInstanceError` when exception is raised from callback.
16+
* exceptions: Fixed crash with `FrozenInstanceError` when an exception is raised from a callback.
917
* jobs: Fixed graceful shutdown of daemon jobs.
1018

1119
### Improved
1220

1321
* codegen: Refined `on_rollback` hook template.
1422
* exceptions: Updated help messages for known exceptions.
15-
* tzkt: Do not request reindexing if missing subgroups matched no handlers.
23+
* tzkt: Do not request reindexing if missing subgroups have matched no handlers.
1624

1725
## 5.0.1 - 2022-04-12
1826

src/dipdup/datasources/tzkt/datasource.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ async def get_migration_originations(
483483
url='v1/operations/migrations',
484484
params={
485485
'kind': 'origination',
486-
'level.gt': first_level,
486+
'level.ge': first_level,
487487
'select': ','.join(ORIGINATION_MIGRATION_FIELDS),
488488
'offset.cr': offset,
489489
'limit': limit,
@@ -519,7 +519,7 @@ async def get_originations(
519519
url='v1/operations/originations',
520520
params={
521521
"originatedContract.in": ','.join(addresses_chunk),
522-
"level.gt": first_level,
522+
"level.ge": first_level,
523523
"level.le": last_level,
524524
"select": ','.join(ORIGINATION_OPERATION_FIELDS),
525525
"status": "applied",
@@ -548,7 +548,7 @@ async def get_transactions(
548548
f"{field}.in": ','.join(addresses),
549549
"offset.cr": offset,
550550
"limit": limit,
551-
"level.gt": first_level,
551+
"level.ge": first_level,
552552
"level.le": last_level,
553553
"select": ','.join(TRANSACTION_OPERATION_FIELDS),
554554
"status": "applied",
@@ -594,7 +594,7 @@ async def get_big_maps(
594594
params={
595595
"contract.in": ",".join(addresses),
596596
"path.in": ",".join(paths),
597-
"level.gt": first_level,
597+
"level.ge": first_level,
598598
"level.le": last_level,
599599
"offset": offset,
600600
"limit": limit,
@@ -635,20 +635,20 @@ async def get_quote(self, level: int) -> QuoteData:
635635

636636
async def get_quotes(
637637
self,
638-
from_level: int,
639-
to_level: int,
638+
first_level: int,
639+
last_level: int,
640640
offset: Optional[int] = None,
641641
limit: Optional[int] = None,
642642
) -> Tuple[QuoteData, ...]:
643643
"""Get quotes for blocks"""
644644
offset, limit = offset or 0, limit or self.request_limit
645-
self._logger.info('Fetching quotes for levels %s-%s', from_level, to_level)
645+
self._logger.info('Fetching quotes for levels %s-%s', first_level, last_level)
646646
quotes_json = await self.request(
647647
'get',
648648
url='v1/quotes',
649649
params={
650-
"level.ge": from_level,
651-
"level.lt": to_level,
650+
"level.ge": first_level,
651+
"level.le": last_level,
652652
"offset.cr": offset,
653653
"limit": limit,
654654
},
@@ -658,14 +658,14 @@ async def get_quotes(
658658

659659
async def iter_quotes(
660660
self,
661-
from_level: int,
662-
to_level: int,
661+
first_level: int,
662+
last_level: int,
663663
) -> AsyncIterator[Tuple[QuoteData, ...]]:
664664
"""Iterate quotes for blocks"""
665665
async for batch in self._iter_batches(
666666
self.get_quotes,
667-
from_level,
668-
to_level,
667+
first_level,
668+
last_level,
669669
):
670670
yield batch
671671

0 commit comments

Comments
 (0)