Skip to content

fix: superchain erc20 factory merge conflicts#93

Merged
agusduha merged 25 commits intosc-feat/crosschain-erc20from
fix/superchain-erc20-factory-merge-conflicts
Oct 11, 2024
Merged

fix: superchain erc20 factory merge conflicts#93
agusduha merged 25 commits intosc-feat/crosschain-erc20from
fix/superchain-erc20-factory-merge-conflicts

Conversation

@agusduha
Copy link
Copy Markdown
Member

No description provided.

geoknee and others added 25 commits October 8, 2024 13:09
* op-node,op-supervisor: feed local-unsafe/local-safe/l1-finalized data to supervisor

* op-node,op-service,op-e2e: wip, fix interop op-node tests

* post-rebase compilation fixes

* BlockRef

* op-supervisor: fix service test, cleanup todo

* op-supervisor: link TODO comments to issue

* interop: fix e2e action test

---------

Co-authored-by: protolambda <proto@protolambda.com>
)

Update README to use singlethreaded-2 since the old singlethreaded likely isn't available if just compiling the latest version.
…m-optimism#12200)

* 1. Added `WithRegisters` for initializing state's `Registers`.
2. Added `ThreadProofEncoder` helper function to generate `ThreadProof`.
3. Updated `AssertEVMReverts` to include `statePCs` for multiple memory requirements, added `ProofData` parameter for passing `ThreadProof`, and introduced `expectedReason` parameter for more precise testing.
4. Revised `TestEVMFault` and `TestEVM_UnsupportedSyscall` test functions to be compatible with `AssertEVMReverts`.

* lint fix and comment fix

* avoid false negatives

* delete WithRegisters && create ProofGenerator

* assert multi outputs

* fix naming issue

* Update cannon/mipsevm/tests/evm_multithreaded_test.go

Nice catch!

Co-authored-by: mbaxter <meredith.a.baxter@gmail.com>

* Small fix

* link check

* make expectedReason a value & delete nil check

---------

Co-authored-by: mbaxter <meredith.a.baxter@gmail.com>
Ports the interface checks command to go. Updates build command
to execute forge fmt and the interface checks.
)

* OPCM: AddressManager and ProxyAdmin assertions.

* fix: Added logic for proxy types to check implementations.

* fix: touch ups for RDP impl checking.

* fix: fully fledged proxies added to tests because of new assertions.

* fix: removing console2 lib.

* fix: semgrep complaining.

* fix: comment cleanup and logical split to avoid stack too deep error.

* fix: adding comment back in.

* fix: added natspec comments for new DeployUtils functions.

* fix: removed unused imports.
Signed-off-by: Chen Kai <281165273grape@gmail.com>
Signed-off-by: Chen Kai <281165273grape@gmail.com>
Updates the dockerfile for building contracts-bedrock to use
just forge-build instead of just build since just build now does
a few other things for the sake of devex.
…mism#12384)

Restores compatibility with the target name people are used to using for e2e tests and that is mentioned in the README and error messages etc.
Adds semgrep to ci builder and adds justfile commands to install
semgrep like everything else.
* feat: add op-deployer inspect command

* lint

* chore: clarify arg
)

* e2e test

* undo some changes

* undo forge-std
Adds INTERFACES.md to explain how contract interfaces are used
within the contracts-bedrock package.
…thereum-optimism#12399)

* use interface and deployutils for remaining contracts in l2genesis

* fix semgrep errors, update semver
Slither hasn't been useful for a long time. Refer to issue ethereum-optimism#12410
for more context.
* cannon: Fix test compilation for 64-bit

* cannon: Fix typo
…thereum-optimism#12382)

* op-program: Store created blocks to avoid needing to re-execute them.

Since op-program always creates a new block via engine_forkChoiceUpdated/engine_getPayload and then immediately sends the same block back to engine_newPayload to be imported, store the created block to the database without updating the chain head, so the engine_newPayload method is a no-op instead of having to execute the transactions again.

* op-program: Add test that created block is not reprocessed on import (ethereum-optimism#12402)

Also fixes differences in block hash for created payloads when using non-op stack chains.
@agusduha agusduha self-assigned this Oct 11, 2024
@agusduha agusduha merged commit 97fb300 into sc-feat/crosschain-erc20 Oct 11, 2024
@agusduha agusduha deleted the fix/superchain-erc20-factory-merge-conflicts branch October 11, 2024 14:58
0xiamflux pushed a commit that referenced this pull request Jan 27, 2026
### Description

> [!WARNING]
>
> Stacked ontop of #124 

Introduces an optimism consensus block type.

### Metadata

Closes #93 
Closes #92

---------

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.