Skip to content

[pull] develop from smartcontractkit:develop #621

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

Merged
pull merged 2 commits into from
Sep 17, 2026
Merged

[pull] develop from smartcontractkit:develop #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fff28e
Lint Roller 7: core/services (#23499)
kalverra Sep 17, 2026
b9d3e2b
Bump common and evm (#23770)
cedric-cordenier Sep 17, 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
4 changes: 4 additions & 0 deletions _typos.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,8 @@ BRIN = "BRIN"
writeable = "writeable"
transferrable = "transferrable"
supercedes = "supercedes"
# Domain terms & identifiers
ot = "ot"
ba = "ba"
BA = "BA"
unparseable = "unparseable"
42 changes: 0 additions & 42 deletions core/scripts/cre/environment/environment/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,8 @@ import (
chipingressset "github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose/chip_ingress_set"
"github.com/smartcontractkit/chainlink-testing-framework/framework/tracking"

keystone_changeset "github.com/smartcontractkit/chainlink/deployment/keystone/changeset"
cldlogger "github.com/smartcontractkit/chainlink/deployment/logger"
libc "github.com/smartcontractkit/chainlink/system-tests/lib/conversions"
"github.com/smartcontractkit/chainlink/system-tests/lib/cre"
libcontracts "github.com/smartcontractkit/chainlink/system-tests/lib/cre/contracts"
"github.com/smartcontractkit/chainlink/system-tests/lib/cre/don/gateway"
creenv "github.com/smartcontractkit/chainlink/system-tests/lib/cre/environment"
blockchains_sets "github.com/smartcontractkit/chainlink/system-tests/lib/cre/environment/blockchains/sets"
Expand Down Expand Up @@ -205,8 +202,6 @@ var StartCmdRecoverHandlerFunc = func(p any, persistedChipIngressStackState *env
func startCmd() *cobra.Command {
var (
extraAllowedGatewayPorts []int
withExampleFlag bool
exampleWorkflowTimeout time.Duration
withPluginsDockerImage string
doSetup bool
cleanupOnFailure bool
Expand Down Expand Up @@ -403,8 +398,6 @@ func startCmd() *cobra.Command {
}
}

registryChainOut := output.CreEnvironment.Blockchains[0]

dxErr := trackStartup(true, hasBuiltDockerImage(in), output.CreEnvironment.Provider.Type, nil, nil, "")
if dxErr != nil {
fmt.Fprintf(os.Stderr, "failed to track startup: %s\n", dxErr)
Expand Down Expand Up @@ -488,39 +481,6 @@ func startCmd() *cobra.Command {
return errors.Wrap(startBillingErr, "failed to start Billing Platform Service")
}
}

if withExampleFlag {
if output.GatewayConnectors == nil || len(output.GatewayConnectors.Configurations) == 0 {
return errors.New("no gateway connector configurations found")
}

fmt.Print(libformat.PurpleText("\nRegistering and verifying example workflow\n\n"))
workflowRegistryAddress := libcontracts.MustGetAddressFromDataStore(output.CreEnvironment.CldfEnvironment.DataStore, output.CreEnvironment.Blockchains[0].ChainSelector(), keystone_changeset.WorkflowRegistry.String(), output.CreEnvironment.ContractVersions[keystone_changeset.WorkflowRegistry.String()], "")

var workflowDonID uint32
var donFamily string
for idx, don := range output.Dons.List() {
if don.HasFlag(cre.WorkflowDON) {
workflowDonID = libc.MustSafeUint32(idx + 1)
donFamily = don.DonFamily()
break
}
}

if workflowDonID == 0 {
return errors.New("no workflow DON found")
}

donFamily, familyErr := finalizeWorkflowDonFamily(donFamily)
if familyErr != nil {
return familyErr
}

deployErr := deployAndVerifyExampleWorkflow(cmdContext, registryChainOut.CtfOutput().Nodes[0].ExternalHTTPUrl, workflowDonID, donFamily, exampleWorkflowTimeout, workflowRegistryAddress, output.CreEnvironment.ContractVersions[keystone_changeset.WorkflowRegistry.String()])
if deployErr != nil {
fmt.Printf("Failed to deploy and verify example workflow: %s\n", deployErr)
}
}
fmt.Print(libformat.PurpleText("\nEnvironment setup completed successfully in %.2f seconds\n\n", time.Since(provisioningStartTime).Seconds()))
fmt.Print("To terminate execute:`go run . env stop`\n\n")

Expand Down Expand Up @@ -549,8 +509,6 @@ func startCmd() *cobra.Command {
cmd.Flags().DurationVarP(&cleanupWait, "wait-on-error-timeout", "w", 15*time.Second, "Time to wait before removing Docker containers if environment fails to start (e.g. 10s, 1m, 1h)")
cmd.Flags().BoolVarP(&cleanupOnFailure, "cleanup-on-error", "l", false, "Whether to remove Docker containers if startup fails")
cmd.Flags().IntSliceVarP(&extraAllowedGatewayPorts, "extra-allowed-gateway-ports", "e", []int{}, "Extra allowed ports for outgoing connections from the Gateway Connector (e.g. 8080,8081)")
cmd.Flags().BoolVarP(&withExampleFlag, "with-example", "x", false, "Deploys and registers example workflow")
cmd.Flags().DurationVarP(&exampleWorkflowTimeout, "example-workflow-timeout", "u", 5*time.Minute, "Time to wait until example workflow succeeds (e.g. 10s, 1m, 1h)")
cmd.Flags().StringVarP(&withPluginsDockerImage, "with-plugins-docker-image", "p", "", "DEPRECATED:Docker image to use (set Docker image in TOML config instead)")
cmd.Flags().BoolVar(&withChipIngressStack, "with-chip-ingress-stack", false, "Deploy Chip Ingress stack (Chip Ingress + Red Panda)")
cmd.Flags().BoolVarP(&withChipIngressStack, "with-beholder", "b", false, "Deprecated: use --with-chip-ingress-stack. Deploy Chip Ingress stack (Chip Ingress + Red Panda)")
Expand Down
235 changes: 0 additions & 235 deletions core/scripts/cre/environment/environment/examples.go
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion core/scripts/cre/environment/environment/workflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ func workflowCmds() *cobra.Command {
Long: `Commands to manage workflows`,
}

workflowCmd.AddCommand(deployAndVerifyExampleWorkflowCmd())
workflowCmd.AddCommand(deleteWorkflowCmd())
workflowCmd.AddCommand(deleteAllWorkflowsCmd())
workflowCmd.AddCommand(compileWorkflowCmd())
Expand Down
10 changes: 4 additions & 6 deletions core/scripts/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,15 @@ require (
github.com/shopspring/decimal v1.4.0
github.com/smartcontractkit/chain-selectors v1.0.109
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260908164107-3de1349d970b
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260915135448-9ec0150ecb5d
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260917115705-1d3a14a9b049
github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20260903141829-ef07b52a737d
github.com/smartcontractkit/chainlink-deployments-framework v0.122.2
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260914143713-424babc506ab
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260917132551-2a2b38e8b744
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260713161920-de075095648b
github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea
github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.8
github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose v0.1.23
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5
github.com/smartcontractkit/chainlink/core/scripts/cre/environment/examples/workflows/proof-of-reserve/cron-based v0.0.0-00010101000000-000000000000
github.com/smartcontractkit/chainlink/system-tests/lib v0.0.0-00010101000000-000000000000
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
Expand All @@ -58,7 +57,6 @@ require (
github.com/urfave/cli v1.22.17
golang.org/x/sync v0.22.0
golang.org/x/text v0.41.0
gopkg.in/yaml.v3 v3.0.1
)

require (
Expand Down Expand Up @@ -516,12 +514,11 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260908155618-50f521d70e62 // indirect
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62 // indirect
github.com/smartcontractkit/chainlink-ccv v0.12.0 // indirect
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260724142814-45996a1bcb72 // indirect
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260915184316-2730f1867c92 // indirect
github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 // indirect
github.com/smartcontractkit/chainlink-data-streams v1.1.1 // indirect
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20260423135514-5b1a7565a99c // indirect
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20260724153515-bb6a2de39bcb // indirect
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20260723212800-b2f21d31b1d2 // indirect
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20260625152110-9afcf56e4053 // indirect
Expand Down Expand Up @@ -673,6 +670,7 @@ require (
gopkg.in/ini.v1 v1.67.3 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.2 // indirect
k8s.io/api v0.36.4 // indirect
k8s.io/apiextensions-apiserver v0.36.0 // indirect
Expand Down
Loading
Loading