From 380f51308bb5a71dfe61433aad75c27fe7b80415 Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:14:44 +0200 Subject: [PATCH 01/12] Update 3-faucet.md --- docs/quick-start/3-faucet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quick-start/3-faucet.md b/docs/quick-start/3-faucet.md index 84948448..87e08904 100644 --- a/docs/quick-start/3-faucet.md +++ b/docs/quick-start/3-faucet.md @@ -82,7 +82,7 @@ Morph Holesky USDT address: "0x9E12AD42c4E4d2acFBADE01a96446e48e6764B98" ~~~ -7. Check you wallet for USDT balance and start to bridge! +7. Check your wallet for USDT balance and start to bridge! From 7bb72b422481074a64c3a1f83b2c883f2ccdc352 Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:16:06 +0200 Subject: [PATCH 02/12] Update 1-morph-decentralized-sequencer-network.md --- .../1-morph-decentralized-sequencer-network.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/how-morph-works/decentralized-sequencers/1-morph-decentralized-sequencer-network.md b/docs/how-morph-works/decentralized-sequencers/1-morph-decentralized-sequencer-network.md index 01034df8..be052706 100644 --- a/docs/how-morph-works/decentralized-sequencers/1-morph-decentralized-sequencer-network.md +++ b/docs/how-morph-works/decentralized-sequencers/1-morph-decentralized-sequencer-network.md @@ -81,7 +81,7 @@ The following is a simple illustration of Morph’s decentralized sequencing net A complete Morph decentralized sequencer network consists of two parts: -- **Sequencer Set** : This forms the core group that provides sequencing services +- **Sequencer Set**: This forms the core group that provides sequencing services - **Sequencer Staking Contract**: This contract facilitates the selection of the sequencer set via an election process. Through the sequencer staking contract, members are elected into the sequencer set, where they collaboratively provide services for the Morph network. Periodically, the election results are synchronized to the Layer 1 Rollup contract. This synchronized data is utilized to obtain the BLS aggregate signatures of sequencer network participants for comparison and verification. From 314f4eb5072ecd354478e32beebf02fb4554a977 Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:17:37 +0200 Subject: [PATCH 03/12] Update 1-rollup.md --- .../general-protocol-design/1-rollup.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/how-morph-works/general-protocol-design/1-rollup.md b/docs/how-morph-works/general-protocol-design/1-rollup.md index 337f27b8..420890ac 100644 --- a/docs/how-morph-works/general-protocol-design/1-rollup.md +++ b/docs/how-morph-works/general-protocol-design/1-rollup.md @@ -26,18 +26,18 @@ The batch submitter then reconstructs L2 blocks, compiling: - Transactions: All transactions contained within the blocks. -- Blockinfo : Essential information from each block. +- Blockinfo: Essential information from each block. The batch submitter continues fetching and reconstructing blocks until it processes a block with a BLS signature, indicating the batch point has been reached. The reconstructed block data is used to construct a batch, which contains: -- lastBlocknumber : The number of the final block in the batch. -- Transactions : Encoded transactions within the batch. -- BlockWitness : Encoded blockinfos, utilized for zkProof. -- PreStateRoot : The stateRoot before the batch is applied. -- PostStateRoot : The stateRoot after the batch is applied. -- WithdrawalRoot : L2 withdrawal Merkle tree root. -- Signature : The batch’s BLS signature. +- lastBlocknumber: The number of the final block in the batch. +- Transactions: Encoded transactions within the batch. +- BlockWitness: Encoded blockinfos, utilized for zkProof. +- PreStateRoot: The stateRoot before the batch is applied. +- PostStateRoot: The stateRoot after the batch is applied. +- WithdrawalRoot: L2 withdrawal Merkle tree root. +- Signature: The batch’s BLS signature. :::info From d2e86f722fca3b5c79bc057a7be9f3b5a2a85829 Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:19:28 +0200 Subject: [PATCH 04/12] Update 2-development-setup.md --- docs/build-on-morph/build-on-morph/2-development-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-on-morph/build-on-morph/2-development-setup.md b/docs/build-on-morph/build-on-morph/2-development-setup.md index 858d1056..c47ca9c7 100644 --- a/docs/build-on-morph/build-on-morph/2-development-setup.md +++ b/docs/build-on-morph/build-on-morph/2-development-setup.md @@ -176,7 +176,7 @@ https://holesky-faucet.pk910.de/ https://cloud.google.com/application/web3/faucet/ethereum (needs a Google account) -We have our own [website faucet](https://morphfaucet.com/) that can claim ETH & USDT for you initial usage. +We have our own [website faucet](https://morphfaucet.com/) that can claim ETH & USDT for your initial usage. Morph also offers a [Discord faucet](../../quick-start/3-faucet.md#morph-holesky-eth) to obtain Morph Holesky USDT & Morph Holesky ETH. From 418a54568d716ee171ea0dced39e1c8bd674c72d Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:21:08 +0200 Subject: [PATCH 05/12] Update 1-deploy-contract-on-morph.md --- docs/build-on-morph/code-examples/1-deploy-contract-on-morph.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-on-morph/code-examples/1-deploy-contract-on-morph.md b/docs/build-on-morph/code-examples/1-deploy-contract-on-morph.md index 10262bec..191e4336 100644 --- a/docs/build-on-morph/code-examples/1-deploy-contract-on-morph.md +++ b/docs/build-on-morph/code-examples/1-deploy-contract-on-morph.md @@ -133,7 +133,7 @@ curl -L https://foundry.paradigm.xyz | bash foundryup ``` -Then go the right folder of our example: +Then go to the right folder of our example: ```bash cd contract-deployment-demos/foundry-demo From e50fc4ed1d050fad276ae7ab3ace3d83c88c2dc4 Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:23:31 +0200 Subject: [PATCH 06/12] Update 5-verify-your-smart-contracts.md --- .../build-on-morph/5-verify-your-smart-contracts.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-on-morph/build-on-morph/5-verify-your-smart-contracts.md b/docs/build-on-morph/build-on-morph/5-verify-your-smart-contracts.md index 11bd5fc4..15cc22de 100644 --- a/docs/build-on-morph/build-on-morph/5-verify-your-smart-contracts.md +++ b/docs/build-on-morph/build-on-morph/5-verify-your-smart-contracts.md @@ -85,7 +85,7 @@ forge flatten --output FlattenedL2StandardBridge.sol ./contracts/L2/L2StandardBr #### Obtain JSON File - Can be obtained through solc -- Can be obatined through remix compiler +- Can be obtained through remix compiler ![sjis2](../../../assets/docs/dev/contract-verify/sjisol3.png) @@ -94,7 +94,7 @@ forge flatten --output FlattenedL2StandardBridge.sol ./contracts/L2/L2StandardBr #### Frontend: -- You can submit multiple contract file by your own needs +- You can submit multiple contract files by your own needs ![mpfs1](../../../assets/docs/dev/contract-verify/mpfsol.png) #### SOL File Process From e112848d05f36473dd1ffae0afce979c7439db8a Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:25:19 +0200 Subject: [PATCH 07/12] Update 3-bridge-between-morph-and-ethereum.md --- .../build-on-morph/3-bridge-between-morph-and-ethereum.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-on-morph/build-on-morph/3-bridge-between-morph-and-ethereum.md b/docs/build-on-morph/build-on-morph/3-bridge-between-morph-and-ethereum.md index f0049a48..2e24d2b2 100644 --- a/docs/build-on-morph/build-on-morph/3-bridge-between-morph-and-ethereum.md +++ b/docs/build-on-morph/build-on-morph/3-bridge-between-morph-and-ethereum.md @@ -162,7 +162,7 @@ The easiest way to support your token is to manually add it on our [official bri ### Add token support to the bridge frontend -By adding your token to the gateway, you and other users can bridge the token by inputting the token address.You need to raise a PR to our bridge repo if you want your token shown on the bridge frontend token list. +By adding your token to the gateway, you and other users can bridge the token by inputting the token address. You need to raise a PR to our bridge repo if you want your token shown on the bridge frontend token list. You can find how to do it in the [morph list repo](https://github.com/morph-l2/morph-list). From 32b4e1790510d84152b5317745eb45fe28ef442d Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:26:42 +0200 Subject: [PATCH 08/12] Update 5-blockchain-oracles.md --- .../use-ecosystem-developer-tools/5-blockchain-oracles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-on-morph/developer-resources/use-ecosystem-developer-tools/5-blockchain-oracles.md b/docs/build-on-morph/developer-resources/use-ecosystem-developer-tools/5-blockchain-oracles.md index 06206c98..b4cfae7b 100644 --- a/docs/build-on-morph/developer-resources/use-ecosystem-developer-tools/5-blockchain-oracles.md +++ b/docs/build-on-morph/developer-resources/use-ecosystem-developer-tools/5-blockchain-oracles.md @@ -19,4 +19,4 @@ eOracle is currently in the progress of integrating Morph mainnet. Deployed Morph Holesky testnet [contract](https://explorer-holesky.morphl2.io/address/0xbd53b35Bf458Cd22dBDeB5Da71181daA3cFb6A10) -Full price feeds and docs can be found here : https://eoracle.gitbook.io/eoracle/price-feeds/feed-addresses. \ No newline at end of file +Full price feeds and docs can be found here: https://eoracle.gitbook.io/eoracle/price-feeds/feed-addresses. From 27b271dd9be7e9b04d28077aa8b1888cc007a7bd Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:31:04 +0200 Subject: [PATCH 09/12] Update 2-how-to-run-a-morph-node-docker.md --- .../node-operation/2-how-to-run-a-morph-node-docker.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/build-on-morph/developer-resources/node-operation/2-how-to-run-a-morph-node-docker.md b/docs/build-on-morph/developer-resources/node-operation/2-how-to-run-a-morph-node-docker.md index e5cf9f11..ce0799c0 100644 --- a/docs/build-on-morph/developer-resources/node-operation/2-how-to-run-a-morph-node-docker.md +++ b/docs/build-on-morph/developer-resources/node-operation/2-how-to-run-a-morph-node-docker.md @@ -31,7 +31,7 @@ make run-holesky-node Running this command will create a `.morph-holesky` directory in your user directory by default, serving as the node's home directory. Before starting the node, this command will perform several preparations: - Create the node's home directory and copy the default configuration files into it. -- Prepare the `secret-jwt.txt` file for for authentication during RPC calls between geth and the node. +- Prepare the `secret-jwt.txt` file for authentication during RPC calls between geth and the node. - Download the latest snapshot data to speed up node synchronization. - Place the extracted snapshot data into the corresponding folder within the home directory. @@ -55,7 +55,7 @@ The host directory paths that are mounted by the Docker container are specified NODE_HOME=${HOME}/.morph-holesky // the data directory for your execution client: geth GETH_DATA_DIR=${NODE_HOME}/geth-data -// the data directory for you consensus client: tendermint +// the data directory for your consensus client: tendermint NODE_DATA_DIR=${NODE_HOME}/node-data // the entrypoint shell script for start execution client GETH_ENTRYPOINT_FILE=${NODE_HOME}/entrypoint-geth.sh @@ -92,4 +92,4 @@ You may also manually manage snapshot, particularly if you are using custom path The **make download-and-decompress-snapshot** command in the ```ops/publicnode``` directory will assist you in downloading and decompressing the snapshot archive. Then, you need to manually place the decompressed data files in the appropriate node data directories. -For example, if the snapshot folder is named ```snapshot-20240805-1```, move the contents from ```snapshot-20240805-1/geth``` to the ```${GETH_DATA_DIR}/geth``` directory and the contents from ```snapshot-20240805-1/data``` to the ```${NODE_DATA_DIR}/data``` directory. \ No newline at end of file +For example, if the snapshot folder is named ```snapshot-20240805-1```, move the contents from ```snapshot-20240805-1/geth``` to the ```${GETH_DATA_DIR}/geth``` directory and the contents from ```snapshot-20240805-1/data``` to the ```${NODE_DATA_DIR}/data``` directory. From 3947837fa7584874df6996bb0c9ab3203c0db616 Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:32:52 +0200 Subject: [PATCH 10/12] Update 1-how-to-run-a-morph-node.md --- .../node-operation/1-how-to-run-a-morph-node.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-on-morph/developer-resources/node-operation/1-how-to-run-a-morph-node.md b/docs/build-on-morph/developer-resources/node-operation/1-how-to-run-a-morph-node.md index 98ff34d8..85ac6994 100644 --- a/docs/build-on-morph/developer-resources/node-operation/1-how-to-run-a-morph-node.md +++ b/docs/build-on-morph/developer-resources/node-operation/1-how-to-run-a-morph-node.md @@ -9,14 +9,14 @@ This guide outlines the steps to start a Morph node. The example assumes the hom Running the morph node requires 2 processes: `geth` and `node`. -- `Geth`:the Morph execution layer which needs to meet the requirements as below +- `Geth`: the Morph execution layer which needs to meet the requirements as below - Fast CPU with 4+ cores - 32GB+ RAM - High-performance SSD with at least 1TB of free space - 25+ MBit/sec download Internet service -- `Node`:the Morph consensus layer embedded tendermint which needs to meet the [tendermint hardware requirements](https://docs.tendermint.com/v0.34/tendermint-core/running-in-production.html#processor-and-memory). +- `Node`: the Morph consensus layer embedded tendermint which needs to meet the [tendermint hardware requirements](https://docs.tendermint.com/v0.34/tendermint-core/running-in-production.html#processor-and-memory). :::tip From a47e2fbe11f4f240915cbea4eb6d2fff75af9ca4 Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:35:07 +0200 Subject: [PATCH 11/12] Update 2-upgrade-node-docker.md --- .../node-operation/upgrade-node/2-upgrade-node-docker.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-on-morph/developer-resources/node-operation/upgrade-node/2-upgrade-node-docker.md b/docs/build-on-morph/developer-resources/node-operation/upgrade-node/2-upgrade-node-docker.md index 6442cd7e..313b4bd6 100644 --- a/docs/build-on-morph/developer-resources/node-operation/upgrade-node/2-upgrade-node-docker.md +++ b/docs/build-on-morph/developer-resources/node-operation/upgrade-node/2-upgrade-node-docker.md @@ -22,9 +22,9 @@ git checkout ${latestVersion} cd ops/publicnode make stop-holesky-node make rm-holesky-node -## delete the pervious docker image for node +## delete the previous docker image for node docker rmi morph/node:latest -## delete the pervious docker image for geth +## delete the previous docker image for geth docker rmi morph/geth-nccc:latest ``` From a42b6a3bca81953616a60b96c07c2c9b98c8a890 Mon Sep 17 00:00:00 2001 From: mcisb <83702309+KyryloKilin@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:37:35 +0200 Subject: [PATCH 12/12] Update 3-morph-json-rpc-api-methods.md --- .../developer-resources/3-morph-json-rpc-api-methods.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/build-on-morph/developer-resources/3-morph-json-rpc-api-methods.md b/docs/build-on-morph/developer-resources/3-morph-json-rpc-api-methods.md index 6c683d92..a3cf1216 100644 --- a/docs/build-on-morph/developer-resources/3-morph-json-rpc-api-methods.md +++ b/docs/build-on-morph/developer-resources/3-morph-json-rpc-api-methods.md @@ -291,11 +291,11 @@ Object - RollupBatch 1. version: quantity - the version of the batch 2. hash: DATA: 32 bytes - the batch of this batch 3. parentBatchHeader: bytes - the parent batch header -4. Chunks: arrays of chunk - Chunk: bytes : the chunk bytes of this batch +4. Chunks: arrays of chunk - Chunk: bytes: the chunk bytes of this batch 5. skippedL1MessageBitmap: bytes - the bitmap of the skipped L1Message 6. prevStateRoot: DATA: 32 bytes - the state root at the beginning of this batch 7. postStateRoot: DATA: 32 bytes - the state root at the end of this batch -8. withdrawRoot: DATA : 32 bytes - the withdraw root at the end of this batch +8. withdrawRoot: DATA: 32 bytes - the withdraw root at the end of this batch 9. sidecar - the side car for the rollup transaction of the blob type 10. signatures - array of object of signature: @@ -517,4 +517,4 @@ It replays the block and returns the structured blockTrace for rollers. "startL1QueueIndex": 0 } } -``` \ No newline at end of file +```