Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion bindings/gen_bindings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
1 change: 0 additions & 1 deletion contracts/tasks/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ task("initialize")
console.log('ContractInit failed, err: ', err)
return
}
// todo transfer contract owner
});

task("fund")
Expand Down
1 change: 0 additions & 1 deletion node/ops-morph/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions node/ops-morph/testnet/tendermint-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
4 changes: 0 additions & 4 deletions prover/crates/mpt/src/mpt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down