Require pnpm package cache for `op-chain-ops` job

.circleci/config.yml

@@ -717,18 +717,6 @@ jobs:
           command: make fuzz
           working_directory: op-chain-ops
 
-  fuzz-cannon:
-    docker:
-      - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
-    steps:
-      - checkout
-      - check-changed:
-          patterns: cannon,packages/contracts-bedrock/contracts/cannon
-      - run:
-          name: Fuzz
-          command: make fuzz
-          working_directory: cannon
-
   depcheck:
     docker:
       - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
@@ -1231,6 +1219,11 @@ workflows:
       - depcheck:
           requires:
             - pnpm-monorepo
+      - op-chain-ops-tests:
+          name: op-chain-ops-tests
+          module: op-chain-ops
+          requires:
+            - pnpm-monorepo
       - devnet:
           name: devnet (with deployed contracts)
           deploy: true
@@ -1294,9 +1287,6 @@ workflows:
       - go-test:
           name: op-bindings-tests
           module: op-bindings
-      - go-test:
-          name: op-chain-ops-tests
-          module: op-chain-ops
       - go-test:
           name: op-node-tests
           module: op-node

cannon/mipsevm/evm_test.go

@@ -39,17 +39,18 @@ func testContractsSetup(t require.TestingT) (*Contracts, *Addresses) {
 
 func SourceMapTracer(t *testing.T, contracts *Contracts, addrs *Addresses) vm.EVMLogger {
 	sources := bindings.Sources
+	contractsDir := "../../packages/contracts-bedrock"
 	for i, source := range sources {
 		// Add relative path to contracts directory if the source is not
 		// already relativized.
 		if !strings.HasPrefix(source, "..") {
-			sources[i] = path.Join("../../packages/contracts-bedrock", source)
+			sources[i] = path.Join(contractsDir, source)
 		}
 	}
 
-	mipsSrcMap, err := contracts.MIPS.SourceMap(append([]string{"contracts/cannon/MIPS.sol"}, sources...))
+	mipsSrcMap, err := contracts.MIPS.SourceMap(append([]string{path.Join(contractsDir, "contracts/cannon/MIPS.sol")}, sources...))
 	require.NoError(t, err)
-	oracleSrcMap, err := contracts.Oracle.SourceMap(append([]string{"contracts/cannon/PreimageOracle.sol"}, sources...))
+	oracleSrcMap, err := contracts.Oracle.SourceMap(append([]string{path.Join(contractsDir, "contracts/cannon/PreimageOracle.sol")}, sources...))
 	require.NoError(t, err)
 
 	return srcmap.NewSourceMapTracer(map[common.Address]*srcmap.SourceMap{addrs.MIPS: mipsSrcMap, addrs.Oracle: oracleSrcMap}, os.Stdout)