diff --git a/.dockerignore b/.dockerignore index f88ea00741..e4eddde84b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,6 @@ +.dockerignore +.git/ +.github/ +.githooks/ **/target **/ts-tests diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index 23dd63e986..5098d72cdb 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -33,4 +33,4 @@ These checks should be performed after forking to a release branch, that is, on These are the general checks for the releasing process. - [ ] Verify a **`tag`** has been correctly acquired on `release-{{ env.VERSION }}` branch. -- [ ] Verify **`release-draft`** has been created by [create_release_draft.yml](https://github.com/litentry/litentry-parachain/blob/dev/.github/workflows/create_release_draft.yml) and is ready to publish. +- [ ] Verify **`release-draft`** has been created by [create-release-draft.yml](https://github.com/litentry/litentry-parachain/blob/dev/.github/workflows/create-release-draft.yml) and is ready to publish. diff --git a/.github/workflows/auto_label_pr.yml b/.github/workflows/auto-label-pr.yml similarity index 100% rename from .github/workflows/auto_label_pr.yml rename to .github/workflows/auto-label-pr.yml diff --git a/.github/workflows/benchmark_runtime_weights.yml b/.github/workflows/benchmark-runtime-weights.yml similarity index 100% rename from .github/workflows/benchmark_runtime_weights.yml rename to .github/workflows/benchmark-runtime-weights.yml diff --git a/.github/workflows/build_and_run_test.yml b/.github/workflows/build-and-test.yml similarity index 100% rename from .github/workflows/build_and_run_test.yml rename to .github/workflows/build-and-test.yml diff --git a/.github/workflows/build_docker_with_args.yml b/.github/workflows/build-docker-with-args.yml similarity index 100% rename from .github/workflows/build_docker_with_args.yml rename to .github/workflows/build-docker-with-args.yml diff --git a/.github/workflows/build_wasm.yml b/.github/workflows/build-wasm.yml similarity index 100% rename from .github/workflows/build_wasm.yml rename to .github/workflows/build-wasm.yml diff --git a/.github/workflows/create_release_draft.yml b/.github/workflows/create-release-draft.yml similarity index 82% rename from .github/workflows/create_release_draft.yml rename to .github/workflows/create-release-draft.yml index 44a0dea5e2..0af6fdf850 100644 --- a/.github/workflows/create_release_draft.yml +++ b/.github/workflows/create-release-draft.yml @@ -119,6 +119,45 @@ jobs: ${{ env.GENESIS_RELEASE }}-genesis-state ${{ env.GENESIS_RELEASE }}-genesis-wasm + + ## test again the built docker image ## + run-ts-tests: + runs-on: ubuntu-latest + needs: build-docker + strategy: + matrix: + chain: + - litmus + - litentry + steps: + - name: Checkout codes + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Download and tag docker image + run: | + docker pull litentry/litentry-parachain:${{ env.RELEASE_TAG }} + docker tag litentry/litentry-parachain:${{ env.RELEASE_TAG }} litentry/litentry-parachain:latest + + - name: Run ts tests for ${{ matrix.chain }} + timeout-minutes: 20 + run: | + make test-ts-docker-${{ matrix.chain }} + + - name: Archive logs if test fails + uses: actions/upload-artifact@v3 + if: ${{ failure() }} + with: + name: ${{ matrix.chain }}-ts-tests-artifacts + path: /tmp/parachain_dev/ + retention-days: 3 + + - name: Clean up for ${{ matrix.chain }} + if: ${{ always() }} + run: | + make clean-docker-${{ matrix.chain }} + ## create the release draft ## create-release-draft: runs-on: ubuntu-latest @@ -126,10 +165,10 @@ jobs: # seems to be the only way to achieve this needs: - build-wasm - - build-docker + - run-ts-tests if: | !failure() && !cancelled() && - (success('build-wasm') || success('build-docker')) + (success('build-wasm') || success('run-ts-tests')) steps: - name: Checkout codes on ${{ env.RELEASE_TAG }} uses: actions/checkout@v2 diff --git a/.github/workflows/create_release_issue.yml b/.github/workflows/create-release-issue.yml similarity index 94% rename from .github/workflows/create_release_issue.yml rename to .github/workflows/create-release-issue.yml index 040eb41ccc..806c069740 100644 --- a/.github/workflows/create_release_issue.yml +++ b/.github/workflows/create-release-issue.yml @@ -3,6 +3,7 @@ on: push: tags: - 'v[0-9]+.[0-9]+.[0-9]+' + - 'v[0-9]+.[0-9]+.[0-9]+-[0-9]+' jobs: create-release-issue: diff --git a/.github/workflows/issue_stale_bot.yml b/.github/workflows/issue-stale-bot.yml similarity index 100% rename from .github/workflows/issue_stale_bot.yml rename to .github/workflows/issue-stale-bot.yml diff --git a/.github/workflows/update_pallets.yml b/.github/workflows/update-pallets.yml similarity index 100% rename from .github/workflows/update_pallets.yml rename to .github/workflows/update-pallets.yml diff --git a/Cargo.lock b/Cargo.lock index 71c19cde55..b8dd0ad6b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -397,7 +397,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.4.4", "object", "rustc-demangle", ] @@ -2400,15 +2400,15 @@ checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" dependencies = [ "cfg-if 1.0.0", "crc32fast", "libc", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.5.1", ] [[package]] @@ -2925,9 +2925,9 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e" +checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" dependencies = [ "futures-channel", "futures-core", @@ -3120,9 +3120,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "6330e8a36bd8c859f3fa6d9382911fbb7147ec39807f63b923933a247240b9ba" [[package]] name = "httpdate" @@ -3187,10 +3187,10 @@ dependencies = [ "hyper", "log", "rustls 0.20.4", - "rustls-native-certs 0.6.1", + "rustls-native-certs 0.6.2", "tokio", "tokio-rustls 0.23.3", - "webpki-roots 0.22.2", + "webpki-roots 0.22.3", ] [[package]] @@ -3390,9 +3390,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" dependencies = [ "wasm-bindgen", ] @@ -3575,14 +3575,14 @@ dependencies = [ "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", "pin-project 1.0.10", - "rustls-native-certs 0.6.1", + "rustls-native-certs 0.6.2", "soketto", "thiserror", "tokio", "tokio-rustls 0.23.3", "tokio-util 0.6.9", "tracing", - "webpki-roots 0.22.2", + "webpki-roots 0.22.3", ] [[package]] @@ -3596,14 +3596,14 @@ dependencies = [ "jsonrpsee-core 0.9.0", "jsonrpsee-types 0.9.0", "pin-project 1.0.10", - "rustls-native-certs 0.6.1", + "rustls-native-certs 0.6.2", "soketto", "thiserror", "tokio", "tokio-rustls 0.23.3", "tokio-util 0.6.9", "tracing", - "webpki-roots 0.22.2", + "webpki-roots 0.22.3", ] [[package]] @@ -3977,9 +3977,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.121" +version = "0.2.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" +checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd" [[package]] name = "libloading" @@ -5020,6 +5020,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "miniz_oxide" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.6.23" @@ -8040,9 +8049,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" dependencies = [ "unicode-xid", ] @@ -8148,9 +8157,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -8260,9 +8269,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" dependencies = [ "autocfg", "crossbeam-deque", @@ -8272,14 +8281,13 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] @@ -8709,9 +8717,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -8721,9 +8729,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "0.2.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" dependencies = [ "base64", ] @@ -11081,9 +11089,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.90" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" dependencies = [ "proc-macro2", "quote", @@ -11345,9 +11353,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] @@ -11360,9 +11368,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ "cfg-if 1.0.0", "pin-project-lite 0.2.8", @@ -11383,9 +11391,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", "valuable", @@ -11769,9 +11777,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -11779,9 +11787,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" dependencies = [ "bumpalo", "lazy_static", @@ -11794,9 +11802,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -11806,9 +11814,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11816,9 +11824,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", @@ -11829,9 +11837,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" +checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" [[package]] name = "wasm-gc-api" @@ -12053,9 +12061,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" dependencies = [ "js-sys", "wasm-bindgen", @@ -12092,9 +12100,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" +checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ "webpki 0.22.0", ] diff --git a/Cargo.toml b/Cargo.toml index 9ff9283a95..2f695899a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,3 @@ -[profile.release] -panic = 'unwind' - [workspace] members = [ 'node', @@ -13,4 +10,20 @@ members = [ 'runtime/litmus', 'runtime/rococo', 'runtime/moonbase', -] \ No newline at end of file +] + +[profile.release] +panic = "unwind" +opt-level = 3 + +[profile.dev] +# https://internals.rust-lang.org/t/help-test-faster-incremental-debug-macos-builds-on-nightly/14016 +split-debuginfo = 'unpacked' + +[profile.dev.package.backtrace] +inherits = "release" + +[profile.production] +inherits = "release" +lto = true +codegen-units = 1 \ No newline at end of file diff --git a/Makefile b/Makefile index f50ea2e3af..5b2fdfdf72 100644 --- a/Makefile +++ b/Makefile @@ -27,27 +27,27 @@ help: .PHONY: build-all ## Build release version build-all: - cargo build --release + cargo build --locked --release .PHONY: build-node ## Build release node with default features build-node: - cargo build -p $(call pkgid, $(NODE_BIN)) --release + cargo build --locked -p $(call pkgid, $(NODE_BIN)) --release .PHONY: build-runtime-litentry ## Build litentry release runtime build-runtime-litentry: - cargo build -p $(call pkgid, litentry-parachain-runtime) --release + cargo build --locked -p $(call pkgid, litentry-parachain-runtime) --release .PHONY: build-runtime-litmus ## Build litmus release runtime build-runtime-litmus: - cargo build -p $(call pkgid, litmus-parachain-runtime) --release + cargo build --locked -p $(call pkgid, litmus-parachain-runtime) --release .PHONY: build-runtime-rococo ## Build rococo release runtime build-runtime-rococo: - cargo build -p $(call pkgid, rococo-parachain-runtime) --release + cargo build --locked -p $(call pkgid, rococo-parachain-runtime) --release .PHONY: build-runtime-moonbase ## Build moonbase release runtime build-runtime-moonbase: - cargo build -p $(call pkgid, moonbase-parachain-runtime) --release + cargo build --locked -p $(call pkgid, moonbase-parachain-runtime) --release .PHONY: srtool-build-wasm-litentry ## Build litentry wasm with srtools srtool-build-wasm-litentry: @@ -75,11 +75,11 @@ build-docker-prod: .PHONY: build-node-benchmarks ## Build release node with `runtime-benchmarks` feature build-node-benchmarks: - cargo build --features runtime-benchmarks --release + cargo build --locked --features runtime-benchmarks --release .PHONY: build-node-tryruntime ## Build release node with `try-runtime` feature build-node-tryruntime: - cargo build --features try-runtime --release + cargo build --locked --features try-runtime --release # launching local dev networks diff --git a/README.md b/README.md index 6b0117215f..a1239ef6b7 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # litentry-parachain -[![Build & Test](https://github.com/litentry/litentry-parachain/actions/workflows/build_and_run_test.yml/badge.svg)](https://github.com/litentry/litentry-parachain/actions/workflows/build_and_run_test.yml) -[![Build wasm](https://github.com/litentry/litentry-parachain/actions/workflows/build_wasm.yml/badge.svg)](https://github.com/litentry/litentry-parachain/actions/workflows/build_wasm.yml) -[![Benchmark](https://github.com/litentry/litentry-parachain/actions/workflows/benchmark_runtime_weights.yml/badge.svg)](https://github.com/litentry/litentry-parachain/actions/workflows/benchmark_runtime_weights.yml) -[![Release](https://github.com/litentry/litentry-parachain/actions/workflows/create_release_draft.yml/badge.svg)](https://github.com/litentry/litentry-parachain/actions/workflows/create_release_draft.yml) +[![Build & Test](https://github.com/litentry/litentry-parachain/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/litentry/litentry-parachain/actions/workflows/build-and-test.yml) +[![Build wasm](https://github.com/litentry/litentry-parachain/actions/workflows/build-wasm.yml/badge.svg)](https://github.com/litentry/litentry-parachain/actions/workflows/build-wasm.yml) +[![Benchmark](https://github.com/litentry/litentry-parachain/actions/workflows/benchmark-runtime-weights.yml/badge.svg)](https://github.com/litentry/litentry-parachain/actions/workflows/benchmark-runtime-weights.yml) +[![Release](https://github.com/litentry/litentry-parachain/actions/workflows/create-release-draft.yml/badge.svg)](https://github.com/litentry/litentry-parachain/actions/workflows/create-release-draft.yml) The Litentry parachain. diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 2d5d6ca941..e9ec78e853 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -37,7 +37,7 @@ RUN cargo chef cook --release --recipe-path recipe.json # copy and build the real src COPY . /litentry ARG BUILD_ARGS -RUN cargo build --release $BUILD_ARGS +RUN cargo build --locked --release $BUILD_ARGS # =================================== # stage 4: packaging diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index d4e3795374..710f647a7e 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -17,8 +17,8 @@ RUN apt-get update && \ apt-get install -y cmake pkg-config libssl-dev git clang libclang-dev ARG BUILD_ARGS -RUN cargo build --release $BUILD_ARGS -RUN strip target/release/litentry-collator +RUN cargo build --locked --profile production $BUILD_ARGS +RUN strip target/production/litentry-collator # ========================== # stage 2: packaging @@ -26,7 +26,7 @@ RUN strip target/release/litentry-collator FROM ubuntu:20.04 LABEL maintainer="litentry-dev" -COPY --from=builder /litentry/target/release/litentry-collator /usr/local/bin +COPY --from=builder /litentry/target/production/litentry-collator /usr/local/bin RUN useradd -m -u 1000 -U -s /bin/sh -d /litentry litentry && \ mkdir -p /data /litentry/.local/share && \ diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 4b7562ead1..498b602d86 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2021-12-12" +channel = "nightly-2022-04-01" targets = ["wasm32-unknown-unknown"] profile = "default" # include rustfmt, clippy diff --git a/ts-tests/package.json b/ts-tests/package.json index 05aaf87f9e..f97f57e9f9 100644 --- a/ts-tests/package.json +++ b/ts-tests/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@polkadot/api": "^8.1.1", - "@polkadot/types": "^8.0.2", + "@polkadot/types": "^8.1.1", "dotenv": "^16.0.0", "web3": "^1.7.3" }, diff --git a/ts-tests/yarn.lock b/ts-tests/yarn.lock index 5e8bd3f10a..09f66b398f 100644 --- a/ts-tests/yarn.lock +++ b/ts-tests/yarn.lock @@ -471,7 +471,7 @@ "@babel/runtime" "^7.17.9" "@polkadot/util" "^9.0.1" -"@polkadot/types@8.1.1", "@polkadot/types@^8.0.2": +"@polkadot/types@8.1.1", "@polkadot/types@^8.1.1": version "8.1.1" resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-8.1.1.tgz#43e5fb78e6214e6af7c5edbdb6ac69d5b919421d" integrity sha512-x9WDx9XcaSkQGlnk2MNu+49oK80s8Js7lr0mmCinV12m8+3si+GvIOvnuV3ydmWgWtpTt2ERfN+T8a/6f50EpA==