Skip to content

Refactor Tiltfile structure and enhance Pocketdex support. #1640

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
Merged
bryanchriswhite merged 9 commits into from
Jul 9, 2025
Merged

Refactor Tiltfile structure and enhance Pocketdex support. #1640

bryanchriswhite merged 9 commits into from
Jul 9, 2025

Conversation

@jorgecuesta
Copy link
Contributor

@jorgecuesta jorgecuesta commented Jul 4, 2025 •
edited
Loading

Summary

Refactor Tiltfile config handling and Pocketdex integration for improved modularity, visibility, and maintainability.

Primary Changes:

  • Introduced tiltfiles/config.Tiltfile: auto-generates and reconciles localnet_config.yaml with a clear UI flow for applying default changes, including UI buttons and dynamic warnings.
  • Moved default configuration logic to tiltfiles/defaults.Tiltfile, improving clarity and easing future updates.

Secondary Changes:

  • Refactored and modularized Pocketdex indexer loading logic into tiltfiles/pocketdex.Tiltfile, including support for:
    • Optional repo cloning
    • Entrypoint selection
  • Update checks with UI resource warnings
  • Introduced utility functions (deep_merge_dicts) in tiltfiles/utils.Tiltfile
  • Removed legacy inline config merge logic from main Tiltfile
  • Removed legacy flat files: tiltfiles/git.tilt, tiltfiles/pocketdex.tilt

Note: The UI/UX flow will just be there only when there are MISSING KEYS, not differences, since a difference between default and my local env is something expected (as dev I want to modify that, right?)

But if there are MORE keys that come with updates and I do not have them, then this will shows up.

Please take a look to the attached files.

image
image
image

Issue

  • Pocketdex integration was not working
  • Config files has a lack of visibility and understand if they are up-to-date or not

Type of change

Select one or more from the following:

  • New feature, functionality or library
  • Bug fix
  • Code health or cleanup
  • Documentation
  • Other (Tilt UX enhancements & config automation)

Sanity Checklist

  • I have updated the GitHub Issue Metadata: assignees, reviewers, labels, project, iteration and milestone
  • For docs: make docusaurus_start
  • For small changes: make go_develop_and_test and make test_e2e
  • For major changes: devnet-test-e2e label to run E2E tests in CI
  • For migration changes: make test_e2e_oneshot
  • 'TODO's, configurations and other docs

@jorgecuesta jorgecuesta self-assigned this Jul 4, 2025
@jorgecuesta jorgecuesta added enhancement New feature or request code health Cleans up some code tooling Tooling - CLI, scripts, helpers, off-chain, etc... labels Jul 4, 2025
@Olshansk Olshansk self-requested a review July 5, 2025 01:22
@Olshansk Olshansk added this to Shannon Jul 5, 2025
@github-project-automation github-project-automation bot moved this to 📋 Backlog in Shannon Jul 5, 2025
@Olshansk Olshansk requested a review from okdas July 5, 2025 01:22
@jorgecuesta
Refactor Tiltfile structure and enhance Pocketdex support.
b888923 
- Updated `git.Tiltfile` for Git-related utilities like cloning, fetching, and change detection.
- Added `defaults.Tiltfile` to manage and load configuration defaults.
- Updated `pocketdex.Tiltfile` for Pocketdex-related logic, including dynamic loading and repository management.
- Replaced `merge_dicts` with `deep_merge_dicts` from `utils.Tiltfile` for recursive dictionary merging.
- Simplified `localnet_config` handling to enforce syncing existing configs with default values.

This refactor improves modularity and maintainability of the Tiltfile setup.
@jorgecuesta
Refactor config management: introduce config.Tiltfile and streamlin…
14b319a 
…e `localnet_config` handling.

- Replaced legacy logic with `read_configs()` for default merging and missing key detection.
- Enhanced Tilt UI integration with buttons for config updates and diff visualization.
- Updated `.gitignore` for generated config files.
- Added dependency (`validator`) to Pocketdex indexer resources.
@jorgecuesta jorgecuesta force-pushed the tilt/fix-pocketdex-enhance-tilt branch from f97dfa3 to 14b319a Compare July 5, 2025 03:38
@bryanchriswhite
Merge remote-tracking branch 'pokt/main' into tilt/fix-pocketdex-enha…
5722214 
…nce-tilt

* pokt/main:
  Remove settlement result from `EventClaimSettled` in `v0.127` release. (#1647)
  Revert "feat: Remove settlement result from EventClaimSettled" (#1643)
  [Code Health] Fix linter issues & attempt to fix flaky tests (#1646)
  Updating config-path-x.yaml with: schema header, owned app for config-path-1
@bryanchriswhite bryanchriswhite moved this from 📋 Backlog to 🏗 In progress in Shannon Jul 7, 2025
@bryanchriswhite bryanchriswhite moved this from 🏗 In progress to 👀 In review in Shannon Jul 7, 2025
bryanchriswhite
bryanchriswhite approved these changes Jul 8, 2025
View reviewed changes
Copy link
Collaborator

@bryanchriswhite bryanchriswhite left a comment

Choose a reason for hiding this comment

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

Thanks again @jorgecuesta and @Alann27! 🙌

@jorgecuesta
Copy link
Contributor Author

jorgecuesta commented Jul 8, 2025

@Olshansk can we merge this?

Olshansk
Olshansk approved these changes Jul 9, 2025
View reviewed changes
Copy link
Collaborator

@Olshansk Olshansk left a comment

Choose a reason for hiding this comment

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

@jorgecuesta Yup, go ahead!

Please just wait for a 🟢 before squash & merging.

I didn't test the indexer, but did pull it locally and verified that LocalNet protocol development continues to work as expected ✅

@bryanchriswhite
Copy link
Collaborator

bryanchriswhite commented Jul 9, 2025

I tested it. 👍

@bryanchriswhite bryanchriswhite merged commit eed20fb into main Jul 9, 2025
14 checks passed
@github-project-automation github-project-automation bot moved this from 👀 In review to ✅ Done in Shannon Jul 9, 2025
@bryanchriswhite bryanchriswhite deleted the tilt/fix-pocketdex-enhance-tilt branch July 14, 2025 06:45
bryanchriswhite added a commit that referenced this pull request Jul 14, 2025
@bryanchriswhite
Merge remote-tracking branch 'pokt/main' into chore/ibc
6e53115 
* pokt/main: (34 commits)
  [RelayMiner] feat: relay miner routes to multiple backend URLs based on RPC Type (#1633)
  [Morse Recovery] Added new addresses for recovery (#1667)
  [DOCS][SERVICE] Adding danger for Grove employees on mainnet service creation (#1666)
  [Foundation] Remove `pulsar` (#1661)
  [RelayMiner] Add timeout support and improved logging to query clients (#1657)
  [RelayMiner] Replace buffer copying with explicit cleanup pattern in SafeReadBody (#1658)
  [Testing] Fixing flaky unit tests to make CI more reliable (#1662)
  [Scripts] Notes, events and queries to query `block` events and `tx` events (#1660)
  [Morse Recovery] Add recovery addresses for issue #1654 (#1656)
  Refactor Tiltfile structure and enhance Pocketdex support. (#1640)
  [Morse Recovery] Updated Recovery Allowlist (#1651)
  [RelayMiner] Improve SafeReadBody concurrency safety by copying buffer data (#1650)
  Add a configurable max body size parameter to RelayMiner configuration. (#1566)
  Update upgrade_tx_v0.1.25_alpha.json
  feat: Improve relay request unmarshaling error handling and logging (#1649)
  [Docs] v0.1.25/26 upgrage artifacts (#1648)
  Remove settlement result from `EventClaimSettled` in `v0.127` release. (#1647)
  Revert "feat: Remove settlement result from EventClaimSettled" (#1643)
  [Code Health] Fix linter issues & attempt to fix flaky tests (#1646)
  Updating config-path-x.yaml with: schema header, owned app for config-path-1
  ...
bryanchriswhite added a commit that referenced this pull request Jul 16, 2025
@bryanchriswhite
Merge remote-tracking branch 'pokt/main' into chore/ibc
fbff8bc 
* pokt/main: (69 commits)
  Refactor Tiltfile structure and enhance Pocketdex support. (#1640)
  [Morse Recovery] Updated Recovery Allowlist (#1651)
  [RelayMiner] Improve SafeReadBody concurrency safety by copying buffer data (#1650)
  Add a configurable max body size parameter to RelayMiner configuration. (#1566)
  Update upgrade_tx_v0.1.25_alpha.json
  feat: Improve relay request unmarshaling error handling and logging (#1649)
  [Docs] v0.1.25/26 upgrage artifacts (#1648)
  Remove settlement result from `EventClaimSettled` in `v0.127` release. (#1647)
  Revert "feat: Remove settlement result from EventClaimSettled" (#1643)
  [Code Health] Fix linter issues & attempt to fix flaky tests (#1646)
  Updating config-path-x.yaml with: schema header, owned app for config-path-1
  [Shannon SDK] Update the `shannon-sdk` in prep for `v0.1.26` (#1641)
  [RelayMiner] Add chain version retrieval functionality to block client (#1639)
  [RelayMiner] Avoid concurrent access to shared logger (#1636)
  [Telegram] Add Korbit channel to broadcast workflow (#1634)
  upgrade: Prepare upgrade plan for v0.1.26 (#1635)
  [RelayMiner] Add proper timeout handling for RelayMiner HTTP requests (#1595)
  [Code only] fix: implement backward compatible relay response signatures  (from #1629) (#1630)
  [Misc] Misc fixes & improvements (#1632)
  Added pocket-knife to ecosystem tools (#1622)
  ...
bryanchriswhite added a commit that referenced this pull request Jul 16, 2025
@bryanchriswhite
Merge branch 'refs/heads/chore/ibc' into chore/localnet/tilt
e93c96b 
* refs/heads/chore/ibc: (69 commits)
  Refactor Tiltfile structure and enhance Pocketdex support. (#1640)
  [Morse Recovery] Updated Recovery Allowlist (#1651)
  [RelayMiner] Improve SafeReadBody concurrency safety by copying buffer data (#1650)
  Add a configurable max body size parameter to RelayMiner configuration. (#1566)
  Update upgrade_tx_v0.1.25_alpha.json
  feat: Improve relay request unmarshaling error handling and logging (#1649)
  [Docs] v0.1.25/26 upgrage artifacts (#1648)
  Remove settlement result from `EventClaimSettled` in `v0.127` release. (#1647)
  Revert "feat: Remove settlement result from EventClaimSettled" (#1643)
  [Code Health] Fix linter issues & attempt to fix flaky tests (#1646)
  Updating config-path-x.yaml with: schema header, owned app for config-path-1
  [Shannon SDK] Update the `shannon-sdk` in prep for `v0.1.26` (#1641)
  [RelayMiner] Add chain version retrieval functionality to block client (#1639)
  [RelayMiner] Avoid concurrent access to shared logger (#1636)
  [Telegram] Add Korbit channel to broadcast workflow (#1634)
  upgrade: Prepare upgrade plan for v0.1.26 (#1635)
  [RelayMiner] Add proper timeout handling for RelayMiner HTTP requests (#1595)
  [Code only] fix: implement backward compatible relay response signatures  (from #1629) (#1630)
  [Misc] Misc fixes & improvements (#1632)
  Added pocket-knife to ecosystem tools (#1622)
  ...

# Conflicts:
#	Makefile
#	Tiltfile
bryanchriswhite added a commit that referenced this pull request Jul 16, 2025
@bryanchriswhite
Merge branch 'chore/localnet/tilt' into chore/ibc-axelar
b0ae014 
* chore/localnet/tilt: (88 commits)
  [Disk Utilization] refactor: remove unnecessary Msg.*Response fields (#1670)
  [RelayMiner] Bump SMT version (#1675)
  [IBC] Prepare pocket for IBC connectivity (#1262)
  fix: TODOs
  fix: onchain upgrade
  [RelayMiner] feat: relay miner routes to multiple backend URLs based on RPC Type (#1633)
  [Morse Recovery] Added new addresses for recovery (#1667)
  [DOCS][SERVICE] Adding danger for Grove employees on mainnet service creation (#1666)
  [Foundation] Remove `pulsar` (#1661)
  [RelayMiner] Add timeout support and improved logging to query clients (#1657)
  [RelayMiner] Replace buffer copying with explicit cleanup pattern in SafeReadBody (#1658)
  [Testing] Fixing flaky unit tests to make CI more reliable (#1662)
  [Scripts] Notes, events and queries to query `block` events and `tx` events (#1660)
  [Morse Recovery] Add recovery addresses for issue #1654 (#1656)
  fixup! upgrade
  fixup! upgrade
  revertme: testing
  fixup! upgrade
  Refactor Tiltfile structure and enhance Pocketdex support. (#1640)
  [Morse Recovery] Updated Recovery Allowlist (#1651)
  ...
bryanchriswhite added a commit that referenced this pull request Jul 16, 2025
@bryanchriswhite
Merge branch 'chore/ibc-axelar' into feat/ibc/packet-forward-middleware
945ac18 
* chore/ibc-axelar: (92 commits)
  [Disk Utilization] refactor: remove unnecessary Msg.*Response fields (#1670)
  [RelayMiner] Bump SMT version (#1675)
  [IBC] Prepare pocket for IBC connectivity (#1262)
  fix: TODOs
  fix: onchain upgrade
  [RelayMiner] feat: relay miner routes to multiple backend URLs based on RPC Type (#1633)
  [Morse Recovery] Added new addresses for recovery (#1667)
  [DOCS][SERVICE] Adding danger for Grove employees on mainnet service creation (#1666)
  [Foundation] Remove `pulsar` (#1661)
  [RelayMiner] Add timeout support and improved logging to query clients (#1657)
  [RelayMiner] Replace buffer copying with explicit cleanup pattern in SafeReadBody (#1658)
  [Testing] Fixing flaky unit tests to make CI more reliable (#1662)
  [Scripts] Notes, events and queries to query `block` events and `tx` events (#1660)
  [Morse Recovery] Add recovery addresses for issue #1654 (#1656)
  fixup! upgrade
  fixup! upgrade
  revertme: testing
  fixup! upgrade
  Refactor Tiltfile structure and enhance Pocketdex support. (#1640)
  [Morse Recovery] Updated Recovery Allowlist (#1651)
  ...
bryanchriswhite added a commit that referenced this pull request Jul 16, 2025
@bryanchriswhite
Merge branch 'chore/ibc-axelar' into docs/ibc/localnet
d2ea329 
* chore/ibc-axelar: (88 commits)
  [Disk Utilization] refactor: remove unnecessary Msg.*Response fields (#1670)
  [RelayMiner] Bump SMT version (#1675)
  [IBC] Prepare pocket for IBC connectivity (#1262)
  fix: TODOs
  fix: onchain upgrade
  [RelayMiner] feat: relay miner routes to multiple backend URLs based on RPC Type (#1633)
  [Morse Recovery] Added new addresses for recovery (#1667)
  [DOCS][SERVICE] Adding danger for Grove employees on mainnet service creation (#1666)
  [Foundation] Remove `pulsar` (#1661)
  [RelayMiner] Add timeout support and improved logging to query clients (#1657)
  [RelayMiner] Replace buffer copying with explicit cleanup pattern in SafeReadBody (#1658)
  [Testing] Fixing flaky unit tests to make CI more reliable (#1662)
  [Scripts] Notes, events and queries to query `block` events and `tx` events (#1660)
  [Morse Recovery] Add recovery addresses for issue #1654 (#1656)
  fixup! upgrade
  fixup! upgrade
  revertme: testing
  fixup! upgrade
  Refactor Tiltfile structure and enhance Pocketdex support. (#1640)
  [Morse Recovery] Updated Recovery Allowlist (#1651)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Olshansk Olshansk Olshansk approved these changes

@okdas okdas Awaiting requested review from okdas

+1 more reviewer

@bryanchriswhite bryanchriswhite bryanchriswhite approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jorgecuesta jorgecuesta

Labels

code health Cleans up some code enhancement New feature or request tooling Tooling - CLI, scripts, helpers, off-chain, etc...

Projects

Shannon
Status: ✅ Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jorgecuesta @bryanchriswhite @Olshansk