git.delta.rocks / unique-network / refs/commits / 20779ae89354

difftreelog

Merge pull request #329 from UniqueNetwork/release-v918001

kozyrevdev2022-03-31parents: #46aada2 #5812736.patch.diff
in: master
Release v918001

5 files changed

modifiedCargo.lockdiffbeforeafterboth
8706 "derivative",8706 "derivative",
8707 "fp-rpc",8707 "fp-rpc",
8708 "fp-self-contained",8708 "fp-self-contained",
8709 "frame-benchmarking",
8710 "frame-executive",8709 "frame-executive",
8711 "frame-support",8710 "frame-support",
8712 "frame-system",8711 "frame-system",
8713 "frame-system-benchmarking",
8714 "frame-system-rpc-runtime-api",8712 "frame-system-rpc-runtime-api",
8715 "hex-literal",
8716 "orml-vesting",8713 "orml-vesting",
8717 "pallet-aura",8714 "pallet-aura",
8718 "pallet-balances",8715 "pallet-balances",
modifiedDockerfile-parachaindiffbeforeafterboth
1# ===== Rust builder =====1# ===== Rust builder =====
2FROM phusion/baseimage:focal-1.0.0 as rust-builder2FROM phusion/baseimage:focal-1.1.0 as rust-builder
3LABEL maintainer="Unique.Network"3LABEL maintainer="Unique.Network"
44
5ARG RUST_TOOLCHAIN=nightly-2021-11-115ARG RUST_TOOLCHAIN=nightly-2021-11-11
7777
78# ===== RUN ======78# ===== RUN ======
7979
80FROM phusion/baseimage:focal-1.0.080FROM phusion/baseimage:focal-1.1.0
8181
82ARG PROFILE=release82ARG PROFILE=release
8383
modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
72impl RuntimeIdentification for Box<dyn sc_service::ChainSpec> {72impl RuntimeIdentification for Box<dyn sc_service::ChainSpec> {
73 fn runtime_id(&self) -> RuntimeId {73 fn runtime_id(&self) -> RuntimeId {
74 #[cfg(feature = "unique-runtime")]74 #[cfg(feature = "unique-runtime")]
75 if self.id().starts_with("unique") {75 if self.id().starts_with("unique") || self.id().starts_with("unq") {
76 return RuntimeId::Unique;76 return RuntimeId::Unique;
77 }77 }
7878
79 #[cfg(feature = "quartz-runtime")]79 #[cfg(feature = "quartz-runtime")]
80 if self.id().starts_with("quartz") {80 if self.id().starts_with("quartz") || self.id().starts_with("qtz") {
81 return RuntimeId::Quartz;81 return RuntimeId::Quartz;
82 }82 }
8383
modifiedpallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth
24use up_sponsorship::SponsorshipHandler;24use up_sponsorship::SponsorshipHandler;
25use core::marker::PhantomData;25use core::marker::PhantomData;
26use core::convert::TryInto;26use core::convert::TryInto;
27use up_data_structs::TokenId;27use up_data_structs::{TokenId, CreateItemData, CreateNftData};
28use up_evm_mapping::EvmBackwardsAddressMapping;28use up_evm_mapping::EvmBackwardsAddressMapping;
29use pallet_common::account::CrossAccountId;29use pallet_common::account::CrossAccountId;
3030
60 let _token_id: TokenId = token_id.try_into().ok()?;60 let _token_id: TokenId = token_id.try_into().ok()?;
61 withdraw_create_item::<T>(61 withdraw_create_item::<T>(
62 &collection,62 &collection,
63 who.as_sub(),63 &who,
64 &CreateItemData::NFT(CreateNftData::default()),64 &CreateItemData::NFT(CreateNftData::default()),
65 )65 )
66 .map(|()| sponsor)66 .map(|()| sponsor)
modifiedpallets/unique/src/sponsorship.rsdiffbeforeafterboth
248 let (sponsor, collection) = load(*collection_id)?;248 let (sponsor, collection) = load(*collection_id)?;
249 withdraw_create_item::<T>(&collection, who, data).map(|()| sponsor)249 withdraw_create_item::<T>(
250 &collection,
251 &T::CrossAccountId::from_sub(who.clone()),
252 data,
253 )
254 .map(|()| sponsor)
250 }255 }