non-blocking-da v1: da errgroup

.circleci/config.yml

@@ -35,6 +35,9 @@ parameters:
   docker_publish_dispatch:
     type: boolean
     default: false
+  publish_contract_artifacts_dispatch:
+    type: boolean
+    default: false
 
 orbs:
   go: circleci/go@1.8.0
@@ -194,6 +197,10 @@ jobs:
       - run:
           name: print forge version
           command: forge --version
+      - run:
+          name: Pull artifacts
+          command: bash scripts/ops/pull-artifacts.sh
+          working_directory: packages/contracts-bedrock
       - run:
           name: Build contracts
           environment:
@@ -1461,6 +1468,34 @@ jobs:
           working_directory: ./packages/contracts-bedrock
       - notify-failures-on-develop
 
+  publish-contract-artifacts:
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
+    resource_class: medium
+    steps:
+      - gcp-cli/install
+      - gcp-oidc-authenticate:
+          gcp_cred_config_file_path: /root/gcp_cred_config.json
+          oidc_token_file_path: /root/oidc_token.json
+          project_id: GCP_TOOLS_ARTIFACTS_PROJECT_ID
+          service_account_email: GCP_CONTRACTS_PUBLISHER_SERVICE_ACCOUNT_EMAIL
+      - checkout
+      - install-contracts-dependencies
+      - run:
+          name: Pull artifacts
+          command: bash scripts/ops/pull-artifacts.sh
+          working_directory: packages/contracts-bedrock
+      - run:
+          name: Build contracts
+          environment:
+            FOUNDRY_PROFILE: ci
+          command: just build
+          working_directory: packages/contracts-bedrock
+      - run:
+          name: Publish artifacts
+          command: bash scripts/ops/publish-artifacts.sh
+          working_directory: packages/contracts-bedrock
+
 workflows:
   main:
     when:
@@ -1928,6 +1963,14 @@ workflows:
             - slack
             - oplabs-fpp-nodes
 
+  develop-publish-contract-artifacts:
+    when:
+      or:
+        - equal: [ "develop", <<pipeline.git.branch>> ]
+        - equal: [ true, <<pipeline.parameters.publish_contract_artifacts_dispatch>> ]
+    jobs:
+      - publish-contract-artifacts
+
   develop-fault-proofs:
     when:
       and:

cannon/main.go

@@ -5,9 +5,8 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"os/signal"
-	"syscall"
 
+	"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
 	"github.com/urfave/cli/v2"
 
 	"github.com/ethereum-optimism/optimism/cannon/cmd"
@@ -23,18 +22,7 @@ func main() {
 		cmd.WitnessCommand,
 		cmd.RunCommand,
 	}
-	ctx, cancel := context.WithCancel(context.Background())
-
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, syscall.SIGINT, syscall.SIGTERM)
-	go func() {
-		for {
-			<-c
-			cancel()
-			fmt.Println("\r\nExiting...")
-		}
-	}()
-
+	ctx := ctxinterrupt.WithSignalWaiterMain(context.Background())
 	err := app.RunContext(ctx, os.Args)
 	if err != nil {
 		if errors.Is(err, ctx.Err()) {

cannon/mipsevm/exec/mips_syscalls.go

@@ -15,7 +15,6 @@ import (
 // Syscall codes
 const (
 	SysMmap       = 4090
-	SysMunmap     = 4091
 	SysBrk        = 4045
 	SysClone      = 4120
 	SysExitGroup  = 4246
@@ -32,6 +31,7 @@ const (
 
 // Noop Syscall codes
 const (
+	SysMunmap        = 4091
 	SysGetAffinity   = 4240
 	SysMadvise       = 4218
 	SysRtSigprocmask = 4195

cannon/mipsevm/multithreaded/mips.go

@@ -102,13 +102,13 @@ func (m *InstrumentedState) handleSyscall() error {
 		// args: a0 = addr, a1 = op, a2 = val, a3 = timeout
 		switch a1 {
 		case exec.FutexWaitPrivate:
-			thread.FutexAddr = a0
 			m.memoryTracker.TrackMemAccess(a0)
 			mem := m.state.Memory.GetMemory(a0)
 			if mem != a2 {
 				v0 = exec.SysErrorSignal
 				v1 = exec.MipsEAGAIN
 			} else {
+				thread.FutexAddr = a0
 				thread.FutexVal = a2
 				if a3 == 0 {
 					thread.FutexTimeoutStep = exec.FutexNoTimeout
@@ -242,11 +242,11 @@ func (m *InstrumentedState) mipsStep() error {
 
 	if m.state.StepsSinceLastContextSwitch >= exec.SchedQuantum {
 		// Force a context switch as this thread has been active too long
-		if m.state.threadCount() > 1 {
+		if m.state.ThreadCount() > 1 {
 			// Log if we're hitting our context switch limit - only matters if we have > 1 thread
 			if m.log.Enabled(context.Background(), log.LevelTrace) {
 				msg := fmt.Sprintf("Thread has reached maximum execution steps (%v) - preempting.", exec.SchedQuantum)
-				m.log.Trace(msg, "threadId", thread.ThreadId, "threadCount", m.state.threadCount(), "pc", thread.Cpu.PC)
+				m.log.Trace(msg, "threadId", thread.ThreadId, "threadCount", m.state.ThreadCount(), "pc", thread.Cpu.PC)
 			}
 		}
 		m.preemptThread(thread)
@@ -339,5 +339,5 @@ func (m *InstrumentedState) popThread() {
 }
 
 func (m *InstrumentedState) lastThreadRemaining() bool {
-	return m.state.threadCount() == 1
+	return m.state.ThreadCount() == 1
 }

cannon/mipsevm/multithreaded/state.go

@@ -215,7 +215,7 @@ func (s *State) EncodeThreadProof() []byte {
 	return out
 }
 
-func (s *State) threadCount() int {
+func (s *State) ThreadCount() int {
 	return len(s.LeftThreadStack) + len(s.RightThreadStack)
 }
 

cannon/mipsevm/multithreaded/testutil/expectations.go

@@ -0,0 +1,203 @@
+package testutil
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
+)
+
+// ExpectedMTState is a test utility that basically stores a copy of a state that can be explicitly mutated
+// to define an expected post-state.  The post-state is then validated with ExpectedMTState.Validate(t, postState)
+type ExpectedMTState struct {
+	PreimageKey    common.Hash
+	PreimageOffset uint32
+	Heap           uint32
+	ExitCode       uint8
+	Exited         bool
+	Step           uint64
+	LastHint       hexutil.Bytes
+	MemoryRoot     common.Hash
+	// Threading-related expectations
+	StepsSinceLastContextSwitch uint64
+	Wakeup                      uint32
+	TraverseRight               bool
+	NextThreadId                uint32
+	ThreadCount                 int
+	RightStackSize              int
+	LeftStackSize               int
+	prestateActiveThreadId      uint32
+	prestateActiveThreadOrig    ExpectedThreadState // Cached for internal use
+	ActiveThreadId              uint32
+	threadExpectations          map[uint32]*ExpectedThreadState
+}
+
+type ExpectedThreadState struct {
+	ThreadId         uint32
+	ExitCode         uint8
+	Exited           bool
+	FutexAddr        uint32
+	FutexVal         uint32
+	FutexTimeoutStep uint64
+	PC               uint32
+	NextPC           uint32
+	HI               uint32
+	LO               uint32
+	Registers        [32]uint32
+	Dropped          bool
+}
+
+func NewExpectedMTState(fromState *multithreaded.State) *ExpectedMTState {
+	currentThread := fromState.GetCurrentThread()
+
+	expectedThreads := make(map[uint32]*ExpectedThreadState)
+	for _, t := range GetAllThreads(fromState) {
+		expectedThreads[t.ThreadId] = newExpectedThreadState(t)
+	}
+
+	return &ExpectedMTState{
+		// General Fields
+		PreimageKey:    fromState.GetPreimageKey(),
+		PreimageOffset: fromState.GetPreimageOffset(),
+		Heap:           fromState.GetHeap(),
+		ExitCode:       fromState.GetExitCode(),
+		Exited:         fromState.GetExited(),
+		Step:           fromState.GetStep(),
+		LastHint:       fromState.GetLastHint(),
+		MemoryRoot:     fromState.GetMemory().MerkleRoot(),
+		// Thread-related global fields
+		StepsSinceLastContextSwitch: fromState.StepsSinceLastContextSwitch,
+		Wakeup:                      fromState.Wakeup,
+		TraverseRight:               fromState.TraverseRight,
+		NextThreadId:                fromState.NextThreadId,
+		ThreadCount:                 fromState.ThreadCount(),
+		RightStackSize:              len(fromState.RightThreadStack),
+		LeftStackSize:               len(fromState.LeftThreadStack),
+		// ThreadState expectations
+		prestateActiveThreadId:   currentThread.ThreadId,
+		prestateActiveThreadOrig: *newExpectedThreadState(currentThread), // Cache prestate thread for internal use
+		ActiveThreadId:           currentThread.ThreadId,
+		threadExpectations:       expectedThreads,
+	}
+}
+
+func newExpectedThreadState(fromThread *multithreaded.ThreadState) *ExpectedThreadState {
+	return &ExpectedThreadState{
+		ThreadId:         fromThread.ThreadId,
+		ExitCode:         fromThread.ExitCode,
+		Exited:           fromThread.Exited,
+		FutexAddr:        fromThread.FutexAddr,
+		FutexVal:         fromThread.FutexVal,
+		FutexTimeoutStep: fromThread.FutexTimeoutStep,
+		PC:               fromThread.Cpu.PC,
+		NextPC:           fromThread.Cpu.NextPC,
+		HI:               fromThread.Cpu.HI,
+		LO:               fromThread.Cpu.LO,
+		Registers:        fromThread.Registers,
+		Dropped:          false,
+	}
+}
+
+func (e *ExpectedMTState) ExpectStep() {
+	// Set some standard expectations for a normal step
+	e.Step += 1
+	e.PrestateActiveThread().PC += 4
+	e.PrestateActiveThread().NextPC += 4
+	e.StepsSinceLastContextSwitch += 1
+}
+
+func (e *ExpectedMTState) ExpectPreemption(preState *multithreaded.State) {
+	e.ActiveThreadId = FindNextThread(preState).ThreadId
+	e.StepsSinceLastContextSwitch = 0
+	if preState.TraverseRight {
+		e.TraverseRight = e.RightStackSize > 1
+		e.RightStackSize -= 1
+		e.LeftStackSize += 1
+	} else {
+		e.TraverseRight = e.LeftStackSize == 1
+		e.LeftStackSize -= 1
+		e.RightStackSize += 1
+	}
+}
+
+func (e *ExpectedMTState) ExpectNewThread() *ExpectedThreadState {
+	newThreadId := e.NextThreadId
+	e.NextThreadId += 1
+	e.ThreadCount += 1
+
+	// Clone expectations from prestate active thread's original state (bf changing any expectations)
+	newThread := &ExpectedThreadState{}
+	*newThread = e.prestateActiveThreadOrig
+
+	newThread.ThreadId = newThreadId
+	e.threadExpectations[newThreadId] = newThread
+
+	return newThread
+}
+
+func (e *ExpectedMTState) ActiveThread() *ExpectedThreadState {
+	return e.threadExpectations[e.ActiveThreadId]
+}
+
+func (e *ExpectedMTState) PrestateActiveThread() *ExpectedThreadState {
+	return e.threadExpectations[e.prestateActiveThreadId]
+}
+
+func (e *ExpectedMTState) Thread(threadId uint32) *ExpectedThreadState {
+	return e.threadExpectations[threadId]
+}
+
+func (e *ExpectedMTState) Validate(t require.TestingT, actualState *multithreaded.State) {
+	require.Equalf(t, e.PreimageKey, actualState.GetPreimageKey(), "Expect preimageKey = %v", e.PreimageKey)
+	require.Equalf(t, e.PreimageOffset, actualState.GetPreimageOffset(), "Expect preimageOffset = %v", e.PreimageOffset)
+	require.Equalf(t, e.Heap, actualState.GetHeap(), "Expect heap = 0x%x", e.Heap)
+	require.Equalf(t, e.ExitCode, actualState.GetExitCode(), "Expect exitCode = 0x%x", e.ExitCode)
+	require.Equalf(t, e.Exited, actualState.GetExited(), "Expect exited = %v", e.Exited)
+	require.Equalf(t, e.Step, actualState.GetStep(), "Expect step = %d", e.Step)
+	require.Equalf(t, e.LastHint, actualState.GetLastHint(), "Expect lastHint = %v", e.LastHint)
+	require.Equalf(t, e.MemoryRoot, common.Hash(actualState.GetMemory().MerkleRoot()), "Expect memory root = %v", e.MemoryRoot)
+	// Thread-related global fields
+	require.Equalf(t, e.StepsSinceLastContextSwitch, actualState.StepsSinceLastContextSwitch, "Expect StepsSinceLastContextSwitch = %v", e.StepsSinceLastContextSwitch)
+	require.Equalf(t, e.Wakeup, actualState.Wakeup, "Expect Wakeup = %v", e.Wakeup)
+	require.Equalf(t, e.TraverseRight, actualState.TraverseRight, "Expect TraverseRight = %v", e.TraverseRight)
+	require.Equalf(t, e.NextThreadId, actualState.NextThreadId, "Expect NextThreadId = %v", e.NextThreadId)
+	require.Equalf(t, e.ThreadCount, actualState.ThreadCount(), "Expect thread count = %v", e.ThreadCount)
+	require.Equalf(t, e.RightStackSize, len(actualState.RightThreadStack), "Expect right stack size = %v", e.RightStackSize)
+	require.Equalf(t, e.LeftStackSize, len(actualState.LeftThreadStack), "Expect right stack size = %v", e.LeftStackSize)
+
+	// Check active thread
+	activeThread := actualState.GetCurrentThread()
+	require.Equal(t, e.ActiveThreadId, activeThread.ThreadId)
+	// Check all threads
+	expectedThreadCount := 0
+	for tid, exp := range e.threadExpectations {
+		actualThread := FindThread(actualState, tid)
+		isActive := tid == activeThread.ThreadId
+		if exp.Dropped {
+			require.Nil(t, actualThread, "Thread %v should have been dropped", tid)
+		} else {
+			require.NotNil(t, actualThread, "Could not find thread matching expected thread with id %v", tid)
+			e.validateThread(t, exp, actualThread, isActive)
+			expectedThreadCount++
+		}
+	}
+	require.Equal(t, expectedThreadCount, actualState.ThreadCount(), "Thread expectations do not match thread count")
+}
+
+func (e *ExpectedMTState) validateThread(t require.TestingT, et *ExpectedThreadState, actual *multithreaded.ThreadState, isActive bool) {
+	threadInfo := fmt.Sprintf("tid = %v, active = %v", actual.ThreadId, isActive)
+	require.Equalf(t, et.ThreadId, actual.ThreadId, "Expect ThreadId = 0x%x (%v)", et.ThreadId, threadInfo)
+	require.Equalf(t, et.PC, actual.Cpu.PC, "Expect PC = 0x%x (%v)", et.PC, threadInfo)
+	require.Equalf(t, et.NextPC, actual.Cpu.NextPC, "Expect nextPC = 0x%x (%v)", et.NextPC, threadInfo)
+	require.Equalf(t, et.HI, actual.Cpu.HI, "Expect HI = 0x%x (%v)", et.HI, threadInfo)
+	require.Equalf(t, et.LO, actual.Cpu.LO, "Expect LO = 0x%x (%v)", et.LO, threadInfo)
+	require.Equalf(t, et.Registers, actual.Registers, "Expect registers to match (%v)", threadInfo)
+	require.Equalf(t, et.ExitCode, actual.ExitCode, "Expect exitCode = %v (%v)", et.ExitCode, threadInfo)
+	require.Equalf(t, et.Exited, actual.Exited, "Expect exited = %v (%v)", et.Exited, threadInfo)
+	require.Equalf(t, et.FutexAddr, actual.FutexAddr, "Expect futexAddr = %v (%v)", et.FutexAddr, threadInfo)
+	require.Equalf(t, et.FutexVal, actual.FutexVal, "Expect futexVal = %v (%v)", et.FutexVal, threadInfo)
+	require.Equalf(t, et.FutexTimeoutStep, actual.FutexTimeoutStep, "Expect futexTimeoutStep = %v (%v)", et.FutexTimeoutStep, threadInfo)
+}