From 3b6e38ef616a50e1a4e2b419e32ce7bc9ff61bbe Mon Sep 17 00:00:00 2001 From: Sha3n Date: Wed, 2 Aug 2023 11:23:22 +0800 Subject: [PATCH] V0.4.3/sync develop (#1323) * [R4R]-{develop}: Fix typos (#1300) * [R4R] - {license}: add DA license (#1263) * add DA license * add DA license and FraudProof LICENSE * fix DA proof --------- Co-authored-by: omahs <73983677+omahs@users.noreply.github.com> Co-authored-by: ethan <101823964+Ethanncnm@users.noreply.github.com> --- CONTRIBUTING.md | 2 +- README.md | 9 ++++++--- fraud-proof/LICENSE | 45 +++++++++++++++++++++++--------------------- gas-oracle/README.md | 4 ++-- l2geth/README.md | 2 +- ops/README.md | 4 ++-- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 66a38cdba5..f9b7ceaa6d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ There are plenty of ways to contribute, in particular we appreciate support in t - Reporting issues. For security issues see [Security policy](https://github.com/mantlenetworkio/mantle/blob/main/SECURITY.md). - Fixing and responding to existing issues. You can start off with those tagged ["good first issue"](https://github.com/mantlenetworkio/mantle/contribute) which are meant as introductory issues for external contributors. - Improving the [documentation](https://github.com/mantlenetworkio/documents) and [tutorials](https://docs.mantle.xyz/network/for-devs/tutorials). -- Become an "Mantler" and answer questions in the [mantle Discord](https://discord.com/invite/0xMantle). +- Become a "Mantler" and answer questions in the [mantle Discord](https://discord.com/invite/0xMantle). - Get involved in the protocol design process by proposing changes or new features or write parts of the spec yourself in the [mantle-specs](https://docs.mantle.xyz/network/intro/overview). Note that we have a [Code of Conduct](https://github.com/mantlenetworkio/.github/blob/main/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project. diff --git a/README.md b/README.md index 6dff30e3f8..a374659923 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Mantle's modular architecture helps achieve greater network efficiency for resou Different parts of the Mantle tech stack are specialized to tackle specific issues. -- [**Data Availability**](https://docs.mantle.xyz/introducing-mantle/a-gentle-introduction/solving-data-availability): Implementing EigenDA, an innovative re-staking solution that leverages Ethereum's validator network to bring the security of L1 to L2 +- [**Data Availability**](https://docs.mantle.xyz/introducing-mantle/a-gentle-introduction/solving-data-availability): Data Availability powered by EigenDA technology, an innovative re-staking solution that leverages Ethereum's validator network to bring the security of L1 to L2 - [**EVM-level Fraud Proofs**](https://docs.mantle.xyz/introducing-mantle/a-gentle-introduction/fraud-proofs): Improved fraud proofs that are evaluated using EVM-level instructions > We encourage you to check out the [**Mantle tech docs**](https://docs.mantle.xyz) to learn more about the inner workings of Mantle. @@ -149,7 +149,7 @@ root ├── bss-core: Core batch-submitter logic and utilities ├── gas-oracle: Service for updating L1 gas prices on L2 ├── integration-tests: Various integration tests for the Mantle network -├── l2geth: Mantle client software, a fork of geth v1.9.10 +├── l2geth: Mantle client software, a fork of geth v1.9.10 (deprecated for BEDROCK upgrade) ├── l2geth-exporter: A prometheus exporter to collect/serve metrics from an L2 geth node ├── proxyd: Configurable RPC request router and proxy @@ -165,4 +165,7 @@ Then check out our list of [good first issues](https://github.com/mantlenetworki ## License -Code forked from [`optimism`](https://github.com/ethereum-optimism) under the name [`optimism`](https://github.com/ethereum-optimism/optimism) is licensed under the [MIT License](https://github.com/git/git-scm.com/blob/main/MIT-LICENSE.txt) in accordance with the [original license](https://github.com/ethereum/go-ethereum/blob/master/COPYING). +Code forked from [`optimism`](https://github.com/ethereum-optimism/optimism) under the name [`optimism`](https://github.com/mantlenetworkio/bitnetwork/tree/master/l2geth) is licensed under the [GNU GPLv3](https://gist.github.com/kn9ts/cbe95340d29fc1aaeaa5dd5c059d2e60) in accordance with the [original license](https://github.com/ethereum-optimism/optimism/blob/master/COPYING). + + +All other files within this repository are licensed under the [MIT License](https://github.com/mantlenetworkio/bitnetwork/blob/master/LICENSE) unless stated otherwise. diff --git a/fraud-proof/LICENSE b/fraud-proof/LICENSE index ec55f3cecb..9bedbe2c35 100644 --- a/fraud-proof/LICENSE +++ b/fraud-proof/LICENSE @@ -1,22 +1,25 @@ -(The MIT License) +// SPDX-License-Identifier: Apache-2.0 -Copyright 2022-2023 Mantle - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +/* + * Modifications Copyright 2022, Specular contributors + * + * This file was changed in accordance to Apache License, Version 2.0. + * + * Copyright 2021, Offchain Labs, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + * Modifications Copyright 2023, Mantle contributors + * + * This file was changed in accordance to Apache License, Version 2.0. + * diff --git a/gas-oracle/README.md b/gas-oracle/README.md index cd1eee8cf7..bde2efb7ba 100644 --- a/gas-oracle/README.md +++ b/gas-oracle/README.md @@ -35,7 +35,7 @@ $ make gas-oracle ### Running the service -Use the `--help` flag when running the `gas-oracle` to see it's configuration +Use the `--help` flag when running the `gas-oracle` to see its configuration options. ``` @@ -49,7 +49,7 @@ VERSION: 0.0.0-1.10.4-stable DESCRIPTION: - Configure with a private key and an Mantle HTTP endpoint to send transactions that update the L2 gas price. + Configure with a private key and a Mantle HTTP endpoint to send transactions that update the L2 gas price. COMMANDS: help, h Shows a list of commands or help for one command diff --git a/l2geth/README.md b/l2geth/README.md index ae1d8778f5..e7478208d8 100644 --- a/l2geth/README.md +++ b/l2geth/README.md @@ -178,7 +178,7 @@ configuration file via: $ geth --config /path/to/your_config.toml ``` -To get an idea how the file should look like you can use the `dumpconfig` subcommand to +To get an idea of how the file should look like you can use the `dumpconfig` subcommand to export your existing configuration: ```shell diff --git a/ops/README.md b/ops/README.md index 1351ee7a1f..5b1540b250 100644 --- a/ops/README.md +++ b/ops/README.md @@ -89,7 +89,7 @@ user: admin password: mantle ``` -## Data persistance +## Data persistence Grafana data is not currently saved. Any modifications or additions will be lost on container restart. @@ -97,7 +97,7 @@ InfluxDB is persisting data to a Docker volume. **Stopping the project removing the containers will not clear this volume** -To remove the influxdb and grafana data, run a commands like +To remove the influxdb and grafana data, run a command like ``` docker volume rm ops_influxdb_data docker volume rm ops_grafana_data