Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce kagome-dev #2064

Merged
merged 3 commits into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Enhancement for KAGOME
description: Suggest an improvement to an existing feature in the KAGOME project.
title: "[Bug]: "
title: "[Enhancement]: "
labels: ["Enhancement"]
projects: ["qdrvm/1"]
body:
Expand All @@ -16,6 +16,10 @@ body:
description: Explain why this enhancement is beneficial
validations:
required: true
- type: textarea
attributes:
label: Additional context
description: Add any other context about the enhancement request here
- type: dropdown
attributes:
label: Are you planning to do it yourself in a pull request ?
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SPDX-License-Identifier: Apache-2.0
<!-- ### Requirements -->
<!-- * Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion. -->
<!-- * All new code must have code coverage above 70% (https://docs.codecov.io/docs/about-code-coverage). -->
<!-- * Branch must be rebased onto base branch (https://soramitsu.atlassian.net/wiki/spaces/IS/pages/11173889/Rebase+and+merge+guide). -->
<!-- * Branch must be rebased onto base branch. -->

### Referenced issues

Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ SPDX-License-Identifier: Apache-2.0

![logo](/docs/image_assets/kagome-logo-(new-2020).svg)

[![CodeFactor](https://www.codefactor.io/repository/github/soramitsu/kagome/badge)](https://www.codefactor.io/repository/github/soramitsu/kagome)
[![codecov](https://codecov.io/gh/soramitsu/kagome/branch/master/graph/badge.svg)](https://codecov.io/gh/soramitsu/kagome)
[![](https://img.shields.io/twitter/follow/qdrvm_io?label=Follow&style=social)](https://twitter.com/qdrvm_io)

Expand All @@ -17,7 +16,7 @@ KAGOME is a [Polkadot Host](https://github.com/w3f/polkadot-spec/tree/master/hos

## Status

![kagome-components-Host drawio-light](https://github.com/soramitsu/kagome/assets/9370151/323c1677-b628-468c-adb8-5c09c2164fc3)
![kagome-components-Host drawio-light](https://github.com/qdrvm/kagome/assets/9370151/323c1677-b628-468c-adb8-5c09c2164fc3)


- [x] JSON-RPC (compatible with Polkadot JS)
Expand All @@ -31,7 +30,7 @@ KAGOME is a [Polkadot Host](https://github.com/w3f/polkadot-spec/tree/master/hos
- [x] Consensus
- [x] BABE
- [x] GRANDPA
- [ ] SASSAFRAS (Q4 2023)
- [ ] SASSAFRAS
- [x] Storage
- [x] Blockchain
- [x] Block storage
Expand All @@ -40,8 +39,8 @@ KAGOME is a [Polkadot Host](https://github.com/w3f/polkadot-spec/tree/master/hos
- [x] Trie storage (merkle trie)
- [x] RocksDB
- [x] Dynamic pruning
- [ ] Trie nodes caches (Q4 2023)
- [ ] State caches (Q4 2023)
- [ ] Trie nodes caches
- [ ] State caches
- [x] Runtime
- [x] Host API
- [x] WASM engine
Expand All @@ -53,7 +52,8 @@ KAGOME is a [Polkadot Host](https://github.com/w3f/polkadot-spec/tree/master/hos
- [x] Data availability
- [x] Approval voting
- [x] Disputes resolution
- [ ] Async-Backing (planned for Q3 2023)
- [x] Async-Backing
- [ ] Elastic scaling
- [x] Networking
- [x] Peer manager
- [x] /dot/block-announces/1
Expand All @@ -74,8 +74,8 @@ KAGOME is a [Polkadot Host](https://github.com/w3f/polkadot-spec/tree/master/hos
- [x] Libp2p
- [x] Transport
- [x] TCP
- [ ] QUIC (Q4 2023)
- [ ] WebRTC (Q4 2023)
- [ ] QUIC
- [ ] WebRTC
- [x] Secure connection
- [x] Noise
- [x] TLS
Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ find_package(binaryen CONFIG REQUIRED)
hunter_add_package(benchmark)
find_package(benchmark CONFIG REQUIRED)

# https://github.com/soramitsu/libp2p
# https://github.com/libp2p/cpp-libp2p
hunter_add_package(libp2p)
find_package(libp2p CONFIG REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion docs/source/development/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ CodeStyle

We follow `CppCoreGuidelines <https://github.com/isocpp/CppCoreGuidelines>`_.

Please use provided `.clang-format <https://github.com/soramitsu/kagome/blob/master/.clang-format>`_ file to autoformat the code.
Please use provided `.clang-format <https://github.com/qdrvm/kagome/blob/master/.clang-format>`_ file to autoformat the code.
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Kagome documentation

.. image:: ../image_assets/kagome-logo-(new-2020).svg

Kagome is a C++ implementation of `Polkadot Host <https://github.com/w3f/polkadot-spec/tree/master/runtime-environment-spec>`_ developed by `Soramitsu <https://soramitsu.co.jp/>`_ and funded by Web3 Foundation `grant <https://github.com/w3f/Web3-collaboration/blob/master/grants/grants.md>`_.
Kagome is a C++ implementation of `Polkadot Host <https://github.com/w3f/polkadot-spec/tree/master/runtime-environment-spec>`_ developed by Quadrivium and funded by Web3 Foundation `grant <https://github.com/w3f/Web3-collaboration/blob/master/grants/grants.md>`_.

**WARNING:** Kagome is early-stage software. While we are doing our best to be compatible with other Polkadot Host implementations, we cannot guarantee full compatibility due to specification being in development.

Expand Down
8 changes: 4 additions & 4 deletions docs/source/tutorials/kagome_in_docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ In this tutorial you will learn how to execute Kagome-based Polkadot-host chain
1. Docker container runtime must be installed in your OS.
Manual of that can be found in [official site](https://docs.docker.com/engine/install/).

2. Image of kagome docker container is soramitsu/kagome
2. Image of kagome docker container is qdrvm/kagome

```bash
# In Debian-like OS (Debian, Ubuntu, Mint, etc.)
docker image pull soramitsu/kagome
docker image pull qdrvm/kagome
```

3. Directory containing configs and keys
Expand Down Expand Up @@ -57,9 +57,9 @@ docker run \
--publish 30363:30363 \
--publish 9933:9933 \
--publish 9944:9944 \
soramitsu/kagome \
qdrvm/kagome \
kagome \
--chain localchain.json \
--chain kusama \
--base-path base_path \
--port 30363 \
--rpc-port 9933 \
Expand Down
63 changes: 3 additions & 60 deletions housekeeping/docker/kagome-dev/minideb.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,45 +26,16 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /
echo \
"deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
bullseye stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
echo \
"deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-11 main" | tee -a /etc/apt/sources.list.d/docker.list > /dev/null && \
echo \
"deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-12 main" | tee -a /etc/apt/sources.list.d/docker.list > /dev/null && \
echo \
"deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-13 main" | tee -a /etc/apt/sources.list.d/docker.list > /dev/null && \
echo \
"deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-14 main" | tee -a /etc/apt/sources.list.d/docker.list > /dev/null && \
echo \
"deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-15 main" | tee -a /etc/apt/sources.list.d/docker.list > /dev/null && \
echo \
"deb http://deb.debian.org/debian/ testing main" | tee -a /etc/apt/sources.list.d/docker.list > /dev/null && \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
wget -q -O- https://github.com/rui314/mold/releases/download/v1.5.1/mold-1.5.1-x86_64-linux.tar.gz | tar -C /usr/local --strip-components=1 -xzf - && \
apt-get update && apt-get install --no-install-recommends -y \
docker-ce \
docker-ce-cli \
containerd.io \
build-essential \
gcc-12 \
g++-12 \
clang-11 \
llvm-11-dev \
clang-tidy-11 \
clang-format-11 \
clang-12 \
llvm-12-dev \
clang-tidy-12 \
clang-format-12 \
clang-13 \
llvm-13-dev \
clang-tidy-13 \
clang-format-13 \
clang-14 \
llvm-14-dev \
clang-tidy-14 \
clang-format-14 \
libclang-rt-14-dev \
clang-15 \
llvm-15-dev \
clang-tidy-15 \
clang-format-15 \
Expand Down Expand Up @@ -97,19 +68,11 @@ RUN python3 -m venv /venv
RUN /venv/bin/python3 -m pip install --no-cache-dir --upgrade pip
RUN /venv/bin/pip install --no-cache-dir cmake==3.25 scikit-build requests gitpython gcovr pyyaml

# install sonar cli
ENV SONAR_CLI_VERSION=4.1.0.1829
RUN set -e; \
mkdir -p /opt/sonar; \
curl -L -o /tmp/sonar.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_CLI_VERSION}-linux.zip; \
unzip -o -d /tmp/sonar-scanner /tmp/sonar.zip; \
mv /tmp/sonar-scanner/sonar-scanner-${SONAR_CLI_VERSION}-linux /opt/sonar/scanner; \
ln -s -f /opt/sonar/scanner/bin/sonar-scanner /usr/local/bin/sonar-scanner; \
rm -rf /tmp/sonar*
ENV HUNTER_PYTHON_LOCATION=/venv/bin/python3

# set env
ENV LLVM_ROOT=/usr/lib/llvm-11
ENV LLVM_DIR=/usr/lib/llvm-11/lib/cmake/llvm/
ENV LLVM_ROOT=/usr/lib/llvm-15
ENV LLVM_DIR=/usr/lib/llvm-15/lib/cmake/llvm/
ENV PATH=${LLVM_ROOT}/bin:${LLVM_ROOT}/share/clang:${PATH}
ENV CC=gcc-12
ENV CXX=g++-12
Expand All @@ -119,26 +82,6 @@ ENV CXX=g++-12
RUN update-alternatives --install /usr/bin/python python /venv/bin/python3 90 && \
update-alternatives --install /usr/bin/python python /usr/bin/python3 80 && \
\
update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-11 90 && \
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 90 && \
update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-11/bin/clang-11 90 && \
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-11 90 && \
\
update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-12 80 && \
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-12 80 && \
update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-12/bin/clang-12 80 && \
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 80 && \
\
update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-13 70 && \
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-13 70 && \
update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-13/bin/clang-13 70 && \
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 70 && \
\
update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 60 && \
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-14 60 && \
update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-14/bin/clang-14 60 && \
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 60 && \
\
update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 50 && \
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 50 && \
update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-15/bin/clang-15 50 && \
Expand Down
Loading