Skip to content

[CLD-1924]: fix(deployment): remove ported code to cld-changesets #22188

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
graham-chainlink wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[CLD-1924]: fix(deployment): remove ported code to cld-changesets #22188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions core/scripts/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ require (
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260422075950-29f37fa83c8a
github.com/smartcontractkit/chainlink-common/keystore v1.1.0
github.com/smartcontractkit/chainlink-data-streams v0.1.13
github.com/smartcontractkit/chainlink-deployments-framework v0.96.0
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.17
github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18
github.com/smartcontractkit/chainlink-testing-framework/framework/components/chiprouter v1.0.2
github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose v0.1.20
github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.5
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 @@ -520,9 +520,10 @@ require (
github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260409184948-5b16fae57fe0 // indirect
github.com/smartcontractkit/chainlink-testing-framework/framework/components/fake v0.10.0 // indirect
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2 // indirect
github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 // indirect
github.com/smartcontractkit/chainlink-ton/deployment v0.0.0-20260415120434-cecc380f8d87 // indirect
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-20260427124350-0ce3f7465dd7 // 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
25 changes: 14 additions & 11 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.

7 changes: 3 additions & 4 deletions deployment/common/changeset/example/solana_transfer_mcm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
mcmssolanasdk "github.com/smartcontractkit/mcms/sdk/solana"
"github.com/smartcontractkit/mcms/types"

cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
cldchangesetssolana "github.com/smartcontractkit/cld-changesets/pkg/family/solana"

cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"

solanachangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset/solana"
"github.com/smartcontractkit/chainlink/deployment/common/changeset/state"
"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
)
Expand Down Expand Up @@ -100,8 +100,7 @@ func (f TransferFromTimelock) Apply(e cldf.Environment, config TransferFromTimel
proposerID := mcmssolanasdk.ContractAddress(mcmState.McmProgram, mcmssolanasdk.PDASeed(mcmState.ProposerMcmSeed))
timelocks[chainSelector] = timelockID
proposers[chainSelector] = proposerID
ixs, err := solanachangeset.FundFromAddressIxs(
solChain,
ixs, err := cldchangesetssolana.FundFromAddressIxs(
timelockSignerPDA,
[]solana.PublicKey{cfgAmounts.To},
cfgAmounts.Amount)
Expand Down
139 changes: 0 additions & 139 deletions deployment/common/changeset/jobspec.go
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions deployment/common/changeset/solana/fund_mcm_pdas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (
"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"

cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
cldchangesetssolana "github.com/smartcontractkit/cld-changesets/pkg/family/solana"

cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
"github.com/smartcontractkit/chainlink/deployment/common/changeset/state"
)

Expand Down Expand Up @@ -80,28 +81,28 @@ func (f FundMCMSignersChangeset) Apply(e cldf.Environment, config FundMCMSignerC
return cldf.ChangesetOutput{}, fmt.Errorf("failed to load MCMS state: %w", err)
}

err = FundFromDeployerKey(
err = cldchangesetssolana.FundFromDeployerKey(
solChain,
[]solana.PublicKey{state.GetTimelockSignerPDA(mcmState.TimelockProgram, mcmState.TimelockSeed)},
cfgAmounts.Timelock)
if err != nil {
return cldf.ChangesetOutput{}, fmt.Errorf("failed to fund timelock signer on chain %d: %w", chainSelector, err)
}
err = FundFromDeployerKey(
err = cldchangesetssolana.FundFromDeployerKey(
solChain,
[]solana.PublicKey{state.GetMCMSignerPDA(mcmState.McmProgram, mcmState.ProposerMcmSeed)},
cfgAmounts.ProposeMCM)
if err != nil {
return cldf.ChangesetOutput{}, fmt.Errorf("failed to fund MCMS proposer on chain %d: %w", chainSelector, err)
}
err = FundFromDeployerKey(
err = cldchangesetssolana.FundFromDeployerKey(
solChain,
[]solana.PublicKey{state.GetMCMSignerPDA(mcmState.McmProgram, mcmState.CancellerMcmSeed)},
cfgAmounts.CancellerMCM)
if err != nil {
return cldf.ChangesetOutput{}, fmt.Errorf("failed to fund MCMS canceller on chain %d: %w", chainSelector, err)
}
err = FundFromDeployerKey(
err = cldchangesetssolana.FundFromDeployerKey(
solChain,
[]solana.PublicKey{state.GetMCMSignerPDA(mcmState.McmProgram, mcmState.BypasserMcmSeed)},
cfgAmounts.BypasserMCM)
Expand Down
Loading
Loading