Use common.Hash in VMState - Update Monorepo submodule to 457f33f

.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}" ]]

.gitignore

@@ -16,3 +16,6 @@ packages/contracts-bedrock
 
 # jetbrains
 .idea/
+
+venv
+.venv

Dockerfile.repro

@@ -37,15 +37,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build cd rvsol/lib/optimism/op-pro
 # Run the op-program-client-riscv.elf binary directly through asterisc's load-elf subcommand.
 RUN /app/rvgo/bin/asterisc load-elf --path /app/rvsol/lib/optimism/op-program/bin/op-program-client-riscv.elf --out /app/prestate.json --meta ""
 
-# Generate the prestate proof containing the absolute pre-state hash.
-RUN /app/rvgo/bin/asterisc run --proof-at '=0' --stop-at '=1' --input /app/prestate.json --meta "" --proof-fmt '/app/%d.json' --output ""
-RUN mv /app/0.json /app/prestate-proof.json
-
 # Exports files to the specified output location.
 # Writing files to host requires buildkit to be enabled.
 # e.g. `BUILDKIT=1 docker build ...`
 FROM scratch AS export-stage
 COPY --from=builder /app/rvsol/lib/optimism/op-program/bin/op-program .
 COPY --from=builder /app/rvsol/lib/optimism/op-program/bin/op-program-client-riscv.elf .
 COPY --from=builder /app/prestate.json .
-COPY --from=builder /app/prestate-proof.json .

go.mod

@@ -7,9 +7,7 @@ toolchain go1.21.1
 replace github.com/ethereum/go-ethereum v1.13.15 => github.com/ethereum-optimism/op-geth v1.101315.2-rc.1
 
 require (
-	github.com/ethereum-optimism/optimism v1.7.7-0.20240610184752-058f39811490
-	github.com/ethereum-optimism/optimism/op-bindings v0.10.14
-	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240610174713-583ceb57407d
+	github.com/ethereum-optimism/optimism v1.7.8-0.20240621000037-457f33f4fdda
 	github.com/ethereum/go-ethereum v1.13.15
 	github.com/holiman/uint256 v1.2.4
 	github.com/pkg/profile v1.7.0
@@ -19,7 +17,7 @@ require (
 )
 
 require (
-	github.com/DataDog/zstd v1.5.2 // indirect
+	github.com/DataDog/zstd v1.5.5 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
 	github.com/andybalholm/brotli v1.1.0 // indirect
@@ -57,6 +55,7 @@ require (
 	github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect
 	github.com/elastic/gosigar v0.14.2 // indirect
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 // indirect
+	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240614103325-d8902381f5d8 // indirect
 	github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/felixge/fgprof v0.9.3 // indirect
@@ -92,7 +91,7 @@ require (
 	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
-	github.com/hashicorp/raft v1.6.1 // indirect
+	github.com/hashicorp/raft v1.7.0 // indirect
 	github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e // indirect
 	github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
@@ -107,7 +106,7 @@ require (
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
 	github.com/jbenet/goprocess v0.1.4 // indirect
-	github.com/klauspost/compress v1.17.8 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/koron/go-ssdp v0.0.4 // indirect
 	github.com/kr/pretty v0.3.1 // indirect

go.sum

@@ -10,12 +10,12 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
-github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
+github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ=
+github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40=
@@ -170,12 +170,10 @@ github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z
 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
 github.com/ethereum-optimism/op-geth v1.101315.2-rc.1 h1:9sNukA27AqReNkBEaus2kf+DLNXgkksRj+NbJHYgqxc=
 github.com/ethereum-optimism/op-geth v1.101315.2-rc.1/go.mod h1:vObZmT4rKd8hjSblIktsJHtLX8SXbCoaIXEd42HMDB0=
-github.com/ethereum-optimism/optimism v1.7.7-0.20240610184752-058f39811490 h1:v83zdjtWDjWH1AokzzA5I5tCMUjZb5XChwmxf34UVv4=
-github.com/ethereum-optimism/optimism v1.7.7-0.20240610184752-058f39811490/go.mod h1:DvCdJFuRIaqLvVSHG3jhpsKPxnzIlLMgQA2xAicl3s8=
-github.com/ethereum-optimism/optimism/op-bindings v0.10.14 h1:SMMnMdNb1QIhJDyvk7QMUv+crAP4UHHoSYBOASBDIjM=
-github.com/ethereum-optimism/optimism/op-bindings v0.10.14/go.mod h1:9ZSUq/rjlzp3uYyBN4sZmhTc3oZgDVqJ4wrUja7vj6c=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240610174713-583ceb57407d h1:lGvrOam2IOoszfxqrpXeIFIT58/e6N1VuOLVaai9GOg=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240610174713-583ceb57407d/go.mod h1:7xh2awFQqsiZxFrHKTgEd+InVfDRrkKVUIuK8SAFHp0=
+github.com/ethereum-optimism/optimism v1.7.8-0.20240621000037-457f33f4fdda h1:7p9sr5fjVPiu39Z8YJpwvlosSi3WJiGYKCR4yk/ljMM=
+github.com/ethereum-optimism/optimism v1.7.8-0.20240621000037-457f33f4fdda/go.mod h1:jKn73pLX8eDIG0Y3XeuUSetepecM8OvRflyPHbi05B4=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240614103325-d8902381f5d8 h1:CTeE8ZsqRwwV0z8NVazSyXgRx4aAPwtCucN/IkfYqdU=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240614103325-d8902381f5d8/go.mod h1:/S7Chw9Xo8Nx6Ranq2OMyeyG+9mFvgBYvLZk4JyTw/k=
 github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=
 github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
@@ -329,8 +327,8 @@ github.com/hashicorp/golang-lru/arc/v2 v2.0.7/go.mod h1:Pe7gBlGdc8clY5LJ0LpJXMt5
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
-github.com/hashicorp/raft v1.6.1 h1:v/jm5fcYHvVkL0akByAp+IDdDSzCNCGhdO6VdB56HIM=
-github.com/hashicorp/raft v1.6.1/go.mod h1:N1sKh6Vn47mrWvEArQgILTyng8GoDRNYlgKyK7PMjs0=
+github.com/hashicorp/raft v1.7.0 h1:4u24Qn6lQ6uwziM++UgsyiT64Q8GyRn43CV41qPiz1o=
+github.com/hashicorp/raft v1.7.0/go.mod h1:N1sKh6Vn47mrWvEArQgILTyng8GoDRNYlgKyK7PMjs0=
 github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e h1:SK4y8oR4ZMHPvwVHryKI88kJPJda4UyWYvG5A6iEQxc=
 github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e/go.mod h1:EMz/UIuG93P0MBeHh6CbXQAEe8ckVJLZjhD17lBzK5Q=
 github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4=
@@ -385,8 +383,8 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
-github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
 github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=

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)

rvgo/fast/state.go

@@ -22,8 +22,8 @@ const (
 type VMState struct {
 	Memory *Memory `json:"memory"`
 
-	PreimageKey    [32]byte `json:"preimageKey"`
-	PreimageOffset uint64   `json:"preimageOffset"`
+	PreimageKey    common.Hash `json:"preimageKey"`
+	PreimageOffset uint64      `json:"preimageOffset"`
 
 	PC uint64 `json:"pc"`
 
@@ -53,8 +53,8 @@ type VMState struct {
 
 	// VMState must hold these values because if not, we must ask FPVM again to
 	// compute these values.
-	Witness   []byte   `json:"witness,omitempty"`
-	StateHash [32]byte `json:"stateHash,omitempty"`
+	Witness   []byte      `json:"witness,omitempty"`
+	StateHash common.Hash `json:"stateHash,omitempty"`
 }
 
 func NewVMState() *VMState {

rvgo/test/syscall_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	preimage "github.com/ethereum-optimism/optimism/op-preimage"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
@@ -1100,7 +1101,7 @@ func FuzzStatePreimageWrite(f *testing.F) {
 		expectedRegisters[10] = count
 		expectedRegisters[11] = 0
 
-		var expectedKey [32]byte
+		var expectedKey common.Hash
 		// slice preimage key by count
 		for i := uint64(0); i < count; i++ {
 			expectedKey[i+32-count] = preimageKey[i]

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