git.delta.rocks / unique-network / refs/commits / 2eedf4593dca

--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@
 FROM phusion/baseimage:18.04-1.0.0 as builder
 LABEL maintainer="UniqueNetwork.io"
 
-ENV WASM_TOOLCHAIN=nightly-2021-01-27
-ENV NATIVE_TOOLCHAIN=1.49.0
+ENV WASM_TOOLCHAIN=nightly-2021-03-01
+# ENV NATIVE_TOOLCHAIN=1.50.0
 
 ARG PROFILE=release
 
@@ -25,10 +25,10 @@
 RUN export PATH="/cargo-home/bin:$PATH" && \
     export CARGO_HOME="/cargo-home" && \
 	rustup toolchain uninstall $(rustup toolchain list) && \
-	rustup toolchain install $NATIVE_TOOLCHAIN && \
+	# rustup toolchain install $NATIVE_TOOLCHAIN && \
 	rustup toolchain install $WASM_TOOLCHAIN && \
 	rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \
-	rustup default $NATIVE_TOOLCHAIN && \
+	rustup default $WASM_TOOLCHAIN && \
     rustup target list --installed && \
     rustup show
 

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 stable toolchain 1.49.0 and make it default, install nightly 2021-01-27:663. Install install nightly 2021-03-01 and make it default:
6767
68```bash68```bash
69rustup toolchain install 1.49.069rustup toolchain install nightly-2021-03-01
70rustup toolchain install nightly-2020-01-27
71rustup default nightly-2021-01-2770rustup default nightly-2021-03-01
72```71```
7372
744. Add wasm target for nightly toolchain:734. Add wasm target for nightly toolchain:
7574
76```bash75```bash
77rustup target add wasm32-unknown-unknown --toolchain nightly-2021-01-2776rustup target add wasm32-unknown-unknown --toolchain nightly-2021-03-01
78```77```
7978
805. Build:795. Build:

--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -16,7 +16,6 @@
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
-use sc_telemetry::TelemetrySpan;
 
 // Our native executor instance.
 native_executor_instance!(

--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -43,7 +43,6 @@
 };
 use sp_runtime::traits::StaticLookup;
 use pallet_contracts::chain_extension::UncheckedFrom;
-use pallet_contracts::*;
 use pallet_transaction_payment::OnChargeTransaction;
 
 #[cfg(test)]
@@ -1118,13 +1117,11 @@
 
             // Transfer permissions check
             let target_collection = <Collection<T>>::get(collection_id);
-            let allowance_limit = if (
-                target_collection.limits.owner_can_transfer &&
+            let allowance_limit = if target_collection.limits.owner_can_transfer &&
                 Self::is_owner_or_admin_permissions(
                     collection_id,
                     sender.clone(),
-                )
-            ) {
+                ) {
                 None
             } else if let Some(amount) = Self::owned_amount(
                 sender.clone(),