Fix for monorepo changes

.circleci/config.yml

@@ -92,9 +92,9 @@ jobs:
             - "packages/contracts-bedrock/tsconfig.tsbuildinfo"
             - "packages/contracts-bedrock/tsconfig.build.tsbuildinfo"
             - ".devnet/allocs-l1.json"
-            - ".devnet/allocs-l2.json"
             - ".devnet/allocs-l2-delta.json"
             - ".devnet/allocs-l2-ecotone.json"
+            - ".devnet/allocs-l2-fjord.json"
             - ".devnet/addresses.json"
             - "packages/contracts-bedrock/deploy-config/devnetL1.json"
             - "packages/contracts-bedrock/deployments/devnetL1"
@@ -250,9 +250,9 @@ jobs:
           command: |
             mkdir -p .devnet
             cp /tmp/workspace/.devnet/allocs-l1.json .devnet/allocs-l1.json
-            cp /tmp/workspace/.devnet/allocs-l2.json .devnet/allocs-l2.json
             cp /tmp/workspace/.devnet/allocs-l2-delta.json .devnet/allocs-l2-delta.json
             cp /tmp/workspace/.devnet/allocs-l2-ecotone.json .devnet/allocs-l2-ecotone.json
+            cp /tmp/workspace/.devnet/allocs-l2-fjord.json .devnet/allocs-l2-fjord.json
             cp /tmp/workspace/.devnet/addresses.json .devnet/addresses.json
             cp /tmp/workspace/packages/contracts-bedrock/deploy-config/devnetL1.json devnetL1.json
             cp -r /tmp/workspace/packages/contracts-bedrock/deployments/devnetL1 devnetL1
@@ -300,9 +300,9 @@ jobs:
       - run:
           name: Copy L2 Allocs
           command: |
-            cp .devnet/allocs-l2.json .devnet-asterisc/allocs-l2.json 
             cp .devnet/allocs-l2-delta.json .devnet-asterisc/allocs-l2-delta.json
             cp .devnet/allocs-l2-ecotone.json .devnet-asterisc/allocs-l2-ecotone.json
+            cp .devnet/allocs-l2-fjord.json .devnet-asterisc/allocs-l2-fjord.json
           working_directory: rvsol
       - persist_to_workspace:
           root: rvsol
@@ -335,9 +335,9 @@ jobs:
           command: |
             mkdir -p .devnet
             cp /tmp/workspace/.devnet-asterisc/allocs-l1.json .devnet/allocs-l1.json
-            cp /tmp/workspace/.devnet-asterisc/allocs-l2.json .devnet/allocs-l2.json
             cp /tmp/workspace/.devnet-asterisc/allocs-l2-delta.json .devnet/allocs-l2-delta.json
             cp /tmp/workspace/.devnet-asterisc/allocs-l2-ecotone.json .devnet/allocs-l2-ecotone.json
+            cp /tmp/workspace/.devnet-asterisc/allocs-l2-fjord.json .devnet/allocs-l2-fjord.json
             cp /tmp/workspace/.devnet-asterisc/addresses.json .devnet/addresses.json
             mkdir -p packages/contracts-bedrock
             cp -r /tmp/workspace/packages/contracts-bedrock/deploy-config packages/contracts-bedrock
@@ -391,7 +391,7 @@ jobs:
           name: Verify prestate
           command: |
             EXPECTED_PRESTATE_HASH=$(jq -r '.["op-program"]["<<parameters.version>>"]' ./prestates.json)
-            ACTUAL=$(jq -r .pre ./bin/prestate-proof.json)
+            ACTUAL=$(jq -r .stateHash ./bin/prestate.json)
             echo "Expected: ${EXPECTED_PRESTATE_HASH}"
             echo "Actual:   ${ACTUAL}"
             if [[ "${EXPECTED_PRESTATE_HASH}" != "${ACTUAL}" ]]

op-e2e/e2eutils/challenger/helper.go

@@ -40,22 +40,22 @@ func applyAsteriscConfig(
 ) {
 	require := require.New(t)
 	root := op_e2e_challenger.FindMonorepoRoot(t)
-	c.AsteriscBin = root + "rvgo/bin/asterisc"
-	c.AsteriscServer = root + "rvsol/lib/optimism/op-program/bin/op-program"
+	c.Asterisc.VmBin = root + "rvgo/bin/asterisc"
+	c.Asterisc.Server = root + "rvsol/lib/optimism/op-program/bin/op-program"
 	c.AsteriscAbsolutePreState = root + "rvgo/bin/prestate.json"
-	c.AsteriscSnapshotFreq = 10_000_000
+	c.Asterisc.SnapshotFreq = 10_000_000
 
 	genesisBytes, err := json.Marshal(l2Genesis)
 	require.NoError(err, "marshall l2 genesis config")
 	genesisFile := filepath.Join(c.Datadir, "l2-genesis.json")
 	require.NoError(os.WriteFile(genesisFile, genesisBytes, 0o644))
-	c.AsteriscL2GenesisPath = genesisFile
+	c.Asterisc.L2GenesisPath = genesisFile
 
 	rollupBytes, err := json.Marshal(rollupCfg)
 	require.NoError(err, "marshall rollup config")
 	rollupFile := filepath.Join(c.Datadir, "rollup.json")
 	require.NoError(os.WriteFile(rollupFile, rollupBytes, 0o644))
-	c.AsteriscRollupConfigPath = rollupFile
+	c.Asterisc.RollupConfigPath = rollupFile
 }
 
 func NewChallenger(t *testing.T, ctx context.Context, sys op_e2e_challenger.EndpointProvider, name string, options ...op_e2e_challenger.Option) *op_e2e_challenger.Helper {
@@ -96,12 +96,12 @@ func NewChallengerConfig(t *testing.T, sys op_e2e_challenger.EndpointProvider, l
 	require.NotEmpty(t, cfg.TxMgrConfig.PrivateKey, "Missing private key for TxMgrConfig")
 	require.NoError(t, cfg.Check(), "op-challenger config should be valid")
 
-	if cfg.AsteriscBin != "" {
-		_, err := os.Stat(cfg.AsteriscBin)
+	if cfg.Asterisc.VmBin != "" {
+		_, err := os.Stat(cfg.Asterisc.VmBin)
 		require.NoError(t, err, "asterisc should be built. Make sure you've run make")
 	}
-	if cfg.AsteriscServer != "" {
-		_, err := os.Stat(cfg.AsteriscServer)
+	if cfg.Asterisc.Server != "" {
+		_, err := os.Stat(cfg.Asterisc.Server)
 		require.NoError(t, err, "op-program should be built. Make sure you've run make prestate")
 	}
 	if cfg.AsteriscAbsolutePreState != "" {

op-e2e/e2eutils/disputegame/helper.go

@@ -6,11 +6,9 @@ import (
 	"time"
 
 	"github.com/ethereum-optimism/asterisc/op-e2e/e2eutils/challenger"
-	"github.com/ethereum-optimism/asterisc/rvgo/bindings"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts/metrics"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/outputs"
-	op_e2e_bindings "github.com/ethereum-optimism/optimism/op-e2e/bindings"
 	op_e2e_challenger "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/challenger"
 	op_e2e_disputegame "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/disputegame"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/disputegame/preimage"
@@ -45,15 +43,14 @@ func (h *AsteriscFactoryHelper) PreimageHelper(ctx context.Context) *preimage.He
 	opts := &bind.CallOpts{Context: ctx}
 	gameAddr, err := h.Factory.GameImpls(opts, asteriscGameType)
 	h.Require.NoError(err)
-	game, err := op_e2e_bindings.NewFaultDisputeGameCaller(gameAddr, h.Client)
+	caller := batching.NewMultiCaller(h.Client.Client(), batching.DefaultBatchSize)
+	game, err := contracts.NewFaultDisputeGameContract(ctx, metrics.NoopContractMetrics, gameAddr, caller)
 	h.Require.NoError(err)
-	vmAddr, err := game.Vm(opts)
+	vm, err := game.Vm(ctx)
 	h.Require.NoError(err)
-	vm, err := bindings.NewRISCVCaller(vmAddr, h.Client)
+	oracle, err := vm.Oracle(ctx)
 	h.Require.NoError(err)
-	oracleAddr, err := vm.Oracle(opts)
-	h.Require.NoError(err)
-	return preimage.NewHelper(h.T, h.Opts, h.Client, oracleAddr)
+	return preimage.NewHelper(h.T, h.PrivKey, h.Client, oracle)
 }
 
 func (h *AsteriscFactoryHelper) StartOutputAsteriscGameWithCorrectRoot(ctx context.Context, l2Node string, l2BlockNumber uint64, opts ...op_e2e_disputegame.GameOpt) *OutputAsteriscGameHelper {

op-e2e/e2eutils/disputegame/output_asterisc_helper.go

@@ -70,7 +70,7 @@ func (g *OutputAsteriscGameHelper) CreateHonestActor(ctx context.Context, l2Node
 	prestateProvider := outputs.NewPrestateProvider(rollupClient, prestateBlock)
 	l1Head := g.GetL1Head(ctx)
 	accessor, err := outputs.NewOutputAsteriscTraceAccessor(
-		logger, metrics.NoopMetrics, cfg, l2Client, prestateProvider, cfg.AsteriscAbsolutePreState, rollupClient, dir, l1Head, splitDepth, prestateBlock, poststateBlock)
+		logger, metrics.NoopMetrics, cfg.Asterisc, l2Client, prestateProvider, cfg.AsteriscAbsolutePreState, rollupClient, dir, l1Head, splitDepth, prestateBlock, poststateBlock)
 	g.Require.NoError(err, "Failed to create output asterisc trace accessor")
 	return op_e2e_disputegame.NewOutputHonestHelper(g.T, g.Require, &g.OutputGameHelper, g.Game, accessor)
 }

op-e2e/faultproofs/precompile_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/ethereum-optimism/asterisc/op-e2e/e2eutils/challenger"
 	"github.com/ethereum-optimism/asterisc/rvgo/fast"
 	"github.com/ethereum-optimism/optimism/op-challenger/config"
-	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/asterisc"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/utils"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/vm"
 	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
 
@@ -148,7 +148,7 @@ func runAsterisc(t *testing.T, ctx context.Context, sys *op_e2e.System, inputs u
 	asteriscOpts(&cfg)
 
 	logger := testlog.Logger(t, log.LevelInfo).New("role", "asterisc")
-	executor := asterisc.NewExecutor(logger, metrics.NoopMetrics, &cfg, cfg.AsteriscAbsolutePreState, inputs)
+	executor := vm.NewExecutor(logger, metrics.NoopMetrics, cfg.Asterisc, cfg.AsteriscAbsolutePreState, inputs)
 
 	t.Log("Running asterisc")
 	err := executor.GenerateProof(ctx, proofsDir, math.MaxUint)

rvsol/foundry.toml

@@ -18,8 +18,9 @@ remappings = [
   'src/dispute=lib/optimism/packages/contracts-bedrock/src/dispute',
   'src/libraries=lib/optimism/packages/contracts-bedrock/src/libraries',
 
-  'forge-std/=lib/forge-std/src',
+  '@forge-std/=lib/forge-std/src',
   'ds-test/=lib/forge-std/lib/ds-test/src',
+  'forge-std/=lib/optimism/packages/contracts-bedrock/lib/forge-std/src',
 ]
 
 ffi = true

rvsol/scripts/Deploy.s.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import { Script } from "forge-std/Script.sol";
-import { console2 as console } from "forge-std/console2.sol";
+import { Script } from "@forge-std/Script.sol";
+import { console2 as console } from "@forge-std/console2.sol";
 
-import { Chains } from "scripts/Chains.sol";
-import { Config } from "scripts/Config.sol";
-import { Deployer } from "scripts/Deployer.sol";
+import { Chains } from "scripts/lib/Chains.sol";
+import { Config } from "scripts/lib/Config.sol";
+import { Deployer } from "scripts/lib/Deployer.sol";
 import { RISCV } from "../src/RISCV.sol";
 
 import { IBigStepper } from "@optimism/src/dispute/interfaces/IBigStepper.sol";

rvsol/scripts/Deploy_Stage_1_4.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import { Config } from "scripts/Config.sol";
-import { Deployer } from "scripts/Deployer.sol";
+import { Config } from "scripts/lib/Config.sol";
+import { Deployer } from "scripts/lib/Deployer.sol";
 import { RISCV } from "../src/RISCV.sol";
 import { IPreimageOracle } from "@optimism/src/cannon/interfaces/IPreimageOracle.sol";
 import { DisputeGameFactory } from "@optimism/src/dispute/DisputeGameFactory.sol";

rvsol/scripts/Artifacts.s.sol → rvsol/scripts/lib/Artifacts.s.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import { console2 as console } from "forge-std/console2.sol";
-import { stdJson } from "forge-std/StdJson.sol";
-import { Vm } from "forge-std/Vm.sol";
-import { Config } from "scripts/Config.sol";
+import { console2 as console } from "@forge-std/console2.sol";
+import { stdJson } from "@forge-std/StdJson.sol";
+import { Vm } from "@forge-std/Vm.sol";
+import { Config } from "scripts/lib/Config.sol";
 
 /// @notice Represents a deployment. Is serialized to JSON as a key/value
 ///         pair. Can be accessed from within scripts.

rvsol/scripts/Config.sol → rvsol/scripts/lib/Config.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import { Vm } from "forge-std/Vm.sol";
+import { Vm } from "@forge-std/Vm.sol";
 
-import { Chains } from "scripts/Chains.sol";
+import { Chains } from "scripts/lib/Chains.sol";
 
 /// @title Config
 library Config {

rvsol/scripts/Deployer.sol → rvsol/scripts/lib/Deployer.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Script } from "forge-std/Script.sol";
-import { Artifacts } from "scripts/Artifacts.s.sol";
-import { Config } from "scripts/Config.sol";
+import { Script } from "@forge-std/Script.sol";
+import { Artifacts } from "scripts/lib/Artifacts.s.sol";
+import { Config } from "scripts/lib/Config.sol";
 
-import { DeployConfig } from "@optimism/scripts/DeployConfig.s.sol";
+import { DeployConfig } from "@optimism/scripts/deploy/DeployConfig.s.sol";
 
 /// @title Deployer
 /// @author tynes

rvsol/test/CommonTest.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Test } from "forge-std/Test.sol";
-import { Vm } from "forge-std/Vm.sol";
+import { Test } from "@forge-std/Test.sol";
+import { Vm } from "@forge-std/Vm.sol";
 
 /// @title FFIInterface
 /// @notice This contract is set into state using `etch` and therefore must not have constructor logic.

rvsol/test/RISCV.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Test } from "forge-std/Test.sol";
+import { Test } from "@forge-std/Test.sol";
 import { RISCV } from "src/RISCV.sol";
 import { PreimageOracle } from "@optimism/src/cannon/PreimageOracle.sol";
 import { CommonTest } from "./CommonTest.sol";