Skip to content

Commit 24d70f8

Browse files
committed
address comment
1 parent e5392dc commit 24d70f8

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

crates/node/src/args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ pub struct SignerArgs {
752752
#[derive(Debug, Default, Clone, clap::Args)]
753753
pub struct RpcArgs {
754754
/// A boolean to represent if the rollup node basic rpc should be enabled.
755-
#[arg(long = "rpc.rollup-node", num_args=0..=1, default_value_t = true, help = "Enable the rollup node basic RPC namespace(default: true)")]
755+
#[arg(long = "rpc.rollup-node", default_value_t = true, action = ArgAction::Set, help = "Enable the rollup node basic RPC namespace(default: true)")]
756756
pub basic_enabled: bool,
757757
/// A boolean to represent if the rollup node admin rpc should be enabled.
758758
#[arg(long = "rpc.rollup-node-admin", help = "Enable the rollup node admin RPC namespace")]

sequencer-migration/common-functions.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ stop_l2geth_mining() {
129129
# Enable l2reth automatic sequencing
130130
enable_l2reth_sequencing() {
131131
log_info "Enabling L2RETH automatic sequencing..."
132-
if cast rpc rollupNode_enableAutomaticSequencing --rpc-url "$L2RETH_RPC_URL" >/dev/null 2>&1; then
132+
if cast rpc rollupNodeAdmin_enableAutomaticSequencing --rpc-url "$L2RETH_RPC_URL" >/dev/null 2>&1; then
133133
log_success "L2RETH automatic sequencing enabled"
134134
return 0
135135
else
@@ -141,7 +141,7 @@ enable_l2reth_sequencing() {
141141
# Disable l2reth automatic sequencing
142142
disable_l2reth_sequencing() {
143143
log_info "Disabling L2RETH automatic sequencing..."
144-
if cast rpc rollupNode_disableAutomaticSequencing --rpc-url "$L2RETH_RPC_URL" >/dev/null 2>&1; then
144+
if cast rpc rollupNodeAdmin_disableAutomaticSequencing --rpc-url "$L2RETH_RPC_URL" >/dev/null 2>&1; then
145145
log_success "L2RETH automatic sequencing disabled"
146146
return 0
147147
else

sequencer-migration/switch-to-l2reth.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ perform_sequencing_switch() {
1818
# Phase 1: Disable L2GETH sequencing
1919
log_info "--- Phase 1: Disabling L2GETH sequencing ---"
2020
stop_l2geth_mining
21-
21+
2222
# wait for l2reth to catch up with l2geth
2323
log_info "-- Phase 1.5: Waiting for L2RETH to catch up with L2GETH ---"
2424
wait_for_l2reth_to_catch_up_with_l2geth

tests/launch_rollup_node_follower.bash

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ exec rollup-node node --chain /l2reth/l2reth-genesis-e2e.json --datadir=/l2reth
88
--network.valid_signer "0xb674ff99cca262c99d3eab5b32796a99188543da" \
99
--http --http.addr=0.0.0.0 --http.port=8545 --http.corsdomain "*" --http.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \
1010
--ws --ws.addr=0.0.0.0 --ws.port=8546 --ws.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \
11-
--rpc.rollup-node \
1211
--log.stdout.format log-fmt -vvv \
1312
--txpool.pending-max-count=1000 \
1413
--builder.gaslimit=30000000 \

tests/launch_rollup_node_sequencer.bash

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ exec rollup-node node --chain /l2reth/l2reth-genesis-e2e.json --datadir=/l2reth
1515
--network.valid_signer "0xb674ff99cca262c99d3eab5b32796a99188543da" \
1616
--http --http.addr=0.0.0.0 --http.port=8545 --http.corsdomain "*" --http.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \
1717
--ws --ws.addr=0.0.0.0 --ws.port=8546 --ws.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \
18-
--rpc.rollup-node \
1918
--rpc.rollup-node-admin \
2019
--log.stdout.format log-fmt -vvv \
2120
--sequencer.enabled \

tests/src/utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ sol! {
6666
pub async fn enable_automatic_sequencing(provider: &NamedProvider) -> Result<bool> {
6767
provider
6868
.client()
69-
.request("rollupNode_enableAutomaticSequencing", ())
69+
.request("rollupNodeAdminAdmin_enableAutomaticSequencing", ())
7070
.await
7171
.map_err(|e| eyre::eyre!("Failed to enable automatic sequencing: {}", e))
7272
}
@@ -75,7 +75,7 @@ pub async fn enable_automatic_sequencing(provider: &NamedProvider) -> Result<boo
7575
pub async fn disable_automatic_sequencing(provider: &NamedProvider) -> Result<bool> {
7676
provider
7777
.client()
78-
.request("rollupNode_disableAutomaticSequencing", ())
78+
.request("rollupNodeAdmin_disableAutomaticSequencing", ())
7979
.await
8080
.map_err(|e| eyre::eyre!("Failed to disable automatic sequencing: {}", e))
8181
}

0 commit comments

Comments
 (0)