Skip to content

Commit

Permalink
Merge branch 'main' into council
Browse files Browse the repository at this point in the history
  • Loading branch information
@vedhavyas
vedhavyas committed Aug 13, 2024
2 parents 6ecbcd7 + a62bea9 commit 306d633
Show file tree
Hide file tree
Showing 77 changed files with 1,743 additions and 948 deletions.
8 changes: 0 additions & 8 deletions .cargo/config.toml
View file

This file was deleted.

1 change: 0 additions & 1 deletion .dockerignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*
!/.cargo
!/crates
!/domains
!/orml
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/rust.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ env:
CARGO_TERM_COLOR: always
# Build smaller artifacts to avoid running out of space in CI
# TODO: Try to remove once https://github.com/paritytech/substrate/issues/11538 is resolved
# TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate with MSRV bump ships:
# https://github.com/RustCrypto/block-ciphers/pull/395
RUSTFLAGS: -C strip=symbols -C opt-level=s --cfg aes_armv8
RUSTFLAGS: -C strip=symbols -C opt-level=s

jobs:
cargo-fmt:
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/snapshot-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,27 +99,22 @@ jobs:
- os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-20.04"') }}
target: x86_64-unknown-linux-gnu
suffix: ubuntu-x86_64-v2-${{ github.ref_name }}
rustflags: "-C target-cpu=x86-64-v2 -C target-feature=+aes"
rustflags: "-C target-cpu=x86-64-v2"
- os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-20.04"') }}
target: aarch64-unknown-linux-gnu
suffix: ubuntu-aarch64-${{ github.ref_name }}
# TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate with MSRV bump ships:
# https://github.com/RustCrypto/block-ciphers/pull/395
rustflags: "-C linker=aarch64-linux-gnu-gcc --cfg aes_armv8"
rustflags: "-C linker=aarch64-linux-gnu-gcc"
- os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "macos-14-arm64"]' || '"macos-14"') }}
target: aarch64-apple-darwin
suffix: macos-aarch64-${{ github.ref_name }}
# TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate with MSRV bump ships:
# https://github.com/RustCrypto/block-ciphers/pull/395
rustflags: "--cfg aes_armv8"
- os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "windows-server-2022-x86-64"]' || '"windows-2022"') }}
target: x86_64-pc-windows-msvc
suffix: windows-x86_64-skylake-${{ github.ref_name }}
rustflags: "-C target-cpu=skylake"
- os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "windows-server-2022-x86-64"]' || '"windows-2022"') }}
target: x86_64-pc-windows-msvc
suffix: windows-x86_64-v2-${{ github.ref_name }}
rustflags: "-C target-cpu=x86-64-v2 -C target-feature=+aes"
rustflags: "-C target-cpu=x86-64-v2"
fail-fast: false
runs-on: ${{ matrix.build.os }}
env:
Expand Down
70 changes: 63 additions & 7 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Dockerfile-bootstrap-node
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04

ARG RUSTC_VERSION=nightly-2024-04-22
ARG RUSTC_VERSION=nightly-2024-08-01
ARG PROFILE=production
ARG RUSTFLAGS
# Workaround for https://github.com/rust-lang/cargo/issues/10583
Expand All @@ -27,7 +27,6 @@ RUN \

RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown

COPY .cargo /code/.cargo
COPY Cargo.lock /code/Cargo.lock
COPY Cargo.toml /code/Cargo.toml
COPY rust-toolchain.toml /code/rust-toolchain.toml
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-bootstrap-node.aarch64
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04

ARG RUSTC_VERSION=nightly-2024-04-22
ARG RUSTC_VERSION=nightly-2024-08-01
ARG PROFILE=production
ARG RUSTFLAGS
# Workaround for https://github.com/rust-lang/cargo/issues/10583
Expand All @@ -27,7 +27,6 @@ RUN \

RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown

COPY .cargo /code/.cargo
COPY Cargo.lock /code/Cargo.lock
COPY Cargo.toml /code/Cargo.toml
COPY rust-toolchain.toml /code/rust-toolchain.toml
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-farmer
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04

ARG RUSTC_VERSION=nightly-2024-04-22
ARG RUSTC_VERSION=nightly-2024-08-01
ARG PROFILE=production
ARG RUSTFLAGS
# Workaround for https://github.com/rust-lang/cargo/issues/10583
Expand All @@ -27,7 +27,6 @@ RUN \

RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown

COPY .cargo /code/.cargo
COPY Cargo.lock /code/Cargo.lock
COPY Cargo.toml /code/Cargo.toml
COPY rust-toolchain.toml /code/rust-toolchain.toml
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-farmer.aarch64
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04

ARG RUSTC_VERSION=nightly-2024-04-22
ARG RUSTC_VERSION=nightly-2024-08-01
ARG PROFILE=production
ARG RUSTFLAGS
# Workaround for https://github.com/rust-lang/cargo/issues/10583
Expand All @@ -27,7 +27,6 @@ RUN \

RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown

COPY .cargo /code/.cargo
COPY Cargo.lock /code/Cargo.lock
COPY Cargo.toml /code/Cargo.toml
COPY rust-toolchain.toml /code/rust-toolchain.toml
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-node
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04

ARG RUSTC_VERSION=nightly-2024-04-22
ARG RUSTC_VERSION=nightly-2024-08-01
ARG PROFILE=production
ARG RUSTFLAGS
# Workaround for https://github.com/rust-lang/cargo/issues/10583
Expand All @@ -27,7 +27,6 @@ RUN \

RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown

COPY .cargo /code/.cargo
COPY Cargo.lock /code/Cargo.lock
COPY Cargo.toml /code/Cargo.toml
COPY rust-toolchain.toml /code/rust-toolchain.toml
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-node.aarch64
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04

ARG RUSTC_VERSION=nightly-2024-04-22
ARG RUSTC_VERSION=nightly-2024-08-01
ARG PROFILE=production
ARG RUSTFLAGS
# Workaround for https://github.com/rust-lang/cargo/issues/10583
Expand All @@ -27,7 +27,6 @@ RUN \

RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown

COPY .cargo /code/.cargo
COPY Cargo.lock /code/Cargo.lock
COPY Cargo.toml /code/Cargo.toml
COPY rust-toolchain.toml /code/rust-toolchain.toml
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-runtime
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04

ARG RUSTC_VERSION=nightly-2024-04-22
ARG RUSTC_VERSION=nightly-2024-08-01
ARG PROFILE=production
ARG RUSTFLAGS
# Workaround for https://github.com/rust-lang/cargo/issues/10583
Expand All @@ -27,7 +27,6 @@ RUN \

RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown

COPY .cargo /code/.cargo
COPY Cargo.lock /code/Cargo.lock
COPY Cargo.toml /code/Cargo.toml
COPY rust-toolchain.toml /code/rust-toolchain.toml
Expand Down
1 change: 0 additions & 1 deletion crates/pallet-domains/src/block_tree.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ pub enum Error {
RuntimeNotFound,
LastBlockNotFound,
UnmatchedNewHeadReceipt,
UnexpectedConfirmedDomainBlock,
}

#[derive(TypeInfo, Debug, Encode, Decode, Clone, PartialEq, Eq)]
Expand Down
Loading

0 comments on commit 306d633

Please sign in to comment.