Merge pull request #100 from defi-wonderland/fix/merge-develop-to-beacon

fix: merge develop to beacon

Author: agusduha

.circleci/config.yml

@@ -828,55 +828,47 @@ jobs:
           when: always
 
   go-test:
-    parameters:
-      module:
-        description: Go Module Name
-        type: string
-      uses_artifacts:
-        description: Uses contract artifacts
-        type: boolean
-        default: false
-    docker:
-      - image: <<pipeline.parameters.ci_builder_image>>
-    resource_class: xlarge
-    circleci_ip_ranges: true
+    machine: true
+    resource_class: ethereum-optimism/latitude-1
     steps:
       - checkout
-      - restore_cache:
-          name: Restore Go modules cache
-          key: gomod-{{ checksum "go.sum" }}
-      - restore_cache:
-          name: Restore Go build cache
-          keys:
-            - golang-build-cache-test-<<parameters.module>>-{{ checksum "go.sum" }}
-            - golang-build-cache-test-
-      - when:
-          condition: <<parameters.uses_artifacts>>
-          steps:
-            - attach_workspace: { at: "." }
-      - run:
-          name: Install components
-          command: |
-            go version
-            go install gotest.tools/[email protected]
-      - run:
-          name: prep results dir
-          command: mkdir -p /tmp/test-results && mkdir -p /tmp/testlogs
+      - attach_workspace:
+          at: "."
       - run:
           name: run tests
           command: |
-            ENABLE_ANVIL=true SEPOLIA_RPC_URL="https://ci-sepolia-l1.optimism.io" gotestsum --format=testname --junitfile=/tmp/test-results/<<parameters.module>>.xml --jsonfile=/tmp/testlogs/log.json \
-            -- -parallel=8 -coverpkg=github.com/ethereum-optimism/optimism/... -coverprofile=coverage.out ./...
-          working_directory: <<parameters.module>>
-      - save_cache:
-          name: Save Go build cache
-          key: golang-build-cache-test-<<parameters.module>>-{{ checksum "go.sum" }}
-          paths:
-            - "/root/.cache/go-build"
+            mkdir -p ./tmp/test-results && mkdir -p ./tmp/testlogs
+            
+            packages=(
+              op-batcher
+              op-chain-ops
+              op-node
+              op-proposer
+              op-challenger
+              op-dispute-mon
+              op-conductor
+              op-program
+              op-service
+              op-supervisor
+              packages/contracts-bedrock/scripts/checks/semver-natspec
+            )
+            formatted_packages=""
+            for package in "${packages[@]}"; do
+              formatted_packages="$formatted_packages ./$package/..."
+            done
+            
+            export ENABLE_ANVIL=true
+            export SEPOLIA_RPC_URL="https://ci-sepolia-l1-archive.optimism.io"
+            
+            gotestsum --format=testname \
+              --junitfile=./tmp/test-results/results.xml \
+              --jsonfile=./tmp/testlogs/log.json \
+              -- -coverpkg=github.com/ethereum-optimism/optimism/... \
+              -coverprofile=coverage.out $formatted_packages
       - store_test_results:
-          path: /tmp/test-results
+          path: ./tmp/test-results
       - store_artifacts:
-          path: /tmp/testlogs
+          path: ./tmp/testlogs
           when: always
 
   go-e2e-test:
@@ -1355,30 +1347,8 @@ workflows:
           uses_artifacts: true
           requires: ["go-mod-download", "contracts-bedrock-build"]
       - go-test:
-          name: <<matrix.module>>-tests
+          name: go-test-all
           requires:
-            - go-mod-download
-          matrix:
-            parameters:
-              module:
-                - op-batcher
-                - op-node
-                - op-proposer
-                - op-challenger
-                - op-dispute-mon
-                - op-conductor
-                - op-program
-                - op-service
-                - op-supervisor
-      - go-test:
-          name: semver-natspec-tests
-          module: packages/contracts-bedrock/scripts/checks/semver-natspec
-      - go-test:
-          name: op-chain-ops-tests
-          module: op-chain-ops
-          uses_artifacts: true
-          requires:
-            - go-mod-download
             - contracts-bedrock-build
       - go-test-kurtosis:
           name: op-chain-ops-integration
@@ -1405,9 +1375,7 @@ workflows:
           requires:
             - contracts-bedrock-build
             - cannon-prestate
-      - op-program-compat:
-          requires:
-            - op-program-tests
+      - op-program-compat
       - bedrock-go-tests:
           requires:
             - go-mod-download
@@ -1417,18 +1385,8 @@ workflows:
             - check-generated-mocks-op-node
             - check-generated-mocks-op-service
             - go-mod-download
-            - op-batcher-tests
-            - op-chain-ops-tests
             - op-chain-ops-integration
-            - op-node-tests
-            - op-proposer-tests
-            - op-challenger-tests
-            - op-dispute-mon-tests
-            - op-conductor-tests
-            - op-program-tests
             - op-program-compat
-            - op-service-tests
-            - op-supervisor-tests
             - op-e2e-HTTP-tests
             - op-e2e-fault-proof-tests
             - op-e2e-action-tests
@@ -1438,6 +1396,7 @@ workflows:
             - op-program-docker-build
             - op-supervisor-docker-build
             - proofs-tools-docker-build
+            - go-test-all
       - docker-build:
           name: <<matrix.docker_name>>-docker-build
           docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>

cannon/Makefile

@@ -21,6 +21,10 @@ cannon32-impl:
 cannon64-impl:
 	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build --tags=cannon64 -v $(LDFLAGS) -o ./bin/cannon64-impl .
 
+# Note: This target is used by ./scripts/build-legacy-cannons.sh
+# It should build the individual versions of cannons and copy them into place in hte multicannon/embeds directory
+# Ideally, preserve backwards compatibility with this behaviour but if it needs to change, build-legacy-cannons.sh will
+# need to be updated to account for different behaviours in different versions.
 cannon-embeds: cannon32-impl cannon64-impl
 	# singlethreaded-v2
 	@cp bin/cannon32-impl ./multicannon/embeds/cannon-2

cannon/mipsevm/exec/calling_convention.go

@@ -0,0 +1,27 @@
+package exec
+
+// FYI: https://en.wikibooks.org/wiki/MIPS_Assembly/Register_File
+//
+//	https://refspecs.linuxfoundation.org/elf/mipsabi.pdf
+const (
+	// syscall number; 1st return value
+	RegV0 = 2
+	// syscall arguments; returned unmodified
+	RegA0 = 4
+	RegA1 = 5
+	RegA2 = 6
+	// 4th syscall argument; set to 0/1 for success/error
+	RegA3 = 7
+)
+
+// FYI: https://web.archive.org/web/20231223163047/https://www.linux-mips.org/wiki/Syscall
+
+const (
+	RegSyscallNum    = RegV0
+	RegSyscallErrno  = RegA3
+	RegSyscallRet1   = RegV0
+	RegSyscallParam1 = RegA0
+	RegSyscallParam2 = RegA1
+	RegSyscallParam3 = RegA2
+	RegSyscallParam4 = RegA3
+)

cannon/mipsevm/exec/mips_syscalls.go

@@ -99,12 +99,12 @@ const (
 )
 
 func GetSyscallArgs(registers *[32]Word) (syscallNum, a0, a1, a2, a3 Word) {
-	syscallNum = registers[2] // v0
+	syscallNum = registers[RegSyscallNum] // v0
 
-	a0 = registers[4]
-	a1 = registers[5]
-	a2 = registers[6]
-	a3 = registers[7]
+	a0 = registers[RegSyscallParam1]
+	a1 = registers[RegSyscallParam2]
+	a2 = registers[RegSyscallParam3]
+	a3 = registers[RegSyscallParam4]
 
 	return syscallNum, a0, a1, a2, a3
 }
@@ -281,8 +281,8 @@ func HandleSysFcntl(a0, a1 Word) (v0, v1 Word) {
 }
 
 func HandleSyscallUpdates(cpu *mipsevm.CpuScalars, registers *[32]Word, v0, v1 Word) {
-	registers[2] = v0
-	registers[7] = v1
+	registers[RegSyscallRet1] = v0
+	registers[RegSyscallErrno] = v1
 
 	cpu.PC = cpu.NextPC
 	cpu.NextPC = cpu.NextPC + 4

cannon/mipsevm/multithreaded/mips.go

@@ -59,8 +59,8 @@ func (m *InstrumentedState) handleSyscall() error {
 
 		newThread.Registers[29] = a1
 		// the child will perceive a 0 value as returned value instead, and no error
-		newThread.Registers[2] = 0
-		newThread.Registers[7] = 0
+		newThread.Registers[exec.RegSyscallRet1] = 0
+		newThread.Registers[exec.RegSyscallErrno] = 0
 		m.state.NextThreadId++
 
 		// Preempt this thread for the new one. But not before updating PCs

cannon/scripts/build-legacy-cannons.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+set -euo pipefail
+SCRIPTS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+
+# This script builds a version of the cannon executable that includes support for both current and legacy state versions.
+# Each cannon release is built
+
+TMP_DIR=$(mktemp -d)
+function cleanup() {
+    rm -rf "${TMP_DIR}"
+}
+trap cleanup EXIT
+echo "Using temp dir: ${TMP_DIR}"
+cd "${TMP_DIR}"
+
+# Need to check out a fresh copy of the monorepo so we can switch to specific tags without it also affecting the
+# contents of this script (which is checked into the repo).
+git clone https://github.com/ethereum-optimism/optimism --recurse-submodules
+
+CANNON_DIR="${SCRIPTS_DIR}/../"
+EMBEDS_DIR="${CANNON_DIR}/multicannon/embeds"
+LOGS_DIR="${CANNON_DIR}/temp/logs"
+REPO_DIR="${TMP_DIR}/optimism"
+BIN_DIR="${REPO_DIR}/cannon/multicannon/embeds"
+
+mkdir -p "${LOGS_DIR}"
+
+cd "${REPO_DIR}"
+
+function buildVersion() {
+  TAG=${1}
+  LOG_FILE="${LOGS_DIR}/build-$(echo "${TAG}" | cut -c 8-).txt"
+  echo "Building Version: ${TAG} Logs: ${LOG_FILE}"
+  git checkout "${TAG}" > "${LOG_FILE}" 2>&1
+  git submodule update --init --recursive >> "${LOG_FILE}" 2>&1
+  rm -rf "${BIN_DIR}/cannon-"*
+  make -C "${REPO_DIR}/cannon" cannon-embeds >> "${LOG_FILE}" 2>&1
+  cp "${BIN_DIR}/cannon-"* "${EMBEDS_DIR}/"
+  echo "Built ${TAG} with versions:"
+  (cd "${BIN_DIR}" && ls cannon-*)
+}
+
+# Build each release of cannon from earliest to latest. Releases with qualifiers (e.g. `-rc`, `-alpha` etc are skipped.
+# If the same state version is supported by multiple version tags built, the build from the last tag listed will be used
+# The currently checked out code is built after this list to include the currently supported state versions and
+# build the final cannon executable.
+VERSIONS=$(git tag --list 'cannon/v*' --sort taggerdate | grep -v -- '-')
+for VERSION in ${VERSIONS}
+do
+  buildVersion "$VERSION"
+done
+
+cd "${CANNON_DIR}"
+LOG_FILE="${LOGS_DIR}/build-current.txt"
+echo "Building current version of cannon Logs: ${LOG_FILE}"
+make cannon > "${LOG_FILE}" 2>&1
+
+echo "All cannon versions successfully built and available in ${EMBEDS_DIR}"
+"${CANNON_DIR}/bin/cannon" list