consolidate test scripts

Dockerfile-contracts

@@ -42,6 +42,13 @@ RUN --mount=type=cache,target=/root/.cache \
 FROM debian:bookworm-slim
 WORKDIR /app
 
+# Update certificates
+RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
+
+# Set environment variables for Go
+ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+ENV SSL_CERT_DIR=/etc/ssl/certs
+
 # Copy foundry tools for runtime use
 COPY --from=contracts-builder /usr/local/bin/forge /usr/local/bin/cast /usr/local/bin/anvil /usr/local/bin/
 

op-node/rollup/derive/system_config.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"log/slog"
 
 	"github.com/hashicorp/go-multierror"
 
@@ -25,7 +24,6 @@ var (
 	SystemConfigUpdateEIP1559Params     = common.Hash{31: 4}
 	SystemConfigUpdateOperatorFeeParams = common.Hash{31: 5}
 	SystemConfigUpdateMinBaseFee        = common.Hash{31: 6}
-	SystemConfigUpdateGasPayingToken    = common.Hash{31: 7}
 )
 
 var (
@@ -196,10 +194,6 @@ func ProcessSystemConfigUpdateLogEvent(destSysCfg *eth.SystemConfig, ev *types.L
 		}
 		destSysCfg.MinBaseFee = minBaseFee
 		return nil
-	case SystemConfigUpdateGasPayingToken:
-		evBytes, _ := ev.MarshalJSON()
-		slog.Default().Info("ignoring L1 sysCfg update to gas-paying token", "txHash", ev.TxHash, "event", string(evBytes))
-		return nil
 	default:
 		return fmt.Errorf("unrecognized L1 sysCfg update type: %s", updateType)
 	}

packages/contracts-bedrock/src/L1/SystemConfig.sol

@@ -40,8 +40,7 @@ contract SystemConfig is ProxyAdminOwnedBase, OwnableUpgradeable, Reinitializabl
         UNSAFE_BLOCK_SIGNER,
         EIP_1559_PARAMS,
         OPERATOR_FEE_PARAMS,
-        MIN_BASE_FEE,
-        GAS_PAYING_TOKEN
+        MIN_BASE_FEE
     }
 
     /// @notice Struct representing the addresses of L1 system contracts. These should be the
@@ -618,8 +617,5 @@ contract SystemConfig is ProxyAdminOwnedBase, OwnableUpgradeable, Reinitializabl
     /// @param _symbol The symbol of the gas paying token as a bytes32.
     function _setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) internal {
         GasPayingToken.set(_token, _decimals, _name, _symbol);
-
-        bytes memory data = abi.encode(_token, _decimals, _name, _symbol);
-        emit ConfigUpdate(VERSION, UpdateType.GAS_PAYING_TOKEN, data);
     }
 }

test-pp-op/0-all-local.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# ./build_images.sh --all # build all images. add --force if want to force rebuild
+make clean
+cp local.env .env
+./1-start-erigon.sh
+./2-deploy-op-contracts.sh
+./3-stop-erigon.sh
+./4-migrate-op.sh
+./5-start-op.sh
+./6-build-op-program.sh
+./7-setup-fraud-proof.sh

test-pp-op/1-start-erigon.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+set -x
+
+if ! [ -f .env ]; then
+  echo "need to provide .env file"
+fi
+
+source .env
+source tools.sh
+
+if [ "$ENV" = "local" ]; then
+    COMPOSE_FILE="docker-compose-local.yml"
+else
+    COMPOSE_FILE="docker-compose.yml"
+fi
+
+DOCKER_COMPOSE=$(shell docker compose version >/dev/null 2>&1 && echo "docker compose" || echo "docker-compose")
+DOCKER_COMPOSE_CMD="${DOCKER_COMPOSE} -f ${COMPOSE_FILE}"
+echo ${DOCKER_COMPOSE_CMD}
+
+# 1. setup l1
+# 2. run & init erigon pp
+start_local_xlayer_erigon() {
+  export ENV=local
+  make run_erigon
+  sleep 3
+  # Calculate addresses for all actors
+  OP_BATCHER_ADDR=$(cast wallet a $OP_BATCHER_PRIVATE_KEY)
+  OP_PROPOSER_ADDR=$(cast wallet a $OP_PROPOSER_PRIVATE_KEY)
+  OP_CHALLENGER_ADDR=$(cast wallet a $OP_CHALLENGER_PRIVATE_KEY)
+
+  # Wait for L1 node to finish syncing
+  while [[ "$(cast rpc eth_syncing --rpc-url $L1_RPC_URL)" != "false" ]]; do
+      echo "Waiting for node to finish syncing..."
+      sleep 1
+  done
+
+  # Fund all actor addresses
+  for addr in $OP_BATCHER_ADDR $OP_PROPOSER_ADDR $OP_CHALLENGER_ADDR; do
+      cast send --private-key $RICH_PRIVATE_KEY --value 100ether $addr --legacy --rpc-url $L1_RPC_URL
+  done
+}
+
+setup_xlayer_erigon() {
+  if [ "$ENV" = "local" ]; then
+      echo "Starting local environment setup..."
+      start_local_xlayer_erigon
+  elif [ "$ENV" = "testnet" ]; then
+      echo "Starting ${ENV} environment setup..."
+      echo "not implemented"
+      exit 1
+  else
+      echo "Starting ${ENV} environment setup..."
+      echo "not implemented"
+      exit 1
+  fi
+}
+
+setup_xlayer_erigon