From f2dde26ccd30e7da693433a53bb906afb32032c8 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Fri, 26 Nov 2021 17:55:27 +0000 Subject: [PATCH] ci: upgrade toolchains Some of our dependencies were updated to 2021 edition, so we are --- --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -13,8 +13,8 @@ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ nvm install v16.2.0 && \ npm install -g yarn && \ - rustup toolchain install nightly-2021-06-28 && \ - rustup default nightly-2021-06-28 && \ + rustup toolchain install nightly-2021-11-11 && \ + rustup default nightly-2021-11-11 && \ rustup target add wasm32-unknown-unknown && \ rustup component add rustfmt clippy && \ cargo install cargo-expand cargo-edit cargo-contract --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -RUST_TOOLCHAIN=nightly-2021-06-28 +RUST_TOOLCHAIN=nightly-2021-11-11 RUST_C=1.55.0-nightly POLKA_VERSION=v0.9.12 NFT_BRANCH=develop --- a/Dockerfile-parachain +++ b/Dockerfile-parachain @@ -2,7 +2,7 @@ FROM phusion/baseimage:focal-1.0.0 as rust-builder LABEL maintainer="Unique.Network" -ARG RUST_TOOLCHAIN=nightly-2021-06-28 +ARG RUST_TOOLCHAIN=nightly-2021-11-11 #ARG RUST_C=1.55.0-nightly ARG POLKA_VERSION=v0.9.12 ARG NFT_BRANCH=develop --- a/README.md +++ b/README.md @@ -63,17 +63,17 @@ 2. Remove all installed toolchains with `rustup toolchain list` and `rustup toolchain uninstall `. -3. Install install nightly 2021-06-28 and make it default: +3. Install install nightly 2021-11-11 and make it default: ```bash -rustup toolchain install nightly-2021-06-28 -rustup default nightly-2021-06-28 +rustup toolchain install nightly-2021-11-11 +rustup default nightly-2021-11-11 ``` 4. Add wasm target for nightly toolchain: ```bash -rustup target add wasm32-unknown-unknown --toolchain nightly-2021-06-28 +rustup target add wasm32-unknown-unknown --toolchain nightly-2021-11-11 ``` 5. Build: @@ -135,7 +135,7 @@ ## Building and Running as Parachain locally -Rust toolchain: nightly-2021-06-28 +Rust toolchain: nightly-2021-11-11 Note: checkout this project and polkadot project (see below) in the sibling folders (both under the same folder) ### Build relay @@ -208,12 +208,12 @@ First of all, add rust toolchain and make it default. ```bash -rustup target add wasm32-unknown-unknown --toolchain nightly-2021-06-28 +rustup target add wasm32-unknown-unknown --toolchain nightly-2021-11-11 ``` Then in "/node/src" run build command below ```bash -cargo +nightly-2021-06-28 build --release --features runtime-benchmarks +cargo +nightly-2021-11-11 build --release --features runtime-benchmarks ``` Run benchmark --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "uc-rpc" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] pallet-common = { default-features = false, path = '../../pallets/common' } --- a/crates/evm-coder-macros/Cargo.toml +++ b/crates/evm-coder-macros/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "evm-coder-macros" version = "0.1.0" -edition = "2018" +edition = "2021" [lib] proc-macro = true @@ -13,4 +13,4 @@ syn = { version = "1.0", features = ["full"] } hex = "0.4.3" Inflector = "0.11.4" -darling = "0.13.0" \ No newline at end of file +darling = "0.13.0" --- a/crates/evm-coder/Cargo.toml +++ b/crates/evm-coder/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "evm-coder" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] evm-coder-macros = { path = "../evm-coder-macros" } --- a/node/rpc/Cargo.toml +++ b/node/rpc/Cargo.toml @@ -3,7 +3,7 @@ version = "3.3.1" authors = ['Unique Network '] license = 'All Rights Reserved' -edition = "2018" +edition = "2021" description = "Unique chain rpc" [package.metadata.docs.rs] --- a/pallets/common/Cargo.toml +++ b/pallets/common/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-common" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies.codec] default-features = false --- a/pallets/contract-helpers/Cargo.toml +++ b/pallets/contract-helpers/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-contract-helpers" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies.codec] default-features = false @@ -16,7 +16,7 @@ pallet-contracts = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' } sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' } sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' } -up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } +up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } [features] default = ["std"] --- a/pallets/evm-coder-substrate/Cargo.toml +++ b/pallets/evm-coder-substrate/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-evm-coder-substrate" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0.0", default-features = false, features = [ --- a/pallets/evm-contract-helpers/Cargo.toml +++ b/pallets/evm-contract-helpers/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-evm-contract-helpers" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0.0", default-features = false, features = [ @@ -15,7 +15,7 @@ evm-coder = { default-features = false, path = '../../crates/evm-coder' } pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' } pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12-weights" } -up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } +up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } log = "0.4.14" [dependencies.codec] --- a/pallets/evm-migration/Cargo.toml +++ b/pallets/evm-migration/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-evm-migration" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0.0", default-features = false, features = [ --- a/pallets/evm-transaction-payment/Cargo.toml +++ b/pallets/evm-transaction-payment/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-evm-transaction-payment" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0.0", default-features = false, features = [ @@ -16,7 +16,7 @@ pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12-weights" } fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12-weights" } pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12-weights" } -up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } +up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" } [dependencies.codec] --- a/pallets/fungible/Cargo.toml +++ b/pallets/fungible/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-fungible" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies.codec] default-features = false --- a/pallets/nft/Cargo.toml +++ b/pallets/nft/Cargo.toml @@ -135,7 +135,7 @@ rlp = { default-features = false, version = "0.5.0" } sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.12" } -up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } +up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" } evm-coder = { default-features = false, path = "../../crates/evm-coder" } pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" } --- a/pallets/nonfungible/Cargo.toml +++ b/pallets/nonfungible/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-nonfungible" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies.codec] default-features = false --- a/pallets/refungible/Cargo.toml +++ b/pallets/refungible/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-refungible" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies.codec] default-features = false --- a/pallets/scheduler/Cargo.toml +++ b/pallets/scheduler/Cargo.toml @@ -2,7 +2,7 @@ name = "pallet-unq-scheduler" version = "3.0.0" authors = ["Parity Technologies "] -edition = "2018" +edition = "2021" license = "Unlicense" homepage = "https://substrate.dev" repository = "https://github.com/paritytech/substrate/" @@ -20,7 +20,7 @@ sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' } frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' } -up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } +up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } log = { version = "0.4.14", default-features = false } [dev-dependencies] --- a/primitives/evm-mapping/Cargo.toml +++ b/primitives/evm-mapping/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "up-evm-mapping" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' } @@ -9,7 +9,4 @@ [features] default = ["std"] -std = [ - "sp-core/std", - "frame-support/std", -] +std = ["sp-core/std", "frame-support/std"] --- a/primitives/nft/Cargo.toml +++ b/primitives/nft/Cargo.toml @@ -2,7 +2,7 @@ name = "nft-data-structs" authors = ['Substrate DevHub '] description = "Nft data structs definitions" -edition = "2018" +edition = "2021" license = 'GPL-3.0' homepage = "https://substrate.dev" repository = 'https://github.com/clover-network/clover' --- a/primitives/rpc/Cargo.toml +++ b/primitives/rpc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "up-rpc" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] pallet-common = { default-features = false, path = '../../pallets/common' } --- a/smart_contracs/transfer/Cargo.toml +++ b/smart_contracs/transfer/Cargo.toml @@ -2,7 +2,7 @@ name = "nft_transfer" version = "0.1.0" authors = ["[Greg Zaitsev] <[your_email]>"] -edition = "2018" +edition = "2021" [workspace] --- a/tests/README.md +++ b/tests/README.md @@ -8,7 +8,7 @@ git checkout release-v0.9.9 ``` -2. Build with nightly-2021-06-28 +2. Build with nightly-2021-11-11 ```bash cargo build --release ``` @@ -28,4 +28,3 @@ 1. Run `yarn install`. 2. Optional step - configure tests with env variables or by editing [configuration file](src/config.ts). 3. Run `yarn test`. - --- a/tests/flipper-src/Cargo.toml +++ b/tests/flipper-src/Cargo.toml @@ -2,7 +2,7 @@ name = "flipper" version = "3.0.0-rc1" authors = ["Parity Technologies "] -edition = "2018" +edition = "2021" [dependencies] ink_primitives = { version = "3.0.0-rc1", git = "https://github.com/paritytech/ink", tag = "v3.0.0-rc1", default-features = false } @@ -32,4 +32,4 @@ "scale-info", "scale-info/std", ] -ink-as-dependency = [] \ No newline at end of file +ink-as-dependency = [] --- a/tests/ink-types-node-runtime/Cargo.toml +++ b/tests/ink-types-node-runtime/Cargo.toml @@ -2,7 +2,7 @@ name = "ink_types_node_runtime" version = "0.1.0" authors = ["Parity Technologies "] -edition = "2018" +edition = "2021" license = "GPL-3.0" readme = "README.md" --- a/tests/ink-types-node-runtime/examples/calls/.ink/abi_gen/Cargo.toml +++ b/tests/ink-types-node-runtime/examples/calls/.ink/abi_gen/Cargo.toml @@ -2,7 +2,7 @@ name = "abi-gen" version = "0.1.0" authors = ["Parity Technologies "] -edition = "2018" +edition = "2021" publish = false [[bin]] --- a/tests/ink-types-node-runtime/examples/calls/Cargo.toml +++ b/tests/ink-types-node-runtime/examples/calls/Cargo.toml @@ -2,7 +2,7 @@ name = "calls" version = "0.1.0" authors = ["Parity Technologies "] -edition = "2018" +edition = "2021" [dependencies] ink_abi = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_abi", default-features = false, features = ["derive"], optional = true } --- a/tests/loadtester-src/Cargo.toml +++ b/tests/loadtester-src/Cargo.toml @@ -2,7 +2,7 @@ name = "loadtester" version = "0.1.0" authors = ["[your_name] <[your_email]>"] -edition = "2018" +edition = "2021" [dependencies] ink_primitives = { version = "3.0.0-rc2", default-features = false } -- gitstuff