Commit 5bf390b4 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

ops: fix chainid to work with ethers ledger (#2380)

Previously the chainid was too large for the ledger package to
work. This is due to ethers using an old version of the ledger
package. There is an unresolved open issue here:
https://github.com/ethers-io/ethers.js/issues/1365

This updates the chainid to 17 to get around this issue.
This chain id is used by ThaiChain 2.0 ThaiFi which
has very little activity.
https://exp.thaifi.com/

It also lints the docker compose file to use `'`
consistently
Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent e36b085c
---
'@eth-optimism/integration-tests': patch
---
Update chainid
...@@ -38,7 +38,7 @@ const procEnv = cleanEnv(process.env, { ...@@ -38,7 +38,7 @@ const procEnv = cleanEnv(process.env, {
L1_URL: str({ default: 'http://localhost:9545' }), L1_URL: str({ default: 'http://localhost:9545' }),
L1_POLLING_INTERVAL: num({ default: 10 }), L1_POLLING_INTERVAL: num({ default: 10 }),
L2_CHAINID: num({ default: 987 }), L2_CHAINID: num({ default: 17 }),
L2_GAS_PRICE: gasPriceValidator({ L2_GAS_PRICE: gasPriceValidator({
default: 'onchain', default: 'onchain',
}), }),
......
...@@ -3,12 +3,11 @@ version: '3.4' ...@@ -3,12 +3,11 @@ version: '3.4'
x-system-addr-env: &system-addr-env x-system-addr-env: &system-addr-env
# private key: a6aecc98b63bafb0de3b29ae9964b14acb4086057808be29f90150214ebd4a0f # private key: a6aecc98b63bafb0de3b29ae9964b14acb4086057808be29f90150214ebd4a0f
# OK to publish this since it will only ever be used in itests # OK to publish this since it will only ever be used in itests
SYSTEM_ADDRESS_0_DEPLOYER: "0xa961b0d6dce82db098cf70a42a14add3ee3db2d5" SYSTEM_ADDRESS_0_DEPLOYER: '0xa961b0d6dce82db098cf70a42a14add3ee3db2d5'
# private key: 3b8d2345102cce2443acb240db6e87c8edd4bb3f821b17fab8ea2c9da08ea132 # private key: 3b8d2345102cce2443acb240db6e87c8edd4bb3f821b17fab8ea2c9da08ea132
# OK to publish this since it will only ever be used in itests # OK to publish this since it will only ever be used in itests
SYSTEM_ADDRESS_1_DEPLOYER: "0xdfc82d475833a50de90c642770f34a9db7deb725" SYSTEM_ADDRESS_1_DEPLOYER: '0xdfc82d475833a50de90c642770f34a9db7deb725'
services: services:
# this is a helper service used because there's no official hardhat image # this is a helper service used because there's no official hardhat image
...@@ -64,7 +63,7 @@ services: ...@@ -64,7 +63,7 @@ services:
DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT: http://l1_chain:8545 DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT: http://l1_chain:8545
DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT: http://l2geth:8545 DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT: http://l2geth:8545
DATA_TRANSPORT_LAYER__SYNC_FROM_L2: 'true' DATA_TRANSPORT_LAYER__SYNC_FROM_L2: 'true'
DATA_TRANSPORT_LAYER__L2_CHAIN_ID: 987 DATA_TRANSPORT_LAYER__L2_CHAIN_ID: 17
ports: ports:
- ${DTL_PORT:-7878}:7878 - ${DTL_PORT:-7878}:7878
...@@ -211,11 +210,11 @@ services: ...@@ -211,11 +210,11 @@ services:
NO_NETWORK: 1 NO_NETWORK: 1
BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE: ${BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE:-zlib} BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE: ${BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE:-zlib}
RUN_SYSTEM_ADDRESS_TESTS: "true" RUN_SYSTEM_ADDRESS_TESTS: 'true'
# must match l2geth environment, see above for why it's safe to publish these # must match l2geth environment, see above for why it's safe to publish these
SYSTEM_ADDRESS_0_DEPLOYER_KEY: "a6aecc98b63bafb0de3b29ae9964b14acb4086057808be29f90150214ebd4a0f" SYSTEM_ADDRESS_0_DEPLOYER_KEY: 'a6aecc98b63bafb0de3b29ae9964b14acb4086057808be29f90150214ebd4a0f'
SYSTEM_ADDRESS_1_DEPLOYER_KEY: "3b8d2345102cce2443acb240db6e87c8edd4bb3f821b17fab8ea2c9da08ea132" SYSTEM_ADDRESS_1_DEPLOYER_KEY: '3b8d2345102cce2443acb240db6e87c8edd4bb3f821b17fab8ea2c9da08ea132'
gas_oracle: gas_oracle:
deploy: deploy:
...@@ -228,7 +227,7 @@ services: ...@@ -228,7 +227,7 @@ services:
GAS_PRICE_ORACLE_ETHEREUM_HTTP_URL: http://l1_chain:8545 GAS_PRICE_ORACLE_ETHEREUM_HTTP_URL: http://l1_chain:8545
GAS_PRICE_ORACLE_LAYER_TWO_HTTP_URL: http://l2geth:8545 GAS_PRICE_ORACLE_LAYER_TWO_HTTP_URL: http://l2geth:8545
# Default hardhat account 5 # Default hardhat account 5
GAS_PRICE_ORACLE_PRIVATE_KEY: "0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba" GAS_PRICE_ORACLE_PRIVATE_KEY: '0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba'
batch_submitter: batch_submitter:
depends_on: depends_on:
......
...@@ -20,12 +20,12 @@ WS_PORT=8546 ...@@ -20,12 +20,12 @@ WS_PORT=8546
WS_API=eth,net,rollup,web3 WS_API=eth,net,rollup,web3
WS_ORIGINS=* WS_ORIGINS=*
CHAIN_ID=987 CHAIN_ID=17
DATADIR=/root/.ethereum DATADIR=/root/.ethereum
GASPRICE=0 GASPRICE=0
GCMODE=archive GCMODE=archive
IPC_DISABLE=true IPC_DISABLE=true
NETWORK_ID=987 NETWORK_ID=17
NO_USB=true NO_USB=true
NO_DISCOVER=true NO_DISCOVER=true
TARGET_GAS_LIMIT=15000000 TARGET_GAS_LIMIT=15000000
......
...@@ -4,7 +4,7 @@ const config: DeployConfig = { ...@@ -4,7 +4,7 @@ const config: DeployConfig = {
network: 'local', network: 'local',
l1BlockTimeSeconds: 15, l1BlockTimeSeconds: 15,
l2BlockGasLimit: 15_000_000, l2BlockGasLimit: 15_000_000,
l2ChainId: 987, l2ChainId: 17,
ctcL2GasDiscountDivisor: 32, ctcL2GasDiscountDivisor: 32,
ctcEnqueueGasCost: 60_000, ctcEnqueueGasCost: 60_000,
sccFaultProofWindowSeconds: 0, sccFaultProofWindowSeconds: 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment