Skip to content

Stage <- Main + resolved conflicts - #2395

Merged
y0sher merged 22 commits into
stagefrom
main+resolve-conflicts-20250714
Jul 17, 2025
Merged

Stage <- Main + resolved conflicts#2395
y0sher merged 22 commits into
stagefrom
main+resolve-conflicts-20250714

Conversation

@nkryuchkov

Copy link
Copy Markdown
Contributor

Porting the latest change from main to stage

Supersedes #2352

nkryuchkov and others added 13 commits July 1, 2025 15:01
…gner_endpoint Configuration (#2350)

* [SSV-16,SSV-20] ssvsigner: Possible Local File Read + SSRF via Web3signer_endpoint Configuration
* [SSV-13] ssvsigner: fix remaining data races

* don't obtain redundant locks
* [SSV-2] ssvsigner: error on empty fingerprints

* fix a comment
…, to get the slot (#2370)

* refactor(executionclient): remove BlockByNumber method from Provider interface and related implementations to streamline code
test(executionclient): remove tests for BlockByNumber method to reflect its removal and maintain test accuracy
fix(scheduler): update ExecutionClient interface to replace BlockByNumber with HeaderByNumber for consistency

refactor(scheduler_mock.go, voluntary_exit.go, voluntary_exit_test.go): rename BlockByNumber to HeaderByNumber for consistency with the underlying method and improve clarity in the codebase

* refactor(event_syncer_test.go): remove unused channels to clean up test code
refactor(multi_client_test.go): change return type from Block to Header in mock client to align with expected behavior

* refactor(voluntary_exit): rename variable block to header for clarity in handling block headers
test(voluntary_exit_test): update variable name from blockByNumberCalls to headerByNumberCalls for consistency with refactor
* Add stale bot

* Specify cron
* ssvsigner-tls-load-hostname-from-multiple-sources

* cleanup

* add removed comments

* fix the logic

* add a unit test

---------

Co-authored-by: Nikita Kryuchkov <nkryuchkov10@gmail.com>
* fasttrack: gas-limit-36: enable on exact epoch configured

* fix spec-alignment

---------

Co-authored-by: rehs0y <lyosher@gmail.com>
# Conflicts:
#	eth/executionclient/multi_client_test.go
#	networkconfig/hoodi.go
#	networkconfig/mainnet.go
#	operator/duties/voluntary_exit.go
#	operator/duties/voluntary_exit_test.go
#	operator/validator/controller.go
#	protocol/v2/ssv/runner/validator_registration.go
#	protocol/v2/ssv/validator/opts.go
#	scripts/spec-alignment/differ.config.yaml
@codecov

codecov Bot commented Jul 14, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 60.71429% with 11 lines in your changes missing coverage. Please review.

Project coverage is 55.2%. Comparing base (5c3351d) to head (3620734).
Report is 4 commits behind head on stage.

Files with missing lines Patch % Lines
ssvsigner/ekm/remote_key_manager.go 65.2% 8 Missing ⚠️
ssvsigner/tls/tls.go 0.0% 3 Missing ⚠️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

kchojn
kchojn previously approved these changes Jul 15, 2025
MatusKysel
MatusKysel previously approved these changes Jul 15, 2025

@iurii-ssv iurii-ssv left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just 1 comment regarding recent GasLimit change

Comment thread protocol/v2/ssv/runner/validator_registration.go Outdated
@nkryuchkov
nkryuchkov dismissed stale reviews from MatusKysel and kchojn via aef843d July 15, 2025 13:18
@nkryuchkov
nkryuchkov requested review from iurii-ssv and kchojn July 15, 2025 14:15
kchojn
kchojn previously approved these changes Jul 15, 2025
oleg-ssvlabs
oleg-ssvlabs previously approved these changes Jul 15, 2025
iurii-ssv
iurii-ssv previously approved these changes Jul 15, 2025
#2402)

* implement mutual TLS for all E2E test connections

  - Add client certificates for E2E test client
  - Configure Web3Signer to require client certificates
  - Update SSV-Signer to use proper client certs when connecting to Web3Signer
  - Refactor certificate generation for clarity and maintainability
  - Remove unnecessary certificate key path fields from TestEnvironment

* copilot suggestions

* use dirMode constant
@nkryuchkov
nkryuchkov dismissed stale reviews from iurii-ssv, oleg-ssvlabs, and kchojn via 49ac9c0 July 15, 2025 23:05
kchojn
kchojn previously approved these changes Jul 16, 2025
olegshmuelov
olegshmuelov previously approved these changes Jul 16, 2025
MatusKysel
MatusKysel previously approved these changes Jul 16, 2025
# Conflicts:
#	scripts/spec-alignment/differ.config.yaml
@y0sher
y0sher merged commit cda77c5 into stage Jul 17, 2025
8 checks passed
@y0sher
y0sher deleted the main+resolve-conflicts-20250714 branch July 17, 2025 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants