From c9b96af3d498ab1b80b2ae863f24d9a042040314 Mon Sep 17 00:00:00 2001 From: crazywriter1 Date: Mon, 31 Aug 2026 18:34:02 +0300 Subject: [PATCH 1/2] docs: fix devnet node count; chore: remove stale TODOs; fix: Linux sed portability - README: devnet-up starts 2 L2 nodes (node-0/1), not 4 - Makefile update_mod: use sed -i.bak (works on Linux and macOS) - gen_bindings.sh, tendermint-setup.sh: same portable sed pattern - Remove stale TODOs in docker-compose, deploy.ts, mpt keccak helper --- Makefile | 4 ++-- README.md | 2 +- bindings/gen_bindings.sh | 2 +- contracts/tasks/deploy.ts | 1 - node/ops-morph/docker-compose.yml | 1 - node/ops-morph/testnet/tendermint-setup.sh | 4 ++-- prover/crates/mpt/src/mpt.rs | 4 ---- 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 26f593412..27a2b2336 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,11 @@ update_mod: @echo "Updating go.mod in $(MODULE)..." @if grep -q '$(ETHEREUM_MODULE_NAME)' $(MODULE)/go.mod; then \ - sed -i '' -e "s|$(ETHEREUM_MODULE_NAME) v[0-9][^[:space:]]*|$(ETHEREUM_MODULE_NAME) $(ETHEREUM_TARGET_VERSION)|" $(MODULE)/go.mod; \ + sed -i.bak -e "s|$(ETHEREUM_MODULE_NAME) v[0-9][^[:space:]]*|$(ETHEREUM_MODULE_NAME) $(ETHEREUM_TARGET_VERSION)|" $(MODULE)/go.mod && rm -f $(MODULE)/go.mod.bak; \ fi @if grep -q '$(TENDERMINT_MODULE_NAME)' $(MODULE)/go.mod; then \ - sed -i '' -e "s|$(TENDERMINT_MODULE_NAME) v[0-9][^[:space:]]*|$(TENDERMINT_MODULE_NAME) $(TENDERMINT_TARGET_VERSION)|" $(MODULE)/go.mod; \ + sed -i.bak -e "s|$(TENDERMINT_MODULE_NAME) v[0-9][^[:space:]]*|$(TENDERMINT_MODULE_NAME) $(TENDERMINT_TARGET_VERSION)|" $(MODULE)/go.mod && rm -f $(MODULE)/go.mod.bak; \ fi @cd $(MODULE) && go mod tidy diff --git a/README.md b/README.md index bb95f79ea..71e5256cb 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ This command performs the following steps: 3. Compiles all necessary components (L1 execution layer, consensus layer, L2 node, and services) 4. Generates genesis configurations for both L1 and L2 networks 5. Deploys smart contracts to the L1 network -6. Starts a 4-node Morph network with associated services +6. Starts a 2-node L2 devnet (node-0 and node-1) with associated services **Note:** The initial startup may take considerable time due to extensive building operations. diff --git a/bindings/gen_bindings.sh b/bindings/gen_bindings.sh index 619f944f8..d8763686a 100755 --- a/bindings/gen_bindings.sh +++ b/bindings/gen_bindings.sh @@ -54,4 +54,4 @@ abigen \ # Place import "github.com/ethereum/go-ethereum" to "github.com/morph-l2/go-ethereum" TO_REPLACED_STRING="github.com/ethereum/go-ethereum" NEW_STRING="github.com/morph-l2/go-ethereum" -sed -i "" -e "s#${TO_REPLACED_STRING}#${NEW_STRING}#g" ./${PACKAGE}/${TYPE_LOWER}.go +sed -i.bak -e "s#${TO_REPLACED_STRING}#${NEW_STRING}#g" ./${PACKAGE}/${TYPE_LOWER}.go && rm -f ./${PACKAGE}/${TYPE_LOWER}.go.bak diff --git a/contracts/tasks/deploy.ts b/contracts/tasks/deploy.ts index 6b6d3ddaf..5496f7911 100644 --- a/contracts/tasks/deploy.ts +++ b/contracts/tasks/deploy.ts @@ -148,7 +148,6 @@ task("initialize") console.log('ContractInit failed, err: ', err) return } - // todo transfer contract owner }); task("fund") diff --git a/node/ops-morph/docker-compose.yml b/node/ops-morph/docker-compose.yml index 4f9106aad..923c796dc 100644 --- a/node/ops-morph/docker-compose.yml +++ b/node/ops-morph/docker-compose.yml @@ -40,7 +40,6 @@ services: - MORPH_NODE_L2_ETH_RPC=http://morph-el-0:8545 - MORPH_NODE_L2_ENGINE_RPC=http://morph-el-0:8551 - MORPH_NODE_L2_ENGINE_AUTH=jwt-secret.txt - ## todo need to replace it to a public network - MORPH_NODE_L1_ETH_RPC=${L1_ETH_RPC} - MORPH_NODE_SYNC_DEPOSIT_CONTRACT_ADDRESS=0x6900000000000000000000000000000000000001 ## - MORPH_NODE_SYNC_START_HEIGHT=88854536 diff --git a/node/ops-morph/testnet/tendermint-setup.sh b/node/ops-morph/testnet/tendermint-setup.sh index 7c6aac8be..ba4daf330 100644 --- a/node/ops-morph/testnet/tendermint-setup.sh +++ b/node/ops-morph/testnet/tendermint-setup.sh @@ -32,5 +32,5 @@ fi #sed -i '' 's/@node3:26656/@127.0.0.1:56656/g' ./mytestnet/node0/config/config.toml ./mytestnet/node1/config/config.toml ./mytestnet/node2/config/config.toml ./mytestnet/node3/config/config.toml -sed -i '' 's#create_empty_blocks_interval = "0s"#create_empty_blocks_interval = "5s"#g' ./mytestnet/node0/config/config.toml ./mytestnet/node1/config/config.toml ./mytestnet/node2/config/config.toml ./mytestnet/node3/config/config.toml -sed -i '' 's#timeout_commit = "1s"#timeout_commit = "3s"#g' ./mytestnet/node0/config/config.toml ./mytestnet/node1/config/config.toml ./mytestnet/node2/config/config.toml ./mytestnet/node3/config/config.toml \ No newline at end of file +sed -i.bak 's#create_empty_blocks_interval = "0s"#create_empty_blocks_interval = "5s"#g' ./mytestnet/node0/config/config.toml ./mytestnet/node1/config/config.toml ./mytestnet/node2/config/config.toml ./mytestnet/node3/config/config.toml && rm -f ./mytestnet/node*/config/config.toml.bak +sed -i.bak 's#timeout_commit = "1s"#timeout_commit = "3s"#g' ./mytestnet/node0/config/config.toml ./mytestnet/node1/config/config.toml ./mytestnet/node2/config/config.toml ./mytestnet/node3/config/config.toml && rm -f ./mytestnet/node*/config/config.toml.bak \ No newline at end of file diff --git a/prover/crates/mpt/src/mpt.rs b/prover/crates/mpt/src/mpt.rs index 91b5fbd84..ab0fce229 100644 --- a/prover/crates/mpt/src/mpt.rs +++ b/prover/crates/mpt/src/mpt.rs @@ -75,12 +75,8 @@ pub const KECCAK_EMPTY: B256 = /// This function is a thin wrapper around the Keccak256 hashing algorithm /// and is optimized for performance. /// -/// # TODO -/// - Consider switching the return type to `B256` for consistency with other parts of the codebase. #[inline] pub fn keccak(data: impl AsRef<[u8]>) -> [u8; 32] { - // TODO: Remove this benchmarking code once performance testing is complete. - // std::hint::black_box(sha2::Sha256::digest(&data)); *alloy_primitives::utils::keccak256(data) } From 3d942e3c8998f9da254fcc2c1e398c706b3df8d1 Mon Sep 17 00:00:00 2001 From: crazywriter1 Date: Mon, 31 Aug 2026 20:47:19 +0300 Subject: [PATCH 2/2] fix(bindings): quote generated file paths in gen_bindings.sh sed/rm --- bindings/gen_bindings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/gen_bindings.sh b/bindings/gen_bindings.sh index d8763686a..e32f3e5ca 100755 --- a/bindings/gen_bindings.sh +++ b/bindings/gen_bindings.sh @@ -54,4 +54,4 @@ abigen \ # Place import "github.com/ethereum/go-ethereum" to "github.com/morph-l2/go-ethereum" TO_REPLACED_STRING="github.com/ethereum/go-ethereum" NEW_STRING="github.com/morph-l2/go-ethereum" -sed -i.bak -e "s#${TO_REPLACED_STRING}#${NEW_STRING}#g" ./${PACKAGE}/${TYPE_LOWER}.go && rm -f ./${PACKAGE}/${TYPE_LOWER}.go.bak +sed -i.bak -e "s#${TO_REPLACED_STRING}#${NEW_STRING}#g" "./${PACKAGE}/${TYPE_LOWER}.go" && rm -f "./${PACKAGE}/${TYPE_LOWER}.go.bak"