--- a/.env +++ b/.env @@ -1,6 +1,6 @@ -RUST_TOOLCHAIN=nightly-2021-11-11 -RUST_C=1.58.0-nightly -POLKA_VERSION=release-v0.9.18 +RUST_TOOLCHAIN=nightly-2022-04-07 +RUST_C=1.62.0-nightly +POLKA_VERSION=release-v0.9.20 UNIQUE_BRANCH=develop USER=*** PASS=*** --- a/Cargo.lock +++ b/Cargo.lock @@ -5475,7 +5475,7 @@ [[package]] name = "opal-runtime" -version = "0.9.18" +version = "0.9.20" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -8682,7 +8682,7 @@ [[package]] name = "quartz-runtime" -version = "0.9.18" +version = "0.9.20" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -12515,7 +12515,7 @@ [[package]] name = "unique-node" -version = "0.9.18" +version = "0.9.20" dependencies = [ "clap", "cumulus-client-cli", @@ -12725,7 +12725,7 @@ [[package]] name = "unique-runtime-common" -version = "0.9.18" +version = "0.9.20" dependencies = [ "fp-rpc", "frame-support", --- a/Dockerfile-parachain +++ b/Dockerfile-parachain @@ -2,9 +2,9 @@ FROM phusion/baseimage:focal-1.1.0 as rust-builder LABEL maintainer="Unique.Network" -ARG RUST_TOOLCHAIN=nightly-2021-11-11 -#ARG RUST_C=1.58.0-nightly -ARG POLKA_VERSION=release-v0.9.18 +ARG RUST_TOOLCHAIN=nightly-2022-04-07 +#ARG RUST_C=1.62.0-nightly +ARG POLKA_VERSION=release-v0.9.20 ARG UNIQUE_BRANCH=develop #ARG USER=*** --- a/README.md +++ b/README.md @@ -51,14 +51,14 @@ 3. Install install nightly 2021-11-11 and make it default: ```bash -rustup toolchain install nightly-2021-11-11 -rustup default nightly-2021-11-11 +rustup toolchain install nightly-2022-04-07 +rustup default nightly-2022-04-07 ``` 4. Add wasm target for nightly toolchain: ```bash -rustup target add wasm32-unknown-unknown --toolchain nightly-2021-11-11 +rustup target add wasm32-unknown-unknown --toolchain nightly-2022-04-07 ``` 5. Build: @@ -81,7 +81,7 @@ ``` git clone https://github.com/paritytech/polkadot.git cd polkadot -git checkout release-v0.9.18 +git checkout release-v0.9.20 cargo build --release ``` --- a/launch-config-full.json +++ b/launch-config-full.json @@ -1,7 +1,7 @@ { "relaychain": { "bin": "../polkadot/target/release/polkadot", - "chain": "rococo-local", + "chain": "westend-local", "nodes": [ { "name": "alice", --- a/launch-config.json +++ b/launch-config.json @@ -1,7 +1,7 @@ { "relaychain": { "bin": "../polkadot/target/release/polkadot", - "chain": "rococo-local", + "chain": "westend-local", "nodes": [ { "name": "alice", --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -283,7 +283,7 @@ license = 'GPLv3' name = 'unique-node' repository = 'https://github.com/UniqueNetwork/unique-chain' -version = '0.9.18' +version = '0.9.20' [[bin]] name = 'unique-collator' --- a/node/cli/src/chain_spec.rs +++ b/node/cli/src/chain_spec.rs @@ -243,7 +243,7 @@ ) } -pub fn local_testnet_rococo_config() -> DefaultChainSpec { +pub fn local_testnet_config() -> DefaultChainSpec { let mut properties = Map::new(); properties.insert("tokenSymbol".into(), default_runtime::TOKEN_SYMBOL.into()); properties.insert("tokenDecimals".into(), 18.into()); @@ -305,7 +305,7 @@ Some(properties), // Extensions Extensions { - relay_chain: "rococo-local".into(), + relay_chain: "westend-local".into(), para_id: 1000, }, ) --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -76,7 +76,7 @@ fn load_spec(id: &str) -> std::result::Result, String> { Ok(match id { "dev" => Box::new(chain_spec::development_config()), - "" | "local" => Box::new(chain_spec::local_testnet_rococo_config()), + "" | "local" => Box::new(chain_spec::local_testnet_config()), path => { let path = std::path::PathBuf::from(path); let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path.clone())?) @@ -405,6 +405,7 @@ cmd.run(config, partials.client.clone(), db, storage) }), + BenchmarkCmd::Machine(cmd) => runner.sync_run(|config| cmd.run(&config)), BenchmarkCmd::Overhead(_) => Err("Unsupported benchmarking command".into()), } } --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -6,7 +6,7 @@ license = 'All Rights Reserved' name = 'unique-runtime-common' repository = 'https://github.com/UniqueNetwork/unique-chain' -version = '0.9.18' +version = '0.9.20' [features] default = ['std'] --- a/runtime/opal/Cargo.toml +++ b/runtime/opal/Cargo.toml @@ -10,7 +10,7 @@ license = 'GPLv3' name = 'opal-runtime' repository = 'https://github.com/UniqueNetwork/unique-chain' -version = '0.9.18' +version = '0.9.20' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] --- a/runtime/opal/build.rs +++ b/runtime/opal/build.rs @@ -14,10 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Unique Network. If not, see . -use substrate_wasm_builder::WasmBuilder; - fn main() { - WasmBuilder::new() + #[cfg(feature = "std")] + substrate_wasm_builder::WasmBuilder::new() .with_current_project() .import_memory() .export_heap_base() --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -169,7 +169,7 @@ spec_name: create_runtime_str!(RUNTIME_NAME), impl_name: create_runtime_str!(RUNTIME_NAME), authoring_version: 1, - spec_version: 918010, + spec_version: 920000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, --- a/runtime/quartz/Cargo.toml +++ b/runtime/quartz/Cargo.toml @@ -10,7 +10,7 @@ license = 'GPLv3' name = 'quartz-runtime' repository = 'https://github.com/UniqueNetwork/unique-chain' -version = '0.9.18' +version = '0.9.20' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] --- a/runtime/quartz/build.rs +++ b/runtime/quartz/build.rs @@ -1,7 +1,6 @@ -use substrate_wasm_builder::WasmBuilder; - fn main() { - WasmBuilder::new() + #[cfg(feature = "std")] + substrate_wasm_builder::WasmBuilder::new() .with_current_project() .import_memory() .export_heap_base() --- a/runtime/quartz/src/lib.rs +++ b/runtime/quartz/src/lib.rs @@ -154,7 +154,7 @@ spec_name: create_runtime_str!(RUNTIME_NAME), impl_name: create_runtime_str!(RUNTIME_NAME), authoring_version: 1, - spec_version: 918010, + spec_version: 920000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, --- a/runtime/unique/build.rs +++ b/runtime/unique/build.rs @@ -1,7 +1,6 @@ -use substrate_wasm_builder::WasmBuilder; - fn main() { - WasmBuilder::new() + #[cfg(feature = "std")] + substrate_wasm_builder::WasmBuilder::new() .with_current_project() .import_memory() .export_heap_base() --- a/runtime/unique/src/lib.rs +++ b/runtime/unique/src/lib.rs @@ -153,7 +153,7 @@ spec_name: create_runtime_str!(RUNTIME_NAME), impl_name: create_runtime_str!(RUNTIME_NAME), authoring_version: 1, - spec_version: 918010, + spec_version: 920000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, --- a/tests/README.md +++ b/tests/README.md @@ -5,7 +5,7 @@ 1. Checkout polkadot in sibling folder with this project ```bash git clone https://github.com/paritytech/polkadot.git && cd polkadot -git checkout release-v0.9.18 +git checkout release-v0.9.20 ``` 2. Build with nightly-2021-11-11 --- a/tests/src/interfaces/augment-api-query.ts +++ b/tests/src/interfaces/augment-api-query.ts @@ -130,6 +130,10 @@ **/ currentTransactionStatuses: AugmentedQuery Observable>>, []> & QueryableStorageEntry; /** + * Injected transactions should have unique nonce, here we store current + **/ + injectedNonce: AugmentedQuery Observable, []> & QueryableStorageEntry; + /** * Current building block's transactions and receipts. **/ pending: AugmentedQuery Observable>>, []> & QueryableStorageEntry; @@ -434,8 +438,11 @@ /** * Events deposited for the current block. * - * NOTE: This storage item is explicitly unbounded since it is never intended to be read - * from within the runtime. + * NOTE: The item is unbound and should therefore never be read on chain. + * It could otherwise inflate the PoV size of a block. + * + * Events have a large in-memory size. Box the events to not go out-of-memory + * just in case someone still reads them from within the runtime. **/ events: AugmentedQuery Observable>, []> & QueryableStorageEntry; /**