Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ parameters:
reproducibility_dispatch:
type: boolean
default: false
diff_asterisc_bytecode_dispatch:
type: boolean
default: false
kontrol_dispatch:
type: boolean
default: false
Expand Down Expand Up @@ -567,48 +564,6 @@ jobs:
- notify-failures-on-develop:
mentions: "@proofs-team"

diff-asterisc-bytecode:
docker:
- image: <<pipeline.parameters.default_docker_image>>
resource_class: xlarge
steps:
- utils/checkout-with-mise:
checkout-method: blobless
enable-mise-cache: true
- run:
name: Check `RISCV.sol` bytecode
working_directory: packages/contracts-bedrock
command: |
# Clone asterisc @ the pinned version to fetch remote `RISCV.sol`
ASTERISC_REV="v$(yq '.tools.asterisc' ../../mise.toml)"
REMOTE_ASTERISC_PATH="./src/vendor/asterisc/RISCV_Remote.sol"
git clone https://github.com/ethereum-optimism/asterisc \
-b $ASTERISC_REV && \
cp ./asterisc/rvsol/src/RISCV.sol $REMOTE_ASTERISC_PATH

# Replace import paths
sed -i -e 's/@optimism\///' $REMOTE_ASTERISC_PATH
# Replace legacy interface paths
sed -i -e 's/src\/cannon\/interfaces\//interfaces\/cannon\//g' $REMOTE_ASTERISC_PATH
sed -i -e 's/src\/dispute\/interfaces\//interfaces\/dispute\//g' $REMOTE_ASTERISC_PATH
# Replace contract name
sed -i -e 's/contract RISCV/contract RISCV_Remote/' $REMOTE_ASTERISC_PATH

# Install deps
forge install

# Diff bytecode, with both contracts compiled in the local environment.
REMOTE_ASTERISC_CODE="$(forge inspect RISCV_Remote bytecode | tr -d '\n')"
LOCAL_ASTERISC_CODE="$(forge inspect RISCV bytecode | tr -d '\n')"
if [ "$REMOTE_ASTERISC_CODE" != "$LOCAL_ASTERISC_CODE" ]; then
echo "Asterisc bytecode mismatch. Local version does not match remote. Diff:"
diff <(echo "$REMOTE_ASTERISC_CODE") <(echo "$LOCAL_ASTERISC_CODE")
else
echo "Asterisc version up to date."
fi
- notify-failures-on-develop:
mentions: "@clabby @proofs-team"

contracts-bedrock-build:
docker:
- image: <<pipeline.parameters.default_docker_image>>
Expand Down Expand Up @@ -2850,9 +2805,6 @@ workflows:
- op-deployer-forge-version:
context:
- circleci-repo-readonly-authenticated-github-token
- diff-asterisc-bytecode:
context:
- circleci-repo-readonly-authenticated-github-token
- semgrep-scan:
name: semgrep-scan-local
scan_command: semgrep scan --timeout=100 --config .semgrep/rules/ --error .
Expand Down
4 changes: 2 additions & 2 deletions kurtosis-devnet/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ _docker_build_stack TAG TARGET *ARGS: (_docker_build TAG TARGET "../" "ops/docke
cannon-image TAG='cannon:devnet': (_docker_build_stack TAG "cannon-target")
da-server-image TAG='da-server:devnet': (_docker_build_stack TAG "da-server-target")
op-batcher-image TAG='op-batcher:devnet': (_docker_build_stack TAG "op-batcher-target")
# TODO: this is a temporary hack to get the kona + asterisc version right.
# TODO: this is a temporary hack to get the kona version right.
# Ideally the Dockerfile should be self-sufficient (right now we depend on
# docker-bake.hcl to do the right thing).
op-challenger-image TAG='op-challenger:devnet': (_docker_build_stack TAG "op-challenger-target" "--build-arg" "KONA_VERSION=1.0.1" "--build-arg" "ASTERISC_VERSION=v1.3.0")
op-challenger-image TAG='op-challenger:devnet': (_docker_build_stack TAG "op-challenger-target" "--build-arg" "KONA_VERSION=1.0.1")
op-conductor-image TAG='op-conductor:devnet': (_docker_build_stack TAG "op-conductor-target")
op-deployer-image TAG='op-deployer:devnet': (_docker_build_stack TAG "op-deployer-target")
op-dispute-mon-image TAG='op-dispute-mon:devnet': (_docker_build_stack TAG "op-dispute-mon-target")
Expand Down
4 changes: 1 addition & 3 deletions mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ op-acceptor = "op-acceptor/v3.8.1"
# Put things here if you need to track versions of tools or projects that can't
# actually be managed by mise (yet). Make sure that anything you put in here is
# also found inside of disabled_tools or mise will try to install it.
asterisc = "1.3.0"
kontrol = "1.0.90"
binary_signer = "1.0.4"

Expand All @@ -64,11 +63,10 @@ svm-rs = "ubi:alloy-rs/svm-rs[exe=svm]"

# These are disabled, but latest mise versions error if they don't have a known
# install source even though it won't ever actually use that source.
asterisc = "ubi:ethereum-optimism/fake-asterisc"
kontrol = "ubi:ethereum-optimism/fake-kontrol"
binary_signer = "ubi:ethereum-optimism/fake-binary_signer"

[settings]
experimental = true
pipx.uvx = true
disable_tools = ["asterisc", "kontrol", "binary_signer"]
disable_tools = ["kontrol", "binary_signer"]
21 changes: 0 additions & 21 deletions op-deployer/pkg/deployer/opcm/asterisc.go

This file was deleted.

31 changes: 0 additions & 31 deletions op-deployer/pkg/deployer/opcm/asterisc_test.go

This file was deleted.

4 changes: 2 additions & 2 deletions op-deployer/pkg/deployer/opcm/dispute_game_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ func deployDisputeGameScriptVM(t *testing.T, host *script.Host) common.Address {
preimageOracleAddress, err := host.Create(addresses.ScriptDeployer, append(preimageOracleArtifact.Bytecode.Object, encodedPreimageOracleConstructor...))
require.NoError(t, err)

bigStepperArtifact, err := host.Artifacts().ReadArtifact("RISCV.sol", "RISCV")
bigStepperArtifact, err := host.Artifacts().ReadArtifact("MIPS64.sol", "MIPS64")
require.NoError(t, err)

encodedBigStepperConstructor, err := bigStepperArtifact.ABI.Pack("", preimageOracleAddress)
encodedBigStepperConstructor, err := bigStepperArtifact.ABI.Pack("", preimageOracleAddress, new(big.Int).SetUint64(standard.MIPSVersion))
require.NoError(t, err)

bigStepperAddress, err := host.Create(addresses.ScriptDeployer, append(bigStepperArtifact.Bytecode.Object, encodedBigStepperConstructor...))
Expand Down
7 changes: 0 additions & 7 deletions op-deployer/pkg/deployer/opcm/scripts.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
type Scripts struct {
DeployAlphabetVM DeployAlphabetVMScript
DeployAltDA DeployAltDAScript
DeployAsterisc DeployAsteriscScript
DeployDisputeGame DeployDisputeGameScript
DeployImplementations DeployImplementationsScript
DeployMIPS DeployMIPSScript
Expand Down Expand Up @@ -41,11 +40,6 @@ func NewScripts(host *script.Host) (*Scripts, error) {
return nil, fmt.Errorf("failed to load DeployAltDA script: %w", err)
}

deployAsterisc, err := NewDeployAsteriscScript(host)
if err != nil {
return nil, fmt.Errorf("failed to load DeployAsterisc script: %w", err)
}

deployDisputeGame, err := NewDeployDisputeGameScript(host)
if err != nil {
return nil, fmt.Errorf("failed to load DeployDisputeGame script: %w", err)
Expand All @@ -64,7 +58,6 @@ func NewScripts(host *script.Host) (*Scripts, error) {
return &Scripts{
DeployAlphabetVM: deployAlphabetVM,
DeployAltDA: deployAltDA,
DeployAsterisc: deployAsterisc,
DeployDisputeGame: deployDisputeGame,
DeployMIPS: deployMIPSScript,
DeployImplementations: deployImplementations,
Expand Down
1 change: 0 additions & 1 deletion op-deployer/pkg/deployer/opcm/scripts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ func TestNewScripts(t *testing.T) {
require.NotNil(t, scripts.DeploySuperchain)
require.NotNil(t, scripts.DeployAlphabetVM)
require.NotNil(t, scripts.DeployAltDA)
require.NotNil(t, scripts.DeployAsterisc)
require.NotNil(t, scripts.DeployDisputeGame)
require.NotNil(t, scripts.DeployMIPS)
})
Expand Down
2 changes: 1 addition & 1 deletion ops/ai-eng/contracts-test-maintenance/prompt/prompt.md
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ contract L1FeeVault_Version_Test {
**INTERPRETING CI STATUS:**
- Only investigate actual code failures: build errors, test failures, lint violations
- "Code Review Requirements" status = waiting for reviewer approvals, not code issues
- Test-only changes cannot affect these CI jobs - skip them: `diff-asterisc-bytecode`, `op-program-compat`
- Test-only changes cannot affect these CI jobs - skip them: `op-program-compat`

**ZERO TOLERANCE - CI FAILURES:**
- vm.expectRevert() must ALWAYS have arguments: either selector or bytes message
Expand Down
2 changes: 1 addition & 1 deletion ops/docker/op-stack-go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# It will default to the target platform.
ARG TARGET_BASE_IMAGE=alpine:3.20

# The ubuntu target base image is used for the op-challenger build with kona and asterisc.
# The ubuntu target base image is used for the op-challenger build with kona.
ARG UBUNTU_TARGET_BASE_IMAGE=ubuntu:22.04

# The version of kona to use.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ SEMVER_LOCK="snapshots/semver-lock.json"

# Define excluded contracts.
EXCLUDED_CONTRACTS=(
"src/vendor/asterisc/RISCV.sol"
)

# Helper function to check if a contract is excluded.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
func main() {
if _, err := common.ProcessFilesGlob(
[]string{"forge-artifacts/**/*.json"},
[]string{"forge-artifacts/L2StandardBridgeInterop.sol/**.json", "forge-artifacts/OptimismPortalInterop.sol/**.json", "forge-artifacts/RISCV.sol/**.json", "forge-artifacts/EAS.sol/**.json", "forge-artifacts/SchemaRegistry.sol/**.json", "forge-artifacts/L1BlockCGT.sol/**.json", "forge-artifacts/L2ToL1MessagePasserCGT.sol/**.json"},
[]string{"forge-artifacts/L2StandardBridgeInterop.sol/**.json", "forge-artifacts/OptimismPortalInterop.sol/**.json", "forge-artifacts/EAS.sol/**.json", "forge-artifacts/SchemaRegistry.sol/**.json", "forge-artifacts/L1BlockCGT.sol/**.json", "forge-artifacts/L2ToL1MessagePasserCGT.sol/**.json"},
processFile,
); err != nil {
fmt.Printf("Error: %v/n", err)
Expand Down
57 changes: 0 additions & 57 deletions packages/contracts-bedrock/scripts/deploy/DeployAsterisc.s.sol

This file was deleted.

68 changes: 0 additions & 68 deletions packages/contracts-bedrock/snapshots/abi/RISCV.json

This file was deleted.

4 changes: 0 additions & 4 deletions packages/contracts-bedrock/snapshots/semver-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,6 @@
"initCodeHash": "0x1fd4b84add5c5ed80205cea0bbca9115e98d0efb416d9cedc12ce0cff9919bda",
"sourceCodeHash": "0xcfbaae5729ca367328ea546bbbe96194341586b2f4bfbd0cfa84acc09324d59b"
},
"src/vendor/asterisc/RISCV.sol:RISCV": {
"initCodeHash": "0x4cd639f7da4eaf86a98eb3227fe285c0e8380ff5c79c4745aefed804cef52162",
"sourceCodeHash": "0x1d18c55a910212cc7572d2e8673c5f092db8352dda1137739c71df18d4ee1db1"
},
"src/vendor/eas/EAS.sol:EAS": {
"initCodeHash": "0xbd79d6fff128b3da3e09ead84b805b7540740190488f2791a6b4e5b7aabf9cff",
"sourceCodeHash": "0x3512c3a1b5871341346f6646a04c0895dd563e9824f2ab7ab965b6a81a41ad2e"
Expand Down
Loading