Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unfinalizedBlock rollback not being handled correctly #2717

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix unfinalizedBlock rollback not being handled correctly #2717

wants to merge 2 commits into from

Conversation

yoozo
Copy link
Collaborator

@yoozo yoozo commented Mar 13, 2025 •
edited
Loading

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist

  • I have tested locally
  • I have performed a self review of my changes
  • Updated any relevant documentation
  • Linked to any relevant issues
  • I have added tests relevant to my changes
  • Any dependent changes have been merged and published in downstream modules
  • My code is up to date with the base branch
  • I have updated relevant changelogs. We suggest using chan

@github-actions GitHub Actions
Copy link

Coverage report for .

St.❔
 Category Percentage Covered / Total
🟡 Statements
67.59% (-2.52% 🔻)
 20611/30494
🟡 Branches
78.57% (+0.28% 🔼)
 2761/3514
🟡 Functions
70.09% (+7.59% 🔼)
 1125/1605
🟡 Lines
67.59% (-2.52% 🔻)
 20611/30494
Show new covered files 🐣
St.❔
 File Statements Branches Functions Lines
🟢
... / migrate.ts
 85.34% 9.09% 100% 85.34%
🟢
... / migrate-abis.controller.ts
 95% 87.5% 100% 95%
🟢
... / constants.ts
 100% 100% 100% 100%
🟢
... / index.ts
 100% 100% 100% 100%
🟢
... / ethereum.ts
 82.28% 83.33% 100% 82.28%
🟢
... / migrate-manifest.controller.ts
 88% 73.33% 88.89% 88%
🟢
... / migrate-mapping.controller.ts
 100% 100% 100% 100%
🟢
... / migrate-controller.ts
 92.41% 84.62% 100% 92.41%
🟢
... / migrate.fixtures.ts
 100% 100% 100% 100%
🟢
... / migrate-schema.controller.ts
 97.23% 79.49% 100% 97.23%
🔴
... / types.ts
 0% 0% 0% 0%
🟢
... / createProject.fixtures.ts
 94.92% 77.78% 100% 94.92%
🟢
... / config.ts
 100% 100% 100% 100%
🟢
... / index.ts
 100% 100% 100% 100%
🔴
... / moduleLoader.ts
 56% 40% 100% 56%
🟢
... / types.ts
 100% 100% 100% 100%
🔴
... / utils.ts
 0% 0% 0% 0%
🟢
... / networkFamily.ts
 92.59% 88.89% 100% 92.59%
🟡
... / IPFSHTTPClientLite.ts
 76.47% 80% 88.89% 76.47%
🟢
... / index.ts
 100% 100% 100% 100%
🟢
... / utils.ts
 92% 66.67% 100% 92%
🟡
... / admin.controller.ts
 75.56% 96% 78.57% 75.56%
🟡
... / blockRange.ts
 74.6% 100% 80% 74.6%
🟢
... / index.ts
 100% 100% 100% 100%
🟢
... / blockchain.service.ts
 100% 100% 100% 100%
🟢
... / SubqueryProject.ts
 86.21% 83.33% 71.43% 86.21%
🟡
... / factory.ts
 79.22% 66.67% 100% 79.22%
🟢
... / core.module.ts
 100% 100% 100% 100%
🟢
... / dictionary.fixtures.ts
 100% 100% 100% 100%
🟡
... / monitor.service.ts
 69.61% 85.88% 94.12% 69.61%
🔴
... / sandbox.service.ts
 33.33% 50% 25% 33.33%
🟡
... / baseCache.service.ts
 67.57% 90.91% 66.67% 67.57%
🟡
... / baseStoreModel.service.ts
 64.41% 83.33% 83.33% 64.41%
🟢
... / cacheable.ts
 89.29% 75% 100% 89.29%
🟡
... / csvStore.ts
 75% 73.68% 85.71% 75%
🟡
... / exporter.ts
 71.67% 71.43% 71.43% 71.67%
🟢
... / index.ts
 100% 100% 100% 100%
🟢
... / index.ts
 100% 100% 100% 100%
🟡
... / cacheMetadata.ts
 66.96% 72.09% 86.67% 66.96%
🟢
... / index.ts
 100% 100% 100% 100%
🔴
... / metadata.ts
 54.22% 71.43% 55.56% 54.22%
🟢
... / utils.ts
 100% 100% 100% 100%
🟢
... / cacheModel.ts
 88.86% 90.7% 90% 88.86%
🟢
... / index.ts
 100% 100% 100% 100%
🟡
... / model.ts
 75.95% 72.73% 90.91% 75.95%
🟢
... / utils.ts
 100% 100% 100% 100%
🟡
... / cachePoi.ts
 77.89% 89.47% 85.71% 77.89%
🟢
... / index.ts
 100% 100% 100% 100%
🔴
... / poi.ts
 41.96% 71.43% 44.44% 41.96%
🟢
... / setValueModel.ts
 85.26% 83.78% 85.71% 85.26%
🟡
... / storeCache.service.ts
 66.67% 75.76% 76.92% 66.67%
🟡
... / storeModel.service.ts
 61.54% 50% 71.43% 61.54%
🟢
... / types.ts
 100% 100% 100% 100%
🟢
... / utils.ts
 93.33% 66.67% 100% 93.33%
🟢
... / worker.core.module.ts
 100% 100% 0% 100%
🔴
... / worker.monitor.service.ts
 39.53% 100% 0% 39.53%
🔴
... / meta.controller.ts
 53.33% 100% 0% 53.33%
🟡
... / meta.module.ts
 60% 100% 0% 60%
🟡
... / process.ts
 61.29% 66.67% 40% 61.29%
🔴
... / foreceClean.init.ts
 47.62% 100% 0% 47.62%
🔴
... / reindex.init.ts
 33.33% 100% 0% 33.33%
🟢
... / testing.core.module.ts
 100% 100% 100% 100%
🟡
... / autoQueue.ts
 65.85% 87.18% 73.33% 65.85%
🟢
... / index.ts
 100% 100% 100% 100%
🔴
... / queue.ts
 47.22% 80% 66.67% 47.22%
🟡
... / rampQueue.ts
 78.72% 91.3% 87.5% 78.72%
🟢
... / string.ts
 100% 95.45% 100% 100%
🟡
... / blockchain.service.ts
 63.68% 100% 42.86% 63.68%
🔴
... / datasourceProcessors.ts
 0% 0% 0% 0%
🔴
... / index.ts
 0% 0% 0% 0%
🔴
... / types.ts
 0% 0% 0% 0%
🔴
... / networking.ts
 31.58% 100% 0% 31.58%
Show files with reduced coverage 🔻
St.❔
 File Statements Branches Functions Lines
🔴
... / delete.ts
48.72% (-5.57% 🔻)
 100% 0%
48.72% (-5.57% 🔻)
🔴
... / promote.ts
44.19% (-4.53% 🔻)
 100% 0%
44.19% (-4.53% 🔻)
🟡
... / add.ts
61.29% (-0.78% 🔻)
 100% 0%
61.29% (-0.78% 🔻)
🟢
... / publish.ts
83.72% (-5.61% 🔻)
 57.14% 100%
83.72% (-5.61% 🔻)
🔴
... / add-chain-controller.ts
39.85% (-0.23% 🔻)
 66.67% 30%
39.85% (-0.23% 🔻)
🟢
... / build-controller.ts
85.62% (-5.69% 🔻)
47.06% (-10.08% 🔻)
 100%
85.62% (-5.69% 🔻)
🟢
... / codegen-controller.ts
88.77% (-0.62% 🔻)
83.95% (+8.37% 🔼)
 100%
88.77% (-0.62% 🔻)
🟡
... / deploy-controller.ts
64.94% (+27.48% 🔼)
72.73% (-5.05% 🔻)
64.29% (+39.29% 🔼)
64.94% (+27.48% 🔼)
🟢
... / generate-controller.ts
97.75% (+0.1% 🔼)
93.24% (-0.79% 🔻)
 100%
97.75% (+0.1% 🔼)
🟡
... / init-controller.ts
76.7% (+6.21% 🔼)
67.65% (-0.35% 🔻)
61.11% (+7.78% 🔼)
76.7% (+6.21% 🔼)
🟢
... / project-controller.ts
83.13% (-14.13% 🔻)
42.86% (-17.14% 🔻)
75% (-25% 🔻)
83.13% (-14.13% 🔻)
🟢
... / publish-controller.ts
82.63% (+2.38% 🔼)
70.27% (-0.84% 🔻)
 100%
82.63% (+2.38% 🔼)
🟡
... / load.ts
79.41% (-8.82% 🔻)
66.67% (-19.05% 🔻)
 100%
79.41% (-8.82% 🔻)
🔴
... / models.ts
55.56% (-43.89% 🔻)
94.12% (+1.81% 🔼)
30.77% (-69.23% 🔻)
55.56% (-43.89% 🔻)
🟢
... / ProjectManifestVersioned.ts
82.19% (-2.74% 🔻)
88.89% (-11.11% 🔻)
61.54% (+3.21% 🔼)
82.19% (-2.74% 🔻)
🟢
... / model.ts
94.29% (-3.43% 🔻)
 100%
73.33% (+1.9% 🔼)
94.29% (-3.43% 🔻)
🔴
... / models.ts
52.94% (-47.06% 🔻)
 100%
0% (-100% 🔻)
52.94% (-47.06% 🔻)
🟡
... / load.ts
64.29% (+5.1% 🔼)
38.89% (-16.67% 🔻)
83.33% (+16.67% 🔼)
64.29% (+5.1% 🔼)
🟡
... / github-reader.ts
67.24% (-22.04% 🔻)
85.71% (+10.71% 🔼)
71.43% (-11.9% 🔻)
67.24% (-22.04% 🔻)
🟡
... / ipfs-reader.ts
63.49% (-22.22% 🔻)
72.73% (+9.09% 🔼)
71.43% (-11.9% 🔻)
63.49% (-22.22% 🔻)
🟡
... / local-reader.ts
72.09% (-13.95% 🔻)
100% (+37.5% 🔼)
83.33% (-16.67% 🔻)
72.09% (-13.95% 🔻)
🟢
... / reader.ts
81.58% (-7.89% 🔻)
57.14% (-17.86% 🔻)
 100%
81.58% (-7.89% 🔻)
🔴
... / base.ts
47.66% (-50.34% 🔻)
87.5% (-12.5% 🔻)
40% (-40% 🔻)
47.66% (-50.34% 🔻)
🔴
... / models.ts
31.74% (-68.26% 🔻)
 100%
0% (-100% 🔻)
31.74% (-68.26% 🔻)
🟢
... / NodeConfig.ts
88.57% (-0.04% 🔻)
82.09% (+2.46% 🔼)
83.33% (-2.71% 🔻)
88.57% (-0.04% 🔻)
🟢
... / ProjectUpgrade.service.ts
81.57% (-5.51% 🔻)
88.76% (-2.59% 🔻)
92.31% (+1% 🔼)
81.57% (-5.51% 🔻)
🟡
... / configure.module.ts
76.89% (-7.68% 🔻)
54.76% (-9.24% 🔻)
 100%
76.89% (-7.68% 🔻)
🟢
... / db.module.ts
89.63% (+1.35% 🔼)
62.5% (-20.83% 🔻)
 80%
89.63% (+1.35% 🔼)
🟢
... / SchemaMigration.service.ts
84.57% (-2.99% 🔻)
78.13% (-3.13% 🔻)
83.33% (-16.67% 🔻)
84.57% (-2.99% 🔻)
🟡
... / migration-helpers.ts
74.54% (-1.48% 🔻)
86.76% (+6.17% 🔼)
 90.91%
74.54% (-1.48% 🔻)
🟡
... / migration.ts
73.39% (-8.89% 🔻)
83.33% (+3.6% 🔼)
85% (-5.48% 🔻)
73.39% (-8.89% 🔻)
🟡
... / StoreOperations.ts
67.06% (-25.25% 🔻)
60% (-25% 🔻)
87.5% (-12.5% 🔻)
67.06% (-25.25% 🔻)
🔴
... / benchmark.service.ts
44.76% (-10.49% 🔻)
 66.67%
36.36% (-3.64% 🔻)
44.76% (-10.49% 🔻)
🔴
... / base-block-dispatcher.ts
17.26% (-30.08% 🔻)
 100%
4.55% (-5.45% 🔻)
17.26% (-30.08% 🔻)
🔴
... / block-dispatcher.ts
31.02% (-9.97% 🔻)
 66.67% 28.57%
31.02% (-9.97% 🔻)
🔴
... / worker-block-dispatcher.ts
18.55% (-31.66% 🔻)
 100%
0% (-27.27% 🔻)
18.55% (-31.66% 🔻)
🔴
... / coreDictionary.ts
48.72% (-51.28% 🔻)
87.5% (-6.94% 🔻)
77.78% (-22.22% 🔻)
48.72% (-51.28% 🔻)
🟡
... / dictionary.service.ts
67.49% (-17.66% 🔻)
80% (-5.71% 🔻)
83.33% (-7.58% 🔻)
67.49% (-17.66% 🔻)
🟢
... / utils.ts
92.59% (-3.7% 🔻)
69.23% (-24.89% 🔻)
 100%
92.59% (-3.7% 🔻)
🟡
... / dictionaryV1.ts
73.88% (-19.35% 🔻)
73.81% (-4.45% 🔻)
91.67% (-8.33% 🔻)
73.88% (-19.35% 🔻)
🟢
... / dictionaryV2.ts
81.44% (-0.23% 🔻)
71.88% (+6.66% 🔼)
88.89% (-11.11% 🔻)
81.44% (-0.23% 🔻)
🔴
... / ds-processor.service.ts
33.93% (-28.16% 🔻)
73.33% (-1.67% 🔻)
58.33% (-29.17% 🔻)
33.93% (-28.16% 🔻)
🟡
... / dynamic-ds.service.ts
63.38% (-26.82% 🔻)
63.64% (-3.03% 🔻)
81.82% (-3.9% 🔻)
63.38% (-26.82% 🔻)
🟢
... / fetch.service.ts
92.76% (+0.48% 🔼)
90.28% (+1.55% 🔼)
84.62% (-2.34% 🔻)
92.76% (+0.48% 🔼)
🟢
... / inMemoryCache.service.ts
86.21% (-13.79% 🔻)
 100%
75% (-25% 🔻)
86.21% (-13.79% 🔻)
🔴
... / indexer.manager.ts
17.73% (-15.48% 🔻)
 100%
10% (-2.5% 🔻)
17.73% (-15.48% 🔻)
🟡
... / PoiBlock.ts
74.19% (-24.19% 🔻)
57.89% (-38.66% 🔻)
75% (-25% 🔻)
74.19% (-24.19% 🔻)
🔴
... / poi.service.ts
55.7% (+31.78% 🔼)
57.69% (-42.31% 🔻)
80% (+51.43% 🔼)
55.7% (+31.78% 🔼)
🔴
... / poiSync.service.ts
55.88% (-31% 🔻)
77.61% (+1.05% 🔼)
88.89% (-3.42% 🔻)
55.88% (-31% 🔻)
🟡
... / project.service.ts
74.42% (-5.58% 🔻)
73.68% (+3.51% 🔼)
85.19% (+1.19% 🔼)
74.42% (-5.58% 🔻)
🔴
... / sandbox.ts
59.73% (-8.25% 🔻)
56.25% (-0.89% 🔻)
57.14% (-4.4% 🔻)
59.73% (-8.25% 🔻)
🔴
... / store.service.ts
59.96% (-6.08% 🔻)
75.41% (+6.99% 🔼)
80.65% (+23.5% 🔼)
59.96% (-6.08% 🔻)
🔴
... / entity.ts
53.57% (-7.97% 🔻)
 100%
50% (+50% 🔼)
53.57% (-7.97% 🔻)
🔴
... / store.ts
31.03% (-1.17% 🔻)
62.5% (-37.5% 🔻)
33.33% (+33.33% 🔼)
31.03% (-1.17% 🔻)
🟢
... / test.runner.ts
95.06% (-4.27% 🔻)
77.78% (+4.44% 🔼)
75% (-25% 🔻)
95.06% (-4.27% 🔻)
🔴
... / testing.service.ts
11.54% (-17.03% 🔻)
 100% 0%
11.54% (-17.03% 🔻)
🔴
... / unfinalizedBlocks.service.ts
58.28% (-25.71% 🔻)
73.08% (-23.64% 🔻)
91.3% (-0.36% 🔻)
58.28% (-25.71% 🔻)
🟡
... / worker.builder.ts
61.97% (-17.22% 🔻)
 65.38% 80%
61.97% (-17.22% 🔻)
🔴
... / worker.cache.service.ts
48.78% (-9.76% 🔻)
 100% 0%
48.78% (-9.76% 🔻)
🔴
... / worker.connectionPoolState.manager.ts
38.21% (-22.76% 🔻)
 100% 0%
38.21% (-22.76% 🔻)
🔴
... / worker.dynamic-ds.service.ts
44.44% (-17.78% 🔻)
 100% 0%
44.44% (-17.78% 🔻)
🔴
... / worker.service.ts
21.24% (-23.4% 🔻)
 100% 0%
21.24% (-23.4% 🔻)
🔴
... / worker.ts
41.75% (-0.71% 🔻)
 100% 0%
41.75% (-0.71% 🔻)
🔴
... / worker.unfinalizedBlocks.service.ts
26.79% (-73.21% 🔻)
 100%
0% (-100% 🔻)
26.79% (-73.21% 🔻)
🔴
... / logger.ts
49.3% (-15.18% 🔻)
 33.33%
40% (+20% 🔼)
49.3% (-15.18% 🔻)
🔴
... / event.listener.ts
16.16% (-64.65% 🔻)
 100%
0% (-25% 🔻)
16.16% (-64.65% 🔻)
🔴
... / health.controller.ts
37.93% (-17.24% 🔻)
 100%
0% (-50% 🔻)
37.93% (-17.24% 🔻)
🔴
... / health.service.ts
21.05% (-36.48% 🔻)
 100%
0% (-20% 🔻)
21.05% (-36.48% 🔻)
🔴
... / meta.service.ts
35.19% (-34.34% 🔻)
100% (+20% 🔼)
0% (-40% 🔻)
35.19% (-34.34% 🔻)
🔴
... / ready.controller.ts
34.78% (-21.74% 🔻)
 100%
0% (-50% 🔻)
34.78% (-21.74% 🔻)
🔴
... / ready.service.ts
37.5% (-54.17% 🔻)
 100%
0% (-66.67% 🔻)
37.5% (-54.17% 🔻)
🔴
... / forceClean.service.ts
21.05% (-5.26% 🔻)
 100% 0%
21.05% (-5.26% 🔻)
🔴
... / reindex.service.ts
19.05% (-14.29% 🔻)
 100% 0%
19.05% (-14.29% 🔻)
🟡
... / blocks.ts
71.21% (-28.79% 🔻)
91.67% (+2.78% 🔼)
75% (-25% 🔻)
71.21% (-28.79% 🔻)
🟡
... / project.ts
71.88% (-1.49% 🔻)
75% (+0.42% 🔼)
 77.78%
71.88% (-1.49% 🔻)
🟢
... / promise.ts
88.14% (-3.63% 🔻)
100% (+13.64% 🔼)
71.43% (-14.29% 🔻)
88.14% (-3.63% 🔻)
🟢
... / reindex.ts
82.05% (+48.01% 🔼)
14.29% (-85.71% 🔻)
100% (+100% 🔼)
82.05% (+48.01% 🔼)
🔴
... / yargs.ts
43.38% (-2.11% 🔻)
 100% 14.29%
43.38% (-2.11% 🔻)
🟢
... / api.service.ts
85.75% (+2.24% 🔼)
78.69% (+6.47% 🔼)
80.77% (-5.9% 🔻)
85.75% (+2.24% 🔼)
🟢
... / apiPromise.connection.ts
80% (+10.92% 🔼)
61.54% (-18.46% 🔻)
66.67% (+23.81% 🔼)
80% (+10.92% 🔼)
🔴
... / index.ts
0% (-100% 🔻)
0% (-100% 🔻)
0% (-100% 🔻)
0% (-100% 🔻)
🟢
... / substrateDictionary.service.ts
98.15% (+7.58% 🔼)
66.67% (-6.06% 🔻)
100% (+20% 🔼)
98.15% (+7.58% 🔼)
🔴
... / types.ts
0% (-100% 🔻)
0% (-100% 🔻)
0% (-100% 🔻)
0% (-100% 🔻)
🟢
... / substrateDictionaryV1.ts
80.79% (-4.69% 🔻)
78.26% (+8.49% 🔼)
76.92% (-6.41% 🔻)
80.79% (-4.69% 🔻)
🟡
... / substrateDictionaryV2.ts
73.03% (-2.48% 🔻)
 75% 33.33%
73.03% (-2.48% 🔻)
🔴
... / indexer.manager.ts
47.96% (-9.58% 🔻)
 100%
16.67% (+7.58% 🔼)
47.96% (-9.58% 🔻)
🟢
... / runtimeService.ts
95.29% (+3.09% 🔼)
83.33% (-5.56% 🔻)
100% (+20% 🔼)
95.29% (+3.09% 🔼)
🟡
... / types.ts
70.45% (-14.84% 🔻)
 100% 0%
70.45% (-14.84% 🔻)
🟢
... / project.ts
88.73% (-0.16% 🔻)
 68.18% 87.5%
88.73% (-0.16% 🔻)
🟢
... / buffer.ts
95.12% (-4.88% 🔻)
95.83% (-4.17% 🔻)
90.48% (+6.27% 🔼)
95.12% (-4.88% 🔻)
🟢
... / builder.ts
93.02% (+0.25% 🔼)
82.14% (-0.62% 🔻)
 100%
93.02% (+0.25% 🔼)
🟡
... / logger.ts
69.19% (-0.41% 🔻)
48.15% (-6.85% 🔻)
78.57% (+3.57% 🔼)
69.19% (-0.41% 🔻)

Test suite run success

603 tests passing in 107 suites.

Report generated by 🧪jest coverage report action from d9245d0

stwiname
stwiname reviewed Mar 14, 2025
View reviewed changes
Copy link
Collaborator

@stwiname stwiname left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to have a test for this.

packages/node-core/src/indexer/blockDispatcher/base-block-dispatcher.ts
Comment on lines +184 to +190

// End transaction
await this.storeModelProvider.applyPendingChanges(
height,
!this.projectService.hasDataSourcesAfterHeight(height),
this.storeService.transaction
);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this happen before the rewind is called? Otherwise it will save data from a block after the rewind?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stwiname stwiname stwiname left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yoozo @stwiname