diff --git a/genesis-init-predeploy/Dockerfile b/genesis-init-predeploy/Dockerfile index a75e082..4ca9209 100644 --- a/genesis-init-predeploy/Dockerfile +++ b/genesis-init-predeploy/Dockerfile @@ -1,4 +1,4 @@ -FROM stackupwallet/op-geth:v1.101315.2 as op-geth +FROM ghcr.io/planetarium/op-geth:v1.101315.2 as op-geth FROM buildpack-deps:scm as foundry ARG TARGETARCH diff --git a/templates/docker-compose-blockscout.yml b/templates/docker-compose-blockscout.yml index 4992ff0..278316d 100644 --- a/templates/docker-compose-blockscout.yml +++ b/templates/docker-compose-blockscout.yml @@ -7,6 +7,7 @@ - blockscout-smart-contract-verifier - blockscout-visualizer - op-geth + - proxyd volumes: - ./data/blockscout/logs/:/app/logs/ - ./data/genesis:/genesis:ro @@ -19,8 +20,8 @@ SUBNETWORK: L2 CHAIN ${L2_CHAIN_ID} # LOGO: /images/blockscout_logo.svg ETHEREUM_JSONRPC_VARIANT: geth - ETHEREUM_JSONRPC_HTTP_URL: http://op-geth:8545/ - ETHEREUM_JSONRPC_TRACE_URL: http://op-geth:8545/ + ETHEREUM_JSONRPC_HTTP_URL: http://proxyd:8080/ + ETHEREUM_JSONRPC_TRACE_URL: http://proxyd:8080/ DATABASE_URL: postgresql://postgres:@blockscout-postgres:5432/blockscout?ssl=false # ETHEREUM_JSONRPC_TRANSPORT: http # ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES: false diff --git a/templates/docker-compose-bundler.yml b/templates/docker-compose-bundler.yml index a6734c0..75db200 100644 --- a/templates/docker-compose-bundler.yml +++ b/templates/docker-compose-bundler.yml @@ -6,8 +6,10 @@ depends_on: op-geth: condition: service_healthy + proxyd: + condition: service_started environment: - ERC4337_BUNDLER_ETH_CLIENT_URL: http://op-geth:8545 + ERC4337_BUNDLER_ETH_CLIENT_URL: http://proxyd:8080 ERC4337_BUNDLER_SUPPORTED_ENTRY_POINTS: ${ERC4337_ENTRYPOINT:-0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789} ERC4337_BUNDLER_PRIVATE_KEY: ${ERC4337_BUNDLER_KEY} ERC4337_BUNDLER_NATIVE_BUNDLER_COLLECTOR_TRACER: bundlerCollectorTracer diff --git a/templates/docker-compose.yml b/templates/docker-compose.yml index a6a2b6d..c000d1e 100644 --- a/templates/docker-compose.yml +++ b/templates/docker-compose.yml @@ -27,7 +27,7 @@ services: op-geth: container_name: op-geth - image: stackupwallet/op-geth:v1.101315.2 + image: ghcr.io/planetarium/op-geth:v1.101315.2 volumes: - ./data/op-geth:/data - ./data/genesis:/genesis diff --git a/templates/proxyd.toml b/templates/proxyd.toml index 327cbeb..6cf8d28 100644 --- a/templates/proxyd.toml +++ b/templates/proxyd.toml @@ -24,20 +24,23 @@ max_degraded_latency_threshold = "10s" max_error_rate_threshold = 0.3 [backends] -[backends.geth] +[backends.node-1] rpc_url = "http://op-geth:8545" -ws_url = "http://op-geth:8546" -max_rps = 3 -max_ws_conns = 1 +max_rps = 0 +consensus_receipts_target = "eth_getBlockReceipts" + +[backends.node-2] +rpc_url = "http://op-geth:8545" +max_rps = 0 consensus_receipts_target = "eth_getBlockReceipts" [backend_groups] [backend_groups.main] -backends = ["geth"] +backends = ["node-2", "node-1"] consensus_aware = false [backend_groups.sequencer] -backends = ["geth"] +backends = ["node-1"] [rpc_method_mappings] web3_clientVersion = "main" @@ -55,10 +58,8 @@ eth_getBlockTransactionCountByNumber = "main" eth_getUncleCountByBlockHash = "main" eth_getUncleCountByBlockNumber = "main" eth_getCode = "main" -eth_sendRawTransaction = "main" eth_getBlockByHash = "main" eth_getBlockByNumber = "main" -eth_getTransactionByHash = "main" eth_getTransactionByBlockHashAndIndex = "main" eth_getTransactionByBlockNumberAndIndex = "main" eth_getUncleByBlockHashAndIndex = "main" @@ -72,11 +73,18 @@ eth_getFilterLogs = "main" eth_getLogs = "main" eth_estimateGas = "main" eth_gasPrice = "main" +eth_maxPriorityFeePerGas = "main" eth_protocolVersion = "main" eth_syncing = "main" eth_coinbase = "main" eth_mining = "main" eth_hashrate = "main" eth_chainId = "main" -eth_getBlockReceipts = "sequencer" -eth_getTransactionReceipt = "sequencer" \ No newline at end of file +eth_getBlockReceipts = "main" +debug_traceCall = "main" +debug_traceTransaction = "main" +txpool_content = "sequencer" +eth_sendTransaction = "sequencer" +eth_sendRawTransaction = "sequencer" +eth_getTransactionReceipt = "sequencer" +eth_getTransactionByHash = "sequencer"