Skip to content
This repository was archived by the owner on Jan 12, 2026. It is now read-only.

chore: merge upstream#25

Merged
danyalprout merged 2 commits into
mainfrom
upstream-main
Nov 25, 2025
Merged

chore: merge upstream#25
danyalprout merged 2 commits into
mainfrom
upstream-main

Conversation

@danyalprout

Copy link
Copy Markdown
Collaborator

📝 Summary

Merge upstream

💡 Motivation and Context


✅ I have completed the following steps:

  • Run make lint
  • Run make test
  • Added tests (if applicable)

Melvillian and others added 2 commits November 24, 2025 16:04
…bots#331)

To account for a bug in the xfam and tdAttributes bitmasking logic, we changed the way the
workload ID is calculated in the BlockBuilderPolicy. That PR is here:

flashbots/flashtestations#53

This means the workload ID calculation needs to change in any upstream services, which includes
op-rbuilder.

I've made the same change that I made in the solidity contract here in the attestation.rs logic
where op-rbuilder calculates the workload ID. The tests have been updated to use the new correct
workload ID, which I obtained by running the BlockBuilderPolicy:workloadIdForTDRegistration function
on the same TEE registration that is used in the tests.
* Fix builder tx cumulative da

* fix builder gas and da calculation

* add test
@danyalprout danyalprout changed the title Upstream main chore: merge upstream Nov 24, 2025
@danyalprout
danyalprout marked this pull request as ready for review November 25, 2025 15:08
@danyalprout
danyalprout merged commit fe56152 into main Nov 25, 2025
8 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants