Fix SMT proof fetching for lifted leaf

msmouse commented 2 weeks ago

In the presence of deletion, a leaf node on the SMT can be lifted, so the hash value won't be matching that in the DB.

Examining more, it's obvious that in such cases proof fetching is not needed in the first place.

Type of Change

[x] Bug fix - blaming https://github.com/aptos-labs/aptos-core/pull/13274

Which Components or Systems Does This Change Impact?

[x] Validator Node

How Has This Been Tested?

updated unit tests. replay-verify.

it's unfortunate unit tests don't have much coverage for state deletion -- a tech debt I'm gonna fix as a follow up.

Key Areas to Review

Checklist

[x] I have read and followed the CONTRIBUTING doc
[x] I have performed a self-review of my own code
[x] I have commented my code, particularly in hard-to-understand areas
[x] I identified and added all stakeholders and component owners affected by this change as reviewers
[ ] I tested both happy and unhappy path of the functionality
[ ] I have made corresponding changes to the documentation

trunk-io[bot] commented 2 weeks ago

⏱️ 12h 16m total CI duration on this PR

| Job | Cumulative Duration | Recent Runs | |---|---|---| | [windows-build](https://github.com/aptos-labs/aptos-core/actions/runs/9123047082/job/25084829893) | 1h 44m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781814/job/25084133410) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800412/job/25084184850) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047082/job/25084829893) | | [rust-smoke-tests](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840648) | 1h 39m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241393/job/25080092052) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122781809/job/25084143262) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122800425/job/25084198984) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840648) | | [rust-targeted-unit-tests](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840729) | 1h 17m | [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9121231527/job/25080066303) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241393/job/25080092175) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122781809/job/25084143356) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800425/job/25084199251) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840729) (+1 more) | | [execution-performance / single-node-performance](https://github.com/aptos-labs/aptos-core/actions/runs/9123047069/job/25084890782) | 1h 16m | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9121241406/job/25083364547) [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9122781806/job/25084205814) [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9122800430/job/25084256108) [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9122800430/job/25084772417) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047069/job/25084890782) (+4 more) | | [forge-e2e-test / forge](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085068688) | 51m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080379012) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084462692) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085068688) | | [rust-move-tests](https://github.com/aptos-labs/aptos-core/actions/runs/9123047065/job/25084830071) | 48m | [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9121231521/job/25080058148) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241402/job/25080082440) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122781807/job/25084133746) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800421/job/25084191149) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047065/job/25084830071) (+1 more) | | [forge-compat-test / forge](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085068798) | 44m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080378680) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084462593) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085068798) | | [rust-images / rust-all](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084836069) | 40m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080085515) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122781830/job/25084143340) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084200683) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084836069) | | [forge-framework-upgrade-test / forge](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085069179) | 35m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084462790) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085069179) | | [rust-lints](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840363) | 25m | [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9121231527/job/25080066212) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241393/job/25080091682) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122781809/job/25084142797) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800425/job/25084199135) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840363) (+1 more) | | [run-tests-main-branch](https://github.com/aptos-labs/aptos-core/actions/runs/9123047064/job/25084838358) | 22m | [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9121231512/job/25080062997) [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9121241396/job/25080091344) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781826/job/25084145448) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800371/job/25084195321) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047064/job/25084838358) (+1 more) | | [cli-e2e-tests / run-cli-tests](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085068597) | 20m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080378369) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084462366) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085068597) | | [execution-performance / test-target-determinator](https://github.com/aptos-labs/aptos-core/actions/runs/9123047069/job/25084830053) | 18m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241406/job/25080075578) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241406/job/25083301186) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781806/job/25084133662) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800430/job/25084185232) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047069/job/25084830053) | | [rust-build-cached-packages](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840467) | 15m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241393/job/25080092451) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122781809/job/25084142938) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800425/job/25084199373) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840467) | | [check](https://github.com/aptos-labs/aptos-core/actions/runs/9123047101/job/25084830233) | 14m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241399/job/25080075498) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122781812/job/25084133981) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800413/job/25084190843) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047101/job/25084830233) | | [test-target-determinator](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084832901) | 12m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080081073) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122781830/job/25084139506) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084196674) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084832901) | | [general-lints](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840258) | 10m | [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9121231527/job/25080066081) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241393/job/25080091855) [⬜](https://github.com/aptos-labs/aptos-core/actions/runs/9122781809/job/25084142614) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800425/job/25084198836) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084840258) (+1 more) | | [check-dynamic-deps](https://github.com/aptos-labs/aptos-core/actions/runs/9123047073/job/25084829753) | 10m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121231496/job/25080049504) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241415/job/25080075024) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781808/job/25084133090) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800416/job/25084184879) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047073/job/25084829753) (+2 more) | | [indexer-grpc-e2e-tests / test-indexer-grpc-docker-compose](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085068997) | 6m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080378788) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084462225) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085068997) | | [semgrep/ci](https://github.com/aptos-labs/aptos-core/actions/runs/9123047071/job/25084829864) | 3m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121231520/job/25080049829) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241409/job/25080075241) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781810/job/25084133068) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800424/job/25084185029) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047071/job/25084829864) (+2 more) | | [node-api-compatibility-tests / node-api-compatibility-tests](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085069090) | 3m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080378890) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084462110) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25085069090) | | [file_change_determinator](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084835370) | 1m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121231527/job/25080057833) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241393/job/25080082632) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781809/job/25084133599) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800425/job/25084191299) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047079/job/25084835370) (+1 more) | | [file_change_determinator](https://github.com/aptos-labs/aptos-core/actions/runs/9123047064/job/25084833116) | 1m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121231512/job/25080056535) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241396/job/25080081239) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781826/job/25084139057) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800371/job/25084189090) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047064/job/25084833116) (+1 more) | | [file_change_determinator](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084833103) | 41s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080080953) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781830/job/25084139184) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084196533) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084833103) | | [permission-check](https://github.com/aptos-labs/aptos-core/actions/runs/9123047067/job/25084829792) | 23s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121231460/job/25080049397) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241392/job/25080075144) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781824/job/25084133051) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800369/job/25084184634) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047067/job/25084829792) (+2 more) | | [permission-check](https://github.com/aptos-labs/aptos-core/actions/runs/9123047080/job/25084830137) | 22s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121231511/job/25080052616) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241412/job/25080075656) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781823/job/25084133805) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800368/job/25084184827) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047080/job/25084830137) (+2 more) | | [permission-check](https://github.com/aptos-labs/aptos-core/actions/runs/9123047064/job/25084830210) | 19s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121231512/job/25080052771) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241396/job/25080078409) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781826/job/25084133648) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800371/job/25084184921) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047064/job/25084830210) (+2 more) | | [permission-check](https://github.com/aptos-labs/aptos-core/actions/runs/9123047066/job/25084829774) | 18s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121231516/job/25080049946) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241390/job/25080075211) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781828/job/25084133344) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800370/job/25084184623) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047066/job/25084829774) (+2 more) | | [permission-check](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084830313) | 13s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080075893) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781830/job/25084134065) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084193090) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084830313) | | [determine-docker-build-metadata](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084833002) | 11s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9121241455/job/25080081195) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122781830/job/25084139346) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9122800384/job/25084196783) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123047090/job/25084833002) |

🚨 3 jobs on the last run were significantly faster/slower than expected

Job	Duration	vs 7d avg
forge-e2e-test / forge	22m	15m
windows-build	30m	39m
forge-framework-upgrade-test / forge	18m	1h 8m

_{settings ⋅ feedback ⋅ docs ⋅ learn more about trunk.io}

msmouse commented 2 weeks ago

#13313 👈
#13307 : 1 other dependent PR (#13312 )
main