[CLD-1916]: fix(state): restore addressbook usage#17
Merged
Conversation
graham-chainlink
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR restores loading of deployed contract state from the AddressBook (with DataStore compatibility where needed), aligning Solana/EVM/Aptos state resolution with the upstream Chainlink approach described in CLD-1916.
Changes:
- Solana: load MCMS+Timelock state primarily from AddressBook, with a DataStore-based fallback path retained.
- EVM: introduce merged address resolution (AddressBook + DataStore) for backward compatibility, and refactor DataStore utilities.
- Aptos: switch MCMS address loading to AddressBook-backed lookups and standardize version constants.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 9 comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/family/solana/state.go | Restores AddressBook-first Solana MCMS loading, adds fallback to DataStore, and introduces seed address encode/decode helpers. |
| pkg/family/solana/state_test.go | Updates Solana tests to exercise AddressBook-based loading and DataStore V2 behavior. |
| pkg/family/evm/state.go | Adds AddressBook+DataStore merge logic and DataStore helper APIs for qualifier-aware loading. |
| pkg/family/evm/state_test.go | Updates EVM tests to reflect fallback/merge semantics and version constant usage. |
| pkg/family/aptos/state.go | Switches Aptos MCMS address loading to AddressBook and hardcodes expected MCMS version constant. |
| pkg/family/aptos/state_test.go | Adjusts Aptos tests for AddressBook-based behavior and updated error expectations. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
My original assumption that we will replace usage of addressbook with datastore were incorrect based on the latest comment [here](https://smartcontract-it.atlassian.net/browse/CLD-1916?focusedCommentId=598151), restoring my previous changes so it is now the same as chainlink repo
graham-chainlink
force-pushed
the
ggoh/cld-1916/restore-address-book-usage
branch
from
d4942f8 to
0f7d914
Compare
ajaskolski
approved these changes
Apr 24, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jkongie
added a commit
that referenced
this pull request
May 6, 2026
🤖 I have created a release *beep* *boop* --- ## [0.1.0](cld-changesets-v0.0.1...cld-changesets-v0.1.0) (2026-05-06) ### Features * add "catalog create chain metadata" changeset ([#36](#36)) ([c12bb51](c12bb51)) * add catalog create contract metadata changeset ([#27](#27)) ([8ec1cbc](8ec1cbc)) * add CRE workflow deploy changeset and operation ([#1](#1)) ([960fde1](960fde1)) * add target name param to cre deploy changeset ([#3](#3)) ([8b25662](8b25662)) * fund mcms pdas ([#22](#22)) ([821e542](821e542)) * **jobspec:** port jobspec changesets from chainlink ([#21](#21)) ([0ce3f74](0ce3f74)) * link token ([#30](#30)) ([07345c1](07345c1)) * **pkg:** add contract constants and Solana MCMS state loading ([#5](#5)) ([6a2bbee](6a2bbee)) * port BuildProposalFromBatchesV2 ([#24](#24)) ([28d53d7](28d53d7)) * port run changeset from chainlink ([#32](#32)) ([693922f](693922f)) * port solana grant role ([#33](#33)) ([7eca5be](7eca5be)) * port token approve ([#40](#40)) ([04130de](04130de)) * **port:** firedrill mcms with operations api refactor ([#25](#25)) ([6d9010c](6d9010c)) * **solana:** add SOL funding helpers for deployer transfers ([#19](#19)) ([63bebf8](63bebf8)) * **solana:** port over mcms pda loader ([#11](#11)) ([7170ddc](7170ddc)) ### Bug Fixes * **aptos:** move state load ([#8](#8)) ([de58102](de58102)) * **evm:** port state load evm funcs ([#9](#9)) ([99279f1](99279f1)) * **state:** restore addressbook usage ([#17](#17)) ([017cd5e](017cd5e)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: app-token-issuer-ops-platform[bot] <275822481+app-token-issuer-ops-platform[bot]@users.noreply.github.com> Co-authored-by: James Kong <61834+jkongie@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
My original assumption that we will replace usage of addressbook with datastore were incorrect based on the latest comment here while be move the code over from chainlink to here, restoring my previous changes so it is now the same as chainlink repo
JIRA: https://smartcontract-it.atlassian.net/browse/CLD-1916