chore: sync fee splitter system

.gitignore

@@ -22,7 +22,6 @@ cache
 
 !op-deployer/pkg/deployer/artifacts
 
-
 packages/contracts-bedrock/deployments/anvil
 
 # vim
@@ -45,8 +44,10 @@ packages/contracts-bedrock/deployments/anvil
 
 coverage.out
 
-
 __pycache__
 
 # Ignore echidna artifacts
 crytic-export
+
+# ignore local asdf config
+.tool-versions

.golangci.yaml

@@ -6,7 +6,6 @@ linters:
     - asciicheck
     - misspell
     - errorlint
-    - bodyclose
 
     # Only enabled in specific cases. See settings and exclusions below
     - exhaustruct

.semgrep/rules/sol-rules.yaml

@@ -319,6 +319,7 @@ rules:
       exclude:
         - packages/contracts-bedrock/src/L1/OPContractsManager.sol
         - packages/contracts-bedrock/src/L1/OptimismPortal2.sol
+        - packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
         - packages/contracts-bedrock/src/L2/FeeVault.sol
         - packages/contracts-bedrock/src/L2/OptimismMintableERC721.sol
         - packages/contracts-bedrock/src/L2/OptimismMintableERC721Factory.sol
@@ -327,7 +328,9 @@ rules:
         - packages/contracts-bedrock/src/dispute/AnchorStateRegistry.sol
         - packages/contracts-bedrock/src/dispute/DelayedWETH.sol
         - packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
+        - packages/contracts-bedrock/src/dispute/v2/FaultDisputeGameV2.sol
         - packages/contracts-bedrock/src/dispute/PermissionedDisputeGame.sol
+        - packages/contracts-bedrock/src/dispute/v2/PermissionedDisputeGameV2.sol
         - packages/contracts-bedrock/src/dispute/SuperFaultDisputeGame.sol
         - packages/contracts-bedrock/src/dispute/SuperPermissionedDisputeGame.sol
         - packages/contracts-bedrock/src/governance/MintManager.sol
@@ -362,3 +365,20 @@ rules:
     paths:
       exclude:
         - packages/contracts-bedrock/scripts/libraries/Config.sol
+
+  - id: sol-style-event-param-fmt
+    languages: [solidity]
+    severity: ERROR
+    message: Event parameters must be named using camelCase and must not be prefixed with underscore
+    pattern-either:
+      # Match parameters with underscore prefix
+      - pattern-regex: event\s+\w+\s*\([^)]*\b(?:address|uint\d*|int\d*|bytes\d*|bool|string)\s+(?:indexed\s+)?_\w+
+      # Match unnamed parameters (type with optional indexed but no parameter name before comma or closing paren)
+      - pattern-regex: event\s+\w+\s*\([^)]*\b(?:address|uint\d*|int\d*|bytes\d*|bool|string)\b(?:\s+indexed)?\s*[,)]
+      # Match parameters that are all uppercase (like NEW_OWNER)
+      - pattern-regex: event\s+\w+\s*\([^)]*\b(?:address|uint\d*|int\d*|bytes\d*|bool|string)\s+(?:indexed\s+)?[A-Z][A-Z0-9_]*\s*[,)]
+    paths:
+      exclude:
+        # LegacyMintableERC20 and the corresponding interface use legacy naming conventions.
+        - packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
+        - packages/contracts-bedrock/interfaces/legacy/ILegacyMintableERC20Full.sol

.semgrep/tests/sol-rules.t.sol

@@ -712,3 +712,23 @@ contract SemgrepTest__sol_safety_try_catch_eip_150 {
         }
     }
 }
+
+contract SemgrepTest__sol_style_event_param_fmt {
+    // ok: sol-style-event-param-fmt
+    event OwnerChanged(address previousOwner, address newOwner);
+
+    // ruleid: sol-style-event-param-fmt
+    event OwnerChanged(address _previousOwner, address _newOwner);
+
+    // ruleid: sol-style-event-param-fmt
+    event OwnerChanged(address);
+
+    // ruleid: sol-style-event-param-fmt
+    event OwnerChanged(address NEW_OWNER);
+
+    // ok: sol-style-event-param-fmt
+    event SomethingWithMint(uint256 mint);
+
+    // ruleid: sol-style-event-param-fmt
+    event SomethingWithMint(uint256 _mint);
+}

Makefile

@@ -206,7 +206,6 @@ TEST_PKGS := \
 	./packages/contracts-bedrock/scripts/checks/... \
 	./op-dripper/... \
 	./devnet-sdk/... \
-	./op-acceptance-tests/... \
 	./kurtosis-devnet/... \
 	./op-devstack/... \
 	./op-deployer/pkg/deployer/artifacts/... \
@@ -265,7 +264,7 @@ go-tests-short: $(TEST_DEPS) ## Runs comprehensive Go tests with -short flag
 go-tests-short-ci: ## Runs short Go tests with gotestsum for CI (assumes deps built by CI)
 	@echo "Setting up test directories..."
 	mkdir -p ./tmp/test-results ./tmp/testlogs
-	@echo "Running Go tests with gotestsum..."
+	@echo 'Running Go tests (short) with gotestsum...'
 	$(DEFAULT_TEST_ENV_VARS) && \
 	$(CI_ENV_VARS) && \
 	gotestsum --format=testname \

README.md

@@ -63,22 +63,38 @@ The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vuln
 ## Directory Structure
 
 <pre>
+├── <a href="./cannon">cannon</a>: Onchain MIPS instruction emulator for fault proofs
+├── <a href="./devnet-sdk">devnet-sdk</a>: Comprehensive toolkit for standardized devnet interactions
 ├── <a href="./docs">docs</a>: A collection of documents including audits and post-mortems
 ├── <a href="./kurtosis-devnet">kurtosis-devnet</a>: OP-Stack Kurtosis devnet
+├── <a href="./op-acceptance-tests">op-acceptance-tests</a>: Acceptance tests and configuration for OP Stack
+├── <a href="./op-alt-da">op-alt-da</a>: Alternative Data Availability mode (beta)
 ├── <a href="./op-batcher">op-batcher</a>: L2-Batch Submitter, submits bundles of batches to L1
 ├── <a href="./op-chain-ops">op-chain-ops</a>: State surgery utilities
 ├── <a href="./op-challenger">op-challenger</a>: Dispute game challenge agent
+├── <a href="./op-conductor">op-conductor</a>: High-availability sequencer service
+├── <a href="./op-deployer">op-deployer</a>: CLI tool for deploying and upgrading OP Stack smart contracts
+├── <a href="./op-devstack">op-devstack</a>: Flexible test frontend for integration and acceptance testing
+├── <a href="./op-dispute-mon">op-dispute-mon</a>: Off-chain service to monitor dispute games
+├── <a href="./op-dripper">op-dripper</a>: Controlled token distribution service
 ├── <a href="./op-e2e">op-e2e</a>: End-to-End testing of all bedrock components in Go
-├── <a href="./op-node">op-node</a>: rollup consensus-layer client
+├── <a href="./op-faucet">op-faucet</a>: Dev-faucet with support for multiple chains
+├── <a href="./op-fetcher">op-fetcher</a>: Data fetching utilities
+├── <a href="./op-interop-mon">op-interop-mon</a>: Interoperability monitoring service
+├── <a href="./op-node">op-node</a>: Rollup consensus-layer client
 ├── <a href="./op-preimage">op-preimage</a>: Go bindings for Preimage Oracle
 ├── <a href="./op-program">op-program</a>: Fault proof program
 ├── <a href="./op-proposer">op-proposer</a>: L2-Output Submitter, submits proposals to L1
 ├── <a href="./op-service">op-service</a>: Common codebase utilities
+├── <a href="./op-supervisor">op-supervisor</a>: Service to monitor chains and determine cross-chain message safety
+├── <a href="./op-sync-tester">op-sync-tester</a>: Sync testing utilities
+├── <a href="./op-test-sequencer">op-test-sequencer</a>: Test sequencer for development
+├── <a href="./op-up">op-up</a>: Deployment and management utilities
+├── <a href="./op-validator">op-validator</a>: Tool for validating Optimism chain configurations and deployments
 ├── <a href="./op-wheel">op-wheel</a>: Database utilities
 ├── <a href="./ops">ops</a>: Various operational packages
 ├── <a href="./packages">packages</a>
 │   ├── <a href="./packages/contracts-bedrock">contracts-bedrock</a>: OP Stack smart contracts
-├── <a href="./.semgrep">semgrep</a>: Semgrep rules and tests
 </pre>
 
 ## Development and Release Process

cannon/cmd/run.go

@@ -99,7 +99,7 @@ var (
 	RunInfoAtFlag = &cli.GenericFlag{
 		Name:     "info-at",
 		Usage:    "step pattern to print info at: " + patternHelp,
-		Value:    MustStepMatcherFlag("%100000"),
+		Value:    MustStepMatcherFlag("%1000000000"),
 		Required: false,
 	}
 	RunPProfCPU = &cli.BoolFlag{
@@ -395,7 +395,7 @@ func Run(ctx *cli.Context) error {
 		}
 	}
 
-	state, err := versions.LoadStateFromFile(ctx.Path(RunInputFlag.Name))
+	state, err := versions.LoadStateFromFileWithLargeICache(ctx.Path(RunInputFlag.Name))
 	if err != nil {
 		return fmt.Errorf("failed to load state: %w", err)
 	}

cannon/mipsevm/arch/arch64.go

@@ -15,11 +15,12 @@ const (
 	ExtMask     = 0x7
 
 	// Ensure virtual address is limited to 48-bits as many user programs assume such to implement packed pointers
-	// limit          0x00_00_FF_FF_FF_FF_FF_FF
-	HeapStart       = 0x00_00_10_00_00_00_00_00
-	HeapEnd         = 0x00_00_60_00_00_00_00_00
-	ProgramBreak    = 0x00_00_40_00_00_00_00_00
-	HighMemoryStart = 0x00_00_7F_FF_FF_FF_F0_00
+	Limit            = 0x00_00_FF_FF_FF_FF_FF_FF
+	ProgramHeapStart = 0x00_00_00_c0_00_00_00_00
+	HeapStart        = 0x00_00_10_00_00_00_00_00
+	HeapEnd          = 0x00_00_60_00_00_00_00_00
+	ProgramBreak     = 0x00_00_40_00_00_00_00_00
+	HighMemoryStart  = 0x00_00_7F_FF_FF_FF_F0_00
 )
 
 // MIPS64 syscall table - https://github.com/torvalds/linux/blob/3efc57369a0ce8f76bf0804f7e673982384e4ac9/arch/mips/kernel/syscalls/syscall_n64.tbl. Generate the syscall numbers using the Makefile in that directory.

cannon/mipsevm/debug.go

@@ -3,11 +3,13 @@ package mipsevm
 import "github.com/ethereum/go-ethereum/common/hexutil"
 
 type DebugInfo struct {
-	Pages               int            `json:"pages"`
-	MemoryUsed          hexutil.Uint64 `json:"memory_used"`
-	NumPreimageRequests int            `json:"num_preimage_requests"`
-	TotalPreimageSize   int            `json:"total_preimage_size"`
-	TotalSteps          uint64         `json:"total_steps"`
+	Pages                     int            `json:"pages"`
+	MemoryUsed                hexutil.Uint64 `json:"memory_used"`
+	NumPreimageRequests       int            `json:"num_preimage_requests"`
+	TotalPreimageSize         int            `json:"total_preimage_size"`
+	TotalSteps                uint64         `json:"total_steps"`
+	InstructionCacheMissCount uint64         `json:"instruction_cache_miss_count"`
+	HighestICacheMissPC       hexutil.Uint64 `json:"highest_icache_miss_pc"`
 	//  Multithreading-related stats below
 	RmwSuccessCount              uint64 `json:"rmw_success_count"`
 	RmwFailCount                 uint64 `json:"rmw_fail_count"`

cannon/mipsevm/debug_test.go

@@ -18,6 +18,8 @@ func TestDebugInfo_Serialization(t *testing.T) {
 		NumPreimageRequests:          3,
 		TotalPreimageSize:            4,
 		TotalSteps:                   123456,
+		InstructionCacheMissCount:    10,
+		HighestICacheMissPC:          11,
 		RmwSuccessCount:              5,
 		RmwFailCount:                 6,
 		MaxStepsBetweenLLAndSC:       7,

cannon/mipsevm/exec/mips_instructions.go

@@ -38,7 +38,7 @@ func GetInstructionDetails(pc Word, memory *memory.Memory) (insn, opcode, fun ui
 
 // ExecMipsCoreStepLogic executes a MIPS instruction that isn't a syscall nor a RMW operation
 // If a store operation occurred, then it returns the effective address of the store memory location.
-func ExecMipsCoreStepLogic(cpu *mipsevm.CpuScalars, registers *[32]Word, memory *memory.Memory, insn, opcode, fun uint32, memTracker MemTracker, stackTracker StackTracker, features mipsevm.FeatureToggles) (memUpdated bool, effMemAddr Word, err error) {
+func ExecMipsCoreStepLogic(cpu *mipsevm.CpuScalars, registers *[32]Word, memory *memory.Memory, insn, opcode, fun uint32, memTracker MemTracker, stackTracker StackTracker) (memUpdated bool, effMemAddr Word, err error) {
 	// j-type j/jal
 	if opcode == 2 || opcode == 3 {
 		linkReg := Word(0)
@@ -117,7 +117,7 @@ func ExecMipsCoreStepLogic(cpu *mipsevm.CpuScalars, registers *[32]Word, memory
 	}
 
 	// ALU
-	val := ExecuteMipsInstruction(insn, opcode, fun, rs, rt, mem, features)
+	val := ExecuteMipsInstruction(insn, opcode, fun, rs, rt, mem)
 
 	funSel := uint32(0x1c)
 	if !arch.IsMips32 {
@@ -182,7 +182,7 @@ func assertMips64Fun(fun uint32) {
 	}
 }
 
-func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem Word, features mipsevm.FeatureToggles) Word {
+func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem Word) Word {
 	if opcode == 0 || (opcode >= 8 && opcode < 0xF) || (!arch.IsMips32 && (opcode == 0x18 || opcode == 0x19)) {
 		// transform ArithLogI to SPECIAL
 		switch opcode {
@@ -350,7 +350,7 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 					rs <<= 1
 				}
 				return Word(i)
-			case features.SupportDclzDclo && (fun == 0x24 || fun == 0x25): // dclz, dclo
+			case fun == 0x24 || fun == 0x25: // dclz, dclo
 				assertMips64Fun(insn)
 				if fun == 0x24 {
 					rs = ^rs

cannon/mipsevm/iface.go

@@ -74,9 +74,6 @@ type Metadata interface {
 // Toggles here are temporary and should be removed once the newer state version is deployed widely. The older
 // version can then be supported via multicannon pulling in a specific build and support for it dropped in latest code.
 type FeatureToggles struct {
-	SupportMinimalSysEventFd2  bool
-	SupportDclzDclo            bool
-	SupportNoopMprotect        bool
 	SupportWorkingSysGetRandom bool
 }
 

cannon/mipsevm/memory/binary_tree.go

@@ -1,7 +1,15 @@
 package memory
 
 import (
+	"fmt"
 	"math/bits"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
+)
+
+const (
+	defaultCodeSize = 128 * 1024 * 1024 // 128 MiB
+	defaultHeapSize = 512 * 1024 * 1024 // 512 MiB
 )
 
 // BinaryTreeIndex is a representation of the state of the memory in a binary merkle tree.
@@ -12,13 +20,39 @@ type BinaryTreeIndex struct {
 	pageTable map[Word]*CachedPage
 }
 
-func NewBinaryTreeMemory() *Memory {
-	pages := make(map[Word]*CachedPage)
+func NewBinaryTreeMemory(codeSize, heapSize arch.Word) *Memory {
+	pages := make(map[arch.Word]*CachedPage)
 	index := NewBinaryTreeIndex(pages)
+
+	if codeSize == 0 {
+		codeSize = defaultCodeSize
+	}
+	if heapSize == 0 {
+		heapSize = defaultHeapSize
+	}
+
+	// Defensive bounds: code region must not overlap heap start
+	if codeSize > arch.ProgramHeapStart {
+		panic(fmt.Sprintf("codeSize (0x%x) overlaps heap start (0x%x)", codeSize, arch.ProgramHeapStart))
+	}
+
+	indexedRegions := make([]MappedMemoryRegion, 2)
+	indexedRegions[0] = MappedMemoryRegion{
+		startAddr: 0,
+		endAddr:   codeSize,
+		Data:      make([]byte, codeSize),
+	}
+	indexedRegions[1] = MappedMemoryRegion{
+		startAddr: arch.ProgramHeapStart,
+		endAddr:   arch.ProgramHeapStart + heapSize,
+		Data:      make([]byte, heapSize),
+	}
+
 	return &Memory{
-		merkleIndex:  index,
-		pageTable:    pages,
-		lastPageKeys: [2]Word{^Word(0), ^Word(0)}, // default to invalid keys, to not match any pages
+		merkleIndex:   index,
+		pageTable:     pages,
+		lastPageKeys:  [2]arch.Word{^arch.Word(0), ^arch.Word(0)},
+		MappedRegions: indexedRegions,
 	}
 }