From ef8f6bc98652a82c0c61d3a2dc32b7ed896b11ba Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 15:07:57 -0400 Subject: [PATCH 01/13] override invalid chain ID --- core/internal/testutils/evmtest/evmtest.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/internal/testutils/evmtest/evmtest.go b/core/internal/testutils/evmtest/evmtest.go index e24e959bb31..ce02fe64c5c 100644 --- a/core/internal/testutils/evmtest/evmtest.go +++ b/core/internal/testutils/evmtest/evmtest.go @@ -120,12 +120,19 @@ func NewChainOpts(t testing.TB, testopts TestChainOpts) (logger.Logger, keystore return lggr, testopts.KeyStore, opts } +const NullClientChainID = 1399100 + // Deprecated, this is a replacement function for tests for now removed default evmChainID logic func MustGetDefaultChainID(t testing.TB, evmCfgs configtoml.EVMConfigs) *big.Int { if len(evmCfgs) == 0 { t.Fatalf("at least one evm chain config must be defined") } - return evmCfgs[0].ChainID.ToInt() + chainID := evmCfgs[0].ChainID.ToInt() + if chainID.Uint64() == 0 { + chainID = big.NewInt(NullClientChainID) + t.Logf("Overriding zero chain ID with %d. Update this test to use a valid chain ID.", NullClientChainID) + } + return chainID } // Deprecated, this is a replacement function for tests for now removed default chain logic From bcc7872e70e72652084d241f0a5f8ebb7f7a3ca1 Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 21:16:53 -0400 Subject: [PATCH 02/13] more fixes --- core/cmd/direct-request-spec-template.yml | 2 +- core/cmd/eth_keys_commands_test.go | 4 +- core/cmd/ocr-bootstrap-spec.yml | 2 +- core/cmd/shell_remote_test.go | 2 +- core/internal/cltest/job_factories.go | 4 +- core/internal/testutils/testutils.go | 2 +- core/services/job/helpers_test.go | 18 +++--- core/services/job/runner_integration_test.go | 16 +++--- core/testdata/testspecs/v2_specs.go | 16 +++--- core/web/health_controller_test.go | 59 ++++++++++++++++---- core/web/jobs_controller_test.go | 24 +++++--- core/web/pipeline_runs_controller_test.go | 4 +- core/web/resolver/job_test.go | 3 +- core/web/testdata/body/health-failing.html | 4 +- core/web/testdata/body/health-failing.json | 2 +- core/web/testdata/body/health-failing.txt | 2 +- core/web/testdata/body/health.html | 26 ++++----- core/web/testdata/body/health.json | 52 ++++++++--------- core/web/testdata/body/health.txt | 26 ++++----- go.mod | 2 +- go.sum | 4 +- 21 files changed, 160 insertions(+), 114 deletions(-) diff --git a/core/cmd/direct-request-spec-template.yml b/core/cmd/direct-request-spec-template.yml index 5774e9a7933..1e8a4bdcc83 100644 --- a/core/cmd/direct-request-spec-template.yml +++ b/core/cmd/direct-request-spec-template.yml @@ -1,6 +1,6 @@ type = "directrequest" schemaVersion = 1 -evmChainID = "0" +evmChainID = "1399100" name = "%s" contractAddress = "0x613a38AC1659769640aaE063C651F48E0250454C" externalJobID = "%s" diff --git a/core/cmd/eth_keys_commands_test.go b/core/cmd/eth_keys_commands_test.go index 71001a31be7..d8cd494babb 100644 --- a/core/cmd/eth_keys_commands_test.go +++ b/core/cmd/eth_keys_commands_test.go @@ -160,7 +160,7 @@ func TestShell_ListETHKeys_Disabled(t *testing.T) { assert.Nil(t, balances[0].LinkBalance) assert.Nil(t, balances[0].MaxGasPriceWei) assert.Equal(t, []string{ - k.Address.String(), "0", "Unknown", "Unknown", "false", + k.Address.String(), testutils.FixtureChainID.String(), "Unknown", "Unknown", "false", balances[0].UpdatedAt.String(), balances[0].CreatedAt.String(), "None", }, balances[0].ToRow()) } @@ -189,7 +189,7 @@ func TestShell_CreateETHKey(t *testing.T) { require.NoError(t, err) require.Len(t, keys, 1) - id := big.NewInt(0) + id := testutils.FixtureChainID set := flag.NewFlagSet("test", 0) flagSetApplyFromAction(client.CreateETHKey, set, "") diff --git a/core/cmd/ocr-bootstrap-spec.yml b/core/cmd/ocr-bootstrap-spec.yml index 058fdeb2c14..86fce82ea21 100644 --- a/core/cmd/ocr-bootstrap-spec.yml +++ b/core/cmd/ocr-bootstrap-spec.yml @@ -3,6 +3,6 @@ schemaVersion = 1 contractAddress = "0x27548a32b9aD5D64c5945EaE9Da5337bc3169D15" externalJobID = "%s" name = "%s" -evmChainID = "0" +evmChainID = "1399100" p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"] isBootstrapPeer = true diff --git a/core/cmd/shell_remote_test.go b/core/cmd/shell_remote_test.go index 7702f872ca8..3cff8546248 100644 --- a/core/cmd/shell_remote_test.go +++ b/core/cmd/shell_remote_test.go @@ -141,7 +141,7 @@ func TestShell_ReplayBlocks(t *testing.T) { c := cli.NewContext(nil, set, nil) assert.ErrorContains(t, client.ReplayFromBlock(c), "chain id does not match any local chains") - require.NoError(t, set.Set("chain-id", "0")) + require.NoError(t, set.Set("chain-id", testutils.FixtureChainID.String())) c = cli.NewContext(nil, set, nil) assert.NoError(t, client.ReplayFromBlock(c)) diff --git a/core/internal/cltest/job_factories.go b/core/internal/cltest/job_factories.go index 0839d36aefb..08550b7d9b7 100644 --- a/core/internal/cltest/job_factories.go +++ b/core/internal/cltest/job_factories.go @@ -23,7 +23,7 @@ const ( type = "offchainreporting" schemaVersion = 1 contractAddress = "%s" - evmChainID = "0" + evmChainID = "%s" p2pPeerID = "%s" p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"] isBootstrapPeer = false @@ -39,7 +39,7 @@ const ( ) func MinimalOCRNonBootstrapSpec(contractAddress, transmitterAddress types.EIP55Address, peerID p2pkey.PeerID, keyBundleID string) string { - return fmt.Sprintf(minimalOCRNonBootstrapTemplate, contractAddress, peerID, transmitterAddress.Hex(), keyBundleID) + return fmt.Sprintf(minimalOCRNonBootstrapTemplate, contractAddress, testutils.FixtureChainID.String(), peerID, transmitterAddress.Hex(), keyBundleID) } func MustInsertWebhookSpec(t *testing.T, ds sqlutil.DataSource) (job.Job, job.WebhookSpec) { diff --git a/core/internal/testutils/testutils.go b/core/internal/testutils/testutils.go index 329b436662b..700b79c20e1 100644 --- a/core/internal/testutils/testutils.go +++ b/core/internal/testutils/testutils.go @@ -41,7 +41,7 @@ const ( // FixtureChainID matches the chain always added by fixtures.sql // It is set to 0 since no real chain ever has this ID and allows a virtual // "test" chain ID to be used without clashes -var FixtureChainID = big.NewInt(0) +var FixtureChainID = big.NewInt(1399100) // SimulatedChainID is the chain ID for the go-ethereum simulated backend var SimulatedChainID = big.NewInt(1337) diff --git a/core/services/job/helpers_test.go b/core/services/job/helpers_test.go index ca3491d11e3..80391bbbc9d 100644 --- a/core/services/job/helpers_test.go +++ b/core/services/job/helpers_test.go @@ -18,6 +18,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-evm/pkg/client/clienttest" + chainlinkevmbig "github.com/smartcontractkit/chainlink-evm/pkg/utils/big" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest" @@ -34,7 +35,7 @@ const ( type = "offchainreporting" schemaVersion = 1 contractAddress = "%s" -evmChainID = "0" +evmChainID = "%s" p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"] isBootstrapPeer = false keyBundleID = "%s" @@ -107,7 +108,7 @@ ds1 -> ds1_parse -> ds1_multiply; transmitterAddress = "%s" keyBundleID = "%s" observationTimeout = "10s" - evmChainID = "0" + evmChainID = "%s" observationSource = """ ds1 [type=http method=GET url="%s" allowunrestrictednetworkaccess="true" %s]; ds1_parse [type=jsonparse path="USD" lax=true]; @@ -118,14 +119,14 @@ ds1 -> ds1_parse; type = "offchainreporting" schemaVersion = 1 contractAddress = "%s" - evmChainID = "0" + evmChainID = "%s" isBootstrapPeer = true ` ocrJobSpecText = ` type = "offchainreporting" schemaVersion = 1 contractAddress = "%s" -evmChainID = "0" +evmChainID = "%s" p2pPeerID = "%s" p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"] isBootstrapPeer = false @@ -162,7 +163,7 @@ func makeOCRJobSpec(t *testing.T, transmitterAddress common.Address, b1, b2 stri peerID := cltest.DefaultP2PPeerID ocrKeyID := cltest.DefaultOCRKeyBundleID - jobSpecText := fmt.Sprintf(ocrJobSpecText, testutils.NewAddress().Hex(), peerID, ocrKeyID, transmitterAddress.Hex(), b1, b2) + jobSpecText := fmt.Sprintf(ocrJobSpecText, testutils.NewAddress().Hex(), testutils.FixtureChainID.String(), peerID, ocrKeyID, transmitterAddress.Hex(), b1, b2) dbSpec := job.Job{ ExternalJobID: uuid.New(), @@ -203,6 +204,7 @@ func makeMinimalHTTPOracleSpec(t *testing.T, db *sqlx.DB, cfg chainlink.GeneralC ContractConfigTrackerSubscribeInterval: models.Interval(2 * time.Minute), ContractConfigTrackerPollInterval: models.Interval(1 * time.Minute), ContractConfigConfirmations: uint16(3), + EVMChainID: chainlinkevmbig.New(testutils.FixtureChainID), } var os = job.Job{ Name: null.NewString("a job", true), @@ -210,7 +212,7 @@ func makeMinimalHTTPOracleSpec(t *testing.T, db *sqlx.DB, cfg chainlink.GeneralC SchemaVersion: 1, ExternalJobID: uuid.New(), } - s := fmt.Sprintf(minimalNonBootstrapTemplate, contractAddress, transmitterAddress, keyBundle, fetchUrl, timeout) + s := fmt.Sprintf(minimalNonBootstrapTemplate, contractAddress, transmitterAddress, keyBundle, testutils.FixtureChainID.String(), fetchUrl, timeout) keyStore := cltest.NewKeyStore(t, db) legacyChains := evmtest.NewLegacyChains(t, evmtest.TestChainOpts{ ChainConfigs: cfg.EVMConfigs(), @@ -240,7 +242,7 @@ func MakeVoterTurnoutOCRJobSpecWithHTTPURL(t *testing.T, transmitterAddress comm t.Helper() ocrKeyID := cltest.DefaultOCRKeyBundleID ds := fmt.Sprintf(voterTurnoutDataSourceTemplate, b1, httpURL, b2) - voterTurnoutJobSpec := fmt.Sprintf(ocrJobSpecTemplate, testutils.NewAddress().Hex(), ocrKeyID, transmitterAddress.Hex(), ds) + voterTurnoutJobSpec := fmt.Sprintf(ocrJobSpecTemplate, testutils.NewAddress().Hex(), testutils.FixtureChainID.String(), ocrKeyID, transmitterAddress.Hex(), ds) return makeOCRJobSpecFromToml(t, voterTurnoutJobSpec) } @@ -248,7 +250,7 @@ func makeSimpleFetchOCRJobSpecWithHTTPURL(t *testing.T, transmitterAddress commo t.Helper() ocrKeyID := cltest.DefaultOCRKeyBundleID ds := fmt.Sprintf(simpleFetchDataSourceTemplate, httpURL, lax) - simpleFetchJobSpec := fmt.Sprintf(ocrJobSpecTemplate, testutils.NewAddress().Hex(), ocrKeyID, transmitterAddress.Hex(), ds) + simpleFetchJobSpec := fmt.Sprintf(ocrJobSpecTemplate, testutils.NewAddress().Hex(), testutils.FixtureChainID.String(), ocrKeyID, transmitterAddress.Hex(), ds) return makeOCRJobSpecFromToml(t, simpleFetchJobSpec) } diff --git a/core/services/job/runner_integration_test.go b/core/services/job/runner_integration_test.go index c58024bdcda..f3ffbd29cdb 100644 --- a/core/services/job/runner_integration_test.go +++ b/core/services/job/runner_integration_test.go @@ -212,7 +212,7 @@ func TestRunner(t *testing.T) { jb, err := ocr.ValidatedOracleSpecToml(config, legacyChains, fmt.Sprintf(` type = "offchainreporting" schemaVersion = 1 - evmChainID = 0 + evmChainID = "%s" transmitterID = "%s" contractAddress = "0x613a38AC1659769640aaE063C651F48E0250454C" isBootstrapPeer = false @@ -231,7 +231,7 @@ func TestRunner(t *testing.T) { ds1 -> ds1_parse -> ds1_multiply -> answer1; answer1 [type=median index=0]; """ - `, placeHolderAddress.String())) + `, testutils.FixtureChainID.String(), placeHolderAddress.String())) require.NoError(t, err) // Should error creating it err = jobORM.CreateJob(ctx, &jb) @@ -455,9 +455,9 @@ answer1 [type=median index=0]; schemaVersion = 1 contractAddress = "%s" isBootstrapPeer = true - evmChainID = "0" + evmChainID = "%s" ` - s = fmt.Sprintf(s, cltest.NewEIP55Address()) + s = fmt.Sprintf(s, cltest.NewEIP55Address(), testutils.FixtureChainID.String()) jb, err := ocr.ValidatedOracleSpecToml(config, legacyChains, s) require.NoError(t, err) err = toml.Unmarshal([]byte(s), &jb) @@ -493,7 +493,7 @@ answer1 [type=median index=0]; kb, err := keyStore.OCR().Create(ctx) require.NoError(t, err) - s := fmt.Sprintf(minimalNonBootstrapTemplate, cltest.NewEIP55Address(), transmitterAddress.Hex(), kb.ID(), "http://blah.com", "") + s := fmt.Sprintf(minimalNonBootstrapTemplate, cltest.NewEIP55Address(), transmitterAddress.Hex(), kb.ID(), testutils.FixtureChainID.String(), "http://blah.com", "") jb, err := ocr.ValidatedOracleSpecToml(config, legacyChains, s) require.NoError(t, err) err = toml.Unmarshal([]byte(s), &jb) @@ -525,7 +525,7 @@ answer1 [type=median index=0]; }) t.Run("test min bootstrap", func(t *testing.T) { - s := fmt.Sprintf(minimalBootstrapTemplate, cltest.NewEIP55Address()) + s := fmt.Sprintf(minimalBootstrapTemplate, cltest.NewEIP55Address(), testutils.FixtureChainID.String()) jb, err := ocr.ValidatedOracleSpecToml(config, legacyChains, s) require.NoError(t, err) err = toml.Unmarshal([]byte(s), &jb) @@ -585,7 +585,7 @@ answer1 [type=median index=0]; kb, err := keyStore.OCR().Create(ctx) require.NoError(t, err) - s := fmt.Sprintf(minimalNonBootstrapTemplate, cltest.NewEIP55Address(), transmitterAddress.Hex(), kb.ID(), "http://blah.com", "") + s := fmt.Sprintf(minimalNonBootstrapTemplate, cltest.NewEIP55Address(), transmitterAddress.Hex(), kb.ID(), testutils.FixtureChainID.String(), "http://blah.com", "") jb, err := ocr.ValidatedOracleSpecToml(config, legacyChains2, s) require.NoError(t, err) err = toml.Unmarshal([]byte(s), &jb) @@ -635,7 +635,7 @@ answer1 [type=median index=0]; // Create a keystore with an ocr key bundle and p2p key. kb, err := keyStore.OCR().Create(ctx) require.NoError(t, err) - spec := fmt.Sprintf(ocrJobSpecTemplate, testutils.NewAddress().Hex(), kb.ID(), transmitterAddress.Hex(), fmt.Sprintf(simpleFetchDataSourceTemplate, "blah", true)) + spec := fmt.Sprintf(ocrJobSpecTemplate, testutils.NewAddress().Hex(), testutils.FixtureChainID.String(), kb.ID(), transmitterAddress.Hex(), fmt.Sprintf(simpleFetchDataSourceTemplate, "blah", true)) jb := makeOCRJobSpecFromToml(t, spec) // Create an OCR job diff --git a/core/testdata/testspecs/v2_specs.go b/core/testdata/testspecs/v2_specs.go index cdaa0641415..e95bd79a926 100644 --- a/core/testdata/testspecs/v2_specs.go +++ b/core/testdata/testspecs/v2_specs.go @@ -63,7 +63,7 @@ type = "directrequest" schemaVersion = 1 name = "%s" contractAddress = "0x613a38AC1659769640aaE063C651F48E0250454C" -evmChainID = "0" +evmChainID = "%s" observationSource = """ ds1 [type=http method=GET url="http://example.com" allowunrestrictednetworkaccess="true"]; ds1_parse [type=jsonparse path="USD"]; @@ -77,7 +77,7 @@ schemaVersion = 1 name = "%s" contractAddress = "0x613a38AC1659769640aaE063C651F48E0250454C" externalJobID = "%s" -evmChainID = "0" +evmChainID = "%s" observationSource = """ ds1 [type=http method=GET url="http://example.com" allowunrestrictednetworkaccess="true"]; ds1_parse [type=jsonparse path="USD"]; @@ -93,7 +93,7 @@ minContractPaymentLinkJuels = "1000000000000000000000" name = "%s" contractAddress = "0x613a38AC1659769640aaE063C651F48E0250454C" externalJobID = "%s" -evmChainID = 0 +evmChainID = "%s" observationSource = """ ds1 [type=http method=GET url="http://example.com" allowunrestrictednetworkaccess="true"]; ds1_parse [type=jsonparse path="USD"]; @@ -107,7 +107,7 @@ schemaVersion = 1 name = "%s" contractAddress = "0x3cCad4715152693fE3BC4460591e3D3Fbd071b42" externalJobID = "%s" -evmChainID = 0 +evmChainID = "%s" threshold = 0.5 absoluteThreshold = 0.0 # optional @@ -148,7 +148,7 @@ observationSource = """ ds -> ds_parse -> ds_multiply; """ [relayConfig] -chainID = 0 +chainID = "%s" [pluginConfig] ` WebhookSpecNoBodyTemplate = ` @@ -273,11 +273,11 @@ func GetDirectRequestSpec() string { } func GetDirectRequestSpecWithUUID(u uuid.UUID) string { - return fmt.Sprintf(DirectRequestSpecTemplate, u, u) + return fmt.Sprintf(DirectRequestSpecTemplate, u, u, testutils.FixtureChainID.String()) } func GetOCR2EVMSpecMinimal() string { - return fmt.Sprintf(OCR2EVMSpecMinimalTemplate, uuid.New()) + return fmt.Sprintf(OCR2EVMSpecMinimalTemplate, uuid.New(), testutils.FixtureChainID.String()) } func GetWebhookSpecNoBody(u uuid.UUID, fetchBridge, submitBridge string) string { @@ -597,7 +597,7 @@ func GenerateOCRSpec(params OCRSpecParams) OCRSpec { ds2BridgeName = params.DS2BridgeName } - evmChainID := "0" + evmChainID := testutils.FixtureChainID.String() if params.EVMChainID != "" { evmChainID = params.EVMChainID } diff --git a/core/web/health_controller_test.go b/core/web/health_controller_test.go index aabe939f19f..0c395b8d7b0 100644 --- a/core/web/health_controller_test.go +++ b/core/web/health_controller_test.go @@ -8,6 +8,7 @@ import ( "net/http" "strings" "testing" + "text/template" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" @@ -110,23 +111,57 @@ var ( ) func TestHealthController_Health_body(t *testing.T) { + templateData := map[string]interface{}{ + "chainID": testutils.FixtureChainID.String(), + } + + bodyJSONTmplt, err := template.New("health.json").Parse(bodyJSON) + require.NoError(t, err) + bodyJSONRes := &bytes.Buffer{} + bodyJSONTmplt.Execute(bodyJSONRes, templateData) + + bodyHTMLTmplt, err := template.New("health.html").Parse(bodyHTML) + require.NoError(t, err) + bodyHTMLRes := &bytes.Buffer{} + bodyHTMLTmplt.Execute(bodyHTMLRes, templateData) + + bodyTXTmplt, err := template.New("health.txt").Parse(bodyTXT) + require.NoError(t, err) + bodyTXTRes := &bytes.Buffer{} + bodyTXTmplt.Execute(bodyTXTRes, templateData) + + bodyJSONFailingTmplt, err := template.New("health.json").Parse(bodyJSONFailing) + require.NoError(t, err) + bodyJSONFailingRes := &bytes.Buffer{} + bodyJSONFailingTmplt.Execute(bodyJSONFailingRes, templateData) + + bodyHTMLFailingTmplt, err := template.New("health.html").Parse(bodyHTMLFailing) + require.NoError(t, err) + bodyHTMLFailingRes := &bytes.Buffer{} + bodyHTMLFailingTmplt.Execute(bodyHTMLFailingRes, templateData) + + bodyTXTFailingTmplt, err := template.New("health.txt").Parse(bodyTXTFailing) + require.NoError(t, err) + bodyTXTFailingRes := &bytes.Buffer{} + bodyTXTFailingTmplt.Execute(bodyTXTFailingRes, templateData) + for _, tc := range []struct { name string path string headers map[string]string expBody string }{ - {"default", "/health", nil, bodyJSON}, - {"json", "/health", map[string]string{"Accept": gin.MIMEJSON}, bodyJSON}, - {"html", "/health", map[string]string{"Accept": gin.MIMEHTML}, bodyHTML}, - {"text", "/health", map[string]string{"Accept": gin.MIMEPlain}, bodyTXT}, - {".txt", "/health.txt", nil, bodyTXT}, - - {"default-failing", "/health?failing", nil, bodyJSONFailing}, - {"json-failing", "/health?failing", map[string]string{"Accept": gin.MIMEJSON}, bodyJSONFailing}, - {"html-failing", "/health?failing", map[string]string{"Accept": gin.MIMEHTML}, bodyHTMLFailing}, - {"text-failing", "/health?failing", map[string]string{"Accept": gin.MIMEPlain}, bodyTXTFailing}, - {".txt-failing", "/health.txt?failing", nil, bodyTXTFailing}, + {"default", "/health", nil, bodyJSONRes.String()}, + {"json", "/health", map[string]string{"Accept": gin.MIMEJSON}, bodyJSONRes.String()}, + {"html", "/health", map[string]string{"Accept": gin.MIMEHTML}, bodyHTMLRes.String()}, + {"text", "/health", map[string]string{"Accept": gin.MIMEPlain}, bodyTXTRes.String()}, + {".txt", "/health.txt", nil, bodyTXTRes.String()}, + + {"default-failing", "/health?failing", nil, bodyJSONFailingRes.String()}, + {"json-failing", "/health?failing", map[string]string{"Accept": gin.MIMEJSON}, bodyJSONFailingRes.String()}, + {"html-failing", "/health?failing", map[string]string{"Accept": gin.MIMEHTML}, bodyHTMLFailingRes.String()}, + {"text-failing", "/health?failing", map[string]string{"Accept": gin.MIMEPlain}, bodyTXTFailingRes.String()}, + {".txt-failing", "/health.txt?failing", nil, bodyTXTFailingRes.String()}, } { t.Run(tc.name, func(t *testing.T) { cfg := configtest.NewGeneralConfig(t, func(cfg *chainlink.Config, secrets *chainlink.Secrets) { @@ -147,7 +182,7 @@ func TestHealthController_Health_body(t *testing.T) { assert.Equal(t, http.StatusMultiStatus, resp.StatusCode) body, err := io.ReadAll(resp.Body) require.NoError(t, err) - if tc.expBody == bodyJSON { + if tc.expBody == bodyJSONRes.String() { // pretty print for comparison var b bytes.Buffer require.NoError(t, json.Indent(&b, body, "", " ")) diff --git a/core/web/jobs_controller_test.go b/core/web/jobs_controller_test.go index f073f85cf75..6740d37ff48 100644 --- a/core/web/jobs_controller_test.go +++ b/core/web/jobs_controller_test.go @@ -119,7 +119,7 @@ func TestJobController_Create_DirectRequest_Fast(t *testing.T) { defer wg.Done() body, err := json.Marshal(web.CreateJobRequest{ - TOML: fmt.Sprintf(testspecs.DirectRequestSpecNoExternalJobID, i), + TOML: fmt.Sprintf(testspecs.DirectRequestSpecNoExternalJobID, i, cltest.FixtureChainID.String()), }) require.NoError(t, err) @@ -170,6 +170,7 @@ func TestJobController_Create_HappyPath(t *testing.T) { DS1BridgeName: b1, DS2BridgeName: b2, Name: nameAndExternalJobID, + EVMChainID: cltest.FixtureChainID.String(), }).Toml() }, assertion: func(t *testing.T, nameAndExternalJobID string, r *http.Response) { @@ -207,10 +208,10 @@ func TestJobController_Create_HappyPath(t *testing.T) { name = "%s" contractAddress = "0x9E40733cC9df84636505f4e6Db28DCa0dC5D1bba" fromAddress = "0xa8037A20989AFcBC51798de9762b351D63ff462e" - evmChainID = 0 + evmChainID = "%s" minIncomingConfigurations = 1 externalJobID = "%s" - `, nameAndExternalJobID, nameAndExternalJobID) + `, nameAndExternalJobID, cltest.FixtureChainID.String(), nameAndExternalJobID) }, assertion: func(t *testing.T, nameAndExternalJobID string, r *http.Response) { require.Equal(t, http.StatusInternalServerError, r.StatusCode) @@ -317,7 +318,7 @@ func TestJobController_Create_HappyPath(t *testing.T) { { name: "directrequest-with-requesters-and-min-contract-payment", tomlTemplate: func(nameAndExternalJobID string) string { - return fmt.Sprintf(testspecs.DirectRequestSpecWithRequestersAndMinContractPaymentTemplate, nameAndExternalJobID, nameAndExternalJobID) + return fmt.Sprintf(testspecs.DirectRequestSpecWithRequestersAndMinContractPaymentTemplate, nameAndExternalJobID, nameAndExternalJobID, cltest.FixtureChainID.String()) }, assertion: func(t *testing.T, nameAndExternalJobID string, r *http.Response) { require.Equal(t, http.StatusOK, r.StatusCode) @@ -342,7 +343,7 @@ func TestJobController_Create_HappyPath(t *testing.T) { { name: "fluxmonitor", tomlTemplate: func(nameAndExternalJobID string) string { - return fmt.Sprintf(testspecs.FluxMonitorSpecTemplate, nameAndExternalJobID, nameAndExternalJobID) + return fmt.Sprintf(testspecs.FluxMonitorSpecTemplate, nameAndExternalJobID, nameAndExternalJobID, cltest.FixtureChainID.String()) }, assertion: func(t *testing.T, nameAndExternalJobID string, r *http.Response) { require.Equal(t, http.StatusInternalServerError, r.StatusCode) @@ -370,7 +371,10 @@ func TestJobController_Create_HappyPath(t *testing.T) { { name: "vrf", tomlTemplate: func(_ string) string { - return testspecs.GenerateVRFSpec(testspecs.VRFSpecParams{PublicKey: pks[0].PublicKey.String()}).Toml() + return testspecs.GenerateVRFSpec(testspecs.VRFSpecParams{ + PublicKey: pks[0].PublicKey.String(), + EVMChainID: cltest.FixtureChainID.String(), + }).Toml() }, assertion: func(t *testing.T, nameAndExternalJobID string, r *http.Response) { require.Equal(t, http.StatusOK, r.StatusCode) @@ -657,6 +661,7 @@ func TestJobsController_Update_HappyPath(t *testing.T) { DS1BridgeName: bridge.Name.String(), DS2BridgeName: bridge2.Name.String(), Name: "old OCR job", + EVMChainID: cltest.FixtureChainID.String(), }) err := toml.Unmarshal([]byte(ocrspec.Toml()), &jb) require.NoError(t, err) @@ -683,6 +688,7 @@ func TestJobsController_Update_HappyPath(t *testing.T) { DS2BridgeName: bridge.Name.String(), Name: "updated OCR job", TransmitterAddress: app.Keys[0].Address.Hex(), + EVMChainID: cltest.FixtureChainID.String(), }) require.NoError(t, err) body, _ := json.Marshal(web.UpdateJobRequest{ @@ -721,6 +727,7 @@ func TestJobsController_Update_NonExistentID(t *testing.T) { DS1BridgeName: bridge.Name.String(), DS2BridgeName: bridge2.Name.String(), Name: "old OCR job", + EVMChainID: cltest.FixtureChainID.String(), }) err := toml.Unmarshal([]byte(ocrspec.Toml()), &jb) require.NoError(t, err) @@ -738,6 +745,7 @@ func TestJobsController_Update_NonExistentID(t *testing.T) { DS2BridgeName: bridge.Name.String(), Name: "updated OCR job", TransmitterAddress: app.Keys[0].EIP55Address.String(), + EVMChainID: cltest.FixtureChainID.String(), }) require.NoError(t, err) body, _ := json.Marshal(web.UpdateJobRequest{ @@ -846,7 +854,7 @@ func setupJobSpecsControllerTestsWithJobs(t *testing.T) (*cltest.TestApplication drSpec := fmt.Sprintf(` type = "directrequest" schemaVersion = 1 - evmChainID = "0" + evmChainID = "%s" name = "example eth request event spec" contractAddress = "0x613a38AC1659769640aaE063C651F48E0250454C" externalJobID = "%s" @@ -857,7 +865,7 @@ func setupJobSpecsControllerTestsWithJobs(t *testing.T) (*cltest.TestApplication ds1_multiply [type=multiply times=100]; ds1 -> ds1_parse -> ds1_multiply; """ - `, uuid.New()) + `, cltest.FixtureChainID.String(), uuid.New()) erejb, err := directrequest.ValidatedDirectRequestSpec(drSpec) require.NoError(t, err) diff --git a/core/web/pipeline_runs_controller_test.go b/core/web/pipeline_runs_controller_test.go index 2bdbb6a92c2..395298d81bb 100644 --- a/core/web/pipeline_runs_controller_test.go +++ b/core/web/pipeline_runs_controller_test.go @@ -278,7 +278,7 @@ func setupPipelineRunsControllerTests(t *testing.T) (cltest.HTTPClientCleaner, i externalJobID = "%s" name = "%s" contractAddress = "%s" - evmChainID = "0" + evmChainID = "%s" p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"] keyBundleID = "%s" transmitterAddress = "%s" @@ -300,7 +300,7 @@ func setupPipelineRunsControllerTests(t *testing.T) (cltest.HTTPClientCleaner, i answer [type=median index=0]; """ - `, nameAndExternalJobID, nameAndExternalJobID, testutils.NewAddress().Hex(), cltest.DefaultOCRKeyBundleID, key.Address.Hex()) + `, nameAndExternalJobID, nameAndExternalJobID, testutils.NewAddress().Hex(), cltest.FixtureChainID.String(), cltest.DefaultOCRKeyBundleID, key.Address.Hex()) var jb job.Job err := toml.Unmarshal([]byte(sp), &jb) require.NoError(t, err) diff --git a/core/web/resolver/job_test.go b/core/web/resolver/job_test.go index cc01622c291..920dc70b619 100644 --- a/core/web/resolver/job_test.go +++ b/core/web/resolver/job_test.go @@ -16,6 +16,7 @@ import ( "gopkg.in/guregu/null.v4" "github.com/smartcontractkit/chainlink-evm/pkg/chains" + "github.com/smartcontractkit/chainlink/v2/core/internal/testutils" clnull "github.com/smartcontractkit/chainlink/v2/core/null" "github.com/smartcontractkit/chainlink/v2/core/services/directrequest" "github.com/smartcontractkit/chainlink/v2/core/services/job" @@ -316,7 +317,7 @@ func TestResolver_CreateJob(t *testing.T) { } }` uuid := uuid.New() - spec := fmt.Sprintf(testspecs.DirectRequestSpecTemplate, uuid, uuid) + spec := fmt.Sprintf(testspecs.DirectRequestSpecTemplate, uuid, uuid, testutils.FixtureChainID.String()) variables := map[string]interface{}{ "input": map[string]interface{}{ "TOML": spec, diff --git a/core/web/testdata/body/health-failing.html b/core/web/testdata/body/health-failing.html index 26a629b70ff..ae73e59e2db 100644 --- a/core/web/testdata/body/health-failing.html +++ b/core/web/testdata/body/health-failing.html @@ -35,11 +35,11 @@
EVM
- 0 + {{.chainID}}
HeadTracker
- HeadListener + HeadListener 
Listener connected = false, receiving heads = false
diff --git a/core/web/testdata/body/health-failing.json b/core/web/testdata/body/health-failing.json index 2556965ab77..2f2c0340bce 100644 --- a/core/web/testdata/body/health-failing.json +++ b/core/web/testdata/body/health-failing.json @@ -1 +1 @@ -{"data":[{"type":"checks","id":"EVM.0.HeadTracker.HeadListener","attributes":{"name":"EVM.0.HeadTracker.HeadListener","status":"failing","output":"Listener connected = false, receiving heads = false"}}]} +{"data":[{"type":"checks","id":"EVM.{{.chainID}}.HeadTracker.HeadListener","attributes":{"name":"EVM.{{.chainID}}.HeadTracker.HeadListener","status":"failing","output":"Listener connected = false, receiving heads = false"}}]} diff --git a/core/web/testdata/body/health-failing.txt b/core/web/testdata/body/health-failing.txt index 50cba41fe9b..8b2f5b367da 100644 --- a/core/web/testdata/body/health-failing.txt +++ b/core/web/testdata/body/health-failing.txt @@ -1,2 +1,2 @@ -! EVM.0.HeadTracker.HeadListener +! EVM.{{.chainID}}.HeadTracker.HeadListener Listener connected = false, receiving heads = false diff --git a/core/web/testdata/body/health.html b/core/web/testdata/body/health.html index 4e30a44b9f7..0bdaff6f88b 100644 --- a/core/web/testdata/body/health.html +++ b/core/web/testdata/body/health.html @@ -38,42 +38,42 @@
EVM
- 0 + {{.chainID}}
- BalanceMonitor + BalanceMonitor
- HeadBroadcaster + HeadBroadcaster
- HeadTracker + HeadTracker
- HeadListener + HeadListener 
Listener connected = false, receiving heads = false
- LogBroadcaster + LogBroadcaster
- Relayer + Relayer
- Txm + Txm
- BlockHistoryEstimator + BlockHistoryEstimator
- Broadcaster + Broadcaster
- Confirmer + Confirmer
- Finalizer + Finalizer
- WrappedEvmEstimator + WrappedEvmEstimator
diff --git a/core/web/testdata/body/health.json b/core/web/testdata/body/health.json index aad94b98330..36291984d1b 100644 --- a/core/web/testdata/body/health.json +++ b/core/web/testdata/body/health.json @@ -11,117 +11,117 @@ }, { "type": "checks", - "id": "EVM.0", + "id": "EVM.{{.chainID}}", "attributes": { - "name": "EVM.0", + "name": "EVM.{{.chainID}}", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.BalanceMonitor", + "id": "EVM.{{.chainID}}.BalanceMonitor", "attributes": { - "name": "EVM.0.BalanceMonitor", + "name": "EVM.{{.chainID}}.BalanceMonitor", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.HeadBroadcaster", + "id": "EVM.{{.chainID}}.HeadBroadcaster", "attributes": { - "name": "EVM.0.HeadBroadcaster", + "name": "EVM.{{.chainID}}.HeadBroadcaster", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.HeadTracker", + "id": "EVM.{{.chainID}}.HeadTracker", "attributes": { - "name": "EVM.0.HeadTracker", + "name": "EVM.{{.chainID}}.HeadTracker", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.HeadTracker.HeadListener", + "id": "EVM.{{.chainID}}.HeadTracker.HeadListener", "attributes": { - "name": "EVM.0.HeadTracker.HeadListener", + "name": "EVM.{{.chainID}}.HeadTracker.HeadListener", "status": "failing", "output": "Listener connected = false, receiving heads = false" } }, { "type": "checks", - "id": "EVM.0.LogBroadcaster", + "id": "EVM.{{.chainID}}.LogBroadcaster", "attributes": { - "name": "EVM.0.LogBroadcaster", + "name": "EVM.{{.chainID}}.LogBroadcaster", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.Relayer", + "id": "EVM.{{.chainID}}.Relayer", "attributes": { - "name": "EVM.0.Relayer", + "name": "EVM.{{.chainID}}.Relayer", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.Txm", + "id": "EVM.{{.chainID}}.Txm", "attributes": { - "name": "EVM.0.Txm", + "name": "EVM.{{.chainID}}.Txm", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.Txm.BlockHistoryEstimator", + "id": "EVM.{{.chainID}}.Txm.BlockHistoryEstimator", "attributes": { - "name": "EVM.0.Txm.BlockHistoryEstimator", + "name": "EVM.{{.chainID}}.Txm.BlockHistoryEstimator", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.Txm.Broadcaster", + "id": "EVM.{{.chainID}}.Txm.Broadcaster", "attributes": { - "name": "EVM.0.Txm.Broadcaster", + "name": "EVM.{{.chainID}}.Txm.Broadcaster", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.Txm.Confirmer", + "id": "EVM.{{.chainID}}.Txm.Confirmer", "attributes": { - "name": "EVM.0.Txm.Confirmer", + "name": "EVM.{{.chainID}}.Txm.Confirmer", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.Txm.Finalizer", + "id": "EVM.{{.chainID}}.Txm.Finalizer", "attributes": { - "name": "EVM.0.Txm.Finalizer", + "name": "EVM.{{.chainID}}.Txm.Finalizer", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.0.Txm.WrappedEvmEstimator", + "id": "EVM.{{.chainID}}.Txm.WrappedEvmEstimator", "attributes": { - "name": "EVM.0.Txm.WrappedEvmEstimator", + "name": "EVM.{{.chainID}}.Txm.WrappedEvmEstimator", "status": "passing", "output": "" } diff --git a/core/web/testdata/body/health.txt b/core/web/testdata/body/health.txt index 01f2242eba1..6dd36465fcc 100644 --- a/core/web/testdata/body/health.txt +++ b/core/web/testdata/body/health.txt @@ -1,18 +1,18 @@ ok BridgeStatusReporter -ok EVM.0 -ok EVM.0.BalanceMonitor -ok EVM.0.HeadBroadcaster -ok EVM.0.HeadTracker -! EVM.0.HeadTracker.HeadListener +ok EVM.{{.chainID}} +ok EVM.{{.chainID}}.BalanceMonitor +ok EVM.{{.chainID}}.HeadBroadcaster +ok EVM.{{.chainID}}.HeadTracker +! EVM.{{.chainID}}.HeadTracker.HeadListener Listener connected = false, receiving heads = false -ok EVM.0.LogBroadcaster -ok EVM.0.Relayer -ok EVM.0.Txm -ok EVM.0.Txm.BlockHistoryEstimator -ok EVM.0.Txm.Broadcaster -ok EVM.0.Txm.Confirmer -ok EVM.0.Txm.Finalizer -ok EVM.0.Txm.WrappedEvmEstimator +ok EVM.{{.chainID}}.LogBroadcaster +ok EVM.{{.chainID}}.Relayer +ok EVM.{{.chainID}}.Txm +ok EVM.{{.chainID}}.Txm.BlockHistoryEstimator +ok EVM.{{.chainID}}.Txm.Broadcaster +ok EVM.{{.chainID}}.Txm.Confirmer +ok EVM.{{.chainID}}.Txm.Finalizer +ok EVM.{{.chainID}}.Txm.WrappedEvmEstimator ok HeadReporter ok Heartbeat ok JobSpawner diff --git a/go.mod b/go.mod index 9acd070c60d..66066dc2451 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250804184440-c0506474fc44 github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-data-streams v0.1.2 - github.com/smartcontractkit/chainlink-evm v0.3.2 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250818175541-3389ac08a563 diff --git a/go.sum b/go.sum index 47ef95fb19c..de9f00e34a6 100644 --- a/go.sum +++ b/go.sum @@ -1094,8 +1094,8 @@ github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-2025041523564 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0= github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20ob5SijxQen51DhnqTLr2f7BEc= github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= -github.com/smartcontractkit/chainlink-evm v0.3.2 h1:cdwDu0peeoK0jCzUV9FQkOiCeKJqG2SBohJO3P50dd4= -github.com/smartcontractkit/chainlink-evm v0.3.2/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= From 0f71dae6e4924fa3ab31971d70c96627aa69fa36 Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 21:20:47 -0400 Subject: [PATCH 03/13] remove unnecessary hardcoding --- core/internal/testutils/evmtest/evmtest.go | 2 +- core/internal/testutils/testutils.go | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/internal/testutils/evmtest/evmtest.go b/core/internal/testutils/evmtest/evmtest.go index ce02fe64c5c..ba8f8085a3f 100644 --- a/core/internal/testutils/evmtest/evmtest.go +++ b/core/internal/testutils/evmtest/evmtest.go @@ -120,7 +120,7 @@ func NewChainOpts(t testing.TB, testopts TestChainOpts) (logger.Logger, keystore return lggr, testopts.KeyStore, opts } -const NullClientChainID = 1399100 +const NullClientChainID = evmclient.NullClientChainID // Deprecated, this is a replacement function for tests for now removed default evmChainID logic func MustGetDefaultChainID(t testing.TB, evmCfgs configtoml.EVMConfigs) *big.Int { diff --git a/core/internal/testutils/testutils.go b/core/internal/testutils/testutils.go index 700b79c20e1..90a50683a6b 100644 --- a/core/internal/testutils/testutils.go +++ b/core/internal/testutils/testutils.go @@ -31,6 +31,7 @@ import ( // anything from "github.com/smartcontractkit/chainlink/v2/core" "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" "github.com/smartcontractkit/chainlink-common/pkg/utils/tests" + evmtestutils "github.com/smartcontractkit/chainlink-evm/pkg/testutils" ) const ( @@ -38,10 +39,7 @@ const ( Password = "16charlengthp4SsW0rD1!@#_" ) -// FixtureChainID matches the chain always added by fixtures.sql -// It is set to 0 since no real chain ever has this ID and allows a virtual -// "test" chain ID to be used without clashes -var FixtureChainID = big.NewInt(1399100) +var FixtureChainID = evmtestutils.FixtureChainID // SimulatedChainID is the chain ID for the go-ethereum simulated backend var SimulatedChainID = big.NewInt(1337) From ebf737fef90b841e1e3b178370c3886d52fd6e7b Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 21:22:09 -0400 Subject: [PATCH 04/13] remove hardcoding --- core/cmd/direct-request-spec-template.yml | 2 +- core/cmd/jobs_commands_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/cmd/direct-request-spec-template.yml b/core/cmd/direct-request-spec-template.yml index 1e8a4bdcc83..e6fda87af92 100644 --- a/core/cmd/direct-request-spec-template.yml +++ b/core/cmd/direct-request-spec-template.yml @@ -1,6 +1,6 @@ type = "directrequest" schemaVersion = 1 -evmChainID = "1399100" +evmChainID = "%s" name = "%s" contractAddress = "0x613a38AC1659769640aaE063C651F48E0250454C" externalJobID = "%s" diff --git a/core/cmd/jobs_commands_test.go b/core/cmd/jobs_commands_test.go index aed79381b90..9adb6a9faf6 100644 --- a/core/cmd/jobs_commands_test.go +++ b/core/cmd/jobs_commands_test.go @@ -304,7 +304,7 @@ func TestJob_ToRows(t *testing.T) { var directRequestSpecTemplate string func getDirectRequestSpec() string { - return fmt.Sprintf(directRequestSpecTemplate, uuid.New(), uuid.New()) + return fmt.Sprintf(directRequestSpecTemplate, testutils.FixtureChainID.String(), uuid.New(), uuid.New()) } func TestShell_ListFindJobs(t *testing.T) { From 5b075ceb06115d917ce7ec46d46d1bc4996237c7 Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 21:22:55 -0400 Subject: [PATCH 05/13] remove hardcoding --- core/cmd/jobs_commands_test.go | 2 +- core/cmd/ocr-bootstrap-spec.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/cmd/jobs_commands_test.go b/core/cmd/jobs_commands_test.go index 9adb6a9faf6..2ba5f1ae550 100644 --- a/core/cmd/jobs_commands_test.go +++ b/core/cmd/jobs_commands_test.go @@ -390,7 +390,7 @@ func TestShell_CreateJobV2(t *testing.T) { flagSetApplyFromAction(client.CreateJob, fs, "") nameAndExternalJobID := uuid.New() - spec := fmt.Sprintf(ocrBootstrapSpec, nameAndExternalJobID, nameAndExternalJobID) + spec := fmt.Sprintf(ocrBootstrapSpec, nameAndExternalJobID, nameAndExternalJobID, testutils.FixtureChainID.String()) require.NoError(t, fs.Parse([]string{spec})) err := client.CreateJob(cli.NewContext(nil, fs, nil)) diff --git a/core/cmd/ocr-bootstrap-spec.yml b/core/cmd/ocr-bootstrap-spec.yml index 86fce82ea21..b9d234c8aad 100644 --- a/core/cmd/ocr-bootstrap-spec.yml +++ b/core/cmd/ocr-bootstrap-spec.yml @@ -3,6 +3,6 @@ schemaVersion = 1 contractAddress = "0x27548a32b9aD5D64c5945EaE9Da5337bc3169D15" externalJobID = "%s" name = "%s" -evmChainID = "1399100" +evmChainID = "%s" p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"] isBootstrapPeer = true From 13d945f8431a943c1346ec8a8d17e7fece20b1ea Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 21:27:47 -0400 Subject: [PATCH 06/13] gomodtidy --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- deployment/go.mod | 2 +- deployment/go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 ++-- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 5cd921919a5..b0cc820718d 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -50,7 +50,7 @@ require ( github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-data-streams v0.1.2 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.2 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250819150450-95ef563f6e6d github.com/smartcontractkit/chainlink-testing-framework/framework v0.10.12 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 06367d0c518..dcf9841d6b7 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1540,8 +1540,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.2 h1:cdwDu0peeoK0jCzUV9FQkOiCeKJqG2SBohJO3P50dd4= -github.com/smartcontractkit/chainlink-evm v0.3.2/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/deployment/go.mod b/deployment/go.mod index b9225901a87..729a8b693ca 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -39,7 +39,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.2 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250819150450-95ef563f6e6d diff --git a/deployment/go.sum b/deployment/go.sum index 05d7100885f..ecd79b99195 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1266,8 +1266,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.2 h1:cdwDu0peeoK0jCzUV9FQkOiCeKJqG2SBohJO3P50dd4= -github.com/smartcontractkit/chainlink-evm v0.3.2/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 5273e539926..2397088cf8c 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -52,7 +52,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.2 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 9d3a055432c..e64f78dfbcf 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1528,8 +1528,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.2 h1:cdwDu0peeoK0jCzUV9FQkOiCeKJqG2SBohJO3P50dd4= -github.com/smartcontractkit/chainlink-evm v0.3.2/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 087f362eab2..b3dc353fde8 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -32,7 +32,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.2 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-testing-framework/framework v0.10.12 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index e29e9db20e4..8db994034e7 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1504,8 +1504,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.2 h1:cdwDu0peeoK0jCzUV9FQkOiCeKJqG2SBohJO3P50dd4= -github.com/smartcontractkit/chainlink-evm v0.3.2/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index f5a0b4d8714..3cfd80bdb07 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -32,7 +32,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.67 github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.2 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250819150450-95ef563f6e6d github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index a054656e37f..5dd2bbfb628 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1516,8 +1516,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.2 h1:cdwDu0peeoK0jCzUV9FQkOiCeKJqG2SBohJO3P50dd4= -github.com/smartcontractkit/chainlink-evm v0.3.2/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 8171dfca1de..fe6e9a03aea 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -515,7 +515,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7f8a0f403c3a // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 // indirect - github.com/smartcontractkit/chainlink-evm v0.3.2 // indirect + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250818175541-3389ac08a563 // indirect github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250717121125-2350c82883e2 // indirect diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index 072f3d17bdc..3df543635b3 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1721,8 +1721,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.2 h1:cdwDu0peeoK0jCzUV9FQkOiCeKJqG2SBohJO3P50dd4= -github.com/smartcontractkit/chainlink-evm v0.3.2/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= From a55f5cc0b4e8c3127f3369c63b118c52f4f430e6 Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 21:30:02 -0400 Subject: [PATCH 07/13] fix lint --- core/web/health_controller_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/web/health_controller_test.go b/core/web/health_controller_test.go index 0c395b8d7b0..d251b59cd26 100644 --- a/core/web/health_controller_test.go +++ b/core/web/health_controller_test.go @@ -118,32 +118,32 @@ func TestHealthController_Health_body(t *testing.T) { bodyJSONTmplt, err := template.New("health.json").Parse(bodyJSON) require.NoError(t, err) bodyJSONRes := &bytes.Buffer{} - bodyJSONTmplt.Execute(bodyJSONRes, templateData) + require.NoError(t, bodyJSONTmplt.Execute(bodyJSONRes, templateData)) bodyHTMLTmplt, err := template.New("health.html").Parse(bodyHTML) require.NoError(t, err) bodyHTMLRes := &bytes.Buffer{} - bodyHTMLTmplt.Execute(bodyHTMLRes, templateData) + require.NoError(t, bodyHTMLTmplt.Execute(bodyHTMLRes, templateData)) bodyTXTmplt, err := template.New("health.txt").Parse(bodyTXT) require.NoError(t, err) bodyTXTRes := &bytes.Buffer{} - bodyTXTmplt.Execute(bodyTXTRes, templateData) + require.NoError(t, bodyTXTmplt.Execute(bodyTXTRes, templateData)) bodyJSONFailingTmplt, err := template.New("health.json").Parse(bodyJSONFailing) require.NoError(t, err) bodyJSONFailingRes := &bytes.Buffer{} - bodyJSONFailingTmplt.Execute(bodyJSONFailingRes, templateData) + require.NoError(t, bodyJSONFailingTmplt.Execute(bodyJSONFailingRes, templateData)) bodyHTMLFailingTmplt, err := template.New("health.html").Parse(bodyHTMLFailing) require.NoError(t, err) bodyHTMLFailingRes := &bytes.Buffer{} - bodyHTMLFailingTmplt.Execute(bodyHTMLFailingRes, templateData) + require.NoError(t, bodyHTMLFailingTmplt.Execute(bodyHTMLFailingRes, templateData)) bodyTXTFailingTmplt, err := template.New("health.txt").Parse(bodyTXTFailing) require.NoError(t, err) bodyTXTFailingRes := &bytes.Buffer{} - bodyTXTFailingTmplt.Execute(bodyTXTFailingRes, templateData) + require.NoError(t, bodyTXTFailingTmplt.Execute(bodyTXTFailingRes, templateData)) for _, tc := range []struct { name string From 1c76005cb6dfefe6654c0c0eab4344f3c26a398b Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 21:42:28 -0400 Subject: [PATCH 08/13] test fixes --- core/services/feeds/service_test.go | 4 ++-- .../headreporter/head_reporter_test.go | 2 +- .../headreporter/prometheus_reporter_test.go | 19 +++++++++---------- core/services/keystore/eth_test.go | 4 ++-- core/services/ocr/validate_test.go | 7 ++++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/services/feeds/service_test.go b/core/services/feeds/service_test.go index 67747a03ea3..756bc522c10 100644 --- a/core/services/feeds/service_test.go +++ b/core/services/feeds/service_test.go @@ -82,7 +82,7 @@ type = "offchainreporting" schemaVersion = 1 name = "%s" externalJobID = "%s" -evmChainID = 0 +evmChainID = "%s" contractAddress = "0x613a38AC1659769640aaE063C651F48E0250454C" p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"] keyBundleID = "f5bf259689b26f1374efb3c9a9868796953a0f814bb2d39b968d0e61b58620a5" @@ -888,7 +888,7 @@ func Test_Service_ProposeJob(t *testing.T) { idOCR1 = int64(2) remoteUUIDOCR1 = uuid.New() ocr1NameAndExternalJobID = uuid.New() - ocr1Spec = fmt.Sprintf(OCR1TestSpecTemplate, ocr1NameAndExternalJobID, ocr1NameAndExternalJobID) + ocr1Spec = fmt.Sprintf(OCR1TestSpecTemplate, ocr1NameAndExternalJobID, ocr1NameAndExternalJobID, testutils.FixtureChainID.String()) argsOCR1 = &feeds.ProposeJobArgs{ FeedsManagerID: 1, RemoteUUID: remoteUUIDOCR1, diff --git a/core/services/headreporter/head_reporter_test.go b/core/services/headreporter/head_reporter_test.go index f8dac4c4038..635b6084145 100644 --- a/core/services/headreporter/head_reporter_test.go +++ b/core/services/headreporter/head_reporter_test.go @@ -17,7 +17,7 @@ import ( ) func NewHead() evmtypes.Head { - return evmtypes.Head{Number: 42, EVMChainID: ubig.NewI(0)} + return evmtypes.Head{Number: 42, EVMChainID: ubig.New(testutils.FixtureChainID)} } func Test_HeadReporterService(t *testing.T) { diff --git a/core/services/headreporter/prometheus_reporter_test.go b/core/services/headreporter/prometheus_reporter_test.go index 7fee93c0c78..595118fde2f 100644 --- a/core/services/headreporter/prometheus_reporter_test.go +++ b/core/services/headreporter/prometheus_reporter_test.go @@ -2,7 +2,6 @@ package headreporter_test import ( "fmt" - "math/big" "testing" "time" @@ -33,9 +32,9 @@ func Test_PrometheusReporter(t *testing.T) { db := pgtest.NewSqlxDB(t) backend := headreporter.NewMockPrometheusBackend(t) - backend.On("SetUnconfirmedTransactions", big.NewInt(0), int64(0)).Return() - backend.On("SetMaxUnconfirmedAge", big.NewInt(0), float64(0)).Return() - backend.On("SetMaxUnconfirmedBlocks", big.NewInt(0), int64(0)).Return() + backend.On("SetUnconfirmedTransactions", evmtestutils.FixtureChainID, int64(0)).Return() + backend.On("SetMaxUnconfirmedAge", evmtestutils.FixtureChainID, float64(0)).Return() + backend.On("SetMaxUnconfirmedBlocks", evmtestutils.FixtureChainID, int64(0)).Return() reporter := headreporter.NewLegacyEVMPrometheusReporter(db, newLegacyChainContainer(t, db)) reporter.SetBackend(backend) @@ -74,11 +73,11 @@ func Test_PrometheusReporter(t *testing.T) { require.NoError(t, txStore.UpdateTxAttemptBroadcastBeforeBlockNum(testutils.Context(t), etx.ID, 7)) backend := headreporter.NewMockPrometheusBackend(t) - backend.On("SetUnconfirmedTransactions", big.NewInt(0), int64(3)).Return() - backend.On("SetMaxUnconfirmedAge", big.NewInt(0), mock.MatchedBy(func(s float64) bool { + backend.On("SetUnconfirmedTransactions", evmtestutils.FixtureChainID, int64(3)).Return() + backend.On("SetMaxUnconfirmedAge", evmtestutils.FixtureChainID, mock.MatchedBy(func(s float64) bool { return s > 0 })).Return() - backend.On("SetMaxUnconfirmedBlocks", big.NewInt(0), int64(35)).Return() + backend.On("SetMaxUnconfirmedBlocks", evmtestutils.FixtureChainID, int64(35)).Return() reporter := headreporter.NewLegacyEVMPrometheusReporter(db, newLegacyChainContainer(t, db)) reporter.SetBackend(backend) @@ -103,9 +102,9 @@ func Test_PrometheusReporter(t *testing.T) { evmtestutils.MustInsertUnfinishedPipelineTaskRun(t, db, 2) backend := headreporter.NewMockPrometheusBackend(t) - backend.On("SetUnconfirmedTransactions", big.NewInt(0), int64(0)).Return() - backend.On("SetMaxUnconfirmedAge", big.NewInt(0), float64(0)).Return() - backend.On("SetMaxUnconfirmedBlocks", big.NewInt(0), int64(0)).Return() + backend.On("SetUnconfirmedTransactions", evmtestutils.FixtureChainID, int64(0)).Return() + backend.On("SetMaxUnconfirmedAge", evmtestutils.FixtureChainID, float64(0)).Return() + backend.On("SetMaxUnconfirmedBlocks", evmtestutils.FixtureChainID, int64(0)).Return() reporter := headreporter.NewLegacyEVMPrometheusReporter(db, newLegacyChainContainer(t, db)) reporter.SetBackend(backend) diff --git a/core/services/keystore/eth_test.go b/core/services/keystore/eth_test.go index aabb0645f20..d5c38431711 100644 --- a/core/services/keystore/eth_test.go +++ b/core/services/keystore/eth_test.go @@ -706,13 +706,13 @@ func Test_EthKeyStore_CheckEnabled(t *testing.T) { t.Run("returns error when key exists but has never been enabled (no state) for the given chain", func(t *testing.T) { err := ks.CheckEnabled(ctx, addr3, testutils.FixtureChainID) assert.Error(t, err) - require.Contains(t, err.Error(), fmt.Sprintf("eth key with address %s exists but is has not been enabled for chain 0 (enabled only for chain IDs: 1337)", addr3.Hex())) + require.Contains(t, err.Error(), fmt.Sprintf("eth key with address %s exists but is has not been enabled for chain %s (enabled only for chain IDs: 1337)", addr3.Hex(), testutils.FixtureChainID.String())) }) t.Run("returns error when key exists but is disabled for the given chain", func(t *testing.T) { err := ks.CheckEnabled(ctx, addr2, testutils.SimulatedChainID) assert.Error(t, err) - require.Contains(t, err.Error(), fmt.Sprintf("eth key with address %s exists but is disabled for chain 1337 (enabled only for chain IDs: 0)", addr2.Hex())) + require.Contains(t, err.Error(), fmt.Sprintf("eth key with address %s exists but is disabled for chain 1337 (enabled only for chain IDs: %s)", addr2.Hex(), testutils.FixtureChainID.String())) }) } diff --git a/core/services/ocr/validate_test.go b/core/services/ocr/validate_test.go index 2d2ad1e8298..68a863c5564 100644 --- a/core/services/ocr/validate_test.go +++ b/core/services/ocr/validate_test.go @@ -2,6 +2,7 @@ package ocr_test import ( "encoding/hex" + "fmt" "math/big" "strings" "testing" @@ -462,10 +463,10 @@ func TestOnChainContractAvailability(t *testing.T) { c.OCR.ConfigLogValidation = testutils.Ptr(true) }) legacyChain := cltest.NewLegacyChainsWithMockChain(t, client, cfg) - jobSpec := ` + jobSpec := fmt.Sprintf(` type = "offchainreporting" schemaVersion = 1 -evmChainID = 0 +evmChainID = "%s" contractAddress = "0x613a38AC1659769640aaE063C651F48E0250454C" isBootstrapPeer = false observationSource = """ @@ -475,7 +476,7 @@ ds1_multiply [type=multiply times=1.23]; ds1 -> ds1_parse -> ds1_multiply -> answer1; answer1 [type=median index=0]; """ -` +`, testutils.FixtureChainID.String()) // Contract is not deployed client.On("CodeAt", mock.Anything, mock.Anything, mock.Anything).Return([]byte{}, nil).Once() From 3067eb91f04b1069e488b264d8b0b60e807dd493 Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 21:49:32 -0400 Subject: [PATCH 09/13] test fixes --- core/services/vrf/delegate_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/core/services/vrf/delegate_test.go b/core/services/vrf/delegate_test.go index 98e683295b6..94c31e9be25 100644 --- a/core/services/vrf/delegate_test.go +++ b/core/services/vrf/delegate_test.go @@ -710,6 +710,7 @@ func Test_VRFV2PlusServiceFailsWhenVRFOwnerProvided(t *testing.T) { PublicKey: vuni.vrfkey.PublicKey.String(), FromAddresses: []string{vuni.submitter.Hex()}, GasLanePrice: chain.Config().EVM().GasEstimator().PriceMax(), + EVMChainID: testutils.FixtureChainID.String(), }) toml := "vrfOwnerAddress=\"0xF62fEFb54a0af9D32CDF0Db21C52710844c7eddb\"\n" + vs.Toml() jb, err := vrfcommon.ValidatedVRFSpec(toml) From 5e03153f6bfb69a484068e166ab06395ce72ad97 Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Tue, 2 Sep 2025 22:04:33 -0400 Subject: [PATCH 10/13] test fixes --- core/services/pipeline/task.eth_call_test.go | 22 +++++++------- core/services/pipeline/task.eth_tx_test.go | 30 ++++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/core/services/pipeline/task.eth_call_test.go b/core/services/pipeline/task.eth_call_test.go index 6bc429516e9..f354d2b2e72 100644 --- a/core/services/pipeline/task.eth_call_test.go +++ b/core/services/pipeline/task.eth_call_test.go @@ -56,7 +56,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "", nil, @@ -77,7 +77,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "", "$(foo)", - "0", + testutils.FixtureChainID.String(), "$(gasLimit)", "", nil, @@ -99,7 +99,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "", &specGasLimit, @@ -120,7 +120,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "", nil, @@ -142,7 +142,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "0xThisAintGonnaWork", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "", nil, @@ -158,7 +158,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbee", "", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "", nil, @@ -174,7 +174,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "", nil, @@ -190,7 +190,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "", nil, @@ -206,7 +206,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "", nil, @@ -244,7 +244,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "latest", nil, @@ -265,7 +265,7 @@ func TestETHCallTask(t *testing.T) { "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF", "", "$(foo)", - "0", + testutils.FixtureChainID.String(), "", "pending", nil, diff --git a/core/services/pipeline/task.eth_tx_test.go b/core/services/pipeline/task.eth_tx_test.go index d111a9e92f2..55881b15d79 100644 --- a/core/services/pipeline/task.eth_tx_test.go +++ b/core/services/pipeline/task.eth_tx_test.go @@ -65,7 +65,7 @@ func TestETHTxTask(t *testing.T) { "12345", `{ "jobID": 321, "requestID": "0x5198616554d738d9485d1a7cf53b2f33e09c3bbc8fe9ac0020bd672cd2bc15d2", "requestTxHash": "0xc524fafafcaec40652b1f84fca09c231185437d008d195fccf2f51e64b7062f8" }`, `0`, - "0", + testutils.FixtureChainID.String(), `{"CheckerType": "vrf_v2", "VRFCoordinatorAddress": "0x2E396ecbc8223Ebc16EC45136228AE5EDB649943"}`, nil, false, @@ -107,7 +107,7 @@ func TestETHTxTask(t *testing.T) { "$(gasLimit)", `{ "jobID": $(jobID), "requestID": $(requestID), "requestTxHash": $(requestTxHash) }`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -151,7 +151,7 @@ func TestETHTxTask(t *testing.T) { "$(gasLimit)", `{ "jobID": $(jobID), "requestID": $(requestID), "requestTxHash": $(requestTxHash) }`, "$(minConfirmations)", - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -183,7 +183,7 @@ func TestETHTxTask(t *testing.T) { "$(gasLimit)", `$(requestData)`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -229,7 +229,7 @@ func TestETHTxTask(t *testing.T) { "$(gasLimit)", `$(requestData)`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -275,7 +275,7 @@ func TestETHTxTask(t *testing.T) { "12345", `{}`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -306,7 +306,7 @@ func TestETHTxTask(t *testing.T) { "", `{ "jobID": 321, "requestID": "0x5198616554d738d9485d1a7cf53b2f33e09c3bbc8fe9ac0020bd672cd2bc15d2", "requestTxHash": "0xc524fafafcaec40652b1f84fca09c231185437d008d195fccf2f51e64b7062f8" }`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, // spec does not override gas limit false, @@ -341,7 +341,7 @@ func TestETHTxTask(t *testing.T) { "", `{ "jobID": 321, "requestID": "0x5198616554d738d9485d1a7cf53b2f33e09c3bbc8fe9ac0020bd672cd2bc15d2", "requestTxHash": "0xc524fafafcaec40652b1f84fca09c231185437d008d195fccf2f51e64b7062f8" }`, `0`, - "0", + testutils.FixtureChainID.String(), "", &specGasLimit, false, @@ -376,7 +376,7 @@ func TestETHTxTask(t *testing.T) { "$(gasLimit)", `$(requestData)`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -405,7 +405,7 @@ func TestETHTxTask(t *testing.T) { "12345", `{ "jobID": 321, "requestID": "0x5198616554d738d9485d1a7cf53b2f33e09c3bbc8fe9ac0020bd672cd2bc15d2", "requestTxHash": "0xc524fafafcaec40652b1f84fca09c231185437d008d195fccf2f51e64b7062f8" }`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -441,7 +441,7 @@ func TestETHTxTask(t *testing.T) { "12345", `{ "jobID": 321, "requestID": "0x5198616554d738d9485d1a7cf53b2f33e09c3bbc8fe9ac0020bd672cd2bc15d2", "requestTxHash": "0xc524fafafcaec40652b1f84fca09c231185437d008d195fccf2f51e64b7062f8", "foo": "bar" }`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -458,7 +458,7 @@ func TestETHTxTask(t *testing.T) { "12345", `{ "jobID": "asdf", "requestID": 123, "requestTxHash": true }`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -475,7 +475,7 @@ func TestETHTxTask(t *testing.T) { "12345", `{ "jobID": 321, "requestID": "0x5198616554d738d9485d1a7cf53b2f33e09c3bbc8fe9ac0020bd672cd2bc15d2", "requestTxHash": "0xc524fafafcaec40652b1f84fca09c231185437d008d195fccf2f51e64b7062f8" }`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -492,7 +492,7 @@ func TestETHTxTask(t *testing.T) { "12345", `{ "jobID": 321, "requestID": "0x5198616554d738d9485d1a7cf53b2f33e09c3bbc8fe9ac0020bd672cd2bc15d2", "requestTxHash": "0xc524fafafcaec40652b1f84fca09c231185437d008d195fccf2f51e64b7062f8" }`, `0`, - "0", + testutils.FixtureChainID.String(), "", nil, false, @@ -509,7 +509,7 @@ func TestETHTxTask(t *testing.T) { "12345", `{ "jobID": 321, "requestID": "0x5198616554d738d9485d1a7cf53b2f33e09c3bbc8fe9ac0020bd672cd2bc15d2", "requestTxHash": "0xc524fafafcaec40652b1f84fca09c231185437d008d195fccf2f51e64b7062f8" }`, `3`, - "0", + testutils.FixtureChainID.String(), "", nil, false, From 5854ede165b8232060a50c027fa4e24d84060d46 Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Wed, 3 Sep 2025 08:01:53 -0400 Subject: [PATCH 11/13] changeset --- .changeset/ready-turkeys-vanish.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/ready-turkeys-vanish.md diff --git a/.changeset/ready-turkeys-vanish.md b/.changeset/ready-turkeys-vanish.md new file mode 100644 index 00000000000..e0430394104 --- /dev/null +++ b/.changeset/ready-turkeys-vanish.md @@ -0,0 +1,5 @@ +--- +"chainlink": minor +--- + +#changed change FixtureChainID From 4b334d4306ff78834c6e87634f72f72eb1c48251 Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Wed, 3 Sep 2025 09:47:35 -0400 Subject: [PATCH 12/13] use direct replace instead of template --- core/web/health_controller_test.go | 64 ++++++---------------- core/web/testdata/body/health-failing.html | 4 +- core/web/testdata/body/health-failing.json | 2 +- core/web/testdata/body/health-failing.txt | 2 +- core/web/testdata/body/health.html | 26 ++++----- core/web/testdata/body/health.json | 52 +++++++++--------- core/web/testdata/body/health.txt | 26 ++++----- 7 files changed, 74 insertions(+), 102 deletions(-) diff --git a/core/web/health_controller_test.go b/core/web/health_controller_test.go index d251b59cd26..fa3f607bcaa 100644 --- a/core/web/health_controller_test.go +++ b/core/web/health_controller_test.go @@ -8,7 +8,6 @@ import ( "net/http" "strings" "testing" - "text/template" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" @@ -111,39 +110,12 @@ var ( ) func TestHealthController_Health_body(t *testing.T) { - templateData := map[string]interface{}{ - "chainID": testutils.FixtureChainID.String(), - } - - bodyJSONTmplt, err := template.New("health.json").Parse(bodyJSON) - require.NoError(t, err) - bodyJSONRes := &bytes.Buffer{} - require.NoError(t, bodyJSONTmplt.Execute(bodyJSONRes, templateData)) - - bodyHTMLTmplt, err := template.New("health.html").Parse(bodyHTML) - require.NoError(t, err) - bodyHTMLRes := &bytes.Buffer{} - require.NoError(t, bodyHTMLTmplt.Execute(bodyHTMLRes, templateData)) - - bodyTXTmplt, err := template.New("health.txt").Parse(bodyTXT) - require.NoError(t, err) - bodyTXTRes := &bytes.Buffer{} - require.NoError(t, bodyTXTmplt.Execute(bodyTXTRes, templateData)) - - bodyJSONFailingTmplt, err := template.New("health.json").Parse(bodyJSONFailing) - require.NoError(t, err) - bodyJSONFailingRes := &bytes.Buffer{} - require.NoError(t, bodyJSONFailingTmplt.Execute(bodyJSONFailingRes, templateData)) - - bodyHTMLFailingTmplt, err := template.New("health.html").Parse(bodyHTMLFailing) - require.NoError(t, err) - bodyHTMLFailingRes := &bytes.Buffer{} - require.NoError(t, bodyHTMLFailingTmplt.Execute(bodyHTMLFailingRes, templateData)) - - bodyTXTFailingTmplt, err := template.New("health.txt").Parse(bodyTXTFailing) - require.NoError(t, err) - bodyTXTFailingRes := &bytes.Buffer{} - require.NoError(t, bodyTXTFailingTmplt.Execute(bodyTXTFailingRes, templateData)) + bodyJSON = strings.ReplaceAll(bodyJSON, "1399100", testutils.FixtureChainID.String()) + bodyHTML = strings.ReplaceAll(bodyHTML, "1399100", testutils.FixtureChainID.String()) + bodyTXT = strings.ReplaceAll(bodyTXT, "1399100", testutils.FixtureChainID.String()) + bodyJSONFailing = strings.ReplaceAll(bodyJSONFailing, "1399100", testutils.FixtureChainID.String()) + bodyHTMLFailing = strings.ReplaceAll(bodyHTMLFailing, "1399100", testutils.FixtureChainID.String()) + bodyTXTFailing = strings.ReplaceAll(bodyTXTFailing, "1399100", testutils.FixtureChainID.String()) for _, tc := range []struct { name string @@ -151,17 +123,17 @@ func TestHealthController_Health_body(t *testing.T) { headers map[string]string expBody string }{ - {"default", "/health", nil, bodyJSONRes.String()}, - {"json", "/health", map[string]string{"Accept": gin.MIMEJSON}, bodyJSONRes.String()}, - {"html", "/health", map[string]string{"Accept": gin.MIMEHTML}, bodyHTMLRes.String()}, - {"text", "/health", map[string]string{"Accept": gin.MIMEPlain}, bodyTXTRes.String()}, - {".txt", "/health.txt", nil, bodyTXTRes.String()}, - - {"default-failing", "/health?failing", nil, bodyJSONFailingRes.String()}, - {"json-failing", "/health?failing", map[string]string{"Accept": gin.MIMEJSON}, bodyJSONFailingRes.String()}, - {"html-failing", "/health?failing", map[string]string{"Accept": gin.MIMEHTML}, bodyHTMLFailingRes.String()}, - {"text-failing", "/health?failing", map[string]string{"Accept": gin.MIMEPlain}, bodyTXTFailingRes.String()}, - {".txt-failing", "/health.txt?failing", nil, bodyTXTFailingRes.String()}, + {"default", "/health", nil, bodyJSON}, + {"json", "/health", map[string]string{"Accept": gin.MIMEJSON}, bodyJSON}, + {"html", "/health", map[string]string{"Accept": gin.MIMEHTML}, bodyHTML}, + {"text", "/health", map[string]string{"Accept": gin.MIMEPlain}, bodyTXT}, + {".txt", "/health.txt", nil, bodyTXT}, + + {"default-failing", "/health?failing", nil, bodyJSONFailing}, + {"json-failing", "/health?failing", map[string]string{"Accept": gin.MIMEJSON}, bodyJSONFailing}, + {"html-failing", "/health?failing", map[string]string{"Accept": gin.MIMEHTML}, bodyHTMLFailing}, + {"text-failing", "/health?failing", map[string]string{"Accept": gin.MIMEPlain}, bodyTXTFailing}, + {".txt-failing", "/health.txt?failing", nil, bodyTXTFailing}, } { t.Run(tc.name, func(t *testing.T) { cfg := configtest.NewGeneralConfig(t, func(cfg *chainlink.Config, secrets *chainlink.Secrets) { @@ -182,7 +154,7 @@ func TestHealthController_Health_body(t *testing.T) { assert.Equal(t, http.StatusMultiStatus, resp.StatusCode) body, err := io.ReadAll(resp.Body) require.NoError(t, err) - if tc.expBody == bodyJSONRes.String() { + if tc.expBody == bodyJSON { // pretty print for comparison var b bytes.Buffer require.NoError(t, json.Indent(&b, body, "", " ")) diff --git a/core/web/testdata/body/health-failing.html b/core/web/testdata/body/health-failing.html index ae73e59e2db..e8e00f7b919 100644 --- a/core/web/testdata/body/health-failing.html +++ b/core/web/testdata/body/health-failing.html @@ -35,11 +35,11 @@
EVM
- {{.chainID}} + 1399100
HeadTracker
- HeadListener + HeadListener 
Listener connected = false, receiving heads = false
diff --git a/core/web/testdata/body/health-failing.json b/core/web/testdata/body/health-failing.json index 2f2c0340bce..0e57192add8 100644 --- a/core/web/testdata/body/health-failing.json +++ b/core/web/testdata/body/health-failing.json @@ -1 +1 @@ -{"data":[{"type":"checks","id":"EVM.{{.chainID}}.HeadTracker.HeadListener","attributes":{"name":"EVM.{{.chainID}}.HeadTracker.HeadListener","status":"failing","output":"Listener connected = false, receiving heads = false"}}]} +{"data":[{"type":"checks","id":"EVM.1399100.HeadTracker.HeadListener","attributes":{"name":"EVM.1399100.HeadTracker.HeadListener","status":"failing","output":"Listener connected = false, receiving heads = false"}}]} diff --git a/core/web/testdata/body/health-failing.txt b/core/web/testdata/body/health-failing.txt index 8b2f5b367da..42a450d1c2c 100644 --- a/core/web/testdata/body/health-failing.txt +++ b/core/web/testdata/body/health-failing.txt @@ -1,2 +1,2 @@ -! EVM.{{.chainID}}.HeadTracker.HeadListener +! EVM.1399100.HeadTracker.HeadListener Listener connected = false, receiving heads = false diff --git a/core/web/testdata/body/health.html b/core/web/testdata/body/health.html index 0bdaff6f88b..8e33c797e26 100644 --- a/core/web/testdata/body/health.html +++ b/core/web/testdata/body/health.html @@ -38,42 +38,42 @@
EVM
- {{.chainID}} + 1399100
- BalanceMonitor + BalanceMonitor
- HeadBroadcaster + HeadBroadcaster
- HeadTracker + HeadTracker
- HeadListener + HeadListener 
Listener connected = false, receiving heads = false
- LogBroadcaster + LogBroadcaster
- Relayer + Relayer
- Txm + Txm
- BlockHistoryEstimator + BlockHistoryEstimator
- Broadcaster + Broadcaster
- Confirmer + Confirmer
- Finalizer + Finalizer
- WrappedEvmEstimator + WrappedEvmEstimator
diff --git a/core/web/testdata/body/health.json b/core/web/testdata/body/health.json index 36291984d1b..6de919b3a15 100644 --- a/core/web/testdata/body/health.json +++ b/core/web/testdata/body/health.json @@ -11,117 +11,117 @@ }, { "type": "checks", - "id": "EVM.{{.chainID}}", + "id": "EVM.1399100", "attributes": { - "name": "EVM.{{.chainID}}", + "name": "EVM.1399100", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.BalanceMonitor", + "id": "EVM.1399100.BalanceMonitor", "attributes": { - "name": "EVM.{{.chainID}}.BalanceMonitor", + "name": "EVM.1399100.BalanceMonitor", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.HeadBroadcaster", + "id": "EVM.1399100.HeadBroadcaster", "attributes": { - "name": "EVM.{{.chainID}}.HeadBroadcaster", + "name": "EVM.1399100.HeadBroadcaster", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.HeadTracker", + "id": "EVM.1399100.HeadTracker", "attributes": { - "name": "EVM.{{.chainID}}.HeadTracker", + "name": "EVM.1399100.HeadTracker", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.HeadTracker.HeadListener", + "id": "EVM.1399100.HeadTracker.HeadListener", "attributes": { - "name": "EVM.{{.chainID}}.HeadTracker.HeadListener", + "name": "EVM.1399100.HeadTracker.HeadListener", "status": "failing", "output": "Listener connected = false, receiving heads = false" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.LogBroadcaster", + "id": "EVM.1399100.LogBroadcaster", "attributes": { - "name": "EVM.{{.chainID}}.LogBroadcaster", + "name": "EVM.1399100.LogBroadcaster", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.Relayer", + "id": "EVM.1399100.Relayer", "attributes": { - "name": "EVM.{{.chainID}}.Relayer", + "name": "EVM.1399100.Relayer", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.Txm", + "id": "EVM.1399100.Txm", "attributes": { - "name": "EVM.{{.chainID}}.Txm", + "name": "EVM.1399100.Txm", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.Txm.BlockHistoryEstimator", + "id": "EVM.1399100.Txm.BlockHistoryEstimator", "attributes": { - "name": "EVM.{{.chainID}}.Txm.BlockHistoryEstimator", + "name": "EVM.1399100.Txm.BlockHistoryEstimator", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.Txm.Broadcaster", + "id": "EVM.1399100.Txm.Broadcaster", "attributes": { - "name": "EVM.{{.chainID}}.Txm.Broadcaster", + "name": "EVM.1399100.Txm.Broadcaster", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.Txm.Confirmer", + "id": "EVM.1399100.Txm.Confirmer", "attributes": { - "name": "EVM.{{.chainID}}.Txm.Confirmer", + "name": "EVM.1399100.Txm.Confirmer", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.Txm.Finalizer", + "id": "EVM.1399100.Txm.Finalizer", "attributes": { - "name": "EVM.{{.chainID}}.Txm.Finalizer", + "name": "EVM.1399100.Txm.Finalizer", "status": "passing", "output": "" } }, { "type": "checks", - "id": "EVM.{{.chainID}}.Txm.WrappedEvmEstimator", + "id": "EVM.1399100.Txm.WrappedEvmEstimator", "attributes": { - "name": "EVM.{{.chainID}}.Txm.WrappedEvmEstimator", + "name": "EVM.1399100.Txm.WrappedEvmEstimator", "status": "passing", "output": "" } diff --git a/core/web/testdata/body/health.txt b/core/web/testdata/body/health.txt index 6dd36465fcc..2138a73feb0 100644 --- a/core/web/testdata/body/health.txt +++ b/core/web/testdata/body/health.txt @@ -1,18 +1,18 @@ ok BridgeStatusReporter -ok EVM.{{.chainID}} -ok EVM.{{.chainID}}.BalanceMonitor -ok EVM.{{.chainID}}.HeadBroadcaster -ok EVM.{{.chainID}}.HeadTracker -! EVM.{{.chainID}}.HeadTracker.HeadListener +ok EVM.1399100 +ok EVM.1399100.BalanceMonitor +ok EVM.1399100.HeadBroadcaster +ok EVM.1399100.HeadTracker +! EVM.1399100.HeadTracker.HeadListener Listener connected = false, receiving heads = false -ok EVM.{{.chainID}}.LogBroadcaster -ok EVM.{{.chainID}}.Relayer -ok EVM.{{.chainID}}.Txm -ok EVM.{{.chainID}}.Txm.BlockHistoryEstimator -ok EVM.{{.chainID}}.Txm.Broadcaster -ok EVM.{{.chainID}}.Txm.Confirmer -ok EVM.{{.chainID}}.Txm.Finalizer -ok EVM.{{.chainID}}.Txm.WrappedEvmEstimator +ok EVM.1399100.LogBroadcaster +ok EVM.1399100.Relayer +ok EVM.1399100.Txm +ok EVM.1399100.Txm.BlockHistoryEstimator +ok EVM.1399100.Txm.Broadcaster +ok EVM.1399100.Txm.Confirmer +ok EVM.1399100.Txm.Finalizer +ok EVM.1399100.Txm.WrappedEvmEstimator ok HeadReporter ok Heartbeat ok JobSpawner From b4af1be41dc885c9b6b04bab136cb5dd2ec7593b Mon Sep 17 00:00:00 2001 From: vreff <104409744+vreff@users.noreply.github.com> Date: Wed, 3 Sep 2025 10:05:51 -0400 Subject: [PATCH 13/13] update chainlink-evm import --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- deployment/go.mod | 2 +- deployment/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 ++-- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index b0cc820718d..3f49d515d3f 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -50,7 +50,7 @@ require ( github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-data-streams v0.1.2 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250819150450-95ef563f6e6d github.com/smartcontractkit/chainlink-testing-framework/framework v0.10.12 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index dcf9841d6b7..21c30211138 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1540,8 +1540,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea h1:qOs/dy1w7QO43pqeSD9U+4iF4dRpWblN4Iiye1yLw0s= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/deployment/go.mod b/deployment/go.mod index 729a8b693ca..777daeff07d 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -39,7 +39,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250819150450-95ef563f6e6d diff --git a/deployment/go.sum b/deployment/go.sum index ecd79b99195..6c4d519aa4d 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1266,8 +1266,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea h1:qOs/dy1w7QO43pqeSD9U+4iF4dRpWblN4Iiye1yLw0s= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/go.mod b/go.mod index 66066dc2451..4019321de4b 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250804184440-c0506474fc44 github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-data-streams v0.1.2 - github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250818175541-3389ac08a563 diff --git a/go.sum b/go.sum index de9f00e34a6..c00844e227f 100644 --- a/go.sum +++ b/go.sum @@ -1094,8 +1094,8 @@ github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-2025041523564 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0= github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20ob5SijxQen51DhnqTLr2f7BEc= github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea h1:qOs/dy1w7QO43pqeSD9U+4iF4dRpWblN4Iiye1yLw0s= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 2397088cf8c..078d2188b2a 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -52,7 +52,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index e64f78dfbcf..a5c8b93daa6 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1528,8 +1528,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea h1:qOs/dy1w7QO43pqeSD9U+4iF4dRpWblN4Iiye1yLw0s= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index b3dc353fde8..2df77ca51e2 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -32,7 +32,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-testing-framework/framework v0.10.12 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 8db994034e7..c60c306f81f 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1504,8 +1504,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea h1:qOs/dy1w7QO43pqeSD9U+4iF4dRpWblN4Iiye1yLw0s= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 3cfd80bdb07..0c72215ef78 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -32,7 +32,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.67 github.com/smartcontractkit/chainlink-common v0.9.4 github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 - github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250819150450-95ef563f6e6d github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 5dd2bbfb628..767d88f501a 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1516,8 +1516,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea h1:qOs/dy1w7QO43pqeSD9U+4iF4dRpWblN4Iiye1yLw0s= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index fe6e9a03aea..325e42a48fd 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -515,7 +515,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7f8a0f403c3a // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 // indirect - github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 // indirect + github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250818175541-3389ac08a563 // indirect github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250717121125-2350c82883e2 // indirect diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index 3df543635b3..6147cd479b8 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1721,8 +1721,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20o github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0 h1:4RKGSyo+nErBSfmi9zsSnDr1jMGyWEvOLM91r9E0bAI= github.com/smartcontractkit/chainlink-deployments-framework v0.25.0/go.mod h1:gnpB4ag+JcerUbkVRTSa0WVjuJfOIqObkEs5hNcjv54= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5 h1:dWf56JWBxWYnecW7pW6LHQuVkbwmPJTuvKC3wfLm/EM= -github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903010628-d6d3fc2e8ea5/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea h1:qOs/dy1w7QO43pqeSD9U+4iF4dRpWblN4Iiye1yLw0s= +github.com/smartcontractkit/chainlink-evm v0.3.3-0.20250903140346-aacd485a7dea/go.mod h1:s+4876jB9bAnX+b46t/Q757IixXHiwtgW82GO0fdsqw= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be h1:NRldnH+Q6v8TjO3sBGo1mL/VRGeaPVneY2L13tCx114= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=