git.delta.rocks / unique-network / refs/commits / f2dde26ccd30

difftreelog

ci upgrade toolchains

Yaroslav Bolyukin2021-11-26parent: #988b868.patch.diff
in: master
Some of our dependencies were updated to 2021 edition, so we are

29 files changed

modified.devcontainer/Dockerfilediffbeforeafterboth
13    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \13    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
14    nvm install v16.2.0 && \14    nvm install v16.2.0 && \
15    npm install -g yarn && \15    npm install -g yarn && \
16    rustup toolchain install nightly-2021-06-28 && \16    rustup toolchain install nightly-2021-11-11 && \
17    rustup default nightly-2021-06-28 && \17    rustup default nightly-2021-11-11 && \
18    rustup target add wasm32-unknown-unknown && \18    rustup target add wasm32-unknown-unknown && \
19    rustup component add rustfmt clippy && \19    rustup component add rustfmt clippy && \
20    cargo install cargo-expand cargo-edit cargo-contract20    cargo install cargo-expand cargo-edit cargo-contract
modified.envdiffbeforeafterboth
1RUST_TOOLCHAIN=nightly-2021-06-281RUST_TOOLCHAIN=nightly-2021-11-11
2RUST_C=1.55.0-nightly2RUST_C=1.55.0-nightly
3POLKA_VERSION=v0.9.123POLKA_VERSION=v0.9.12
4NFT_BRANCH=develop4NFT_BRANCH=develop
modifiedDockerfile-parachaindiffbeforeafterboth
2FROM phusion/baseimage:focal-1.0.0 as rust-builder2FROM phusion/baseimage:focal-1.0.0 as rust-builder
3LABEL maintainer="Unique.Network"3LABEL maintainer="Unique.Network"
44
5ARG RUST_TOOLCHAIN=nightly-2021-06-285ARG RUST_TOOLCHAIN=nightly-2021-11-11
6#ARG RUST_C=1.55.0-nightly6#ARG RUST_C=1.55.0-nightly
7ARG POLKA_VERSION=v0.9.127ARG POLKA_VERSION=v0.9.12
8ARG NFT_BRANCH=develop8ARG NFT_BRANCH=develop
modifiedREADME.mddiffbeforeafterboth
6363
642. Remove all installed toolchains with `rustup toolchain list` and `rustup toolchain uninstall <toolchain>`.642. Remove all installed toolchains with `rustup toolchain list` and `rustup toolchain uninstall <toolchain>`.
6565
663. Install install nightly 2021-06-28 and make it default:663. Install install nightly 2021-11-11 and make it default:
6767
68```bash68```bash
69rustup toolchain install nightly-2021-06-2869rustup toolchain install nightly-2021-11-11
70rustup default nightly-2021-06-2870rustup default nightly-2021-11-11
71```71```
7272
734. Add wasm target for nightly toolchain:734. Add wasm target for nightly toolchain:
7474
75```bash75```bash
76rustup target add wasm32-unknown-unknown --toolchain nightly-2021-06-2876rustup target add wasm32-unknown-unknown --toolchain nightly-2021-11-11
77```77```
7878
795. Build:795. Build:
135135
136## Building and Running as Parachain locally136## Building and Running as Parachain locally
137137
138Rust toolchain: nightly-2021-06-28138Rust toolchain: nightly-2021-11-11
139Note: checkout this project and polkadot project (see below) in the sibling folders (both under the same folder)139Note: checkout this project and polkadot project (see below) in the sibling folders (both under the same folder)
140140
141### Build relay141### Build relay
208208
209First of all, add rust toolchain and make it default.209First of all, add rust toolchain and make it default.
210```bash210```bash
211rustup target add wasm32-unknown-unknown --toolchain nightly-2021-06-28211rustup target add wasm32-unknown-unknown --toolchain nightly-2021-11-11
212```212```
213213
214Then in "/node/src" run build command below214Then in "/node/src" run build command below
215```bash215```bash
216cargo +nightly-2021-06-28 build --release --features runtime-benchmarks216cargo +nightly-2021-11-11 build --release --features runtime-benchmarks
217```217```
218218
219Run benchmark219Run benchmark
modifiedclient/rpc/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "uc-rpc"2name = "uc-rpc"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7pallet-common = { default-features = false, path = '../../pallets/common' }7pallet-common = { default-features = false, path = '../../pallets/common' }
modifiedcrates/evm-coder-macros/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "evm-coder-macros"2name = "evm-coder-macros"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[lib]6[lib]
7proc-macro = true7proc-macro = true
modifiedcrates/evm-coder/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "evm-coder"2name = "evm-coder"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7evm-coder-macros = { path = "../evm-coder-macros" }7evm-coder-macros = { path = "../evm-coder-macros" }
modifiednode/rpc/Cargo.tomldiffbeforeafterboth
3version = "3.3.1"3version = "3.3.1"
4authors = ['Unique Network <support@uniquenetwork.io>']4authors = ['Unique Network <support@uniquenetwork.io>']
5license = 'All Rights Reserved'5license = 'All Rights Reserved'
6edition = "2018"6edition = "2021"
7description = "Unique chain rpc"7description = "Unique chain rpc"
88
9[package.metadata.docs.rs]9[package.metadata.docs.rs]
modifiedpallets/common/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "pallet-common"2name = "pallet-common"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies.codec]6[dependencies.codec]
7default-features = false7default-features = false
modifiedpallets/contract-helpers/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "pallet-contract-helpers"2name = "pallet-contract-helpers"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies.codec]6[dependencies.codec]
7default-features = false7default-features = false
modifiedpallets/evm-coder-substrate/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "pallet-evm-coder-substrate"2name = "pallet-evm-coder-substrate"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7scale-info = { version = "1.0.0", default-features = false, features = [7scale-info = { version = "1.0.0", default-features = false, features = [
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "pallet-evm-contract-helpers"2name = "pallet-evm-contract-helpers"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7scale-info = { version = "1.0.0", default-features = false, features = [7scale-info = { version = "1.0.0", default-features = false, features = [
modifiedpallets/evm-migration/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "pallet-evm-migration"2name = "pallet-evm-migration"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7scale-info = { version = "1.0.0", default-features = false, features = [7scale-info = { version = "1.0.0", default-features = false, features = [
modifiedpallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "pallet-evm-transaction-payment"2name = "pallet-evm-transaction-payment"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7scale-info = { version = "1.0.0", default-features = false, features = [7scale-info = { version = "1.0.0", default-features = false, features = [
modifiedpallets/fungible/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "pallet-fungible"2name = "pallet-fungible"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies.codec]6[dependencies.codec]
7default-features = false7default-features = false
modifiedpallets/nft/Cargo.tomldiffbeforeafterboth

no syntactic changes

modifiedpallets/nonfungible/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "pallet-nonfungible"2name = "pallet-nonfungible"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies.codec]6[dependencies.codec]
7default-features = false7default-features = false
modifiedpallets/refungible/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "pallet-refungible"2name = "pallet-refungible"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies.codec]6[dependencies.codec]
7default-features = false7default-features = false
modifiedpallets/scheduler/Cargo.tomldiffbeforeafterboth
2name = "pallet-unq-scheduler"2name = "pallet-unq-scheduler"
3version = "3.0.0"3version = "3.0.0"
4authors = ["Parity Technologies <admin@parity.io>"]4authors = ["Parity Technologies <admin@parity.io>"]
5edition = "2018"5edition = "2021"
6license = "Unlicense"6license = "Unlicense"
7homepage = "https://substrate.dev"7homepage = "https://substrate.dev"
8repository = "https://github.com/paritytech/substrate/"8repository = "https://github.com/paritytech/substrate/"
modifiedprimitives/evm-mapping/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "up-evm-mapping"2name = "up-evm-mapping"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }7sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
modifiedprimitives/nft/Cargo.tomldiffbeforeafterboth
2name = "nft-data-structs"2name = "nft-data-structs"
3authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']3authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
4description = "Nft data structs definitions"4description = "Nft data structs definitions"
5edition = "2018"5edition = "2021"
6license = 'GPL-3.0'6license = 'GPL-3.0'
7homepage = "https://substrate.dev"7homepage = "https://substrate.dev"
8repository = 'https://github.com/clover-network/clover'8repository = 'https://github.com/clover-network/clover'
modifiedprimitives/rpc/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "up-rpc"2name = "up-rpc"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7pallet-common = { default-features = false, path = '../../pallets/common' }7pallet-common = { default-features = false, path = '../../pallets/common' }
modifiedsmart_contracs/transfer/Cargo.tomldiffbeforeafterboth
2name = "nft_transfer"2name = "nft_transfer"
3version = "0.1.0"3version = "0.1.0"
4authors = ["[Greg Zaitsev] <[your_email]>"]4authors = ["[Greg Zaitsev] <[your_email]>"]
5edition = "2018"5edition = "2021"
66
7[workspace]7[workspace]
88
modifiedtests/README.mddiffbeforeafterboth
8git checkout release-v0.9.98git checkout release-v0.9.9
9```9```
1010
112. Build with nightly-2021-06-28112. Build with nightly-2021-11-11
12```bash12```bash
13cargo build --release13cargo build --release
14```14```
281. Run `yarn install`.281. Run `yarn install`.
292. Optional step - configure tests with env variables or by editing [configuration file](src/config.ts).292. Optional step - configure tests with env variables or by editing [configuration file](src/config.ts).
303. Run `yarn test`.303. Run `yarn test`.
31
3231
modifiedtests/flipper-src/Cargo.tomldiffbeforeafterboth
2name = "flipper"2name = "flipper"
3version = "3.0.0-rc1"3version = "3.0.0-rc1"
4authors = ["Parity Technologies <admin@parity.io>"]4authors = ["Parity Technologies <admin@parity.io>"]
5edition = "2018"5edition = "2021"
66
7[dependencies]7[dependencies]
8ink_primitives = { version = "3.0.0-rc1", git = "https://github.com/paritytech/ink", tag = "v3.0.0-rc1", default-features = false }8ink_primitives = { version = "3.0.0-rc1", git = "https://github.com/paritytech/ink", tag = "v3.0.0-rc1", default-features = false }
modifiedtests/ink-types-node-runtime/Cargo.tomldiffbeforeafterboth
2name = "ink_types_node_runtime"2name = "ink_types_node_runtime"
3version = "0.1.0"3version = "0.1.0"
4authors = ["Parity Technologies <admin@parity.io>"]4authors = ["Parity Technologies <admin@parity.io>"]
5edition = "2018"5edition = "2021"
66
7license = "GPL-3.0"7license = "GPL-3.0"
8readme = "README.md"8readme = "README.md"
modifiedtests/ink-types-node-runtime/examples/calls/.ink/abi_gen/Cargo.tomldiffbeforeafterboth
2name = "abi-gen"2name = "abi-gen"
3version = "0.1.0"3version = "0.1.0"
4authors = ["Parity Technologies <admin@parity.io>"]4authors = ["Parity Technologies <admin@parity.io>"]
5edition = "2018"5edition = "2021"
6publish = false6publish = false
77
8[[bin]]8[[bin]]
modifiedtests/ink-types-node-runtime/examples/calls/Cargo.tomldiffbeforeafterboth
2name = "calls"2name = "calls"
3version = "0.1.0"3version = "0.1.0"
4authors = ["Parity Technologies <admin@parity.io>"]4authors = ["Parity Technologies <admin@parity.io>"]
5edition = "2018"5edition = "2021"
66
7[dependencies]7[dependencies]
8ink_abi = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_abi", default-features = false, features = ["derive"], optional = true }8ink_abi = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_abi", default-features = false, features = ["derive"], optional = true }
modifiedtests/loadtester-src/Cargo.tomldiffbeforeafterboth
2name = "loadtester"2name = "loadtester"
3version = "0.1.0"3version = "0.1.0"
4authors = ["[your_name] <[your_email]>"]4authors = ["[your_name] <[your_email]>"]
5edition = "2018"5edition = "2021"
66
7[dependencies]7[dependencies]
8ink_primitives = { version = "3.0.0-rc2", default-features = false }8ink_primitives = { version = "3.0.0-rc2", default-features = false }