Merge 750ed20 - #130

Merged
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20
Dec 17, 2024
Merged

Merge 750ed20#130
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20

Conversation

@blockchaindevsh

@blockchaindevshblockchaindevsh commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

This PR merges with optimism's latest release ethereum-optimism@750ed20 .

Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol

The conflicts in .circleci/config.yml are left to @qzhodl in a follow up commit(in this PR), all other conflicts are resolved.

@qizhou , we want to keep the upstream commits, so I think we should not use squash for this PR.

axelKingsleyand others added 30 commits November 19, 2024 15:12
…ethereum-optimism#12919)
* Reset Derivation when Supervisor is Behind
* Disable Batcher Throttling in Interop local-devnet
Adds a unit test for mainnet deployments at version 1.6.0.
…#12820)
* interop: make geth Dockerfile use rc5
* use rc6
* Update ops-bedrock/l2-op-geth-interop.Dockerfile
It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
* migrate close-stale github action
* using external script
* completing script
* removing old github action
* example only
* removing versions
* removing tag-service
* feat(ctb): `RISCV.sol`
semver-lock
Co-Authored-By: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-Authored-By: Taem Park <wwwee98@gmail.com>
Co-Authored-By: Park Changwan <pcw109550@gmail.com>
Co-Authored-By: protolambda <proto@protolambda.com>
* snapshots
* diff with remote in CI
* schedule diff job
* Update .circleci/config.yml
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* remove check changed
---------
Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-authored-by: Taem Park <wwwee98@gmail.com>
Co-authored-by: Park Changwan <pcw109550@gmail.com>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* improve delayedWeth test and coverage
* improve delayedWeth test and coverage
* fix DataAvailabilityChallenge failing fuzz test
…#12996)
* improve universal and libraries tests and coverage
* fixes
…-optimism#12982)
Bumps ethereum/client-go from v1.14.11 to v1.14.12.
---
updated-dependencies:
- dependency-name: ethereum/client-go
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* contracts: remove op-nft
Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.
* fix: semver lock step - ran pre-pr.
* fix: use added/modified filter for heavy fuzz
Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.
---------
Co-authored-by: Blaine Malone <blainemalone01@gmail.com>
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
* improve optimismportal(2) test coverage
* improve optimismportal(2) test coverage
* more tests, fixes
* improve dispute game tests and coverage
* fixes
…thereum-optimism#12983)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.1...1.4.2)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* op-node: Create metrics to record if sequencer is active
* op-node: Update transactions_sequenced_total metric
---------
Co-authored-by: protolambda <proto@protolambda.com>
)
- Enables support for deploying tagged versions against new chains, but behind a huge warning that requires user input to bypass. Since our tagged release versions do not contain all implementations, using op-deployer in this way will deploy contracts that haven't been governance approved. Since this workflow is useful for development but bad for prod, I've added support for it but users have to bypass a large warning that describes the risks.
- Validates the hashes of tagged version artifacts after downloading them. This prevents users from downloading tampered versions of the artifacts from GCS.
…#13000)
* make riscv compile without the optimizer turned on
* bump riscv.sol
* bump riscv.sol
…2985)
Test hard fork offset overrides
Co-authored-by: Vinod Damle <vinod@oplabs.co>
…ations (ethereum-optimism#13012)
This is adding op-program/v1.4.0-rc.1 with absolute prestate hash
0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe
to the releases.json file.
This release contains Sepolia Holocene activation times for
OP, Base, Mode, Zora, BUT NOT Metal.
dependabotBotand others added 18 commits December 4, 2024 23:15
…eum-optimism#13233)
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0.
- [Commits](golang/sync@v0.9.0...v0.10.0)
---
updated-dependencies:
- dependency-name: golang.org/x/sync
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…thereum-optimism#13234)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.2...1.4.3)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…13232)
Updates the spacers check to use the new framework for contracts
checks written in Go. Adds tests for the functions that this
check uses.
Fixes the name for scheduled-forge-coverage to
develop-forge-coverage in line with the existing pattern.
* op-deployer: Update OPCM bootstrap command
Updates the OPCM bootstrap command to allow bootstrapping Holocene.
* fix merge artifact
* ci: Remove Kurtosis-specific go job
Kurtosis landed [my fix](kurtosis-tech/kurtosis#2567) for the race condition that prevented us from running a shared Kurtosis instance between jobs. This PR brings that back.
* remove dep
…ask (ethereum-optimism#13250)
* chore(op-deployer): Accept existing impl in `DelayedWETH` bootstrap task
* remove check
…config chain ID indicator (ethereum-optimism#13217)
* op-challenger: Support --cannon-l2-chain-id to pass chain ID through to op-program.
* op-program: Default to assuming configs are available in client.
Provide a --l2.custom flag to set the chain ID to the custom chain indicator so the client will load configs via the preimage oracle.
Since loading configs via the preimage oracle doesn't work on-chain, this is a safer and simpler default now that op-program can be built
with custom configs embedded.
* op-challenger: Switch to custom L2 flag instead of specifying chain ID
* op-challenger: Fix boolean option in op-program execution.
* op-e2e: Set custom L2 flag in precompiles test
* interop: parallelized receipt fetching
* fix test
* remove elastic thread count
* Add Debug Message for Range Fetching
* rename end to last
* Remove Println
---------
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
I've found a [deadlock](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73846/workflows/19369ca9-9eaa-4021-9eb8-589a06e7bd34/jobs/3018041) in the op-conductor tests. The inner conductor loop is stuck waiting on a queue signal that never arrives, which in turn causes the test to hang since the coordinating waitgroup is never decremented. I believe this happens because the conductor's `queueAction` method is non-blocking, so nothing ever triggers conductor's inner loop when conductor start up. I've updated the code to use a blocking channel write when conductor starts to avoid this issue.
The traces of the deadlock look like this, for reference:
```
goroutine 227 [semacquire, 9 minutes]:
sync.runtime_Semacquire(0xc0004df577?)
/usr/local/go/src/runtime/sema.go:62 +0x25
sync.(*WaitGroup).Wait(0x0?)
/usr/local/go/src/sync/waitgroup.go:116 +0x48
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).execute(0xc0003e4008, 0x0)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:177 +0x65
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).executeAction(...)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:197
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:163 +0x93
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).TestScenario4(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:420 +0x27
reflect.Value.call({0xc000131900?, 0xc0001b3740?, 0x1fed5b8?}, {0x191d63c, 0x4}, {0xc0004dff28, 0x1, 0x16f12e0?})
/usr/local/go/src/reflect/value.go:596 +0xca6
reflect.Value.Call({0xc000131900?, 0xc0001b3740?, 0x28307b8?}, {0xc0004dff28?, 0xf?, 0x0?})
/usr/local/go/src/reflect/value.go:380 +0xb9
github.com/stretchr/testify/suite.Run.func1(0xc0001f9ba0)
/home/circleci/go/pkg/mod/github.com/stretchr/testify@v1.10.0/suite/suite.go:202 +0x4a5
testing.tRunner(0xc0001f9ba0, 0xc0001f4e10)
/usr/local/go/src/testing/testing.go:1689 +0xfb
created by testing.(*T).Run in goroutine 166
/usr/local/go/src/testing/testing.go:1742 +0x390
goroutine 229 [select, 9 minutes]:
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loopAction(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:577 +0x14f
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization.func1()
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:159 +0x33
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loop(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:570 +0x99
created by github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).Start in goroutine 227
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:376 +0x1f6
FAIL	github.com/ethereum-optimism/optimism/op-conductor/conductor	600.103s
```
(TODO: resolve conflict in .circleci/config.yml)
Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol
@qizhou

Copy link
Copy Markdown

What is the corresponding release of the remote commit?

@blockchaindevsh

Copy link
Copy Markdown
CollaboratorAuthor

What is the corresponding release of the remote commit?

It corresponds to this release: https://github.com/ethereum-optimism/optimism/releases/tag/op-dispute-mon%2Fv1.3.0

@qzhodlqzhodl mentioned this pull request Dec 17, 2024
@blockchaindevsh
blockchaindevsh merged commit 7b1aae7 into op-esDec 17, 2024
@blockchaindevsh
blockchaindevsh deleted the merge_750ed20 branch December 17, 2024 02:11
Sign up for freeto 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.

20 participants

@blockchaindevsh@qizhou@qzhodl@axelKingsley@mslipper@tynes@geoknee@zhiqiangxu@protolambda@blmalone@raffaele-oplabs@clabby@AmadiMichael@trianglesphere@vdamle@sebastianst@sigma@mbaxter@agusduha@bitwiseguy
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Merge 750ed20 - #130

Merged
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20
Dec 17, 2024
Merged

Merge 750ed20#130
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20

Conversation

@blockchaindevsh

@blockchaindevshblockchaindevsh commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

This PR merges with optimism's latest release ethereum-optimism@750ed20 .

Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol

The conflicts in .circleci/config.yml are left to @qzhodl in a follow up commit(in this PR), all other conflicts are resolved.

@qizhou , we want to keep the upstream commits, so I think we should not use squash for this PR.

axelKingsleyand others added 30 commits November 19, 2024 15:12
…ethereum-optimism#12919)
* Reset Derivation when Supervisor is Behind
* Disable Batcher Throttling in Interop local-devnet
Adds a unit test for mainnet deployments at version 1.6.0.
…#12820)
* interop: make geth Dockerfile use rc5
* use rc6
* Update ops-bedrock/l2-op-geth-interop.Dockerfile
It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
* migrate close-stale github action
* using external script
* completing script
* removing old github action
* example only
* removing versions
* removing tag-service
* feat(ctb): `RISCV.sol`
semver-lock
Co-Authored-By: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-Authored-By: Taem Park <wwwee98@gmail.com>
Co-Authored-By: Park Changwan <pcw109550@gmail.com>
Co-Authored-By: protolambda <proto@protolambda.com>
* snapshots
* diff with remote in CI
* schedule diff job
* Update .circleci/config.yml
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* remove check changed
---------
Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-authored-by: Taem Park <wwwee98@gmail.com>
Co-authored-by: Park Changwan <pcw109550@gmail.com>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* improve delayedWeth test and coverage
* improve delayedWeth test and coverage
* fix DataAvailabilityChallenge failing fuzz test
…#12996)
* improve universal and libraries tests and coverage
* fixes
…-optimism#12982)
Bumps ethereum/client-go from v1.14.11 to v1.14.12.
---
updated-dependencies:
- dependency-name: ethereum/client-go
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* contracts: remove op-nft
Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.
* fix: semver lock step - ran pre-pr.
* fix: use added/modified filter for heavy fuzz
Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.
---------
Co-authored-by: Blaine Malone <blainemalone01@gmail.com>
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
* improve optimismportal(2) test coverage
* improve optimismportal(2) test coverage
* more tests, fixes
* improve dispute game tests and coverage
* fixes
…thereum-optimism#12983)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.1...1.4.2)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* op-node: Create metrics to record if sequencer is active
* op-node: Update transactions_sequenced_total metric
---------
Co-authored-by: protolambda <proto@protolambda.com>
)
- Enables support for deploying tagged versions against new chains, but behind a huge warning that requires user input to bypass. Since our tagged release versions do not contain all implementations, using op-deployer in this way will deploy contracts that haven't been governance approved. Since this workflow is useful for development but bad for prod, I've added support for it but users have to bypass a large warning that describes the risks.
- Validates the hashes of tagged version artifacts after downloading them. This prevents users from downloading tampered versions of the artifacts from GCS.
…#13000)
* make riscv compile without the optimizer turned on
* bump riscv.sol
* bump riscv.sol
…2985)
Test hard fork offset overrides
Co-authored-by: Vinod Damle <vinod@oplabs.co>
…ations (ethereum-optimism#13012)
This is adding op-program/v1.4.0-rc.1 with absolute prestate hash
0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe
to the releases.json file.
This release contains Sepolia Holocene activation times for
OP, Base, Mode, Zora, BUT NOT Metal.
dependabotBotand others added 18 commits December 4, 2024 23:15
…eum-optimism#13233)
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0.
- [Commits](golang/sync@v0.9.0...v0.10.0)
---
updated-dependencies:
- dependency-name: golang.org/x/sync
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…thereum-optimism#13234)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.2...1.4.3)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…13232)
Updates the spacers check to use the new framework for contracts
checks written in Go. Adds tests for the functions that this
check uses.
Fixes the name for scheduled-forge-coverage to
develop-forge-coverage in line with the existing pattern.
* op-deployer: Update OPCM bootstrap command
Updates the OPCM bootstrap command to allow bootstrapping Holocene.
* fix merge artifact
* ci: Remove Kurtosis-specific go job
Kurtosis landed [my fix](kurtosis-tech/kurtosis#2567) for the race condition that prevented us from running a shared Kurtosis instance between jobs. This PR brings that back.
* remove dep
…ask (ethereum-optimism#13250)
* chore(op-deployer): Accept existing impl in `DelayedWETH` bootstrap task
* remove check
…config chain ID indicator (ethereum-optimism#13217)
* op-challenger: Support --cannon-l2-chain-id to pass chain ID through to op-program.
* op-program: Default to assuming configs are available in client.
Provide a --l2.custom flag to set the chain ID to the custom chain indicator so the client will load configs via the preimage oracle.
Since loading configs via the preimage oracle doesn't work on-chain, this is a safer and simpler default now that op-program can be built
with custom configs embedded.
* op-challenger: Switch to custom L2 flag instead of specifying chain ID
* op-challenger: Fix boolean option in op-program execution.
* op-e2e: Set custom L2 flag in precompiles test
* interop: parallelized receipt fetching
* fix test
* remove elastic thread count
* Add Debug Message for Range Fetching
* rename end to last
* Remove Println
---------
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
I've found a [deadlock](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73846/workflows/19369ca9-9eaa-4021-9eb8-589a06e7bd34/jobs/3018041) in the op-conductor tests. The inner conductor loop is stuck waiting on a queue signal that never arrives, which in turn causes the test to hang since the coordinating waitgroup is never decremented. I believe this happens because the conductor's `queueAction` method is non-blocking, so nothing ever triggers conductor's inner loop when conductor start up. I've updated the code to use a blocking channel write when conductor starts to avoid this issue.
The traces of the deadlock look like this, for reference:
```
goroutine 227 [semacquire, 9 minutes]:
sync.runtime_Semacquire(0xc0004df577?)
/usr/local/go/src/runtime/sema.go:62 +0x25
sync.(*WaitGroup).Wait(0x0?)
/usr/local/go/src/sync/waitgroup.go:116 +0x48
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).execute(0xc0003e4008, 0x0)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:177 +0x65
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).executeAction(...)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:197
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:163 +0x93
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).TestScenario4(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:420 +0x27
reflect.Value.call({0xc000131900?, 0xc0001b3740?, 0x1fed5b8?}, {0x191d63c, 0x4}, {0xc0004dff28, 0x1, 0x16f12e0?})
/usr/local/go/src/reflect/value.go:596 +0xca6
reflect.Value.Call({0xc000131900?, 0xc0001b3740?, 0x28307b8?}, {0xc0004dff28?, 0xf?, 0x0?})
/usr/local/go/src/reflect/value.go:380 +0xb9
github.com/stretchr/testify/suite.Run.func1(0xc0001f9ba0)
/home/circleci/go/pkg/mod/github.com/stretchr/testify@v1.10.0/suite/suite.go:202 +0x4a5
testing.tRunner(0xc0001f9ba0, 0xc0001f4e10)
/usr/local/go/src/testing/testing.go:1689 +0xfb
created by testing.(*T).Run in goroutine 166
/usr/local/go/src/testing/testing.go:1742 +0x390
goroutine 229 [select, 9 minutes]:
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loopAction(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:577 +0x14f
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization.func1()
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:159 +0x33
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loop(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:570 +0x99
created by github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).Start in goroutine 227
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:376 +0x1f6
FAIL	github.com/ethereum-optimism/optimism/op-conductor/conductor	600.103s
```
(TODO: resolve conflict in .circleci/config.yml)
Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol
@qizhou

Copy link
Copy Markdown

What is the corresponding release of the remote commit?

@blockchaindevsh

Copy link
Copy Markdown
CollaboratorAuthor

What is the corresponding release of the remote commit?

It corresponds to this release: https://github.com/ethereum-optimism/optimism/releases/tag/op-dispute-mon%2Fv1.3.0

@qzhodlqzhodl mentioned this pull request Dec 17, 2024
@blockchaindevsh
blockchaindevsh merged commit 7b1aae7 into op-esDec 17, 2024
@blockchaindevsh
blockchaindevsh deleted the merge_750ed20 branch December 17, 2024 02:11
Sign up for freeto 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.

20 participants

@blockchaindevsh@qizhou@qzhodl@axelKingsley@mslipper@tynes@geoknee@zhiqiangxu@protolambda@blmalone@raffaele-oplabs@clabby@AmadiMichael@trianglesphere@vdamle@sebastianst@sigma@mbaxter@agusduha@bitwiseguy
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Merge 750ed20 - #130

Merged
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20
Dec 17, 2024
Merged

Merge 750ed20#130
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20

Conversation

@blockchaindevsh

@blockchaindevshblockchaindevsh commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

This PR merges with optimism's latest release ethereum-optimism@750ed20 .

Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol

The conflicts in .circleci/config.yml are left to @qzhodl in a follow up commit(in this PR), all other conflicts are resolved.

@qizhou , we want to keep the upstream commits, so I think we should not use squash for this PR.

axelKingsleyand others added 30 commits November 19, 2024 15:12
…ethereum-optimism#12919)
* Reset Derivation when Supervisor is Behind
* Disable Batcher Throttling in Interop local-devnet
Adds a unit test for mainnet deployments at version 1.6.0.
…#12820)
* interop: make geth Dockerfile use rc5
* use rc6
* Update ops-bedrock/l2-op-geth-interop.Dockerfile
It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
* migrate close-stale github action
* using external script
* completing script
* removing old github action
* example only
* removing versions
* removing tag-service
* feat(ctb): `RISCV.sol`
semver-lock
Co-Authored-By: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-Authored-By: Taem Park <wwwee98@gmail.com>
Co-Authored-By: Park Changwan <pcw109550@gmail.com>
Co-Authored-By: protolambda <proto@protolambda.com>
* snapshots
* diff with remote in CI
* schedule diff job
* Update .circleci/config.yml
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* remove check changed
---------
Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-authored-by: Taem Park <wwwee98@gmail.com>
Co-authored-by: Park Changwan <pcw109550@gmail.com>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* improve delayedWeth test and coverage
* improve delayedWeth test and coverage
* fix DataAvailabilityChallenge failing fuzz test
…#12996)
* improve universal and libraries tests and coverage
* fixes
…-optimism#12982)
Bumps ethereum/client-go from v1.14.11 to v1.14.12.
---
updated-dependencies:
- dependency-name: ethereum/client-go
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* contracts: remove op-nft
Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.
* fix: semver lock step - ran pre-pr.
* fix: use added/modified filter for heavy fuzz
Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.
---------
Co-authored-by: Blaine Malone <blainemalone01@gmail.com>
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
* improve optimismportal(2) test coverage
* improve optimismportal(2) test coverage
* more tests, fixes
* improve dispute game tests and coverage
* fixes
…thereum-optimism#12983)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.1...1.4.2)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* op-node: Create metrics to record if sequencer is active
* op-node: Update transactions_sequenced_total metric
---------
Co-authored-by: protolambda <proto@protolambda.com>
)
- Enables support for deploying tagged versions against new chains, but behind a huge warning that requires user input to bypass. Since our tagged release versions do not contain all implementations, using op-deployer in this way will deploy contracts that haven't been governance approved. Since this workflow is useful for development but bad for prod, I've added support for it but users have to bypass a large warning that describes the risks.
- Validates the hashes of tagged version artifacts after downloading them. This prevents users from downloading tampered versions of the artifacts from GCS.
…#13000)
* make riscv compile without the optimizer turned on
* bump riscv.sol
* bump riscv.sol
…2985)
Test hard fork offset overrides
Co-authored-by: Vinod Damle <vinod@oplabs.co>
…ations (ethereum-optimism#13012)
This is adding op-program/v1.4.0-rc.1 with absolute prestate hash
0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe
to the releases.json file.
This release contains Sepolia Holocene activation times for
OP, Base, Mode, Zora, BUT NOT Metal.
dependabotBotand others added 18 commits December 4, 2024 23:15
…eum-optimism#13233)
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0.
- [Commits](golang/sync@v0.9.0...v0.10.0)
---
updated-dependencies:
- dependency-name: golang.org/x/sync
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…thereum-optimism#13234)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.2...1.4.3)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…13232)
Updates the spacers check to use the new framework for contracts
checks written in Go. Adds tests for the functions that this
check uses.
Fixes the name for scheduled-forge-coverage to
develop-forge-coverage in line with the existing pattern.
* op-deployer: Update OPCM bootstrap command
Updates the OPCM bootstrap command to allow bootstrapping Holocene.
* fix merge artifact
* ci: Remove Kurtosis-specific go job
Kurtosis landed [my fix](kurtosis-tech/kurtosis#2567) for the race condition that prevented us from running a shared Kurtosis instance between jobs. This PR brings that back.
* remove dep
…ask (ethereum-optimism#13250)
* chore(op-deployer): Accept existing impl in `DelayedWETH` bootstrap task
* remove check
…config chain ID indicator (ethereum-optimism#13217)
* op-challenger: Support --cannon-l2-chain-id to pass chain ID through to op-program.
* op-program: Default to assuming configs are available in client.
Provide a --l2.custom flag to set the chain ID to the custom chain indicator so the client will load configs via the preimage oracle.
Since loading configs via the preimage oracle doesn't work on-chain, this is a safer and simpler default now that op-program can be built
with custom configs embedded.
* op-challenger: Switch to custom L2 flag instead of specifying chain ID
* op-challenger: Fix boolean option in op-program execution.
* op-e2e: Set custom L2 flag in precompiles test
* interop: parallelized receipt fetching
* fix test
* remove elastic thread count
* Add Debug Message for Range Fetching
* rename end to last
* Remove Println
---------
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
I've found a [deadlock](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73846/workflows/19369ca9-9eaa-4021-9eb8-589a06e7bd34/jobs/3018041) in the op-conductor tests. The inner conductor loop is stuck waiting on a queue signal that never arrives, which in turn causes the test to hang since the coordinating waitgroup is never decremented. I believe this happens because the conductor's `queueAction` method is non-blocking, so nothing ever triggers conductor's inner loop when conductor start up. I've updated the code to use a blocking channel write when conductor starts to avoid this issue.
The traces of the deadlock look like this, for reference:
```
goroutine 227 [semacquire, 9 minutes]:
sync.runtime_Semacquire(0xc0004df577?)
/usr/local/go/src/runtime/sema.go:62 +0x25
sync.(*WaitGroup).Wait(0x0?)
/usr/local/go/src/sync/waitgroup.go:116 +0x48
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).execute(0xc0003e4008, 0x0)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:177 +0x65
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).executeAction(...)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:197
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:163 +0x93
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).TestScenario4(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:420 +0x27
reflect.Value.call({0xc000131900?, 0xc0001b3740?, 0x1fed5b8?}, {0x191d63c, 0x4}, {0xc0004dff28, 0x1, 0x16f12e0?})
/usr/local/go/src/reflect/value.go:596 +0xca6
reflect.Value.Call({0xc000131900?, 0xc0001b3740?, 0x28307b8?}, {0xc0004dff28?, 0xf?, 0x0?})
/usr/local/go/src/reflect/value.go:380 +0xb9
github.com/stretchr/testify/suite.Run.func1(0xc0001f9ba0)
/home/circleci/go/pkg/mod/github.com/stretchr/testify@v1.10.0/suite/suite.go:202 +0x4a5
testing.tRunner(0xc0001f9ba0, 0xc0001f4e10)
/usr/local/go/src/testing/testing.go:1689 +0xfb
created by testing.(*T).Run in goroutine 166
/usr/local/go/src/testing/testing.go:1742 +0x390
goroutine 229 [select, 9 minutes]:
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loopAction(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:577 +0x14f
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization.func1()
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:159 +0x33
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loop(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:570 +0x99
created by github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).Start in goroutine 227
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:376 +0x1f6
FAIL	github.com/ethereum-optimism/optimism/op-conductor/conductor	600.103s
```
(TODO: resolve conflict in .circleci/config.yml)
Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol
@qizhou

Copy link
Copy Markdown

What is the corresponding release of the remote commit?

@blockchaindevsh

Copy link
Copy Markdown
CollaboratorAuthor

What is the corresponding release of the remote commit?

It corresponds to this release: https://github.com/ethereum-optimism/optimism/releases/tag/op-dispute-mon%2Fv1.3.0

@qzhodlqzhodl mentioned this pull request Dec 17, 2024
@blockchaindevsh
blockchaindevsh merged commit 7b1aae7 into op-esDec 17, 2024
@blockchaindevsh
blockchaindevsh deleted the merge_750ed20 branch December 17, 2024 02:11
Sign up for freeto 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.

20 participants

@blockchaindevsh@qizhou@qzhodl@axelKingsley@mslipper@tynes@geoknee@zhiqiangxu@protolambda@blmalone@raffaele-oplabs@clabby@AmadiMichael@trianglesphere@vdamle@sebastianst@sigma@mbaxter@agusduha@bitwiseguy
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Merge 750ed20 - #130

Merged
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20
Dec 17, 2024
Merged

Merge 750ed20#130
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20

Conversation

@blockchaindevsh

@blockchaindevshblockchaindevsh commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

This PR merges with optimism's latest release ethereum-optimism@750ed20 .

Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol

The conflicts in .circleci/config.yml are left to @qzhodl in a follow up commit(in this PR), all other conflicts are resolved.

@qizhou , we want to keep the upstream commits, so I think we should not use squash for this PR.

axelKingsleyand others added 30 commits November 19, 2024 15:12
…ethereum-optimism#12919)
* Reset Derivation when Supervisor is Behind
* Disable Batcher Throttling in Interop local-devnet
Adds a unit test for mainnet deployments at version 1.6.0.
…#12820)
* interop: make geth Dockerfile use rc5
* use rc6
* Update ops-bedrock/l2-op-geth-interop.Dockerfile
It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
* migrate close-stale github action
* using external script
* completing script
* removing old github action
* example only
* removing versions
* removing tag-service
* feat(ctb): `RISCV.sol`
semver-lock
Co-Authored-By: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-Authored-By: Taem Park <wwwee98@gmail.com>
Co-Authored-By: Park Changwan <pcw109550@gmail.com>
Co-Authored-By: protolambda <proto@protolambda.com>
* snapshots
* diff with remote in CI
* schedule diff job
* Update .circleci/config.yml
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* remove check changed
---------
Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-authored-by: Taem Park <wwwee98@gmail.com>
Co-authored-by: Park Changwan <pcw109550@gmail.com>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* improve delayedWeth test and coverage
* improve delayedWeth test and coverage
* fix DataAvailabilityChallenge failing fuzz test
…#12996)
* improve universal and libraries tests and coverage
* fixes
…-optimism#12982)
Bumps ethereum/client-go from v1.14.11 to v1.14.12.
---
updated-dependencies:
- dependency-name: ethereum/client-go
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* contracts: remove op-nft
Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.
* fix: semver lock step - ran pre-pr.
* fix: use added/modified filter for heavy fuzz
Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.
---------
Co-authored-by: Blaine Malone <blainemalone01@gmail.com>
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
* improve optimismportal(2) test coverage
* improve optimismportal(2) test coverage
* more tests, fixes
* improve dispute game tests and coverage
* fixes
…thereum-optimism#12983)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.1...1.4.2)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* op-node: Create metrics to record if sequencer is active
* op-node: Update transactions_sequenced_total metric
---------
Co-authored-by: protolambda <proto@protolambda.com>
)
- Enables support for deploying tagged versions against new chains, but behind a huge warning that requires user input to bypass. Since our tagged release versions do not contain all implementations, using op-deployer in this way will deploy contracts that haven't been governance approved. Since this workflow is useful for development but bad for prod, I've added support for it but users have to bypass a large warning that describes the risks.
- Validates the hashes of tagged version artifacts after downloading them. This prevents users from downloading tampered versions of the artifacts from GCS.
…#13000)
* make riscv compile without the optimizer turned on
* bump riscv.sol
* bump riscv.sol
…2985)
Test hard fork offset overrides
Co-authored-by: Vinod Damle <vinod@oplabs.co>
…ations (ethereum-optimism#13012)
This is adding op-program/v1.4.0-rc.1 with absolute prestate hash
0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe
to the releases.json file.
This release contains Sepolia Holocene activation times for
OP, Base, Mode, Zora, BUT NOT Metal.
dependabotBotand others added 18 commits December 4, 2024 23:15
…eum-optimism#13233)
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0.
- [Commits](golang/sync@v0.9.0...v0.10.0)
---
updated-dependencies:
- dependency-name: golang.org/x/sync
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…thereum-optimism#13234)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.2...1.4.3)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…13232)
Updates the spacers check to use the new framework for contracts
checks written in Go. Adds tests for the functions that this
check uses.
Fixes the name for scheduled-forge-coverage to
develop-forge-coverage in line with the existing pattern.
* op-deployer: Update OPCM bootstrap command
Updates the OPCM bootstrap command to allow bootstrapping Holocene.
* fix merge artifact
* ci: Remove Kurtosis-specific go job
Kurtosis landed [my fix](kurtosis-tech/kurtosis#2567) for the race condition that prevented us from running a shared Kurtosis instance between jobs. This PR brings that back.
* remove dep
…ask (ethereum-optimism#13250)
* chore(op-deployer): Accept existing impl in `DelayedWETH` bootstrap task
* remove check
…config chain ID indicator (ethereum-optimism#13217)
* op-challenger: Support --cannon-l2-chain-id to pass chain ID through to op-program.
* op-program: Default to assuming configs are available in client.
Provide a --l2.custom flag to set the chain ID to the custom chain indicator so the client will load configs via the preimage oracle.
Since loading configs via the preimage oracle doesn't work on-chain, this is a safer and simpler default now that op-program can be built
with custom configs embedded.
* op-challenger: Switch to custom L2 flag instead of specifying chain ID
* op-challenger: Fix boolean option in op-program execution.
* op-e2e: Set custom L2 flag in precompiles test
* interop: parallelized receipt fetching
* fix test
* remove elastic thread count
* Add Debug Message for Range Fetching
* rename end to last
* Remove Println
---------
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
I've found a [deadlock](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73846/workflows/19369ca9-9eaa-4021-9eb8-589a06e7bd34/jobs/3018041) in the op-conductor tests. The inner conductor loop is stuck waiting on a queue signal that never arrives, which in turn causes the test to hang since the coordinating waitgroup is never decremented. I believe this happens because the conductor's `queueAction` method is non-blocking, so nothing ever triggers conductor's inner loop when conductor start up. I've updated the code to use a blocking channel write when conductor starts to avoid this issue.
The traces of the deadlock look like this, for reference:
```
goroutine 227 [semacquire, 9 minutes]:
sync.runtime_Semacquire(0xc0004df577?)
/usr/local/go/src/runtime/sema.go:62 +0x25
sync.(*WaitGroup).Wait(0x0?)
/usr/local/go/src/sync/waitgroup.go:116 +0x48
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).execute(0xc0003e4008, 0x0)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:177 +0x65
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).executeAction(...)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:197
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:163 +0x93
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).TestScenario4(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:420 +0x27
reflect.Value.call({0xc000131900?, 0xc0001b3740?, 0x1fed5b8?}, {0x191d63c, 0x4}, {0xc0004dff28, 0x1, 0x16f12e0?})
/usr/local/go/src/reflect/value.go:596 +0xca6
reflect.Value.Call({0xc000131900?, 0xc0001b3740?, 0x28307b8?}, {0xc0004dff28?, 0xf?, 0x0?})
/usr/local/go/src/reflect/value.go:380 +0xb9
github.com/stretchr/testify/suite.Run.func1(0xc0001f9ba0)
/home/circleci/go/pkg/mod/github.com/stretchr/testify@v1.10.0/suite/suite.go:202 +0x4a5
testing.tRunner(0xc0001f9ba0, 0xc0001f4e10)
/usr/local/go/src/testing/testing.go:1689 +0xfb
created by testing.(*T).Run in goroutine 166
/usr/local/go/src/testing/testing.go:1742 +0x390
goroutine 229 [select, 9 minutes]:
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loopAction(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:577 +0x14f
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization.func1()
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:159 +0x33
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loop(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:570 +0x99
created by github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).Start in goroutine 227
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:376 +0x1f6
FAIL	github.com/ethereum-optimism/optimism/op-conductor/conductor	600.103s
```
(TODO: resolve conflict in .circleci/config.yml)
Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol
@qizhou

Copy link
Copy Markdown

What is the corresponding release of the remote commit?

@blockchaindevsh

Copy link
Copy Markdown
CollaboratorAuthor

What is the corresponding release of the remote commit?

It corresponds to this release: https://github.com/ethereum-optimism/optimism/releases/tag/op-dispute-mon%2Fv1.3.0

@qzhodlqzhodl mentioned this pull request Dec 17, 2024
@blockchaindevsh
blockchaindevsh merged commit 7b1aae7 into op-esDec 17, 2024
@blockchaindevsh
blockchaindevsh deleted the merge_750ed20 branch December 17, 2024 02:11
Sign up for freeto 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.

20 participants

@blockchaindevsh@qizhou@qzhodl@axelKingsley@mslipper@tynes@geoknee@zhiqiangxu@protolambda@blmalone@raffaele-oplabs@clabby@AmadiMichael@trianglesphere@vdamle@sebastianst@sigma@mbaxter@agusduha@bitwiseguy
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Merge 750ed20 - #130

Merged
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20
Dec 17, 2024
Merged

Merge 750ed20#130
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20

Conversation

@blockchaindevsh

@blockchaindevshblockchaindevsh commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

This PR merges with optimism's latest release ethereum-optimism@750ed20 .

Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol

The conflicts in .circleci/config.yml are left to @qzhodl in a follow up commit(in this PR), all other conflicts are resolved.

@qizhou , we want to keep the upstream commits, so I think we should not use squash for this PR.

axelKingsleyand others added 30 commits November 19, 2024 15:12
…ethereum-optimism#12919)
* Reset Derivation when Supervisor is Behind
* Disable Batcher Throttling in Interop local-devnet
Adds a unit test for mainnet deployments at version 1.6.0.
…#12820)
* interop: make geth Dockerfile use rc5
* use rc6
* Update ops-bedrock/l2-op-geth-interop.Dockerfile
It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
* migrate close-stale github action
* using external script
* completing script
* removing old github action
* example only
* removing versions
* removing tag-service
* feat(ctb): `RISCV.sol`
semver-lock
Co-Authored-By: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-Authored-By: Taem Park <wwwee98@gmail.com>
Co-Authored-By: Park Changwan <pcw109550@gmail.com>
Co-Authored-By: protolambda <proto@protolambda.com>
* snapshots
* diff with remote in CI
* schedule diff job
* Update .circleci/config.yml
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* remove check changed
---------
Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-authored-by: Taem Park <wwwee98@gmail.com>
Co-authored-by: Park Changwan <pcw109550@gmail.com>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* improve delayedWeth test and coverage
* improve delayedWeth test and coverage
* fix DataAvailabilityChallenge failing fuzz test
…#12996)
* improve universal and libraries tests and coverage
* fixes
…-optimism#12982)
Bumps ethereum/client-go from v1.14.11 to v1.14.12.
---
updated-dependencies:
- dependency-name: ethereum/client-go
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* contracts: remove op-nft
Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.
* fix: semver lock step - ran pre-pr.
* fix: use added/modified filter for heavy fuzz
Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.
---------
Co-authored-by: Blaine Malone <blainemalone01@gmail.com>
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
* improve optimismportal(2) test coverage
* improve optimismportal(2) test coverage
* more tests, fixes
* improve dispute game tests and coverage
* fixes
…thereum-optimism#12983)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.1...1.4.2)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* op-node: Create metrics to record if sequencer is active
* op-node: Update transactions_sequenced_total metric
---------
Co-authored-by: protolambda <proto@protolambda.com>
)
- Enables support for deploying tagged versions against new chains, but behind a huge warning that requires user input to bypass. Since our tagged release versions do not contain all implementations, using op-deployer in this way will deploy contracts that haven't been governance approved. Since this workflow is useful for development but bad for prod, I've added support for it but users have to bypass a large warning that describes the risks.
- Validates the hashes of tagged version artifacts after downloading them. This prevents users from downloading tampered versions of the artifacts from GCS.
…#13000)
* make riscv compile without the optimizer turned on
* bump riscv.sol
* bump riscv.sol
…2985)
Test hard fork offset overrides
Co-authored-by: Vinod Damle <vinod@oplabs.co>
…ations (ethereum-optimism#13012)
This is adding op-program/v1.4.0-rc.1 with absolute prestate hash
0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe
to the releases.json file.
This release contains Sepolia Holocene activation times for
OP, Base, Mode, Zora, BUT NOT Metal.
dependabotBotand others added 18 commits December 4, 2024 23:15
…eum-optimism#13233)
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0.
- [Commits](golang/sync@v0.9.0...v0.10.0)
---
updated-dependencies:
- dependency-name: golang.org/x/sync
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…thereum-optimism#13234)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.2...1.4.3)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…13232)
Updates the spacers check to use the new framework for contracts
checks written in Go. Adds tests for the functions that this
check uses.
Fixes the name for scheduled-forge-coverage to
develop-forge-coverage in line with the existing pattern.
* op-deployer: Update OPCM bootstrap command
Updates the OPCM bootstrap command to allow bootstrapping Holocene.
* fix merge artifact
* ci: Remove Kurtosis-specific go job
Kurtosis landed [my fix](kurtosis-tech/kurtosis#2567) for the race condition that prevented us from running a shared Kurtosis instance between jobs. This PR brings that back.
* remove dep
…ask (ethereum-optimism#13250)
* chore(op-deployer): Accept existing impl in `DelayedWETH` bootstrap task
* remove check
…config chain ID indicator (ethereum-optimism#13217)
* op-challenger: Support --cannon-l2-chain-id to pass chain ID through to op-program.
* op-program: Default to assuming configs are available in client.
Provide a --l2.custom flag to set the chain ID to the custom chain indicator so the client will load configs via the preimage oracle.
Since loading configs via the preimage oracle doesn't work on-chain, this is a safer and simpler default now that op-program can be built
with custom configs embedded.
* op-challenger: Switch to custom L2 flag instead of specifying chain ID
* op-challenger: Fix boolean option in op-program execution.
* op-e2e: Set custom L2 flag in precompiles test
* interop: parallelized receipt fetching
* fix test
* remove elastic thread count
* Add Debug Message for Range Fetching
* rename end to last
* Remove Println
---------
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
I've found a [deadlock](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73846/workflows/19369ca9-9eaa-4021-9eb8-589a06e7bd34/jobs/3018041) in the op-conductor tests. The inner conductor loop is stuck waiting on a queue signal that never arrives, which in turn causes the test to hang since the coordinating waitgroup is never decremented. I believe this happens because the conductor's `queueAction` method is non-blocking, so nothing ever triggers conductor's inner loop when conductor start up. I've updated the code to use a blocking channel write when conductor starts to avoid this issue.
The traces of the deadlock look like this, for reference:
```
goroutine 227 [semacquire, 9 minutes]:
sync.runtime_Semacquire(0xc0004df577?)
/usr/local/go/src/runtime/sema.go:62 +0x25
sync.(*WaitGroup).Wait(0x0?)
/usr/local/go/src/sync/waitgroup.go:116 +0x48
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).execute(0xc0003e4008, 0x0)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:177 +0x65
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).executeAction(...)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:197
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:163 +0x93
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).TestScenario4(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:420 +0x27
reflect.Value.call({0xc000131900?, 0xc0001b3740?, 0x1fed5b8?}, {0x191d63c, 0x4}, {0xc0004dff28, 0x1, 0x16f12e0?})
/usr/local/go/src/reflect/value.go:596 +0xca6
reflect.Value.Call({0xc000131900?, 0xc0001b3740?, 0x28307b8?}, {0xc0004dff28?, 0xf?, 0x0?})
/usr/local/go/src/reflect/value.go:380 +0xb9
github.com/stretchr/testify/suite.Run.func1(0xc0001f9ba0)
/home/circleci/go/pkg/mod/github.com/stretchr/testify@v1.10.0/suite/suite.go:202 +0x4a5
testing.tRunner(0xc0001f9ba0, 0xc0001f4e10)
/usr/local/go/src/testing/testing.go:1689 +0xfb
created by testing.(*T).Run in goroutine 166
/usr/local/go/src/testing/testing.go:1742 +0x390
goroutine 229 [select, 9 minutes]:
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loopAction(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:577 +0x14f
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization.func1()
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:159 +0x33
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loop(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:570 +0x99
created by github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).Start in goroutine 227
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:376 +0x1f6
FAIL	github.com/ethereum-optimism/optimism/op-conductor/conductor	600.103s
```
(TODO: resolve conflict in .circleci/config.yml)
Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol
@qizhou

Copy link
Copy Markdown

What is the corresponding release of the remote commit?

@blockchaindevsh

Copy link
Copy Markdown
CollaboratorAuthor

What is the corresponding release of the remote commit?

It corresponds to this release: https://github.com/ethereum-optimism/optimism/releases/tag/op-dispute-mon%2Fv1.3.0

@qzhodlqzhodl mentioned this pull request Dec 17, 2024
@blockchaindevsh
blockchaindevsh merged commit 7b1aae7 into op-esDec 17, 2024
@blockchaindevsh
blockchaindevsh deleted the merge_750ed20 branch December 17, 2024 02:11
Sign up for freeto 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.

20 participants

@blockchaindevsh@qizhou@qzhodl@axelKingsley@mslipper@tynes@geoknee@zhiqiangxu@protolambda@blmalone@raffaele-oplabs@clabby@AmadiMichael@trianglesphere@vdamle@sebastianst@sigma@mbaxter@agusduha@bitwiseguy
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Merge 750ed20 - #130

Merged
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20
Dec 17, 2024
Merged

Merge 750ed20#130
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20

Conversation

@blockchaindevsh

@blockchaindevshblockchaindevsh commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

This PR merges with optimism's latest release ethereum-optimism@750ed20 .

Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol

The conflicts in .circleci/config.yml are left to @qzhodl in a follow up commit(in this PR), all other conflicts are resolved.

@qizhou , we want to keep the upstream commits, so I think we should not use squash for this PR.

axelKingsleyand others added 30 commits November 19, 2024 15:12
…ethereum-optimism#12919)
* Reset Derivation when Supervisor is Behind
* Disable Batcher Throttling in Interop local-devnet
Adds a unit test for mainnet deployments at version 1.6.0.
…#12820)
* interop: make geth Dockerfile use rc5
* use rc6
* Update ops-bedrock/l2-op-geth-interop.Dockerfile
It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
* migrate close-stale github action
* using external script
* completing script
* removing old github action
* example only
* removing versions
* removing tag-service
* feat(ctb): `RISCV.sol`
semver-lock
Co-Authored-By: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-Authored-By: Taem Park <wwwee98@gmail.com>
Co-Authored-By: Park Changwan <pcw109550@gmail.com>
Co-Authored-By: protolambda <proto@protolambda.com>
* snapshots
* diff with remote in CI
* schedule diff job
* Update .circleci/config.yml
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* remove check changed
---------
Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-authored-by: Taem Park <wwwee98@gmail.com>
Co-authored-by: Park Changwan <pcw109550@gmail.com>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* improve delayedWeth test and coverage
* improve delayedWeth test and coverage
* fix DataAvailabilityChallenge failing fuzz test
…#12996)
* improve universal and libraries tests and coverage
* fixes
…-optimism#12982)
Bumps ethereum/client-go from v1.14.11 to v1.14.12.
---
updated-dependencies:
- dependency-name: ethereum/client-go
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* contracts: remove op-nft
Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.
* fix: semver lock step - ran pre-pr.
* fix: use added/modified filter for heavy fuzz
Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.
---------
Co-authored-by: Blaine Malone <blainemalone01@gmail.com>
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
* improve optimismportal(2) test coverage
* improve optimismportal(2) test coverage
* more tests, fixes
* improve dispute game tests and coverage
* fixes
…thereum-optimism#12983)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.1...1.4.2)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* op-node: Create metrics to record if sequencer is active
* op-node: Update transactions_sequenced_total metric
---------
Co-authored-by: protolambda <proto@protolambda.com>
)
- Enables support for deploying tagged versions against new chains, but behind a huge warning that requires user input to bypass. Since our tagged release versions do not contain all implementations, using op-deployer in this way will deploy contracts that haven't been governance approved. Since this workflow is useful for development but bad for prod, I've added support for it but users have to bypass a large warning that describes the risks.
- Validates the hashes of tagged version artifacts after downloading them. This prevents users from downloading tampered versions of the artifacts from GCS.
…#13000)
* make riscv compile without the optimizer turned on
* bump riscv.sol
* bump riscv.sol
…2985)
Test hard fork offset overrides
Co-authored-by: Vinod Damle <vinod@oplabs.co>
…ations (ethereum-optimism#13012)
This is adding op-program/v1.4.0-rc.1 with absolute prestate hash
0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe
to the releases.json file.
This release contains Sepolia Holocene activation times for
OP, Base, Mode, Zora, BUT NOT Metal.
dependabotBotand others added 18 commits December 4, 2024 23:15
…eum-optimism#13233)
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0.
- [Commits](golang/sync@v0.9.0...v0.10.0)
---
updated-dependencies:
- dependency-name: golang.org/x/sync
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…thereum-optimism#13234)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.2...1.4.3)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…13232)
Updates the spacers check to use the new framework for contracts
checks written in Go. Adds tests for the functions that this
check uses.
Fixes the name for scheduled-forge-coverage to
develop-forge-coverage in line with the existing pattern.
* op-deployer: Update OPCM bootstrap command
Updates the OPCM bootstrap command to allow bootstrapping Holocene.
* fix merge artifact
* ci: Remove Kurtosis-specific go job
Kurtosis landed [my fix](kurtosis-tech/kurtosis#2567) for the race condition that prevented us from running a shared Kurtosis instance between jobs. This PR brings that back.
* remove dep
…ask (ethereum-optimism#13250)
* chore(op-deployer): Accept existing impl in `DelayedWETH` bootstrap task
* remove check
…config chain ID indicator (ethereum-optimism#13217)
* op-challenger: Support --cannon-l2-chain-id to pass chain ID through to op-program.
* op-program: Default to assuming configs are available in client.
Provide a --l2.custom flag to set the chain ID to the custom chain indicator so the client will load configs via the preimage oracle.
Since loading configs via the preimage oracle doesn't work on-chain, this is a safer and simpler default now that op-program can be built
with custom configs embedded.
* op-challenger: Switch to custom L2 flag instead of specifying chain ID
* op-challenger: Fix boolean option in op-program execution.
* op-e2e: Set custom L2 flag in precompiles test
* interop: parallelized receipt fetching
* fix test
* remove elastic thread count
* Add Debug Message for Range Fetching
* rename end to last
* Remove Println
---------
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
I've found a [deadlock](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73846/workflows/19369ca9-9eaa-4021-9eb8-589a06e7bd34/jobs/3018041) in the op-conductor tests. The inner conductor loop is stuck waiting on a queue signal that never arrives, which in turn causes the test to hang since the coordinating waitgroup is never decremented. I believe this happens because the conductor's `queueAction` method is non-blocking, so nothing ever triggers conductor's inner loop when conductor start up. I've updated the code to use a blocking channel write when conductor starts to avoid this issue.
The traces of the deadlock look like this, for reference:
```
goroutine 227 [semacquire, 9 minutes]:
sync.runtime_Semacquire(0xc0004df577?)
/usr/local/go/src/runtime/sema.go:62 +0x25
sync.(*WaitGroup).Wait(0x0?)
/usr/local/go/src/sync/waitgroup.go:116 +0x48
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).execute(0xc0003e4008, 0x0)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:177 +0x65
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).executeAction(...)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:197
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:163 +0x93
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).TestScenario4(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:420 +0x27
reflect.Value.call({0xc000131900?, 0xc0001b3740?, 0x1fed5b8?}, {0x191d63c, 0x4}, {0xc0004dff28, 0x1, 0x16f12e0?})
/usr/local/go/src/reflect/value.go:596 +0xca6
reflect.Value.Call({0xc000131900?, 0xc0001b3740?, 0x28307b8?}, {0xc0004dff28?, 0xf?, 0x0?})
/usr/local/go/src/reflect/value.go:380 +0xb9
github.com/stretchr/testify/suite.Run.func1(0xc0001f9ba0)
/home/circleci/go/pkg/mod/github.com/stretchr/testify@v1.10.0/suite/suite.go:202 +0x4a5
testing.tRunner(0xc0001f9ba0, 0xc0001f4e10)
/usr/local/go/src/testing/testing.go:1689 +0xfb
created by testing.(*T).Run in goroutine 166
/usr/local/go/src/testing/testing.go:1742 +0x390
goroutine 229 [select, 9 minutes]:
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loopAction(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:577 +0x14f
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization.func1()
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:159 +0x33
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loop(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:570 +0x99
created by github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).Start in goroutine 227
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:376 +0x1f6
FAIL	github.com/ethereum-optimism/optimism/op-conductor/conductor	600.103s
```
(TODO: resolve conflict in .circleci/config.yml)
Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol
@qizhou

Copy link
Copy Markdown

What is the corresponding release of the remote commit?

@blockchaindevsh

Copy link
Copy Markdown
CollaboratorAuthor

What is the corresponding release of the remote commit?

It corresponds to this release: https://github.com/ethereum-optimism/optimism/releases/tag/op-dispute-mon%2Fv1.3.0

@qzhodlqzhodl mentioned this pull request Dec 17, 2024
@blockchaindevsh
blockchaindevsh merged commit 7b1aae7 into op-esDec 17, 2024
@blockchaindevsh
blockchaindevsh deleted the merge_750ed20 branch December 17, 2024 02:11
Sign up for freeto 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.

20 participants

@blockchaindevsh@qizhou@qzhodl@axelKingsley@mslipper@tynes@geoknee@zhiqiangxu@protolambda@blmalone@raffaele-oplabs@clabby@AmadiMichael@trianglesphere@vdamle@sebastianst@sigma@mbaxter@agusduha@bitwiseguy
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Merge 750ed20 - #130

Merged
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20
Dec 17, 2024
Merged

Merge 750ed20#130
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20

Conversation

@blockchaindevsh

@blockchaindevshblockchaindevsh commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

This PR merges with optimism's latest release ethereum-optimism@750ed20 .

Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol

The conflicts in .circleci/config.yml are left to @qzhodl in a follow up commit(in this PR), all other conflicts are resolved.

@qizhou , we want to keep the upstream commits, so I think we should not use squash for this PR.

axelKingsleyand others added 30 commits November 19, 2024 15:12
…ethereum-optimism#12919)
* Reset Derivation when Supervisor is Behind
* Disable Batcher Throttling in Interop local-devnet
Adds a unit test for mainnet deployments at version 1.6.0.
…#12820)
* interop: make geth Dockerfile use rc5
* use rc6
* Update ops-bedrock/l2-op-geth-interop.Dockerfile
It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
* migrate close-stale github action
* using external script
* completing script
* removing old github action
* example only
* removing versions
* removing tag-service
* feat(ctb): `RISCV.sol`
semver-lock
Co-Authored-By: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-Authored-By: Taem Park <wwwee98@gmail.com>
Co-Authored-By: Park Changwan <pcw109550@gmail.com>
Co-Authored-By: protolambda <proto@protolambda.com>
* snapshots
* diff with remote in CI
* schedule diff job
* Update .circleci/config.yml
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* remove check changed
---------
Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-authored-by: Taem Park <wwwee98@gmail.com>
Co-authored-by: Park Changwan <pcw109550@gmail.com>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* improve delayedWeth test and coverage
* improve delayedWeth test and coverage
* fix DataAvailabilityChallenge failing fuzz test
…#12996)
* improve universal and libraries tests and coverage
* fixes
…-optimism#12982)
Bumps ethereum/client-go from v1.14.11 to v1.14.12.
---
updated-dependencies:
- dependency-name: ethereum/client-go
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* contracts: remove op-nft
Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.
* fix: semver lock step - ran pre-pr.
* fix: use added/modified filter for heavy fuzz
Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.
---------
Co-authored-by: Blaine Malone <blainemalone01@gmail.com>
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
* improve optimismportal(2) test coverage
* improve optimismportal(2) test coverage
* more tests, fixes
* improve dispute game tests and coverage
* fixes
…thereum-optimism#12983)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.1...1.4.2)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* op-node: Create metrics to record if sequencer is active
* op-node: Update transactions_sequenced_total metric
---------
Co-authored-by: protolambda <proto@protolambda.com>
)
- Enables support for deploying tagged versions against new chains, but behind a huge warning that requires user input to bypass. Since our tagged release versions do not contain all implementations, using op-deployer in this way will deploy contracts that haven't been governance approved. Since this workflow is useful for development but bad for prod, I've added support for it but users have to bypass a large warning that describes the risks.
- Validates the hashes of tagged version artifacts after downloading them. This prevents users from downloading tampered versions of the artifacts from GCS.
…#13000)
* make riscv compile without the optimizer turned on
* bump riscv.sol
* bump riscv.sol
…2985)
Test hard fork offset overrides
Co-authored-by: Vinod Damle <vinod@oplabs.co>
…ations (ethereum-optimism#13012)
This is adding op-program/v1.4.0-rc.1 with absolute prestate hash
0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe
to the releases.json file.
This release contains Sepolia Holocene activation times for
OP, Base, Mode, Zora, BUT NOT Metal.
dependabotBotand others added 18 commits December 4, 2024 23:15
…eum-optimism#13233)
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0.
- [Commits](golang/sync@v0.9.0...v0.10.0)
---
updated-dependencies:
- dependency-name: golang.org/x/sync
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…thereum-optimism#13234)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.2...1.4.3)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…13232)
Updates the spacers check to use the new framework for contracts
checks written in Go. Adds tests for the functions that this
check uses.
Fixes the name for scheduled-forge-coverage to
develop-forge-coverage in line with the existing pattern.
* op-deployer: Update OPCM bootstrap command
Updates the OPCM bootstrap command to allow bootstrapping Holocene.
* fix merge artifact
* ci: Remove Kurtosis-specific go job
Kurtosis landed [my fix](kurtosis-tech/kurtosis#2567) for the race condition that prevented us from running a shared Kurtosis instance between jobs. This PR brings that back.
* remove dep
…ask (ethereum-optimism#13250)
* chore(op-deployer): Accept existing impl in `DelayedWETH` bootstrap task
* remove check
…config chain ID indicator (ethereum-optimism#13217)
* op-challenger: Support --cannon-l2-chain-id to pass chain ID through to op-program.
* op-program: Default to assuming configs are available in client.
Provide a --l2.custom flag to set the chain ID to the custom chain indicator so the client will load configs via the preimage oracle.
Since loading configs via the preimage oracle doesn't work on-chain, this is a safer and simpler default now that op-program can be built
with custom configs embedded.
* op-challenger: Switch to custom L2 flag instead of specifying chain ID
* op-challenger: Fix boolean option in op-program execution.
* op-e2e: Set custom L2 flag in precompiles test
* interop: parallelized receipt fetching
* fix test
* remove elastic thread count
* Add Debug Message for Range Fetching
* rename end to last
* Remove Println
---------
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
I've found a [deadlock](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73846/workflows/19369ca9-9eaa-4021-9eb8-589a06e7bd34/jobs/3018041) in the op-conductor tests. The inner conductor loop is stuck waiting on a queue signal that never arrives, which in turn causes the test to hang since the coordinating waitgroup is never decremented. I believe this happens because the conductor's `queueAction` method is non-blocking, so nothing ever triggers conductor's inner loop when conductor start up. I've updated the code to use a blocking channel write when conductor starts to avoid this issue.
The traces of the deadlock look like this, for reference:
```
goroutine 227 [semacquire, 9 minutes]:
sync.runtime_Semacquire(0xc0004df577?)
/usr/local/go/src/runtime/sema.go:62 +0x25
sync.(*WaitGroup).Wait(0x0?)
/usr/local/go/src/sync/waitgroup.go:116 +0x48
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).execute(0xc0003e4008, 0x0)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:177 +0x65
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).executeAction(...)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:197
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:163 +0x93
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).TestScenario4(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:420 +0x27
reflect.Value.call({0xc000131900?, 0xc0001b3740?, 0x1fed5b8?}, {0x191d63c, 0x4}, {0xc0004dff28, 0x1, 0x16f12e0?})
/usr/local/go/src/reflect/value.go:596 +0xca6
reflect.Value.Call({0xc000131900?, 0xc0001b3740?, 0x28307b8?}, {0xc0004dff28?, 0xf?, 0x0?})
/usr/local/go/src/reflect/value.go:380 +0xb9
github.com/stretchr/testify/suite.Run.func1(0xc0001f9ba0)
/home/circleci/go/pkg/mod/github.com/stretchr/testify@v1.10.0/suite/suite.go:202 +0x4a5
testing.tRunner(0xc0001f9ba0, 0xc0001f4e10)
/usr/local/go/src/testing/testing.go:1689 +0xfb
created by testing.(*T).Run in goroutine 166
/usr/local/go/src/testing/testing.go:1742 +0x390
goroutine 229 [select, 9 minutes]:
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loopAction(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:577 +0x14f
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization.func1()
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:159 +0x33
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loop(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:570 +0x99
created by github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).Start in goroutine 227
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:376 +0x1f6
FAIL	github.com/ethereum-optimism/optimism/op-conductor/conductor	600.103s
```
(TODO: resolve conflict in .circleci/config.yml)
Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol
@qizhou

Copy link
Copy Markdown

What is the corresponding release of the remote commit?

@blockchaindevsh

Copy link
Copy Markdown
CollaboratorAuthor

What is the corresponding release of the remote commit?

It corresponds to this release: https://github.com/ethereum-optimism/optimism/releases/tag/op-dispute-mon%2Fv1.3.0

@qzhodlqzhodl mentioned this pull request Dec 17, 2024
@blockchaindevsh
blockchaindevsh merged commit 7b1aae7 into op-esDec 17, 2024
@blockchaindevsh
blockchaindevsh deleted the merge_750ed20 branch December 17, 2024 02:11
Sign up for freeto 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.

20 participants

@blockchaindevsh@qizhou@qzhodl@axelKingsley@mslipper@tynes@geoknee@zhiqiangxu@protolambda@blmalone@raffaele-oplabs@clabby@AmadiMichael@trianglesphere@vdamle@sebastianst@sigma@mbaxter@agusduha@bitwiseguy
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Merge 750ed20 - #130

Merged
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20
Dec 17, 2024
Merged

Merge 750ed20#130
blockchaindevsh merged 168 commits into
op-esfrom
merge_750ed20

Conversation

@blockchaindevsh

@blockchaindevshblockchaindevsh commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

This PR merges with optimism's latest release ethereum-optimism@750ed20 .

Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol

The conflicts in .circleci/config.yml are left to @qzhodl in a follow up commit(in this PR), all other conflicts are resolved.

@qizhou , we want to keep the upstream commits, so I think we should not use squash for this PR.

axelKingsleyand others added 30 commits November 19, 2024 15:12
…ethereum-optimism#12919)
* Reset Derivation when Supervisor is Behind
* Disable Batcher Throttling in Interop local-devnet
Adds a unit test for mainnet deployments at version 1.6.0.
…#12820)
* interop: make geth Dockerfile use rc5
* use rc6
* Update ops-bedrock/l2-op-geth-interop.Dockerfile
It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
* migrate close-stale github action
* using external script
* completing script
* removing old github action
* example only
* removing versions
* removing tag-service
* feat(ctb): `RISCV.sol`
semver-lock
Co-Authored-By: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-Authored-By: Taem Park <wwwee98@gmail.com>
Co-Authored-By: Park Changwan <pcw109550@gmail.com>
Co-Authored-By: protolambda <proto@protolambda.com>
* snapshots
* diff with remote in CI
* schedule diff job
* Update .circleci/config.yml
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* remove check changed
---------
Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-authored-by: Taem Park <wwwee98@gmail.com>
Co-authored-by: Park Changwan <pcw109550@gmail.com>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* improve delayedWeth test and coverage
* improve delayedWeth test and coverage
* fix DataAvailabilityChallenge failing fuzz test
…#12996)
* improve universal and libraries tests and coverage
* fixes
…-optimism#12982)
Bumps ethereum/client-go from v1.14.11 to v1.14.12.
---
updated-dependencies:
- dependency-name: ethereum/client-go
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* contracts: remove op-nft
Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.
* fix: semver lock step - ran pre-pr.
* fix: use added/modified filter for heavy fuzz
Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.
---------
Co-authored-by: Blaine Malone <blainemalone01@gmail.com>
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
* improve optimismportal(2) test coverage
* improve optimismportal(2) test coverage
* more tests, fixes
* improve dispute game tests and coverage
* fixes
…thereum-optimism#12983)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.1...1.4.2)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* op-node: Create metrics to record if sequencer is active
* op-node: Update transactions_sequenced_total metric
---------
Co-authored-by: protolambda <proto@protolambda.com>
)
- Enables support for deploying tagged versions against new chains, but behind a huge warning that requires user input to bypass. Since our tagged release versions do not contain all implementations, using op-deployer in this way will deploy contracts that haven't been governance approved. Since this workflow is useful for development but bad for prod, I've added support for it but users have to bypass a large warning that describes the risks.
- Validates the hashes of tagged version artifacts after downloading them. This prevents users from downloading tampered versions of the artifacts from GCS.
…#13000)
* make riscv compile without the optimizer turned on
* bump riscv.sol
* bump riscv.sol
…2985)
Test hard fork offset overrides
Co-authored-by: Vinod Damle <vinod@oplabs.co>
…ations (ethereum-optimism#13012)
This is adding op-program/v1.4.0-rc.1 with absolute prestate hash
0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe
to the releases.json file.
This release contains Sepolia Holocene activation times for
OP, Base, Mode, Zora, BUT NOT Metal.
dependabotBotand others added 18 commits December 4, 2024 23:15
…eum-optimism#13233)
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0.
- [Commits](golang/sync@v0.9.0...v0.10.0)
---
updated-dependencies:
- dependency-name: golang.org/x/sync
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…thereum-optimism#13234)
Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.2...1.4.3)
---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…13232)
Updates the spacers check to use the new framework for contracts
checks written in Go. Adds tests for the functions that this
check uses.
Fixes the name for scheduled-forge-coverage to
develop-forge-coverage in line with the existing pattern.
* op-deployer: Update OPCM bootstrap command
Updates the OPCM bootstrap command to allow bootstrapping Holocene.
* fix merge artifact
* ci: Remove Kurtosis-specific go job
Kurtosis landed [my fix](kurtosis-tech/kurtosis#2567) for the race condition that prevented us from running a shared Kurtosis instance between jobs. This PR brings that back.
* remove dep
…ask (ethereum-optimism#13250)
* chore(op-deployer): Accept existing impl in `DelayedWETH` bootstrap task
* remove check
…config chain ID indicator (ethereum-optimism#13217)
* op-challenger: Support --cannon-l2-chain-id to pass chain ID through to op-program.
* op-program: Default to assuming configs are available in client.
Provide a --l2.custom flag to set the chain ID to the custom chain indicator so the client will load configs via the preimage oracle.
Since loading configs via the preimage oracle doesn't work on-chain, this is a safer and simpler default now that op-program can be built
with custom configs embedded.
* op-challenger: Switch to custom L2 flag instead of specifying chain ID
* op-challenger: Fix boolean option in op-program execution.
* op-e2e: Set custom L2 flag in precompiles test
* interop: parallelized receipt fetching
* fix test
* remove elastic thread count
* Add Debug Message for Range Fetching
* rename end to last
* Remove Println
---------
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
I've found a [deadlock](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73846/workflows/19369ca9-9eaa-4021-9eb8-589a06e7bd34/jobs/3018041) in the op-conductor tests. The inner conductor loop is stuck waiting on a queue signal that never arrives, which in turn causes the test to hang since the coordinating waitgroup is never decremented. I believe this happens because the conductor's `queueAction` method is non-blocking, so nothing ever triggers conductor's inner loop when conductor start up. I've updated the code to use a blocking channel write when conductor starts to avoid this issue.
The traces of the deadlock look like this, for reference:
```
goroutine 227 [semacquire, 9 minutes]:
sync.runtime_Semacquire(0xc0004df577?)
/usr/local/go/src/runtime/sema.go:62 +0x25
sync.(*WaitGroup).Wait(0x0?)
/usr/local/go/src/sync/waitgroup.go:116 +0x48
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).execute(0xc0003e4008, 0x0)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:177 +0x65
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).executeAction(...)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:197
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:163 +0x93
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).TestScenario4(0xc0003e4008)
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:420 +0x27
reflect.Value.call({0xc000131900?, 0xc0001b3740?, 0x1fed5b8?}, {0x191d63c, 0x4}, {0xc0004dff28, 0x1, 0x16f12e0?})
/usr/local/go/src/reflect/value.go:596 +0xca6
reflect.Value.Call({0xc000131900?, 0xc0001b3740?, 0x28307b8?}, {0xc0004dff28?, 0xf?, 0x0?})
/usr/local/go/src/reflect/value.go:380 +0xb9
github.com/stretchr/testify/suite.Run.func1(0xc0001f9ba0)
/home/circleci/go/pkg/mod/github.com/stretchr/testify@v1.10.0/suite/suite.go:202 +0x4a5
testing.tRunner(0xc0001f9ba0, 0xc0001f4e10)
/usr/local/go/src/testing/testing.go:1689 +0xfb
created by testing.(*T).Run in goroutine 166
/usr/local/go/src/testing/testing.go:1742 +0x390
goroutine 229 [select, 9 minutes]:
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loopAction(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:577 +0x14f
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization.func1()
/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:159 +0x33
github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loop(0xc00056ab40)
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:570 +0x99
created by github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).Start in goroutine 227
/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:376 +0x1f6
FAIL	github.com/ethereum-optimism/optimism/op-conductor/conductor	600.103s
```
(TODO: resolve conflict in .circleci/config.yml)
Conflicts:
.circleci/config.yml
go.mod
go.sum
op-batcher/batcher/driver.go
op-service/txmgr/txmgr.go
packages/contracts-bedrock/interfaces/L2/ISoulGasToken.sol
packages/contracts-bedrock/test/setup/Setup.sol
@qizhou

Copy link
Copy Markdown

What is the corresponding release of the remote commit?

@blockchaindevsh

Copy link
Copy Markdown
CollaboratorAuthor

What is the corresponding release of the remote commit?

It corresponds to this release: https://github.com/ethereum-optimism/optimism/releases/tag/op-dispute-mon%2Fv1.3.0

@qzhodlqzhodl mentioned this pull request Dec 17, 2024
@blockchaindevsh
blockchaindevsh merged commit 7b1aae7 into op-esDec 17, 2024
@blockchaindevsh
blockchaindevsh deleted the merge_750ed20 branch December 17, 2024 02:11
Sign up for freeto 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.

20 participants

@blockchaindevsh@qizhou@qzhodl@axelKingsley@mslipper@tynes@geoknee@zhiqiangxu@protolambda@blmalone@raffaele-oplabs@clabby@AmadiMichael@trianglesphere@vdamle@sebastianst@sigma@mbaxter@agusduha@bitwiseguy