difftreelog
ci upgrade toolchains
in: master
Some of our dependencies were updated to 2021 edition, so we are
29 files changed
.devcontainer/Dockerfilediffbeforeafterboth--- 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
.envdiffbeforeafterboth--- 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
Dockerfile-parachaindiffbeforeafterboth--- 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
README.mddiffbeforeafterboth--- a/README.md
+++ b/README.md
@@ -63,17 +63,17 @@
2. Remove all installed toolchains with `rustup toolchain list` and `rustup toolchain uninstall <toolchain>`.
-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
client/rpc/Cargo.tomldiffbeforeafterboth--- 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' }
crates/evm-coder-macros/Cargo.tomldiffbeforeafterboth--- 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"
crates/evm-coder/Cargo.tomldiffbeforeafterboth--- 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" }
node/rpc/Cargo.tomldiffbeforeafterboth--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -3,7 +3,7 @@
version = "3.3.1"
authors = ['Unique Network <support@uniquenetwork.io>']
license = 'All Rights Reserved'
-edition = "2018"
+edition = "2021"
description = "Unique chain rpc"
[package.metadata.docs.rs]
pallets/common/Cargo.tomldiffbeforeafterboth--- 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
pallets/contract-helpers/Cargo.tomldiffbeforeafterboth--- 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"]
pallets/evm-coder-substrate/Cargo.tomldiffbeforeafterboth--- 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 = [
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- 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]
pallets/evm-migration/Cargo.tomldiffbeforeafterboth--- 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 = [
pallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth--- 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]
pallets/fungible/Cargo.tomldiffbeforeafterboth--- 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
pallets/nft/Cargo.tomldiffbeforeafterboth--- 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" }
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- 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
pallets/refungible/Cargo.tomldiffbeforeafterboth--- 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
pallets/scheduler/Cargo.tomldiffbeforeafterboth--- 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 <admin@parity.io>"]
-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]
primitives/evm-mapping/Cargo.tomldiffbeforeafterboth--- 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"]
primitives/nft/Cargo.tomldiffbeforeafterboth1[package]2name = "nft-data-structs"3authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']4description = "Nft data structs definitions"5edition = "2018"6license = 'GPL-3.0'7homepage = "https://substrate.dev"8repository = 'https://github.com/clover-network/clover'9version = '0.9.0'1011[dependencies]12scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }13codec = { package = "parity-scale-codec", version = "2.3.0", default-features = false, features = [14 'derive',15] }16serde = { version = "1.0.130", features = [17 'derive',18], default-features = false, optional = true }19frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }20frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }21sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }22sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }23sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }24derivative = "2.2.0"2526[features]27default = ["std"]28std = [29 "serde1",30 "serde/std",31 "codec/std",32 "frame-system/std",33 "frame-support/std",34 "sp-runtime/std",35 "sp-core/std",36 "sp-std/std",37]38serde1 = ["serde"]39limit-testing = []1[package]2name = "nft-data-structs"3authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']4description = "Nft data structs definitions"5edition = "2021"6license = 'GPL-3.0'7homepage = "https://substrate.dev"8repository = 'https://github.com/clover-network/clover'9version = '0.9.0'1011[dependencies]12scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }13codec = { package = "parity-scale-codec", version = "2.3.0", default-features = false, features = [14 'derive',15] }16serde = { version = "1.0.130", features = [17 'derive',18], default-features = false, optional = true }19frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }20frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }21sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }22sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }23sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }24derivative = "2.2.0"2526[features]27default = ["std"]28std = [29 "serde1",30 "serde/std",31 "codec/std",32 "frame-system/std",33 "frame-support/std",34 "sp-runtime/std",35 "sp-core/std",36 "sp-std/std",37]38serde1 = ["serde"]39limit-testing = []primitives/rpc/Cargo.tomldiffbeforeafterboth--- 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' }
smart_contracs/transfer/Cargo.tomldiffbeforeafterboth--- 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]
tests/README.mddiffbeforeafterboth--- 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`.
-
tests/flipper-src/Cargo.tomldiffbeforeafterboth--- 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 <admin@parity.io>"]
-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 = []
tests/ink-types-node-runtime/Cargo.tomldiffbeforeafterboth--- 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 <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
license = "GPL-3.0"
readme = "README.md"
tests/ink-types-node-runtime/examples/calls/.ink/abi_gen/Cargo.tomldiffbeforeafterboth--- 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 <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
publish = false
[[bin]]
tests/ink-types-node-runtime/examples/calls/Cargo.tomldiffbeforeafterboth--- 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 <admin@parity.io>"]
-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 }
tests/loadtester-src/Cargo.tomldiffbeforeafterboth--- 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 }