Skip to content

Commit 3b96e6a

Browse files
fix(deployment): remove ported code to cld-changesets
Remove solana/helpers.go and jobspec.go as they have been moved over to cld-changesets JIRA: https://smartcontract-it.atlassian.net/browse/CLD-1924
1 parent 8bb73b5 commit 3b96e6a

18 files changed

Lines changed: 142 additions & 294 deletions

File tree

core/scripts/go.mod

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ require (
4949
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260422075950-29f37fa83c8a
5050
github.com/smartcontractkit/chainlink-common/keystore v1.1.0
5151
github.com/smartcontractkit/chainlink-data-streams v0.1.13
52-
github.com/smartcontractkit/chainlink-deployments-framework v0.96.0
52+
github.com/smartcontractkit/chainlink-deployments-framework v0.98.0
5353
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260416173445-80f6efde0a03
54-
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
54+
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260421142741-9c7fbaf7c828
5555
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260420204255-a3f3bdd56877
5656
github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0
57-
github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.17
57+
github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18
5858
github.com/smartcontractkit/chainlink-testing-framework/framework/components/chiprouter v1.0.2
5959
github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose v0.1.20
6060
github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.5
@@ -361,7 +361,7 @@ require (
361361
github.com/jackc/pgconn v1.14.3 // indirect
362362
github.com/jackc/pgio v1.0.0 // indirect
363363
github.com/jackc/pgpassfile v1.0.0 // indirect
364-
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
364+
github.com/jackc/pgproto3/v2 v2.3.4-0.20250125160525-bc041643406d // indirect
365365
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
366366
github.com/jackc/pgtype v1.14.4 // indirect
367367
github.com/jackc/pgx/v5 v5.9.2 // indirect
@@ -520,9 +520,10 @@ require (
520520
github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260409184948-5b16fae57fe0 // indirect
521521
github.com/smartcontractkit/chainlink-testing-framework/framework/components/fake v0.10.0 // indirect
522522
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2 // indirect
523-
github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 // indirect
524-
github.com/smartcontractkit/chainlink-ton/deployment v0.0.0-20260415120434-cecc380f8d87 // indirect
523+
github.com/smartcontractkit/chainlink-ton v0.0.0-20260423161209-5ce1dba9785e // indirect
524+
github.com/smartcontractkit/chainlink-ton/deployment v0.0.0-20260423161209-5ce1dba9785e // indirect
525525
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20260408092456-3c6369888d4a // indirect
526+
github.com/smartcontractkit/cld-changesets v0.0.0-20260427124350-0ce3f7465dd7 // indirect
526527
github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad // indirect
527528
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
528529
github.com/smartcontractkit/mcms v0.41.1 // indirect

core/scripts/go.sum

Lines changed: 14 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deployment/common/changeset/example/solana_transfer_mcm.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
mcmssolanasdk "github.com/smartcontractkit/mcms/sdk/solana"
1111
"github.com/smartcontractkit/mcms/types"
1212

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

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

17-
solanachangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset/solana"
1818
"github.com/smartcontractkit/chainlink/deployment/common/changeset/state"
1919
"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
2020
)
@@ -100,8 +100,7 @@ func (f TransferFromTimelock) Apply(e cldf.Environment, config TransferFromTimel
100100
proposerID := mcmssolanasdk.ContractAddress(mcmState.McmProgram, mcmssolanasdk.PDASeed(mcmState.ProposerMcmSeed))
101101
timelocks[chainSelector] = timelockID
102102
proposers[chainSelector] = proposerID
103-
ixs, err := solanachangeset.FundFromAddressIxs(
104-
solChain,
103+
ixs, err := cldchangesetssolana.FundFromAddressIxs(
105104
timelockSignerPDA,
106105
[]solana.PublicKey{cfgAmounts.To},
107106
cfgAmounts.Amount)

deployment/common/changeset/jobspec.go

Lines changed: 0 additions & 139 deletions
This file was deleted.

deployment/common/changeset/solana/fund_mcm_pdas.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import (
77
"github.com/gagliardetto/solana-go"
88
"github.com/gagliardetto/solana-go/rpc"
99

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

12+
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
1213
"github.com/smartcontractkit/chainlink/deployment/common/changeset/state"
1314
)
1415

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

83-
err = FundFromDeployerKey(
84+
err = cldchangesetssolana.FundFromDeployerKey(
8485
solChain,
8586
[]solana.PublicKey{state.GetTimelockSignerPDA(mcmState.TimelockProgram, mcmState.TimelockSeed)},
8687
cfgAmounts.Timelock)
8788
if err != nil {
8889
return cldf.ChangesetOutput{}, fmt.Errorf("failed to fund timelock signer on chain %d: %w", chainSelector, err)
8990
}
90-
err = FundFromDeployerKey(
91+
err = cldchangesetssolana.FundFromDeployerKey(
9192
solChain,
9293
[]solana.PublicKey{state.GetMCMSignerPDA(mcmState.McmProgram, mcmState.ProposerMcmSeed)},
9394
cfgAmounts.ProposeMCM)
9495
if err != nil {
9596
return cldf.ChangesetOutput{}, fmt.Errorf("failed to fund MCMS proposer on chain %d: %w", chainSelector, err)
9697
}
97-
err = FundFromDeployerKey(
98+
err = cldchangesetssolana.FundFromDeployerKey(
9899
solChain,
99100
[]solana.PublicKey{state.GetMCMSignerPDA(mcmState.McmProgram, mcmState.CancellerMcmSeed)},
100101
cfgAmounts.CancellerMCM)
101102
if err != nil {
102103
return cldf.ChangesetOutput{}, fmt.Errorf("failed to fund MCMS canceller on chain %d: %w", chainSelector, err)
103104
}
104-
err = FundFromDeployerKey(
105+
err = cldchangesetssolana.FundFromDeployerKey(
105106
solChain,
106107
[]solana.PublicKey{state.GetMCMSignerPDA(mcmState.McmProgram, mcmState.BypasserMcmSeed)},
107108
cfgAmounts.BypasserMCM)

0 commit comments

Comments
 (0)