Skip to content

[pull] develop from smartcontractkit:develop#546

Merged
pull[bot] merged 8 commits intoMarcelRaschke:developfrom
smartcontractkit:develop
Apr 14, 2026
Merged

[pull] develop from smartcontractkit:develop#546
pull[bot] merged 8 commits intoMarcelRaschke:developfrom
smartcontractkit:develop

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Apr 14, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

kalverra and others added 8 commits April 14, 2026 06:35
* Fix CI Core test timeouts

* lint

* Comments

* Cleaner dropping DBs

* Use DROP DATABASE FORCE

* Use corresponding chainlink-common fixes

* Better output

* Go mod tidy

* Fix lints

* Prints

* Fix quoting

* Script

* Linting and printing

* Lint

* All the damn lint

* Fix keystore tests

* Add monitoring

* bust cache again

* Ensure unique addresses for DB hangs

* Update dorny paths

* Fix contract addr

* Subract second for api expiration

* Re-run

* Re-trigger

* re-run

* Rollback some fixes

* Pre-test reset

* Fix races

* Doc

* Cleanup debugging

* Tighter timelines

* Not that tight

* mod
* chore(cre): bumps http-action capability

* chore: changeset
… safe failure (#21955)

* fix(CORE-2383): use require over assert and fix simulated backend deprecation in ccipevm tests

- Replace assert with require before slice access in executecodec_test to avoid panics on failure
- Increase simulated backend EVM timeout from 5s to 60s in msghasher_test
- Replace deprecated backends.NewSimulatedBackend with simulated.NewBackend in both test files

* fix(test): add RPCEVMTimeout override to executecodec_test and fix import ordering

Add the same RPCEVMTimeout: 60s override to executecodec_test.go that
msghasher_test.go already has. Both tests call eth_call through the
simulated backend and are subject to the default 5s timeout under
-race -count=100. Also fixes time import ordering per review.
…RE-2388] (#21975)

* fix(cmd): prevent test DB connection leak via app.Before config swap

TestShell_BeforeNode and TestShell_RunNode_WithBeforeNode were calling
app.Before(c) after pre-setting shell.Config with a txdb-wrapped config
via configtest.NewGeneralConfig. app.Before unconditionally ran
opts.New() → CoreDefaults() which set Database.DriverName back to pgx
and assigned the fresh config to s.Config, silently overwriting the
test's txdb config. BeforeNode → pg.NewLockedDB then opened real pgx
connections against the shared chainlink_test database, persisting
keystore state and leaking it to other tests (flaking Test_CSAKeyStore_E2E)
and eating slots from the server-wide max_connections budget (causing
the mass 25-minute chan-receive timeouts in CORE-2388).

- core/cmd/app.go: guard opts.New() so a pre-set s.Config is preserved.
  Defense-in-depth against any future test hitting the same trap.
- core/cmd/shell_local.go: nil-guard CloseLogger in afterNode (parity
  with app.After; tests calling BeforeNode directly never set it).
- core/cmd/shell_local_test.go: remove the unnecessary app.Before(c)
  calls. Drop the incorrect_password subtests — they were load-bearing
  on the leak; the underlying keystore invariant is covered by
  TestMasterKeystore_Unlock_Save in core/services/keystore.

Refs: CORE-2388, CORE-2370
Supersedes: #21504

* test(cmd): restore app.Before call in BeforeNode tests

Restores the app.Before(c) calls that were removed when fixing the
txdb config overwrite bug. With the nil-check guard in app.Before,
pre-set test configs are now preserved, making it safe to call
app.Before in tests again. This keeps the test flow consistent with
the real production CLI execution order.

* test(cmd): restore incorrect password test using heavyweight DB

Switch TestShell_BeforeNode to heavyweight.FullTestDBV2 so beforeNode's
own DB connection can see pre-populated key material. This restores the
incorrect password test case that was removed when the app.Before config
fix made txdb connections isolated.

* fix(cmd): use DB-backed keystore to seed encrypted key material

cltest.NewKeyStore uses keystore.NewInMemory which stores keys in a
struct field, never writing to encrypted_key_rings. BeforeNode opens
its own DB connection and creates a separate keystore.New instance,
so the seeded keys were invisible and any password was accepted.

Switch to keystore.New (DB-backed) so encrypted keys persist to the
table and the incorrect password test actually fails decryption.
* CCIP-9203 bump chainlink-ccv staging (pre-fcr)

* merge
* propose-aptos-job-spec

* adding test

* test

* comments

* apto

* revert

* fix

* adding family validation

* delta stage is required now
chore: move legacy analyzer into ccip pkg
@pull pull bot locked and limited conversation to collaborators Apr 14, 2026
@pull pull bot added the ⤵️ pull label Apr 14, 2026
@pull pull bot merged commit 8351146 into MarcelRaschke:develop Apr 14, 2026
1 of 2 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants