client (op-l1): use monorepo, fix missing npx

Author: tuxcanfly

clients/op-l1/Dockerfile

@@ -23,10 +23,8 @@ ADD entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 # Deploy contracts using Hardhat
-RUN git clone https://github.com/ethereum-optimism/optimism /opt
-RUN cd /opt && git submodule init && git submodule update
-RUN cp -r /opt/packages/contracts-bedrock /hive/contracts
-RUN cp -r /opt/tsconfig.json /
+RUN git clone https://github.com/ethereum-optimism/optimism /hive/optimism
+RUN cd /hive/optimism && git submodule init && git submodule update
 # Defer until L1 rpc server is up; called from devnet.go
 ADD deploy.sh /hive-bin/deploy.sh
 RUN chmod +x /hive-bin/deploy.sh

clients/op-l1/deploy.sh

@@ -1,10 +1,13 @@
 #!/bin/sh
 
-cd /hive/contracts
-echo "node version"
+yarn global add npx -W 2>&1
+cd /hive/optimism
+yarn 2>&1
+yarn build 2>&1
+cd /hive/optimism/packages/contracts-bedrock
 node --version
-yarn
-yarn build
+yarn 2>&1
+yarn build 2>&1
 export L2OO_STARTING_BLOCK_TIMESTAMP=$(cat /hive/genesis_timestamp)
 echo "L2OO_STARTING_BLOCK_TIMESTAMP=$L2OO_STARTING_BLOCK_TIMESTAMP"
 forge --version

clients/op-node/rollup.json

@@ -13,9 +13,11 @@
 
   "block_time": 2,
 
-  "max_sequencer_drift": 10,
+  "max_sequencer_drift": 1000,
 
-  "seq_window_size": 2,
+  "seq_window_size": 4,
+
+  "channel_timeout": 40,
 
   "l1_chain_id": 900,
 

simulators/optimism/rpc/devnet.go

@@ -136,43 +136,43 @@ func (d *Devnet) InitL2() error {
 	}
 	d.genesisTimestamp = genesisTimestamp
 
-	l2OutputOracle, err := d.Cat("/hive/contracts/deployments/devnetL1/L2OutputOracleProxy.json")
+	l2OutputOracle, err := d.Cat("/hive/optimism/packages/contracts-bedrock/deployments/devnetL1/L2OutputOracleProxy.json")
 	if err != nil {
 		return err
 	}
 	d.l2OutputOracle = l2OutputOracle
 
-	optimismPortal, err := d.Cat("/hive/contracts/deployments/devnetL1/OptimismPortalProxy.json")
+	optimismPortal, err := d.Cat("/hive/optimism/packages/contracts-bedrock/deployments/devnetL1/OptimismPortalProxy.json")
 	if err != nil {
 		return err
 	}
 	d.optimismPortal = optimismPortal
 
-	l2ToL1MessagePasserJSON, err := d.Cat("/hive/contracts/artifacts/contracts/L2/L2ToL1MessagePasser.sol/L2ToL1MessagePasser.json")
+	l2ToL1MessagePasserJSON, err := d.Cat("/hive/optimism/packages/contracts-bedrock/artifacts/contracts/L2/L2ToL1MessagePasser.sol/L2ToL1MessagePasser.json")
 	if err != nil {
 		return err
 	}
 	d.l2ToL1MessagePasserJSON = l2ToL1MessagePasserJSON
 
-	l2CrossDomainMessengerJSON, err := d.Cat("/hive/contracts/artifacts/contracts/L2/L2CrossDomainMessenger.sol/L2CrossDomainMessenger.json")
+	l2CrossDomainMessengerJSON, err := d.Cat("/hive/optimism/packages/contracts-bedrock/artifacts/contracts/L2/L2CrossDomainMessenger.sol/L2CrossDomainMessenger.json")
 	if err != nil {
 		return err
 	}
 	d.l2CrossDomainMessengerJSON = l2CrossDomainMessengerJSON
 
-	optimismMintableTokenFactoryJSON, err := d.Cat("/hive/contracts/artifacts/contracts/universal/OptimismMintableTokenFactoryProxy.sol/OptimismMintableTokenFactoryProxy.json")
+	optimismMintableTokenFactoryJSON, err := d.Cat("/hive/optimism/packages/contracts-bedrock/artifacts/contracts/universal/OptimismMintableTokenFactoryProxy.sol/OptimismMintableTokenFactoryProxy.json")
 	if err != nil {
 		return err
 	}
 	d.optimismMintableTokenFactoryJSON = optimismMintableTokenFactoryJSON
 
-	l2StandardBridgeJSON, err := d.Cat("/hive/contracts/artifacts/contracts/L2/L2StandardBridge.sol/L2StandardBridge.json")
+	l2StandardBridgeJSON, err := d.Cat("/hive/optimism/packages/contracts-bedrock/artifacts/contracts/L2/L2StandardBridge.sol/L2StandardBridge.json")
 	if err != nil {
 		return err
 	}
 	d.l2StandardBridgeJSON = l2StandardBridgeJSON
 
-	l1BlockJSON, err := d.Cat("/hive/contracts/artifacts/contracts/L2/L1Block.sol/L1Block.json")
+	l1BlockJSON, err := d.Cat("/hive/optimism/packages/contracts-bedrock/artifacts/contracts/L2/L1Block.sol/L1Block.json")
 	if err != nil {
 		return err
 	}