Skip to content

chore: remove link token and static link token view functions and use cld-changesets instead #22151

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

Open
ecPablo wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

chore: remove link token and static link token view functions and use cld-changesets instead #22151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d7d4408
chore: remove link token and static link token view functions and use…
ecPablo Apr 23, 2026
8692b4f
chore: update gomods
ecPablo Apr 23, 2026
a52f647
Merge branch 'develop' into ecpablo/replace-view-state-evm
ecPablo Apr 23, 2026
90b14ee
wip: update go.md
ecPablo Apr 23, 2026
7fe799f
fix: bump ton contracts hash
ecPablo Apr 23, 2026
c74b9e1
Update deployment/ccip/changeset/testhelpers/test_environment.go
ecPablo Apr 23, 2026
9220336
Merge branch 'develop' into ecpablo/replace-view-state-evm
ecPablo Apr 23, 2026
0091a9e
fix: go mods
ecPablo Apr 23, 2026
38ea637
Merge branch 'develop' into ecpablo/replace-view-state-evm
ecPablo Apr 25, 2026
490f418
fix: go mods
ecPablo Apr 25, 2026
ae0c03c
Merge branch 'develop' into ecpablo/replace-view-state-evm
ecPablo Apr 27, 2026
66ad07d
Merge branch 'develop' into ecpablo/replace-view-state-evm
ecPablo Apr 28, 2026
0393196
fix: go mods
ecPablo Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions core/scripts/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ require (
github.com/smartcontractkit/chainlink-data-streams v0.1.13
github.com/smartcontractkit/chainlink-deployments-framework v0.98.0
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260416173445-80f6efde0a03
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260421142741-9c7fbaf7c828
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260420204255-a3f3bdd56877
github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0
github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18
Expand Down Expand Up @@ -361,7 +361,7 @@ require (
github.com/jackc/pgconn v1.14.3 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgproto3/v2 v2.3.4-0.20250125160525-bc041643406d // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgtype v1.14.4 // indirect
github.com/jackc/pgx/v5 v5.9.2 // indirect
Expand Down Expand Up @@ -523,6 +523,7 @@ require (
github.com/smartcontractkit/chainlink-ton v0.0.0-20260423161209-5ce1dba9785e // indirect
github.com/smartcontractkit/chainlink-ton/deployment v0.0.0-20260423161209-5ce1dba9785e // indirect
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20260408092456-3c6369888d4a // indirect
github.com/smartcontractkit/cld-changesets v0.0.0-20260427210718-b873c54e8d22 // indirect
github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad // indirect
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
github.com/smartcontractkit/mcms v0.41.1 // indirect
Expand Down
9 changes: 6 additions & 3 deletions core/scripts/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions deployment/ccip/view/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import (

suistate "github.com/smartcontractkit/chainlink-sui/deployment"
tonstate "github.com/smartcontractkit/chainlink-ton/deployment/state"

linkviewv10 "github.com/smartcontractkit/cld-changesets/pkg/contract/link/view/v1_0"

"github.com/smartcontractkit/chainlink/deployment/ccip/view/aptos"
"github.com/smartcontractkit/chainlink/deployment/ccip/view/shared"
"github.com/smartcontractkit/chainlink/deployment/ccip/view/solana"
Expand Down Expand Up @@ -51,8 +54,8 @@ type ChainView struct {
CCIPHome map[string]v1_6.CCIPHomeView `json:"ccipHome,omitempty"`
CapabilityRegistry map[string]common_v1_0.CapabilityRegistryView `json:"capabilityRegistry,omitempty"`
MCMSWithTimelock common_v1_0.MCMSWithTimelockView `json:"mcmsWithTimelock"`
LinkToken common_v1_0.LinkTokenView `json:"linkToken"`
StaticLinkToken common_v1_0.StaticLinkTokenView `json:"staticLinkToken"`
LinkToken linkviewv10.LinkTokenView `json:"linkToken"`
StaticLinkToken linkviewv10.StaticLinkTokenView `json:"staticLinkToken"`

UpdateMu *sync.Mutex `json:"-"`
}
Expand Down Expand Up @@ -81,8 +84,8 @@ func NewChain() ChainView {
CapabilityRegistry: make(map[string]common_v1_0.CapabilityRegistryView),
CCIPHome: make(map[string]v1_6.CCIPHomeView),
MCMSWithTimelock: common_v1_0.MCMSWithTimelockView{},
LinkToken: common_v1_0.LinkTokenView{},
StaticLinkToken: common_v1_0.StaticLinkTokenView{},
LinkToken: linkviewv10.LinkTokenView{},
StaticLinkToken: linkviewv10.StaticLinkTokenView{},
UpdateMu: &sync.Mutex{},
}
}
Expand Down
13 changes: 7 additions & 6 deletions deployment/common/changeset/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

"github.com/ethereum/go-ethereum/common"
owner_helpers "github.com/smartcontractkit/ccip-owner-contracts/pkg/gethwrappers"
linkviewv10 "github.com/smartcontractkit/cld-changesets/pkg/contract/link/view/v1_0"

"github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/link_token_interface"
"github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/link_token"
Expand Down Expand Up @@ -195,11 +196,11 @@ type LinkTokenState struct {

// Deprecated: use GenerateLinkView from deployment/common/changeset/state/evm.go instead
// if you are changing this, please make the similar changes in deployment/common/changeset/state
func (s LinkTokenState) GenerateLinkView() (v1_0.LinkTokenView, error) {
func (s LinkTokenState) GenerateLinkView() (linkviewv10.LinkTokenView, error) {
if s.LinkToken == nil {
return v1_0.LinkTokenView{}, errors.New("link token not found")
return linkviewv10.LinkTokenView{}, errors.New("link token not found")
}
return v1_0.GenerateLinkTokenView(s.LinkToken)
return linkviewv10.GenerateLinkTokenView(s.LinkToken)
}

// MaybeLoadLinkTokenState loads the LinkTokenState state for each chain in the given environment.
Expand Down Expand Up @@ -258,11 +259,11 @@ type StaticLinkTokenState struct {

// Deprecated: use GenerateStaticLinkView from deployment/common/changeset/state/evm.go instead
// if you are changing this, please make the similar changes in deployment/common/changeset/state
func (s StaticLinkTokenState) GenerateStaticLinkView() (v1_0.StaticLinkTokenView, error) {
func (s StaticLinkTokenState) GenerateStaticLinkView() (linkviewv10.StaticLinkTokenView, error) {
if s.StaticLinkToken == nil {
return v1_0.StaticLinkTokenView{}, errors.New("static link token not found")
return linkviewv10.StaticLinkTokenView{}, errors.New("static link token not found")
}
return v1_0.GenerateStaticLinkTokenView(s.StaticLinkToken)
return linkviewv10.GenerateStaticLinkTokenView(s.StaticLinkToken)
}

// Deprecated: use MaybeLoadStaticLinkTokenState from deployment/common/changeset/state/evm.go instead
Expand Down
13 changes: 7 additions & 6 deletions deployment/common/changeset/state/evm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/ethereum/go-ethereum/common"
bindings "github.com/smartcontractkit/ccip-owner-contracts/pkg/gethwrappers"
linkviewv10 "github.com/smartcontractkit/cld-changesets/pkg/contract/link/view/v1_0"

"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
"github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/link_token_interface"
Expand Down Expand Up @@ -392,11 +393,11 @@ type LinkTokenState struct {
LinkToken *link_token.LinkToken
}

func (s LinkTokenState) GenerateLinkView() (view.LinkTokenView, error) {
func (s LinkTokenState) GenerateLinkView() (linkviewv10.LinkTokenView, error) {
if s.LinkToken == nil {
return view.LinkTokenView{}, errors.New("link token not found")
return linkviewv10.LinkTokenView{}, errors.New("link token not found")
}
return view.GenerateLinkTokenView(s.LinkToken)
return linkviewv10.GenerateLinkTokenView(s.LinkToken)
}

func MaybeLoadLinkTokenChainState(chain cldf_evm.Chain, addresses map[string]cldf.TypeAndVersion) (*LinkTokenState, error) {
Expand Down Expand Up @@ -428,11 +429,11 @@ type StaticLinkTokenState struct {
StaticLinkToken *link_token_interface.LinkToken
}

func (s StaticLinkTokenState) GenerateStaticLinkView() (view.StaticLinkTokenView, error) {
func (s StaticLinkTokenState) GenerateStaticLinkView() (linkviewv10.StaticLinkTokenView, error) {
if s.StaticLinkToken == nil {
return view.StaticLinkTokenView{}, errors.New("static link token not found")
return linkviewv10.StaticLinkTokenView{}, errors.New("static link token not found")
}
return view.GenerateStaticLinkTokenView(s.StaticLinkToken)
return linkviewv10.GenerateStaticLinkTokenView(s.StaticLinkToken)
}

func MaybeLoadStaticLinkTokenState(chain cldf_evm.Chain, addresses map[string]cldf.TypeAndVersion) (*StaticLinkTokenState, error) {
Expand Down
61 changes: 0 additions & 61 deletions deployment/common/view/v1_0/link_token.go
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions deployment/common/view/v1_0/link_token_test.go
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions deployment/common/view/v1_0/static_link_token.go
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions deployment/common/view/v1_0/static_link_token_test.go
View file
Open in desktop

This file was deleted.

Loading
Loading