Skip to content

Commit

Permalink
Merge branch 'centrifuge:main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
omahs authored Nov 6, 2023
2 parents 71767b1 + f46d327 commit 7654455
Show file tree
Hide file tree
Showing 196 changed files with 8,412 additions and 6,309 deletions.
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ pallets/restricted-tokens/* @mustermeiszer
pallets/data-collector/* @lemunozm
pallets/fees/* @lemunozm
pallets/transfer-allowlist/* @mustermeiszer
pallets/foreign-investments/* @wischli

## Changes to specific libraries
libs/mock-builder/* @lemunozm
Expand All @@ -38,7 +39,7 @@ libs/traits/src/changes.rs @lemunozm
libs/traits/src/data.rs @lemunozm

## Changes to runtime
runtime/common/* @mustermeiszer @NunoAlexandre @hieronx @lemunozm
runtime/common/* @mustermeiszer @NunoAlexandre @hieronx @lemunozm @wischli
runtime/altair/* @mustermeiszer @NunoAlexandre @hieronx @wischli
runtime/centrifuge/* @mustermeiszer @NunoAlexandre @hieronx @wischli

Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ jobs:
name: Publish to GCS
run: |
gsutil cp ./runtime/altair/target/srtool/release/wbuild/altair-runtime/altair_runtime.compact.compressed.wasm gs://centrifuge-artifact-releases/test-parachain/altair_runtime-$(git rev-parse --short HEAD).compact.compressed.wasm
- if: ${{ matrix.target == 'build-runtime-testnet' && matrix.package == 'altair-runtime' }}
name: Publish to GCS
run: |
gsutil cp ./runtime/altair/target/srtool/release/wbuild/altair-runtime/altair_runtime.compact.compressed.wasm gs://centrifuge-artifact-releases/parachain/algol-$(git rev-parse --short HEAD).compact.compressed.wasm
- if: ${{ matrix.target == 'build-runtime' && matrix.package == 'centrifuge-runtime' }}
name: Publish to GCS
run: |
Expand Down
28 changes: 19 additions & 9 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "centrifuge-chain"
version = "0.10.28"
version = "0.10.34"
authors = ["Centrifuge <[email protected]>"]
description = "Centrifuge chain implementation in Rust."
build = "build.rs"
Expand All @@ -27,7 +27,6 @@ path = "src/main.rs"

[workspace]
members = [
"libs/mock-builder",
"libs/mocks",
"libs/primitives",
"libs/proofs",
Expand Down Expand Up @@ -71,6 +70,9 @@ members = [
"runtime/integration-tests",
]

[workspace.dependencies]
mock-builder = { git = "https://github.com/foss3/runtime-pallet-library", branch = "polkadot-v0.9.38" }

[dependencies]
# third-party dependencies
async-trait = "0.1"
Expand Down Expand Up @@ -167,8 +169,10 @@ fc-mapping-sync = { git = "https://github.com/PureStake/frontier", default-featu
fc-rpc = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.38" }
fc-rpc-core = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.38" }
fp-consensus = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.38" }
fp-evm = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.38" }
fp-rpc = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.38" }
fp-storage = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.38" }
pallet-evm = { git = "https://github.com/PureStake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.38" }

[build-dependencies]
substrate-build-script-utils = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
Expand Down Expand Up @@ -278,10 +282,6 @@ fast-runtime = [
"runtime-integration-tests/fast-runtime",
]

testnet-runtime = [
"altair-runtime/testnet-runtime",
]

#
# Cargo patch rules for all the paritytech/ based crates.
#
Expand Down
5 changes: 0 additions & 5 deletions ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ case $TARGET in
docker run --rm -e PACKAGE=$PACKAGE -e BUILD_OPTS="--features=fast-runtime" -v $PWD:/build -v /tmp/cargo:/cargo-home paritytech/srtool:$SRTOOL_VERSION build
;;

build-runtime-testnet)
export RUSTC_VERSION=$RUST_TOOLCHAIN
docker run --rm -e PACKAGE=$PACKAGE -e BUILD_OPTS="--features=testnet-runtime" -v $PWD:/build -v /tmp/cargo:/cargo-home paritytech/srtool:$SRTOOL_VERSION build
;;

tests)
RUST_MIN_STACK=8388608 cargo test --workspace --release --features runtime-benchmarks,try-runtime --exclude runtime-integration-tests
;;
Expand Down
36 changes: 0 additions & 36 deletions libs/mock-builder/Cargo.toml

This file was deleted.

Loading

0 comments on commit 7654455

Please sign in to comment.