difftreelog
Merge branch 'develop' into tests/generalization
in: master
41 files changed
.docker/Dockerfile-chain-devdiffbeforeafterboth--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM uniquenetwork/services:latest
ARG RUST_TOOLCHAIN
ARG NETWORK
@@ -10,10 +10,6 @@
ENV PATH="/cargo-home/bin:$PATH"
RUN echo "$NETWORK\n" && echo "$RUST_TOOLCHAIN\n"
-
-RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake protobuf-compiler
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
RUN rustup toolchain uninstall $(rustup toolchain list) && \
rustup toolchain install $RUST_TOOLCHAIN && \
.docker/Dockerfile-chain-dev-unitdiffbeforeafterboth--- a/.docker/Dockerfile-chain-dev-unit
+++ b/.docker/Dockerfile-chain-dev-unit
@@ -1,14 +1,8 @@
-FROM ubuntu:20.04
+FROM uniquenetwork/services:latest
ENV DEBIAN_FRONTEND=noninteractive
-ENV TZ=Etc/UTC
-
-RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake protobuf-compiler
-
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
ARG RUST_TOOLCHAIN
ARG NETWORK
.docker/Dockerfile-parachaindiffbeforeafterboth--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -2,24 +2,13 @@
FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
# ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
-
+FROM uniquenetwork/services:latest as rust-builder
ARG RUST_TOOLCHAIN=
ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
ENV TZ=UTC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN apt-get update && \
- apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \
- apt-get clean && \
- rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
RUN rustup toolchain uninstall $(rustup toolchain list) && \
rustup toolchain install $RUST_TOOLCHAIN && \
rustup default $RUST_TOOLCHAIN && \
.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -2,24 +2,13 @@
FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
# ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
+FROM uniquenetwork/services:latest as rust-builder
ARG RUST_TOOLCHAIN=
-
ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
ENV TZ=UTC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN apt-get update && \
- apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \
- apt-get clean && \
- rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
RUN rustup toolchain uninstall $(rustup toolchain list) && \
rustup toolchain install $RUST_TOOLCHAIN && \
rustup default $RUST_TOOLCHAIN && \
.docker/Dockerfile-parachain-upgradediffbeforeafterboth--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -2,8 +2,7 @@
FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
# ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
+FROM uniquenetwork/services:latest as rust-builder
ARG RUST_TOOLCHAIN=
@@ -11,15 +10,6 @@
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
ENV TZ=UTC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN apt-get update && \
- apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \
- apt-get clean && \
- rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
RUN rustup toolchain uninstall $(rustup toolchain list) && \
rustup toolchain install $RUST_TOOLCHAIN && \
rustup default $RUST_TOOLCHAIN && \
.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -2,23 +2,13 @@
FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
# ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
-
+FROM uniquenetwork/services:latest as rust-builder
ARG RUST_TOOLCHAIN=
ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
ENV TZ=UTC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN apt-get update && \
- apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \
- apt-get clean && \
- rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
RUN rustup toolchain uninstall $(rustup toolchain list) && \
rustup toolchain install $RUST_TOOLCHAIN && \
.docker/Dockerfile-testnet.j2diffbeforeafterboth--- a/.docker/Dockerfile-testnet.j2
+++ b/.docker/Dockerfile-testnet.j2
@@ -1,18 +1,11 @@
# ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
+FROM uniquenetwork/services:latest as rust-builder
+ARG RUST_TOOLCHAIN=
+ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
ENV TZ=UTC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN apt-get update && \
- apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \
- apt-get clean && \
- rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
RUN rustup toolchain uninstall $(rustup toolchain list) && \
rustup toolchain install {{ RUST_TOOLCHAIN }} && \
.docker/Dockerfile-try-runtimediffbeforeafterboth--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -1,6 +1,5 @@
# ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
+FROM uniquenetwork/services:latest as rust-builder
ARG RUST_TOOLCHAIN
@@ -8,15 +7,6 @@
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
ENV TZ=UTC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-
-RUN apt-get update && \
- apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \
- apt-get clean && \
- rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
RUN rustup toolchain uninstall $(rustup toolchain list) && \
rustup toolchain install $RUST_TOOLCHAIN && \
.docker/Dockerfile-xcm.j2diffbeforeafterboth--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -1,18 +1,8 @@
# ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
-
+FROM uniquenetwork/services:latest as rust-builder
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
ENV TZ=UTC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN apt-get update && \
- apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \
- apt-get clean && \
- rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
RUN rustup toolchain uninstall $(rustup toolchain list) && \
rustup toolchain install {{ RUST_TOOLCHAIN }} && \
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2340,7 +2340,7 @@
[[package]]
name = "evm-coder-procedural"
-version = "0.2.2"
+version = "0.2.3"
dependencies = [
"Inflector",
"hex",
@@ -2467,7 +2467,7 @@
[[package]]
name = "fc-consensus"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"async-trait",
"fc-db",
@@ -2486,7 +2486,7 @@
[[package]]
name = "fc-db"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"fp-storage",
"kvdb-rocksdb",
@@ -2505,7 +2505,7 @@
[[package]]
name = "fc-mapping-sync"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"fc-db",
"fp-consensus",
@@ -2522,7 +2522,7 @@
[[package]]
name = "fc-rpc"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -2565,7 +2565,7 @@
[[package]]
name = "fc-rpc-core"
version = "1.1.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -2730,7 +2730,7 @@
[[package]]
name = "fp-consensus"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"parity-scale-codec 3.2.1",
@@ -2742,7 +2742,7 @@
[[package]]
name = "fp-ethereum"
version = "1.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -2757,7 +2757,7 @@
[[package]]
name = "fp-evm"
version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"evm",
"frame-support",
@@ -2771,7 +2771,7 @@
[[package]]
name = "fp-evm-mapping"
version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"frame-support",
"sp-core",
@@ -2780,7 +2780,7 @@
[[package]]
name = "fp-rpc"
version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -2797,7 +2797,7 @@
[[package]]
name = "fp-self-contained"
version = "1.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"frame-support",
@@ -2810,7 +2810,7 @@
[[package]]
name = "fp-storage"
version = "2.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"parity-scale-codec 3.2.1",
"serde",
@@ -5687,7 +5687,7 @@
[[package]]
name = "pallet-base-fee"
version = "1.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"fp-evm",
"frame-support",
@@ -5952,7 +5952,7 @@
[[package]]
name = "pallet-ethereum"
version = "4.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -5980,7 +5980,7 @@
[[package]]
name = "pallet-evm"
version = "6.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"environmental",
"evm",
@@ -6066,7 +6066,7 @@
[[package]]
name = "pallet-evm-precompile-simple"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"fp-evm",
"ripemd",
crates/evm-coder/procedural/Cargo.tomldiffbeforeafterboth--- a/crates/evm-coder/procedural/Cargo.toml
+++ b/crates/evm-coder/procedural/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "evm-coder-procedural"
-version = "0.2.2"
+version = "0.2.3"
license = "GPLv3"
edition = "2021"
crates/evm-coder/procedural/src/solidity_interface.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/solidity_interface.rs
+++ b/crates/evm-coder/procedural/src/solidity_interface.rs
@@ -811,6 +811,13 @@
let list = generics_list(gen);
quote! { <#list> }
}
+fn generics_stub(gen: &Generics) -> proc_macro2::TokenStream {
+ if gen.params.is_empty() {
+ return quote! {};
+ }
+ let params = (0..gen.params.len()).map(|_| quote! {()});
+ quote! {<#(#params,)*>}
+}
fn generics_data(gen: &Generics) -> proc_macro2::TokenStream {
let list = generics_list(gen);
if gen.params.len() == 1 {
@@ -866,6 +873,7 @@
let generics = self.generics;
let gen_ref = generics_reference(&generics);
let gen_data = generics_data(&generics);
+ let gen_stub = generics_stub(&generics);
let gen_where = &generics.where_clause;
let call_sub = self
@@ -936,6 +944,12 @@
let solidity_events_idents = self.info.events.0.iter().map(|is| is.name.clone());
let docs = &self.docs;
+ let expect_selector = self.info.expect_selector.map(|s| {
+ quote! {
+ const _: () = assert!(#s == u32::from_be_bytes(<#call_name #gen_stub>::interface_id()), "selector mismatch, review contained function selectors");
+ }
+ });
+
quote! {
#(
const _: ::core::marker::PhantomData<#solidity_events_idents> = ::core::marker::PhantomData;
@@ -952,12 +966,15 @@
#call_sub,
)*
}
+
+ #expect_selector
+
impl #gen_ref #call_name #gen_ref {
#(
#consts
)*
/// Return this call ERC165 selector
- pub fn interface_id() -> ::evm_coder::types::bytes4 {
+ pub const fn interface_id() -> ::evm_coder::types::bytes4 {
let mut interface_id = 0;
#(#interface_id)*
#(#inline_interface_id)*
crates/evm-coder/procedural/src/to_log.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/to_log.rs
+++ b/crates/evm-coder/procedural/src/to_log.rs
@@ -16,7 +16,6 @@
use inflector::cases;
use syn::{Data, DeriveInput, Field, Fields, Ident, Variant, spanned::Spanned};
-use std::fmt::Write;
use quote::quote;
use crate::{parse_ident_from_path, parse_ident_from_type, snake_ident_to_screaming};
@@ -61,13 +60,13 @@
name: Ident,
name_screaming: Ident,
fields: Vec<EventField>,
- selector: [u8; 32],
- selector_str: String,
+ selector: proc_macro2::TokenStream,
}
impl Event {
fn try_from(variant: &Variant) -> syn::Result<Self> {
let name = &variant.ident;
+ let name_lit = proc_macro2::Literal::string(name.to_string().as_str());
let name_screaming = snake_ident_to_screaming(name);
let named = match &variant.fields {
@@ -89,22 +88,40 @@
"events can have at most 4 indexed fields (1 indexed field is reserved for event signature)"
));
}
- let mut selector_str = format!("{}(", name);
- for (i, arg) in fields.iter().enumerate() {
- if i != 0 {
- write!(selector_str, ",").unwrap();
+
+ let args = fields.iter().map(|f| {
+ let ty = &f.ty;
+ quote! {nameof(<#ty as ::evm_coder::abi::AbiType>::SIGNATURE) fixed(",")}
+ });
+ // Remove trailing comma
+ let shift = (!fields.is_empty()).then(|| quote! {shift_left(1)});
+
+ let signature = quote! { ::evm_coder::make_signature!(new fixed(#name_lit) fixed("(") #(#args)* #shift fixed(")")) };
+ let selector = quote! {
+ {
+ let signature = #signature;
+ let mut sum = ::evm_coder::sha3_const::Keccak256::new();
+ let mut pos = 0;
+ while pos < signature.len {
+ sum = sum.update(&[signature.data[pos]; 1]);
+ pos += 1;
+ }
+ let a = sum.finalize();
+ let mut selector_bytes = [0; 32];
+ let mut i = 0;
+ while i != 32 {
+ selector_bytes[i] = a[i];
+ i += 1;
+ }
+ selector_bytes
}
- write!(selector_str, "{}", arg.ty).unwrap();
- }
- selector_str.push(')');
- let selector = crate::event_selector_str(&selector_str);
+ };
Ok(Self {
name: name.to_owned(),
name_screaming,
fields,
selector,
- selector_str,
})
}
@@ -133,14 +150,10 @@
fn expand_consts(&self) -> proc_macro2::TokenStream {
let name_screaming = &self.name_screaming;
- let selector_str = &self.selector_str;
let selector = &self.selector;
quote! {
- #[doc = #selector_str]
- const #name_screaming: [u8; 32] = [#(
- #selector,
- )*];
+ const #name_screaming: [u8; 32] = #selector;
}
}
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -143,7 +143,7 @@
AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
}
-#[cfg(feature = "quartz-runtime")]
+#[cfg(not(feature = "unique-runtime"))]
macro_rules! testnet_genesis {
(
$runtime:path,
@@ -207,7 +207,7 @@
}};
}
-#[cfg(not(feature = "quartz-runtime"))]
+#[cfg(feature = "unique-runtime")]
macro_rules! testnet_genesis {
(
$runtime:path,
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -176,7 +176,7 @@
key: property_key(p as usize),
value: property_value(),
}).collect::<Vec<_>>();
- }: {<Pallet<T>>::set_collection_properties(&collection, &owner, props)?}
+ }: {<Pallet<T>>::set_collection_properties(&collection, &owner, props.into_iter())?}
delete_collection_properties {
let b in 0..MAX_PROPERTIES_PER_ITEM;
@@ -188,7 +188,7 @@
key: property_key(p as usize),
value: property_value(),
}).collect::<Vec<_>>();
- <Pallet<T>>::set_collection_properties(&collection, &owner, props)?;
+ <Pallet<T>>::set_collection_properties(&collection, &owner, props.into_iter())?;
let to_delete = (0..b).map(|p| property_key(p as usize)).collect::<Vec<_>>();
- }: {<Pallet<T>>::delete_collection_properties(&collection, &owner, to_delete)?}
+ }: {<Pallet<T>>::delete_collection_properties(&collection, &owner, to_delete.into_iter())?}
}
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -125,7 +125,7 @@
.map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?;
- <Pallet<T>>::set_collection_properties(self, &caller, properties)
+ <Pallet<T>>::set_collection_properties(self, &caller, properties.into_iter())
.map_err(dispatch_to_evm::<T>)
}
@@ -158,7 +158,8 @@
})
.collect::<Result<Vec<_>>>()?;
- <Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)
+ <Pallet<T>>::delete_collection_properties(self, &caller, keys.into_iter())
+ .map_err(dispatch_to_evm::<T>)
}
/// Get collection property.
pallets/common/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Common pallet18//!19//! The Common pallet provides functionality for handling collections.20//!21//! ## Overview22//!23//! The Common pallet provides an interface for common collection operations for different collection types24//! (see [CommonCollectionOperations]), as well as a generic dispatcher for these, see [dispatch] module.25//! It also provides this functionality to EVM, see [erc] and [eth] modules.26//!27//! The Common pallet provides functions for:28//!29//! - Setting and approving collection sponsor.30//! - Get\set\delete allow list.31//! - Get\set\delete collection properties.32//! - Get\set\delete collection property permissions.33//! - Get\set\delete token property permissions.34//! - Get\set\delete collection administrators.35//! - Checking access permissions.36//!37//! ### Terminology38//! **Collection sponsor** - For the collection, you can set a sponsor, at whose expense it will39//! be possible to mint tokens.40//!41//! **Allow list** - List of users who have the right to minting tokens.42//!43//! **Collection properties** - Collection properties are simply key-value stores where various44//! metadata can be placed.45//!46//! **Permissions on token properties** - For each property in the token can be set permission47//! to change, see [`PropertyPermission`].48//!49//! **Collection administrator** - For a collection, you can set administrators who have the right50//! to most actions on the collection.5152#![warn(missing_docs)]53#![cfg_attr(not(feature = "std"), no_std)]54extern crate alloc;5556use core::ops::{Deref, DerefMut};57use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};58use sp_std::vec::Vec;59use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};60use evm_coder::ToLog;61use frame_support::{62 dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},63 ensure,64 traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},65 dispatch::Pays,66 transactional,67};68use pallet_evm::GasWeightMapping;69use up_data_structs::{70 COLLECTION_NUMBER_LIMIT,71 Collection,72 RpcCollection,73 CollectionFlags,74 RpcCollectionFlags,75 CollectionId,76 CreateItemData,77 MAX_TOKEN_PREFIX_LENGTH,78 COLLECTION_ADMINS_LIMIT,79 TokenId,80 TokenChild,81 CollectionStats,82 MAX_TOKEN_OWNERSHIP,83 CollectionMode,84 NFT_SPONSOR_TRANSFER_TIMEOUT,85 FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,86 REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,87 MAX_SPONSOR_TIMEOUT,88 CUSTOM_DATA_LIMIT,89 CollectionLimits,90 CreateCollectionData,91 SponsorshipState,92 CreateItemExData,93 SponsoringRateLimit,94 budget::Budget,95 PhantomType,96 Property,97 Properties,98 PropertiesPermissionMap,99 PropertyKey,100 PropertyValue,101 PropertyPermission,102 PropertiesError,103 PropertyKeyPermission,104 TokenData,105 TrySetProperty,106 PropertyScope,107 // RMRK108 RmrkCollectionInfo,109 RmrkInstanceInfo,110 RmrkResourceInfo,111 RmrkPropertyInfo,112 RmrkBaseInfo,113 RmrkPartType,114 RmrkBoundedTheme,115 RmrkNftChild,116 CollectionPermissions,117};118use up_pov_estimate_rpc::PovInfo;119120pub use pallet::*;121use sp_core::H160;122use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};123#[cfg(feature = "runtime-benchmarks")]124pub mod benchmarking;125pub mod dispatch;126pub mod erc;127pub mod eth;128pub mod weights;129130/// Weight info.131pub type SelfWeightOf<T> = <T as Config>::WeightInfo;132133/// Collection handle contains information about collection data and id.134/// Also provides functionality to count consumed gas.135///136/// CollectionHandle is used as a generic wrapper for collections of all types.137/// It allows to perform common operations and queries on any collection type,138/// both completely general for all, as well as their respective implementations of [`CommonCollectionOperations`].139#[must_use = "Should call submit_logs or save, otherwise some data will be lost for evm side"]140pub struct CollectionHandle<T: Config> {141 /// Collection id142 pub id: CollectionId,143 collection: Collection<T::AccountId>,144 /// Substrate recorder for counting consumed gas145 pub recorder: SubstrateRecorder<T>,146}147148impl<T: Config> WithRecorder<T> for CollectionHandle<T> {149 fn recorder(&self) -> &SubstrateRecorder<T> {150 &self.recorder151 }152 fn into_recorder(self) -> SubstrateRecorder<T> {153 self.recorder154 }155}156157impl<T: Config> CollectionHandle<T> {158 /// Same as [CollectionHandle::new] but with an explicit gas limit.159 pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {160 <CollectionById<T>>::get(id).map(|collection| Self {161 id,162 collection,163 recorder: SubstrateRecorder::new(gas_limit),164 })165 }166167 /// Same as [CollectionHandle::new] but with an existed [`SubstrateRecorder`].168 pub fn new_with_recorder(id: CollectionId, recorder: SubstrateRecorder<T>) -> Option<Self> {169 <CollectionById<T>>::get(id).map(|collection| Self {170 id,171 collection,172 recorder,173 })174 }175176 /// Retrives collection data from storage and creates collection handle with default parameters.177 /// If collection not found return `None`178 pub fn new(id: CollectionId) -> Option<Self> {179 Self::new_with_gas_limit(id, u64::MAX)180 }181182 /// Same as [`CollectionHandle::new`] but if collection not found [CollectionNotFound](Error::CollectionNotFound) returned.183 pub fn try_get(id: CollectionId) -> Result<Self, DispatchError> {184 Ok(Self::new(id).ok_or(<Error<T>>::CollectionNotFound)?)185 }186187 /// Consume gas for reading.188 pub fn consume_store_reads(&self, reads: u64) -> evm_coder::execution::Result<()> {189 self.recorder190 .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_ref_time(191 <T as frame_system::Config>::DbWeight::get()192 .read193 .saturating_mul(reads),194 )))195 }196197 /// Consume gas for writing.198 pub fn consume_store_writes(&self, writes: u64) -> evm_coder::execution::Result<()> {199 self.recorder200 .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_ref_time(201 <T as frame_system::Config>::DbWeight::get()202 .write203 .saturating_mul(writes),204 )))205 }206207 /// Consume gas for reading and writing.208 pub fn consume_store_reads_and_writes(209 &self,210 reads: u64,211 writes: u64,212 ) -> evm_coder::execution::Result<()> {213 let weight = <T as frame_system::Config>::DbWeight::get();214 let reads = weight.read.saturating_mul(reads);215 let writes = weight.read.saturating_mul(writes);216 self.recorder217 .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_ref_time(218 reads.saturating_add(writes),219 )))220 }221222 /// Save collection to storage.223 pub fn save(&self) -> DispatchResult {224 <CollectionById<T>>::insert(self.id, &self.collection);225 Ok(())226 }227228 /// Set collection sponsor.229 ///230 /// Unique collections allows sponsoring for certain actions.231 /// This method allows you to set the sponsor of the collection.232 /// In order for sponsorship to become active, it must be confirmed through [`Self::confirm_sponsorship`].233 pub fn set_sponsor(234 &mut self,235 sender: &T::CrossAccountId,236 sponsor: T::AccountId,237 ) -> DispatchResult {238 self.check_is_internal()?;239 self.check_is_owner_or_admin(sender)?;240241 self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor.clone());242243 <Pallet<T>>::deposit_event(Event::<T>::CollectionSponsorSet(self.id, sponsor));244 <PalletEvm<T>>::deposit_log(245 erc::CollectionHelpersEvents::CollectionChanged {246 collection_id: eth::collection_id_to_address(self.id),247 }248 .to_log(T::ContractAddress::get()),249 );250251 self.save()252 }253254 /// Force set `sponsor`.255 ///256 /// Differs from [`set_sponsor`][`Self::set_sponsor`] in that confirmation257 /// from the `sponsor` is not required.258 ///259 /// # Arguments260 ///261 /// * `sender`: Caller's account.262 /// * `sponsor`: ID of the account of the sponsor-to-be.263 pub fn force_set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {264 self.check_is_internal()?;265266 self.collection.sponsorship = SponsorshipState::Confirmed(sponsor.clone());267268 <Pallet<T>>::deposit_event(Event::<T>::CollectionSponsorSet(self.id, sponsor.clone()));269 <Pallet<T>>::deposit_event(Event::<T>::SponsorshipConfirmed(self.id, sponsor));270 <PalletEvm<T>>::deposit_log(271 erc::CollectionHelpersEvents::CollectionChanged {272 collection_id: eth::collection_id_to_address(self.id),273 }274 .to_log(T::ContractAddress::get()),275 );276277 self.save()278 }279280 /// Confirm sponsorship281 ///282 /// In order for the sponsorship to become active, the user set as the sponsor must confirm their participation.283 /// Before confirming sponsorship, the user must be specified as the sponsor of the collection via [`Self::set_sponsor`].284 pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> DispatchResult {285 self.check_is_internal()?;286 ensure!(287 self.collection.sponsorship.pending_sponsor() == Some(sender),288 Error::<T>::ConfirmSponsorshipFail289 );290291 self.collection.sponsorship = SponsorshipState::Confirmed(sender.clone());292293 <Pallet<T>>::deposit_event(Event::<T>::SponsorshipConfirmed(self.id, sender.clone()));294 <PalletEvm<T>>::deposit_log(295 erc::CollectionHelpersEvents::CollectionChanged {296 collection_id: eth::collection_id_to_address(self.id),297 }298 .to_log(T::ContractAddress::get()),299 );300301 self.save()302 }303304 /// Remove collection sponsor.305 pub fn remove_sponsor(&mut self, sender: &T::CrossAccountId) -> DispatchResult {306 self.check_is_internal()?;307 self.check_is_owner_or_admin(sender)?;308309 self.collection.sponsorship = SponsorshipState::Disabled;310311 <Pallet<T>>::deposit_event(Event::<T>::CollectionSponsorRemoved(self.id));312 <PalletEvm<T>>::deposit_log(313 erc::CollectionHelpersEvents::CollectionChanged {314 collection_id: eth::collection_id_to_address(self.id),315 }316 .to_log(T::ContractAddress::get()),317 );318 self.save()319 }320321 /// Force remove `sponsor`.322 ///323 /// Differs from `remove_sponsor` in that324 /// it doesn't require consent from the `owner` of the collection.325 pub fn force_remove_sponsor(&mut self) -> DispatchResult {326 self.check_is_internal()?;327328 self.collection.sponsorship = SponsorshipState::Disabled;329330 <Pallet<T>>::deposit_event(Event::<T>::CollectionSponsorRemoved(self.id));331 <PalletEvm<T>>::deposit_log(332 erc::CollectionHelpersEvents::CollectionChanged {333 collection_id: eth::collection_id_to_address(self.id),334 }335 .to_log(T::ContractAddress::get()),336 );337 self.save()338 }339340 /// Checks that the collection was created with, and must be operated upon through **Unique API**.341 /// Now check only the `external` flag and if it's **true**, then return [`Error::CollectionIsExternal`] error.342 pub fn check_is_internal(&self) -> DispatchResult {343 if self.flags.external {344 return Err(<Error<T>>::CollectionIsExternal)?;345 }346347 Ok(())348 }349350 /// Checks that the collection was created with, and must be operated upon through an **assimilated API**.351 /// Now check only the `external` flag and if it's **false**, then return [`Error::CollectionIsInternal`] error.352 pub fn check_is_external(&self) -> DispatchResult {353 if !self.flags.external {354 return Err(<Error<T>>::CollectionIsInternal)?;355 }356357 Ok(())358 }359}360361impl<T: Config> Deref for CollectionHandle<T> {362 type Target = Collection<T::AccountId>;363364 fn deref(&self) -> &Self::Target {365 &self.collection366 }367}368369impl<T: Config> DerefMut for CollectionHandle<T> {370 fn deref_mut(&mut self) -> &mut Self::Target {371 &mut self.collection372 }373}374375impl<T: Config> CollectionHandle<T> {376 /// Checks if the `user` is the owner of the collection.377 pub fn check_is_owner(&self, user: &T::CrossAccountId) -> DispatchResult {378 ensure!(*user.as_sub() == self.owner, <Error<T>>::NoPermission);379 Ok(())380 }381382 /// Returns **true** if the `user` is the owner or administrator of the collection.383 pub fn is_owner_or_admin(&self, user: &T::CrossAccountId) -> bool {384 *user.as_sub() == self.owner || <IsAdmin<T>>::get((self.id, user))385 }386387 /// Checks if the `user` is the owner or administrator of the collection.388 pub fn check_is_owner_or_admin(&self, user: &T::CrossAccountId) -> DispatchResult {389 ensure!(self.is_owner_or_admin(user), <Error<T>>::NoPermission);390 Ok(())391 }392393 /// Returns **true** if394 /// * the `user`is a collection owner or admin395 /// * the collection limits allow the owner/admins to transfer/burn any collection token396 pub fn ignores_token_restrictions(&self, user: &T::CrossAccountId) -> bool {397 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)398 }399400 /// Return **true** if `user` does not have enough token parts, and he can ignore such restrictions.401 pub fn ignores_owned_amount(&self, user: &T::CrossAccountId) -> bool {402 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)403 }404405 /// Checks if the user is in the allow list. If not [Error::AddressNotInAllowlist] returns.406 pub fn check_allowlist(&self, user: &T::CrossAccountId) -> DispatchResult {407 ensure!(408 <Allowlist<T>>::get((self.id, user)),409 <Error<T>>::AddressNotInAllowlist410 );411 Ok(())412 }413414 /// Changes collection owner to another account415 /// #### Store read/writes416 /// 1 writes417 pub fn change_owner(418 &mut self,419 caller: T::CrossAccountId,420 new_owner: T::CrossAccountId,421 ) -> DispatchResult {422 self.check_is_internal()?;423 self.check_is_owner(&caller)?;424 self.collection.owner = new_owner.as_sub().clone();425426 <Pallet<T>>::deposit_event(Event::<T>::CollectionOwnerChanged(427 self.id,428 new_owner.as_sub().clone(),429 ));430 <PalletEvm<T>>::deposit_log(431 erc::CollectionHelpersEvents::CollectionChanged {432 collection_id: eth::collection_id_to_address(self.id),433 }434 .to_log(T::ContractAddress::get()),435 );436437 self.save()438 }439}440441#[frame_support::pallet]442pub mod pallet {443 use super::*;444 use dispatch::CollectionDispatch;445 use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};446 use frame_system::pallet_prelude::*;447 use frame_support::traits::Currency;448 use up_data_structs::{TokenId, mapping::TokenAddressMapping};449 use scale_info::TypeInfo;450 use weights::WeightInfo;451452 #[pallet::config]453 pub trait Config:454 frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::Config + TypeInfo455 {456 /// Weight information for functions of this pallet.457 type WeightInfo: WeightInfo;458459 /// Events compatible with [`frame_system::Config::Event`].460 type RuntimeEvent: IsType<<Self as frame_system::Config>::RuntimeEvent> + From<Event<Self>>;461462 /// Handler of accounts and payment.463 type Currency: Currency<Self::AccountId>;464465 /// Set price to create a collection.466 #[pallet::constant]467 type CollectionCreationPrice: Get<468 <<Self as Config>::Currency as Currency<Self::AccountId>>::Balance,469 >;470471 /// Dispatcher of operations on collections.472 type CollectionDispatch: CollectionDispatch<Self>;473474 /// Account which holds the chain's treasury.475 type TreasuryAccountId: Get<Self::AccountId>;476477 /// Address under which the CollectionHelper contract would be available.478 #[pallet::constant]479 type ContractAddress: Get<H160>;480481 /// Mapper for token addresses to Ethereum addresses.482 type EvmTokenAddressMapping: TokenAddressMapping<H160>;483484 /// Mapper for token addresses to [`CrossAccountId`].485 type CrossTokenAddressMapping: TokenAddressMapping<Self::CrossAccountId>;486 }487488 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);489490 #[pallet::pallet]491 #[pallet::storage_version(STORAGE_VERSION)]492 #[pallet::generate_store(pub(super) trait Store)]493 pub struct Pallet<T>(_);494495 #[pallet::extra_constants]496 impl<T: Config> Pallet<T> {497 /// Maximum admins per collection.498 pub fn collection_admins_limit() -> u32 {499 COLLECTION_ADMINS_LIMIT500 }501 }502503 #[pallet::event]504 #[pallet::generate_deposit(pub fn deposit_event)]505 pub enum Event<T: Config> {506 /// New collection was created507 CollectionCreated(508 /// Globally unique identifier of newly created collection.509 CollectionId,510 /// [`CollectionMode`] converted into _u8_.511 u8,512 /// Collection owner.513 T::AccountId,514 ),515516 /// New collection was destroyed517 CollectionDestroyed(518 /// Globally unique identifier of collection.519 CollectionId,520 ),521522 /// New item was created.523 ItemCreated(524 /// Id of the collection where item was created.525 CollectionId,526 /// Id of an item. Unique within the collection.527 TokenId,528 /// Owner of newly created item529 T::CrossAccountId,530 /// Always 1 for NFT531 u128,532 ),533534 /// Collection item was burned.535 ItemDestroyed(536 /// Id of the collection where item was destroyed.537 CollectionId,538 /// Identifier of burned NFT.539 TokenId,540 /// Which user has destroyed its tokens.541 T::CrossAccountId,542 /// Amount of token pieces destroed. Always 1 for NFT.543 u128,544 ),545546 /// Item was transferred547 Transfer(548 /// Id of collection to which item is belong.549 CollectionId,550 /// Id of an item.551 TokenId,552 /// Original owner of item.553 T::CrossAccountId,554 /// New owner of item.555 T::CrossAccountId,556 /// Amount of token pieces transfered. Always 1 for NFT.557 u128,558 ),559560 /// Amount pieces of token owned by `sender` was approved for `spender`.561 Approved(562 /// Id of collection to which item is belong.563 CollectionId,564 /// Id of an item.565 TokenId,566 /// Original owner of item.567 T::CrossAccountId,568 /// Id for which the approval was granted.569 T::CrossAccountId,570 /// Amount of token pieces transfered. Always 1 for NFT.571 u128,572 ),573574 /// A `sender` approves operations on all owned tokens for `spender`.575 ApprovedForAll(576 /// Id of collection to which item is belong.577 CollectionId,578 /// Owner of a wallet.579 T::CrossAccountId,580 /// Id for which operator status was granted or rewoked.581 T::CrossAccountId,582 /// Is operator status granted or revoked?583 bool,584 ),585586 /// The colletion property has been added or edited.587 CollectionPropertySet(588 /// Id of collection to which property has been set.589 CollectionId,590 /// The property that was set.591 PropertyKey,592 ),593594 /// The property has been deleted.595 CollectionPropertyDeleted(596 /// Id of collection to which property has been deleted.597 CollectionId,598 /// The property that was deleted.599 PropertyKey,600 ),601602 /// The token property has been added or edited.603 TokenPropertySet(604 /// Identifier of the collection whose token has the property set.605 CollectionId,606 /// The token for which the property was set.607 TokenId,608 /// The property that was set.609 PropertyKey,610 ),611612 /// The token property has been deleted.613 TokenPropertyDeleted(614 /// Identifier of the collection whose token has the property deleted.615 CollectionId,616 /// The token for which the property was deleted.617 TokenId,618 /// The property that was deleted.619 PropertyKey,620 ),621622 /// The token property permission of a collection has been set.623 PropertyPermissionSet(624 /// ID of collection to which property permission has been set.625 CollectionId,626 /// The property permission that was set.627 PropertyKey,628 ),629630 /// Address was added to the allow list.631 AllowListAddressAdded(632 /// ID of the affected collection.633 CollectionId,634 /// Address of the added account.635 T::CrossAccountId,636 ),637638 /// Address was removed from the allow list.639 AllowListAddressRemoved(640 /// ID of the affected collection.641 CollectionId,642 /// Address of the removed account.643 T::CrossAccountId,644 ),645646 /// Collection admin was added.647 CollectionAdminAdded(648 /// ID of the affected collection.649 CollectionId,650 /// Admin address.651 T::CrossAccountId,652 ),653654 /// Collection admin was removed.655 CollectionAdminRemoved(656 /// ID of the affected collection.657 CollectionId,658 /// Removed admin address.659 T::CrossAccountId,660 ),661662 /// Collection limits were set.663 CollectionLimitSet(664 /// ID of the affected collection.665 CollectionId,666 ),667668 /// Collection owned was changed.669 CollectionOwnerChanged(670 /// ID of the affected collection.671 CollectionId,672 /// New owner address.673 T::AccountId,674 ),675676 /// Collection permissions were set.677 CollectionPermissionSet(678 /// ID of the affected collection.679 CollectionId,680 ),681682 /// Collection sponsor was set.683 CollectionSponsorSet(684 /// ID of the affected collection.685 CollectionId,686 /// New sponsor address.687 T::AccountId,688 ),689690 /// New sponsor was confirm.691 SponsorshipConfirmed(692 /// ID of the affected collection.693 CollectionId,694 /// New sponsor address.695 T::AccountId,696 ),697698 /// Collection sponsor was removed.699 CollectionSponsorRemoved(700 /// ID of the affected collection.701 CollectionId,702 ),703 }704705 #[pallet::error]706 pub enum Error<T> {707 /// This collection does not exist.708 CollectionNotFound,709 /// Sender parameter and item owner must be equal.710 MustBeTokenOwner,711 /// No permission to perform action712 NoPermission,713 /// Destroying only empty collections is allowed714 CantDestroyNotEmptyCollection,715 /// Collection is not in mint mode.716 PublicMintingNotAllowed,717 /// Address is not in allow list.718 AddressNotInAllowlist,719720 /// Collection name can not be longer than 63 char.721 CollectionNameLimitExceeded,722 /// Collection description can not be longer than 255 char.723 CollectionDescriptionLimitExceeded,724 /// Token prefix can not be longer than 15 char.725 CollectionTokenPrefixLimitExceeded,726 /// Total collections bound exceeded.727 TotalCollectionsLimitExceeded,728 /// Exceeded max admin count729 CollectionAdminCountExceeded,730 /// Collection limit bounds per collection exceeded731 CollectionLimitBoundsExceeded,732 /// Tried to enable permissions which are only permitted to be disabled733 OwnerPermissionsCantBeReverted,734 /// Collection settings not allowing items transferring735 TransferNotAllowed,736 /// Account token limit exceeded per collection737 AccountTokenLimitExceeded,738 /// Collection token limit exceeded739 CollectionTokenLimitExceeded,740 /// Metadata flag frozen741 MetadataFlagFrozen,742743 /// Item does not exist744 TokenNotFound,745 /// Item is balance not enough746 TokenValueTooLow,747 /// Requested value is more than the approved748 ApprovedValueTooLow,749 /// Tried to approve more than owned750 CantApproveMoreThanOwned,751 /// Only spending from eth mirror could be approved752 AddressIsNotEthMirror,753754 /// Can't transfer tokens to ethereum zero address755 AddressIsZero,756757 /// The operation is not supported758 UnsupportedOperation,759760 /// Insufficient funds to perform an action761 NotSufficientFounds,762763 /// User does not satisfy the nesting rule764 UserIsNotAllowedToNest,765 /// Only tokens from specific collections may nest tokens under this one766 SourceCollectionIsNotAllowedToNest,767768 /// Tried to store more data than allowed in collection field769 CollectionFieldSizeExceeded,770771 /// Tried to store more property data than allowed772 NoSpaceForProperty,773774 /// Tried to store more property keys than allowed775 PropertyLimitReached,776777 /// Property key is too long778 PropertyKeyIsTooLong,779780 /// Only ASCII letters, digits, and symbols `_`, `-`, and `.` are allowed781 InvalidCharacterInPropertyKey,782783 /// Empty property keys are forbidden784 EmptyPropertyKey,785786 /// Tried to access an external collection with an internal API787 CollectionIsExternal,788789 /// Tried to access an internal collection with an external API790 CollectionIsInternal,791792 /// This address is not set as sponsor, use setCollectionSponsor first.793 ConfirmSponsorshipFail,794795 /// The user is not an administrator.796 UserIsNotCollectionAdmin,797 }798799 /// Storage of the count of created collections. Essentially contains the last collection ID.800 #[pallet::storage]801 pub type CreatedCollectionCount<T> = StorageValue<Value = CollectionId, QueryKind = ValueQuery>;802803 /// Storage of the count of deleted collections.804 #[pallet::storage]805 pub type DestroyedCollectionCount<T> =806 StorageValue<Value = CollectionId, QueryKind = ValueQuery>;807808 /// Storage of collection info.809 #[pallet::storage]810 pub type CollectionById<T> = StorageMap<811 Hasher = Blake2_128Concat,812 Key = CollectionId,813 Value = Collection<<T as frame_system::Config>::AccountId>,814 QueryKind = OptionQuery,815 >;816817 /// Storage of collection properties.818 #[pallet::storage]819 #[pallet::getter(fn collection_properties)]820 pub type CollectionProperties<T> = StorageMap<821 Hasher = Blake2_128Concat,822 Key = CollectionId,823 Value = Properties,824 QueryKind = ValueQuery,825 OnEmpty = up_data_structs::CollectionProperties,826 >;827828 /// Storage of token property permissions of a collection.829 #[pallet::storage]830 #[pallet::getter(fn property_permissions)]831 pub type CollectionPropertyPermissions<T> = StorageMap<832 Hasher = Blake2_128Concat,833 Key = CollectionId,834 Value = PropertiesPermissionMap,835 QueryKind = ValueQuery,836 >;837838 /// Storage of the amount of collection admins.839 #[pallet::storage]840 pub type AdminAmount<T> = StorageMap<841 Hasher = Blake2_128Concat,842 Key = CollectionId,843 Value = u32,844 QueryKind = ValueQuery,845 >;846847 /// List of collection admins.848 #[pallet::storage]849 pub type IsAdmin<T: Config> = StorageNMap<850 Key = (851 Key<Blake2_128Concat, CollectionId>,852 Key<Blake2_128Concat, T::CrossAccountId>,853 ),854 Value = bool,855 QueryKind = ValueQuery,856 >;857858 /// Allowlisted collection users.859 #[pallet::storage]860 pub type Allowlist<T: Config> = StorageNMap<861 Key = (862 Key<Blake2_128Concat, CollectionId>,863 Key<Blake2_128Concat, T::CrossAccountId>,864 ),865 Value = bool,866 QueryKind = ValueQuery,867 >;868869 /// Not used by code, exists only to provide some types to metadata.870 #[pallet::storage]871 pub type DummyStorageValue<T: Config> = StorageValue<872 Value = (873 CollectionStats,874 CollectionId,875 TokenId,876 TokenChild,877 PhantomType<(878 TokenData<T::CrossAccountId>,879 RpcCollection<T::AccountId>,880 // RMRK881 RmrkCollectionInfo<T::AccountId>,882 RmrkInstanceInfo<T::AccountId>,883 RmrkResourceInfo,884 RmrkPropertyInfo,885 RmrkBaseInfo<T::AccountId>,886 RmrkPartType,887 RmrkBoundedTheme,888 RmrkNftChild,889 // PoV Estimate Info890 PovInfo,891 )>,892 ),893 QueryKind = OptionQuery,894 >;895896 #[pallet::hooks]897 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {898 fn on_runtime_upgrade() -> Weight {899 StorageVersion::new(1).put::<Pallet<T>>();900901 Weight::zero()902 }903 }904}905906impl<T: Config> Pallet<T> {907 /// Enshure that receiver address is correct.908 ///909 /// Ethereum receiver 0x0000000000000000000000000000000000000000 is reserved, and shouldn't own tokens.910 pub fn ensure_correct_receiver(receiver: &T::CrossAccountId) -> DispatchResult {911 ensure!(912 &T::CrossAccountId::from_eth(H160([0; 20])) != receiver,913 <Error<T>>::AddressIsZero914 );915 Ok(())916 }917918 /// Get a vector of collection admins.919 pub fn adminlist(collection: CollectionId) -> Vec<T::CrossAccountId> {920 <IsAdmin<T>>::iter_prefix((collection,))921 .map(|(a, _)| a)922 .collect()923 }924925 /// Get a vector of users allowed to mint tokens.926 pub fn allowlist(collection: CollectionId) -> Vec<T::CrossAccountId> {927 <Allowlist<T>>::iter_prefix((collection,))928 .map(|(a, _)| a)929 .collect()930 }931932 /// Is `user` allowed to mint token in `collection`.933 pub fn allowed(collection: CollectionId, user: T::CrossAccountId) -> bool {934 <Allowlist<T>>::get((collection, user))935 }936937 /// Get statistics of collections.938 pub fn collection_stats() -> CollectionStats {939 let created = <CreatedCollectionCount<T>>::get();940 let destroyed = <DestroyedCollectionCount<T>>::get();941 CollectionStats {942 created: created.0,943 destroyed: destroyed.0,944 alive: created.0 - destroyed.0,945 }946 }947948 /// Get the effective limits for the collection.949 pub fn effective_collection_limits(collection: CollectionId) -> Option<CollectionLimits> {950 let collection = <CollectionById<T>>::get(collection)?;951 let limits = collection.limits;952 let effective_limits = CollectionLimits {953 account_token_ownership_limit: Some(limits.account_token_ownership_limit()),954 sponsored_data_size: Some(limits.sponsored_data_size()),955 sponsored_data_rate_limit: Some(956 limits957 .sponsored_data_rate_limit958 .unwrap_or(SponsoringRateLimit::SponsoringDisabled),959 ),960 token_limit: Some(limits.token_limit()),961 sponsor_transfer_timeout: Some(limits.sponsor_transfer_timeout(962 match collection.mode {963 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,964 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,965 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,966 },967 )),968 sponsor_approve_timeout: Some(limits.sponsor_approve_timeout()),969 owner_can_transfer: Some(limits.owner_can_transfer()),970 owner_can_destroy: Some(limits.owner_can_destroy()),971 transfers_enabled: Some(limits.transfers_enabled()),972 };973974 Some(effective_limits)975 }976977 /// Returns information about the `collection` adapted for rpc.978 pub fn rpc_collection(collection: CollectionId) -> Option<RpcCollection<T::AccountId>> {979 let Collection {980 name,981 description,982 owner,983 mode,984 token_prefix,985 sponsorship,986 limits,987 permissions,988 flags,989 } = <CollectionById<T>>::get(collection)?;990991 let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)992 .into_iter()993 .map(|(key, permission)| PropertyKeyPermission { key, permission })994 .collect();995996 let properties = <CollectionProperties<T>>::get(collection)997 .into_iter()998 .map(|(key, value)| Property { key, value })999 .collect();10001001 let permissions = CollectionPermissions {1002 access: Some(permissions.access()),1003 mint_mode: Some(permissions.mint_mode()),1004 nesting: Some(permissions.nesting().clone()),1005 };10061007 Some(RpcCollection {1008 name: name.into_inner(),1009 description: description.into_inner(),1010 owner,1011 mode,1012 token_prefix: token_prefix.into_inner(),1013 sponsorship,1014 limits,1015 permissions,1016 token_property_permissions,1017 properties,1018 read_only: flags.external,10191020 flags: RpcCollectionFlags {1021 foreign: flags.foreign,1022 erc721metadata: flags.erc721metadata,1023 },1024 })1025 }1026}10271028macro_rules! limit_default {1029 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{1030 $(1031 if let Some($new) = $new.$field {1032 let $old = $old.$field($($arg)?);1033 let _ = $new;1034 let _ = $old;1035 $check1036 } else {1037 $new.$field = $old.$field1038 }1039 )*1040 }};1041}1042macro_rules! limit_default_clone {1043 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{1044 $(1045 if let Some($new) = $new.$field.clone() {1046 let $old = $old.$field($($arg)?);1047 let _ = $new;1048 let _ = $old;1049 $check1050 } else {1051 $new.$field = $old.$field.clone()1052 }1053 )*1054 }};1055}10561057impl<T: Config> Pallet<T> {1058 /// Create new collection.1059 ///1060 /// * `owner` - The owner of the collection.1061 /// * `data` - Description of the created collection.1062 /// * `flags` - Extra flags to store.1063 pub fn init_collection(1064 owner: T::CrossAccountId,1065 payer: T::CrossAccountId,1066 data: CreateCollectionData<T::AccountId>,1067 flags: CollectionFlags,1068 ) -> Result<CollectionId, DispatchError> {1069 {1070 ensure!(1071 data.token_prefix.len() <= MAX_TOKEN_PREFIX_LENGTH as usize,1072 Error::<T>::CollectionTokenPrefixLimitExceeded1073 );1074 }10751076 let created_count = <CreatedCollectionCount<T>>::get()1077 .01078 .checked_add(1)1079 .ok_or(ArithmeticError::Overflow)?;1080 let destroyed_count = <DestroyedCollectionCount<T>>::get().0;1081 let id = CollectionId(created_count);10821083 // bound Total number of collections1084 ensure!(1085 created_count - destroyed_count <= COLLECTION_NUMBER_LIMIT,1086 <Error<T>>::TotalCollectionsLimitExceeded1087 );10881089 // =========10901091 let collection = Collection {1092 owner: owner.as_sub().clone(),1093 name: data.name,1094 mode: data.mode.clone(),1095 description: data.description,1096 token_prefix: data.token_prefix,1097 sponsorship: data1098 .pending_sponsor1099 .map(SponsorshipState::Unconfirmed)1100 .unwrap_or_default(),1101 limits: data1102 .limits1103 .map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))1104 .unwrap_or_else(|| Ok(CollectionLimits::default()))?,1105 permissions: data1106 .permissions1107 .map(|permissions| {1108 Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)1109 })1110 .unwrap_or_else(|| Ok(CollectionPermissions::default()))?,1111 flags,1112 };11131114 let mut collection_properties = up_data_structs::CollectionProperties::get();1115 collection_properties1116 .try_set_from_iter(data.properties.into_iter())1117 .map_err(<Error<T>>::from)?;11181119 CollectionProperties::<T>::insert(id, collection_properties);11201121 let mut token_props_permissions = PropertiesPermissionMap::new();1122 token_props_permissions1123 .try_set_from_iter(data.token_property_permissions.into_iter())1124 .map_err(<Error<T>>::from)?;11251126 CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);11271128 // Take a (non-refundable) deposit of collection creation1129 {1130 let mut imbalance =1131 <<<T as Config>::Currency as Currency<T::AccountId>>::PositiveImbalance>::zero();1132 imbalance.subsume(1133 <<T as Config>::Currency as Currency<T::AccountId>>::deposit_creating(1134 &T::TreasuryAccountId::get(),1135 T::CollectionCreationPrice::get(),1136 ),1137 );1138 <T as Config>::Currency::settle(1139 payer.as_sub(),1140 imbalance,1141 WithdrawReasons::TRANSFER,1142 ExistenceRequirement::KeepAlive,1143 )1144 .map_err(|_| Error::<T>::NotSufficientFounds)?;1145 }11461147 <CreatedCollectionCount<T>>::put(created_count);1148 <Pallet<T>>::deposit_event(Event::CollectionCreated(1149 id,1150 data.mode.id(),1151 owner.as_sub().clone(),1152 ));1153 <PalletEvm<T>>::deposit_log(1154 erc::CollectionHelpersEvents::CollectionCreated {1155 owner: *owner.as_eth(),1156 collection_id: eth::collection_id_to_address(id),1157 }1158 .to_log(T::ContractAddress::get()),1159 );1160 <CollectionById<T>>::insert(id, collection);1161 Ok(id)1162 }11631164 /// Destroy collection.1165 ///1166 /// * `collection` - Collection handler.1167 /// * `sender` - The owner or administrator of the collection.1168 pub fn destroy_collection(1169 collection: CollectionHandle<T>,1170 sender: &T::CrossAccountId,1171 ) -> DispatchResult {1172 ensure!(1173 collection.limits.owner_can_destroy(),1174 <Error<T>>::NoPermission,1175 );1176 collection.check_is_owner(sender)?;11771178 let destroyed_collections = <DestroyedCollectionCount<T>>::get()1179 .01180 .checked_add(1)1181 .ok_or(ArithmeticError::Overflow)?;11821183 // =========11841185 <DestroyedCollectionCount<T>>::put(destroyed_collections);1186 <CollectionById<T>>::remove(collection.id);1187 <AdminAmount<T>>::remove(collection.id);1188 let _ = <IsAdmin<T>>::clear_prefix((collection.id,), u32::MAX, None);1189 let _ = <Allowlist<T>>::clear_prefix((collection.id,), u32::MAX, None);1190 <CollectionProperties<T>>::remove(collection.id);11911192 <Pallet<T>>::deposit_event(Event::CollectionDestroyed(collection.id));11931194 <PalletEvm<T>>::deposit_log(1195 erc::CollectionHelpersEvents::CollectionDestroyed {1196 collection_id: eth::collection_id_to_address(collection.id),1197 }1198 .to_log(T::ContractAddress::get()),1199 );1200 Ok(())1201 }12021203 /// This function sets or removes a collection properties according to1204 /// `properties_updates` contents:1205 /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`1206 /// * removes a property under the <key> if the value is `None` `(<key>, None)`.1207 ///1208 /// This function fires an event for each property change.1209 /// In case of an error, all the changes (including the events) will be reverted1210 /// since the function is transactional.1211 #[transactional]1212 fn modify_collection_properties(1213 collection: &CollectionHandle<T>,1214 sender: &T::CrossAccountId,1215 properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,1216 ) -> DispatchResult {1217 collection.check_is_owner_or_admin(sender)?;12181219 let mut stored_properties = <CollectionProperties<T>>::get(collection.id);12201221 for (key, value) in properties_updates {1222 match value {1223 Some(value) => {1224 stored_properties1225 .try_set(key.clone(), value)1226 .map_err(<Error<T>>::from)?;12271228 Self::deposit_event(Event::CollectionPropertySet(collection.id, key));1229 <PalletEvm<T>>::deposit_log(1230 erc::CollectionHelpersEvents::CollectionChanged {1231 collection_id: eth::collection_id_to_address(collection.id),1232 }1233 .to_log(T::ContractAddress::get()),1234 );1235 }1236 None => {1237 stored_properties.remove(&key).map_err(<Error<T>>::from)?;12381239 Self::deposit_event(Event::CollectionPropertyDeleted(collection.id, key));1240 <PalletEvm<T>>::deposit_log(1241 erc::CollectionHelpersEvents::CollectionChanged {1242 collection_id: eth::collection_id_to_address(collection.id),1243 }1244 .to_log(T::ContractAddress::get()),1245 );1246 }1247 }1248 }12491250 <CollectionProperties<T>>::set(collection.id, stored_properties);12511252 Ok(())1253 }12541255 /// Set collection property.1256 ///1257 /// * `collection` - Collection handler.1258 /// * `sender` - The owner or administrator of the collection.1259 /// * `property` - The property to set.1260 pub fn set_collection_property(1261 collection: &CollectionHandle<T>,1262 sender: &T::CrossAccountId,1263 property: Property,1264 ) -> DispatchResult {1265 Self::set_collection_properties(collection, sender, [property].into_iter())1266 }12671268 /// Set a scoped collection property, where the scope is a special prefix1269 /// prohibiting a user access to change the property directly.1270 ///1271 /// * `collection_id` - ID of the collection for which the property is being set.1272 /// * `scope` - Property scope.1273 /// * `property` - The property to set.1274 pub fn set_scoped_collection_property(1275 collection_id: CollectionId,1276 scope: PropertyScope,1277 property: Property,1278 ) -> DispatchResult {1279 CollectionProperties::<T>::try_mutate(collection_id, |properties| {1280 properties.try_scoped_set(scope, property.key, property.value)1281 })1282 .map_err(<Error<T>>::from)?;12831284 Ok(())1285 }12861287 /// Set scoped collection properties, where the scope is a special prefix1288 /// prohibiting a user access to change the properties directly.1289 ///1290 /// * `collection_id` - ID of the collection for which the properties is being set.1291 /// * `scope` - Property scope.1292 /// * `properties` - The properties to set.1293 pub fn set_scoped_collection_properties(1294 collection_id: CollectionId,1295 scope: PropertyScope,1296 properties: impl Iterator<Item = Property>,1297 ) -> DispatchResult {1298 CollectionProperties::<T>::try_mutate(collection_id, |stored_properties| {1299 stored_properties.try_scoped_set_from_iter(scope, properties)1300 })1301 .map_err(<Error<T>>::from)?;13021303 Ok(())1304 }13051306 /// Set collection properties.1307 ///1308 /// * `collection` - Collection handler.1309 /// * `sender` - The owner or administrator of the collection.1310 /// * `properties` - The properties to set.1311 pub fn set_collection_properties(1312 collection: &CollectionHandle<T>,1313 sender: &T::CrossAccountId,1314 properties: impl Iterator<Item = Property>,1315 ) -> DispatchResult {1316 Self::modify_collection_properties(1317 collection,1318 sender,1319 properties.map(|property| (property.key, Some(property.value))),1320 )1321 }13221323 /// Delete collection property.1324 ///1325 /// * `collection` - Collection handler.1326 /// * `sender` - The owner or administrator of the collection.1327 /// * `property` - The property to delete.1328 pub fn delete_collection_property(1329 collection: &CollectionHandle<T>,1330 sender: &T::CrossAccountId,1331 property_key: PropertyKey,1332 ) -> DispatchResult {1333 Self::delete_collection_properties(collection, sender, [property_key].into_iter())1334 }13351336 /// Delete collection properties.1337 ///1338 /// * `collection` - Collection handler.1339 /// * `sender` - The owner or administrator of the collection.1340 /// * `properties` - The properties to delete.1341 pub fn delete_collection_properties(1342 collection: &CollectionHandle<T>,1343 sender: &T::CrossAccountId,1344 property_keys: impl Iterator<Item = PropertyKey>,1345 ) -> DispatchResult {1346 Self::modify_collection_properties(collection, sender, property_keys.map(|key| (key, None)))1347 }13481349 /// Set collection propetry permission without any checks.1350 ///1351 /// Used for migrations.1352 ///1353 /// * `collection` - Collection handler.1354 /// * `property_permissions` - Property permissions.1355 pub fn set_property_permission_unchecked(1356 collection: CollectionId,1357 property_permission: PropertyKeyPermission,1358 ) -> DispatchResult {1359 <CollectionPropertyPermissions<T>>::try_mutate(collection, |permissions| {1360 permissions.try_set(property_permission.key, property_permission.permission)1361 })1362 .map_err(<Error<T>>::from)?;1363 Ok(())1364 }13651366 /// Set collection property permission.1367 ///1368 /// * `collection` - Collection handler.1369 /// * `sender` - The owner or administrator of the collection.1370 /// * `property_permission` - Property permission.1371 pub fn set_property_permission(1372 collection: &CollectionHandle<T>,1373 sender: &T::CrossAccountId,1374 property_permission: PropertyKeyPermission,1375 ) -> DispatchResult {1376 Self::set_scoped_property_permission(1377 collection,1378 sender,1379 PropertyScope::None,1380 property_permission,1381 )1382 }13831384 /// Set collection property permission with scope.1385 ///1386 /// * `collection` - Collection handler.1387 /// * `sender` - The owner or administrator of the collection.1388 /// * `scope` - Property scope.1389 /// * `property_permission` - Property permission.1390 pub fn set_scoped_property_permission(1391 collection: &CollectionHandle<T>,1392 sender: &T::CrossAccountId,1393 scope: PropertyScope,1394 property_permission: PropertyKeyPermission,1395 ) -> DispatchResult {1396 collection.check_is_owner_or_admin(sender)?;13971398 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);1399 let current_permission = all_permissions.get(&property_permission.key);1400 if matches![1401 current_permission,1402 Some(PropertyPermission { mutable: false, .. })1403 ] {1404 return Err(<Error<T>>::NoPermission.into());1405 }14061407 CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {1408 let property_permission = property_permission.clone();1409 permissions.try_scoped_set(1410 scope,1411 property_permission.key,1412 property_permission.permission,1413 )1414 })1415 .map_err(<Error<T>>::from)?;14161417 Self::deposit_event(Event::PropertyPermissionSet(1418 collection.id,1419 property_permission.key,1420 ));1421 <PalletEvm<T>>::deposit_log(1422 erc::CollectionHelpersEvents::CollectionChanged {1423 collection_id: eth::collection_id_to_address(collection.id),1424 }1425 .to_log(T::ContractAddress::get()),1426 );14271428 Ok(())1429 }14301431 /// Set token property permission.1432 ///1433 /// * `collection` - Collection handler.1434 /// * `sender` - The owner or administrator of the collection.1435 /// * `property_permissions` - Property permissions.1436 #[transactional]1437 pub fn set_token_property_permissions(1438 collection: &CollectionHandle<T>,1439 sender: &T::CrossAccountId,1440 property_permissions: Vec<PropertyKeyPermission>,1441 ) -> DispatchResult {1442 Self::set_scoped_token_property_permissions(1443 collection,1444 sender,1445 PropertyScope::None,1446 property_permissions,1447 )1448 }14491450 /// Set token property permission with scope.1451 ///1452 /// * `collection` - Collection handler.1453 /// * `sender` - The owner or administrator of the collection.1454 /// * `scope` - Property scope.1455 /// * `property_permissions` - Property permissions.1456 #[transactional]1457 pub fn set_scoped_token_property_permissions(1458 collection: &CollectionHandle<T>,1459 sender: &T::CrossAccountId,1460 scope: PropertyScope,1461 property_permissions: Vec<PropertyKeyPermission>,1462 ) -> DispatchResult {1463 for prop_pemission in property_permissions {1464 Self::set_scoped_property_permission(collection, sender, scope, prop_pemission)?;1465 }14661467 Ok(())1468 }14691470 /// Get collection property.1471 pub fn get_collection_property(1472 collection_id: CollectionId,1473 key: &PropertyKey,1474 ) -> Option<PropertyValue> {1475 Self::collection_properties(collection_id).get(key).cloned()1476 }14771478 /// Convert byte vector to property key vector.1479 pub fn bytes_keys_to_property_keys(1480 keys: Vec<Vec<u8>>,1481 ) -> Result<Vec<PropertyKey>, DispatchError> {1482 keys.into_iter()1483 .map(|key| -> Result<PropertyKey, DispatchError> {1484 key.try_into()1485 .map_err(|_| <Error<T>>::PropertyKeyIsTooLong.into())1486 })1487 .collect::<Result<Vec<PropertyKey>, DispatchError>>()1488 }14891490 /// Get properties according to given keys.1491 pub fn filter_collection_properties(1492 collection_id: CollectionId,1493 keys: Option<Vec<PropertyKey>>,1494 ) -> Result<Vec<Property>, DispatchError> {1495 let properties = Self::collection_properties(collection_id);14961497 let properties = keys1498 .map(|keys| {1499 keys.into_iter()1500 .filter_map(|key| {1501 properties.get(&key).map(|value| Property {1502 key,1503 value: value.clone(),1504 })1505 })1506 .collect()1507 })1508 .unwrap_or_else(|| {1509 properties1510 .into_iter()1511 .map(|(key, value)| Property { key, value })1512 .collect()1513 });15141515 Ok(properties)1516 }15171518 /// Get property permissions according to given keys.1519 pub fn filter_property_permissions(1520 collection_id: CollectionId,1521 keys: Option<Vec<PropertyKey>>,1522 ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {1523 let permissions = Self::property_permissions(collection_id);15241525 let key_permissions = keys1526 .map(|keys| {1527 keys.into_iter()1528 .filter_map(|key| {1529 permissions1530 .get(&key)1531 .map(|permission| PropertyKeyPermission {1532 key,1533 permission: permission.clone(),1534 })1535 })1536 .collect()1537 })1538 .unwrap_or_else(|| {1539 permissions1540 .into_iter()1541 .map(|(key, permission)| PropertyKeyPermission { key, permission })1542 .collect()1543 });15441545 Ok(key_permissions)1546 }15471548 /// Toggle `user` participation in the `collection`'s allow list.1549 /// #### Store read/writes1550 /// 1 writes1551 pub fn toggle_allowlist(1552 collection: &CollectionHandle<T>,1553 sender: &T::CrossAccountId,1554 user: &T::CrossAccountId,1555 allowed: bool,1556 ) -> DispatchResult {1557 collection.check_is_owner_or_admin(sender)?;15581559 // =========15601561 if allowed {1562 <Allowlist<T>>::insert((collection.id, user), true);1563 Self::deposit_event(Event::<T>::AllowListAddressAdded(1564 collection.id,1565 user.clone(),1566 ));1567 } else {1568 <Allowlist<T>>::remove((collection.id, user));1569 Self::deposit_event(Event::<T>::AllowListAddressRemoved(1570 collection.id,1571 user.clone(),1572 ));1573 }15741575 <PalletEvm<T>>::deposit_log(1576 erc::CollectionHelpersEvents::CollectionChanged {1577 collection_id: eth::collection_id_to_address(collection.id),1578 }1579 .to_log(T::ContractAddress::get()),1580 );15811582 Ok(())1583 }15841585 /// Toggle `user` participation in the `collection`'s admin list.1586 /// #### Store read/writes1587 /// 2 reads, 2 writes1588 pub fn toggle_admin(1589 collection: &CollectionHandle<T>,1590 sender: &T::CrossAccountId,1591 user: &T::CrossAccountId,1592 admin: bool,1593 ) -> DispatchResult {1594 collection.check_is_internal()?;1595 collection.check_is_owner(sender)?;15961597 let is_admin = <IsAdmin<T>>::get((collection.id, user));1598 if is_admin == admin {1599 if admin {1600 return Ok(());1601 } else {1602 return Err(Error::<T>::UserIsNotCollectionAdmin.into());1603 }1604 }1605 let amount = <AdminAmount<T>>::get(collection.id);16061607 // =========16081609 if admin {1610 let amount = amount1611 .checked_add(1)1612 .ok_or(<Error<T>>::CollectionAdminCountExceeded)?;1613 ensure!(1614 amount <= Self::collection_admins_limit(),1615 <Error<T>>::CollectionAdminCountExceeded,1616 );16171618 <AdminAmount<T>>::insert(collection.id, amount);1619 <IsAdmin<T>>::insert((collection.id, user), true);16201621 Self::deposit_event(Event::<T>::CollectionAdminAdded(1622 collection.id,1623 user.clone(),1624 ));1625 } else {1626 <AdminAmount<T>>::insert(collection.id, amount.saturating_sub(1));1627 <IsAdmin<T>>::remove((collection.id, user));16281629 Self::deposit_event(Event::<T>::CollectionAdminRemoved(1630 collection.id,1631 user.clone(),1632 ));1633 }16341635 <PalletEvm<T>>::deposit_log(1636 erc::CollectionHelpersEvents::CollectionChanged {1637 collection_id: eth::collection_id_to_address(collection.id),1638 }1639 .to_log(T::ContractAddress::get()),1640 );16411642 Ok(())1643 }16441645 /// Update collection limits.1646 pub fn update_limits(1647 user: &T::CrossAccountId,1648 collection: &mut CollectionHandle<T>,1649 new_limit: CollectionLimits,1650 ) -> DispatchResult {1651 collection.check_is_internal()?;1652 collection.check_is_owner_or_admin(user)?;16531654 collection.limits =1655 Self::clamp_limits(collection.mode.clone(), &collection.limits, new_limit)?;16561657 Self::deposit_event(Event::<T>::CollectionLimitSet(collection.id));1658 <PalletEvm<T>>::deposit_log(1659 erc::CollectionHelpersEvents::CollectionChanged {1660 collection_id: eth::collection_id_to_address(collection.id),1661 }1662 .to_log(T::ContractAddress::get()),1663 );16641665 collection.save()1666 }16671668 /// Merge set fields from `new_limit` to `old_limit`.1669 fn clamp_limits(1670 mode: CollectionMode,1671 old_limit: &CollectionLimits,1672 mut new_limit: CollectionLimits,1673 ) -> Result<CollectionLimits, DispatchError> {1674 let limits = old_limit;1675 limit_default!(old_limit, new_limit,1676 account_token_ownership_limit => ensure!(1677 new_limit <= MAX_TOKEN_OWNERSHIP,1678 <Error<T>>::CollectionLimitBoundsExceeded,1679 ),1680 sponsored_data_size => ensure!(1681 new_limit <= CUSTOM_DATA_LIMIT,1682 <Error<T>>::CollectionLimitBoundsExceeded,1683 ),16841685 sponsored_data_rate_limit => {},1686 token_limit => ensure!(1687 old_limit >= new_limit && new_limit > 0,1688 <Error<T>>::CollectionTokenLimitExceeded1689 ),16901691 sponsor_transfer_timeout(match mode {1692 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,1693 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1694 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1695 }) => ensure!(1696 new_limit <= MAX_SPONSOR_TIMEOUT,1697 <Error<T>>::CollectionLimitBoundsExceeded,1698 ),1699 sponsor_approve_timeout => {},1700 owner_can_transfer => ensure!(1701 !limits.owner_can_transfer_instaled() ||1702 old_limit || !new_limit,1703 <Error<T>>::OwnerPermissionsCantBeReverted,1704 ),1705 owner_can_destroy => ensure!(1706 old_limit || !new_limit,1707 <Error<T>>::OwnerPermissionsCantBeReverted,1708 ),1709 transfers_enabled => {},1710 );1711 Ok(new_limit)1712 }17131714 /// Update collection permissions.1715 pub fn update_permissions(1716 user: &T::CrossAccountId,1717 collection: &mut CollectionHandle<T>,1718 new_permission: CollectionPermissions,1719 ) -> DispatchResult {1720 collection.check_is_internal()?;1721 collection.check_is_owner_or_admin(user)?;1722 collection.permissions = Self::clamp_permissions(1723 collection.mode.clone(),1724 &collection.permissions,1725 new_permission,1726 )?;17271728 Self::deposit_event(Event::<T>::CollectionPermissionSet(collection.id));1729 <PalletEvm<T>>::deposit_log(1730 erc::CollectionHelpersEvents::CollectionChanged {1731 collection_id: eth::collection_id_to_address(collection.id),1732 }1733 .to_log(T::ContractAddress::get()),1734 );17351736 collection.save()1737 }17381739 /// Merge set fields from `new_permission` to `old_permission`.1740 fn clamp_permissions(1741 _mode: CollectionMode,1742 old_permission: &CollectionPermissions,1743 mut new_permission: CollectionPermissions,1744 ) -> Result<CollectionPermissions, DispatchError> {1745 limit_default_clone!(old_permission, new_permission,1746 access => {},1747 mint_mode => {},1748 nesting => { /* todo check for permissive, if only it gets out of benchmarks */ },1749 );1750 Ok(new_permission)1751 }17521753 /// Repair possibly broken properties of a collection.1754 pub fn repair_collection(collection_id: CollectionId) -> DispatchResult {1755 CollectionProperties::<T>::mutate(collection_id, |properties| {1756 properties.recompute_consumed_space();1757 });17581759 Ok(())1760 }1761}17621763/// Indicates unsupported methods by returning [Error::UnsupportedOperation].1764#[macro_export]1765macro_rules! unsupported {1766 ($runtime:path) => {1767 Err($crate::Error::<$runtime>::UnsupportedOperation.into())1768 };1769}17701771/// Return weights for various worst-case operations.1772pub trait CommonWeightInfo<CrossAccountId> {1773 /// Weight of item creation.1774 fn create_item() -> Weight;17751776 /// Weight of items creation.1777 fn create_multiple_items(amount: &[CreateItemData]) -> Weight;17781779 /// Weight of items creation.1780 fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;17811782 /// The weight of the burning item.1783 fn burn_item() -> Weight;17841785 /// Property setting weight.1786 ///1787 /// * `amount`- The number of properties to set.1788 fn set_collection_properties(amount: u32) -> Weight;17891790 /// Collection property deletion weight.1791 ///1792 /// * `amount`- The number of properties to set.1793 fn delete_collection_properties(amount: u32) -> Weight;17941795 /// Token property setting weight.1796 ///1797 /// * `amount`- The number of properties to set.1798 fn set_token_properties(amount: u32) -> Weight;17991800 /// Token property deletion weight.1801 ///1802 /// * `amount`- The number of properties to delete.1803 fn delete_token_properties(amount: u32) -> Weight;18041805 /// Token property permissions set weight.1806 ///1807 /// * `amount`- The number of property permissions to set.1808 fn set_token_property_permissions(amount: u32) -> Weight;18091810 /// Transfer price of the token or its parts.1811 fn transfer() -> Weight;18121813 /// The price of setting the permission of the operation from another user.1814 fn approve() -> Weight;18151816 /// The price of setting the permission of the operation from another user for eth mirror.1817 fn approve_from() -> Weight;18181819 /// Transfer price from another user.1820 fn transfer_from() -> Weight;18211822 /// The price of burning a token from another user.1823 fn burn_from() -> Weight;18241825 /// Differs from burn_item in case of Fungible and Refungible, as it should burn1826 /// whole users's balance.1827 ///1828 /// This method shouldn't be used directly, as it doesn't count breadth price, use [burn_recursively](CommonWeightInfo::burn_recursively) instead1829 fn burn_recursively_self_raw() -> Weight;18301831 /// Cost of iterating over `amount` children while burning, without counting child burning itself.1832 ///1833 /// This method shouldn't be used directly, as it doesn't count depth price, use [burn_recursively](CommonWeightInfo::burn_recursively) instead1834 fn burn_recursively_breadth_raw(amount: u32) -> Weight;18351836 /// The price of recursive burning a token.1837 ///1838 /// `max_selfs` - The maximum burning weight of the token itself.1839 /// `max_breadth` - The maximum number of nested tokens to burn.1840 fn burn_recursively(max_selfs: u32, max_breadth: u32) -> Weight {1841 Self::burn_recursively_self_raw()1842 .saturating_mul(max_selfs.max(1) as u64)1843 .saturating_add(Self::burn_recursively_breadth_raw(max_breadth))1844 }18451846 /// The price of retrieving token owner1847 fn token_owner() -> Weight;18481849 /// The price of setting approval for all1850 fn set_allowance_for_all() -> Weight;18511852 /// The price of repairing an item.1853 fn force_repair_item() -> Weight;1854}18551856/// Weight info extension trait for refungible pallet.1857pub trait RefungibleExtensionsWeightInfo {1858 /// Weight of token repartition.1859 fn repartition() -> Weight;1860}18611862/// Common collection operations.1863///1864/// It wraps methods in Fungible, Nonfungible and Refungible pallets1865/// and adds weight info.1866pub trait CommonCollectionOperations<T: Config> {1867 /// Create token.1868 ///1869 /// * `sender` - The user who mint the token and pays for the transaction.1870 /// * `to` - The user who will own the token.1871 /// * `data` - Token data.1872 /// * `nesting_budget` - A budget that can be spent on nesting tokens.1873 fn create_item(1874 &self,1875 sender: T::CrossAccountId,1876 to: T::CrossAccountId,1877 data: CreateItemData,1878 nesting_budget: &dyn Budget,1879 ) -> DispatchResultWithPostInfo;18801881 /// Create multiple tokens.1882 ///1883 /// * `sender` - The user who mint the token and pays for the transaction.1884 /// * `to` - The user who will own the token.1885 /// * `data` - Token data.1886 /// * `nesting_budget` - A budget that can be spent on nesting tokens.1887 fn create_multiple_items(1888 &self,1889 sender: T::CrossAccountId,1890 to: T::CrossAccountId,1891 data: Vec<CreateItemData>,1892 nesting_budget: &dyn Budget,1893 ) -> DispatchResultWithPostInfo;18941895 /// Create multiple tokens.1896 ///1897 /// * `sender` - The user who mint the token and pays for the transaction.1898 /// * `to` - The user who will own the token.1899 /// * `data` - Token data.1900 /// * `nesting_budget` - A budget that can be spent on nesting tokens.1901 fn create_multiple_items_ex(1902 &self,1903 sender: T::CrossAccountId,1904 data: CreateItemExData<T::CrossAccountId>,1905 nesting_budget: &dyn Budget,1906 ) -> DispatchResultWithPostInfo;19071908 /// Burn token.1909 ///1910 /// * `sender` - The user who owns the token.1911 /// * `token` - Token id that will burned.1912 /// * `amount` - The number of parts of the token that will be burned.1913 fn burn_item(1914 &self,1915 sender: T::CrossAccountId,1916 token: TokenId,1917 amount: u128,1918 ) -> DispatchResultWithPostInfo;19191920 /// Burn token and all nested tokens recursievly.1921 ///1922 /// * `sender` - The user who owns the token.1923 /// * `token` - Token id that will burned.1924 /// * `self_budget` - The budget that can be spent on burning tokens.1925 /// * `breadth_budget` - The budget that can be spent on burning nested tokens.1926 fn burn_item_recursively(1927 &self,1928 sender: T::CrossAccountId,1929 token: TokenId,1930 self_budget: &dyn Budget,1931 breadth_budget: &dyn Budget,1932 ) -> DispatchResultWithPostInfo;19331934 /// Set collection properties.1935 ///1936 /// * `sender` - Must be either the owner of the collection or its admin.1937 /// * `properties` - Properties to be set.1938 fn set_collection_properties(1939 &self,1940 sender: T::CrossAccountId,1941 properties: Vec<Property>,1942 ) -> DispatchResultWithPostInfo;19431944 /// Delete collection properties.1945 ///1946 /// * `sender` - Must be either the owner of the collection or its admin.1947 /// * `properties` - The properties to be removed.1948 fn delete_collection_properties(1949 &self,1950 sender: &T::CrossAccountId,1951 property_keys: Vec<PropertyKey>,1952 ) -> DispatchResultWithPostInfo;19531954 /// Set token properties.1955 ///1956 /// The appropriate [`PropertyPermission`] for the token property1957 /// must be set with [`Self::set_token_property_permissions`].1958 ///1959 /// * `sender` - Must be either the owner of the token or its admin.1960 /// * `token_id` - The token for which the properties are being set.1961 /// * `properties` - Properties to be set.1962 /// * `budget` - Budget for setting properties.1963 fn set_token_properties(1964 &self,1965 sender: T::CrossAccountId,1966 token_id: TokenId,1967 properties: Vec<Property>,1968 budget: &dyn Budget,1969 ) -> DispatchResultWithPostInfo;19701971 /// Remove token properties.1972 ///1973 /// The appropriate [`PropertyPermission`] for the token property1974 /// must be set with [`Self::set_token_property_permissions`].1975 ///1976 /// * `sender` - Must be either the owner of the token or its admin.1977 /// * `token_id` - The token for which the properties are being remove.1978 /// * `property_keys` - Keys to remove corresponding properties.1979 /// * `budget` - Budget for removing properties.1980 fn delete_token_properties(1981 &self,1982 sender: T::CrossAccountId,1983 token_id: TokenId,1984 property_keys: Vec<PropertyKey>,1985 budget: &dyn Budget,1986 ) -> DispatchResultWithPostInfo;19871988 /// Set token property permissions.1989 ///1990 /// * `sender` - Must be either the owner of the token or its admin.1991 /// * `token_id` - The token for which the properties are being set.1992 /// * `property_permissions` - Property permissions to be set.1993 /// * `budget` - Budget for setting properties.1994 fn set_token_property_permissions(1995 &self,1996 sender: &T::CrossAccountId,1997 property_permissions: Vec<PropertyKeyPermission>,1998 ) -> DispatchResultWithPostInfo;19992000 /// Transfer amount of token pieces.2001 ///2002 /// * `sender` - Donor user.2003 /// * `to` - Recepient user.2004 /// * `token` - The token of which parts are being sent.2005 /// * `amount` - The number of parts of the token that will be transferred.2006 /// * `budget` - The maximum budget that can be spent on the transfer.2007 fn transfer(2008 &self,2009 sender: T::CrossAccountId,2010 to: T::CrossAccountId,2011 token: TokenId,2012 amount: u128,2013 budget: &dyn Budget,2014 ) -> DispatchResultWithPostInfo;20152016 /// Grant access to another account to transfer parts of the token owned by the calling user via [Self::transfer_from].2017 ///2018 /// * `sender` - The user who grants access to the token.2019 /// * `spender` - The user to whom the rights are granted.2020 /// * `token` - The token to which access is granted.2021 /// * `amount` - The amount of pieces that another user can dispose of.2022 fn approve(2023 &self,2024 sender: T::CrossAccountId,2025 spender: T::CrossAccountId,2026 token: TokenId,2027 amount: u128,2028 ) -> DispatchResultWithPostInfo;20292030 /// Grant access to another account to transfer parts of the token owned by the calling user's eth mirror via [Self::transfer_from].2031 ///2032 /// * `sender` - The user who grants access to the token.2033 /// * `from` - Spender's eth mirror.2034 /// * `to` - The user to whom the rights are granted.2035 /// * `token` - The token to which access is granted.2036 /// * `amount` - The amount of pieces that another user can dispose of.2037 fn approve_from(2038 &self,2039 sender: T::CrossAccountId,2040 from: T::CrossAccountId,2041 to: T::CrossAccountId,2042 token: TokenId,2043 amount: u128,2044 ) -> DispatchResultWithPostInfo;20452046 /// Send parts of a token owned by another user.2047 ///2048 /// Before calling this method, you must grant rights to the calling user via [`Self::approve`].2049 ///2050 /// * `sender` - The user who must have access to the token (see [`Self::approve`]).2051 /// * `from` - The user who owns the token.2052 /// * `to` - Recepient user.2053 /// * `token` - The token of which parts are being sent.2054 /// * `amount` - The number of parts of the token that will be transferred.2055 /// * `budget` - The maximum budget that can be spent on the transfer.2056 fn transfer_from(2057 &self,2058 sender: T::CrossAccountId,2059 from: T::CrossAccountId,2060 to: T::CrossAccountId,2061 token: TokenId,2062 amount: u128,2063 budget: &dyn Budget,2064 ) -> DispatchResultWithPostInfo;20652066 /// Burn parts of a token owned by another user.2067 ///2068 /// Before calling this method, you must grant rights to the calling user via [`Self::approve`].2069 ///2070 /// * `sender` - The user who must have access to the token (see [`Self::approve`]).2071 /// * `from` - The user who owns the token.2072 /// * `token` - The token of which parts are being sent.2073 /// * `amount` - The number of parts of the token that will be transferred.2074 /// * `budget` - The maximum budget that can be spent on the burn.2075 fn burn_from(2076 &self,2077 sender: T::CrossAccountId,2078 from: T::CrossAccountId,2079 token: TokenId,2080 amount: u128,2081 budget: &dyn Budget,2082 ) -> DispatchResultWithPostInfo;20832084 /// Check permission to nest token.2085 ///2086 /// * `sender` - The user who initiated the check.2087 /// * `from` - The token that is checked for embedding.2088 /// * `under` - Token under which to check.2089 /// * `budget` - The maximum budget that can be spent on the check.2090 fn check_nesting(2091 &self,2092 sender: T::CrossAccountId,2093 from: (CollectionId, TokenId),2094 under: TokenId,2095 budget: &dyn Budget,2096 ) -> DispatchResult;20972098 /// Nest one token into another.2099 ///2100 /// * `under` - Token holder.2101 /// * `to_nest` - Nested token.2102 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId));21032104 /// Unnest token.2105 ///2106 /// * `under` - Token holder.2107 /// * `to_nest` - Token to unnest.2108 fn unnest(&self, under: TokenId, to_nest: (CollectionId, TokenId));21092110 /// Get all user tokens.2111 ///2112 /// * `account` - Account for which you need to get tokens.2113 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;21142115 /// Get all the tokens in the collection.2116 fn collection_tokens(&self) -> Vec<TokenId>;21172118 /// Check if the token exists.2119 ///2120 /// * `token` - Id token to check.2121 fn token_exists(&self, token: TokenId) -> bool;21222123 /// Get the id of the last minted token.2124 fn last_token_id(&self) -> TokenId;21252126 /// Get the owner of the token.2127 ///2128 /// * `token` - The token for which you need to find out the owner.2129 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;21302131 /// Returns 10 tokens owners in no particular order.2132 ///2133 /// * `token` - The token for which you need to find out the owners.2134 fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId>;21352136 /// Get the value of the token property by key.2137 ///2138 /// * `token` - Token with the property to get.2139 /// * `key` - Property name.2140 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue>;21412142 /// Get a set of token properties by key vector.2143 ///2144 /// * `token` - Token with the property to get.2145 /// * `keys` - Vector of property keys. If this parameter is [None](sp_std::result::Result),2146 /// then all properties are returned.2147 fn token_properties(&self, token: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property>;21482149 /// Amount of unique collection tokens2150 fn total_supply(&self) -> u32;21512152 /// Amount of different tokens account has.2153 ///2154 /// * `account` - The account for which need to get the balance.2155 fn account_balance(&self, account: T::CrossAccountId) -> u32;21562157 /// Amount of specific token account have.2158 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128;21592160 /// Amount of token pieces2161 fn total_pieces(&self, token: TokenId) -> Option<u128>;21622163 /// Get the number of parts of the token that a trusted user can manage.2164 ///2165 /// * `sender` - Trusted user.2166 /// * `spender` - Owner of the token.2167 /// * `token` - The token for which to get the value.2168 fn allowance(2169 &self,2170 sender: T::CrossAccountId,2171 spender: T::CrossAccountId,2172 token: TokenId,2173 ) -> u128;21742175 /// Get extension for RFT collection.2176 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>>;21772178 /// The `operator` is allowed to transfer all tokens of the `owner` on their behalf.2179 /// * `owner` - Token owner2180 /// * `operator` - Operator2181 /// * `approve` - Should operator status be granted or revoked?2182 fn set_allowance_for_all(2183 &self,2184 owner: T::CrossAccountId,2185 operator: T::CrossAccountId,2186 approve: bool,2187 ) -> DispatchResultWithPostInfo;21882189 /// Tells whether the given `owner` approves the `operator`.2190 fn allowance_for_all(&self, owner: T::CrossAccountId, operator: T::CrossAccountId) -> bool;21912192 /// Repairs a possibly broken item.2193 fn repair_item(&self, token: TokenId) -> DispatchResultWithPostInfo;2194}21952196/// Extension for RFT collection.2197pub trait RefungibleExtensions<T>2198where2199 T: Config,2200{2201 /// Change the number of parts of the token.2202 ///2203 /// When the value changes down, this function is equivalent to burning parts of the token.2204 ///2205 /// * `sender` - The user calling the repartition operation. Must be the owner of the token.2206 /// * `token` - The token for which you want to change the number of parts.2207 /// * `amount` - The new value of the parts of the token.2208 fn repartition(2209 &self,2210 sender: &T::CrossAccountId,2211 token: TokenId,2212 amount: u128,2213 ) -> DispatchResultWithPostInfo;2214}22152216/// Merge [`DispatchResult`] with [`Weight`] into [`DispatchResultWithPostInfo`].2217///2218/// Used for [`CommonCollectionOperations`] implementations and flexible enough to do so.2219pub fn with_weight(res: DispatchResult, weight: Weight) -> DispatchResultWithPostInfo {2220 let post_info = PostDispatchInfo {2221 actual_weight: Some(weight),2222 pays_fee: Pays::Yes,2223 };2224 match res {2225 Ok(()) => Ok(post_info),2226 Err(error) => Err(DispatchErrorWithPostInfo { post_info, error }),2227 }2228}22292230impl<T: Config> From<PropertiesError> for Error<T> {2231 fn from(error: PropertiesError) -> Self {2232 match error {2233 PropertiesError::NoSpaceForProperty => Self::NoSpaceForProperty,2234 PropertiesError::PropertyLimitReached => Self::PropertyLimitReached,2235 PropertiesError::InvalidCharacterInPropertyKey => Self::InvalidCharacterInPropertyKey,2236 PropertiesError::PropertyKeyIsTooLong => Self::PropertyKeyIsTooLong,2237 PropertiesError::EmptyPropertyKey => Self::EmptyPropertyKey,2238 }2239 }2240}pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -266,7 +266,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- <PalletCommon<T>>::set_collection_properties(collection, sender, properties)
+ <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())
}
/// Delete properties of the collection, associated with the provided keys.
@@ -275,7 +275,11 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
+ <PalletCommon<T>>::delete_collection_properties(
+ collection,
+ sender,
+ property_keys.into_iter(),
+ )
}
/// Checks if collection has tokens. Return `true` if it has.
@@ -673,8 +677,14 @@
// `from`, `to` checked in [`transfer`]
collection.check_allowlist(spender)?;
}
+
+ if collection.ignores_token_restrictions(spender) {
+ return Ok(Self::compute_allowance_decrease(
+ collection, from, spender, amount,
+ ));
+ }
+
if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {
- // TODO: should collection owner be allowed to perform this transfer?
ensure!(
<PalletStructure<T>>::check_indirectly_owned(
spender.clone(),
@@ -687,17 +697,24 @@
);
return Ok(None);
}
- let allowance = <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount);
- if allowance.is_none() {
- ensure!(
- collection.ignores_allowance(spender),
- <CommonError<T>>::ApprovedValueTooLow
- );
- }
+ let allowance = Self::compute_allowance_decrease(collection, from, spender, amount);
+ ensure!(allowance.is_some(), <CommonError<T>>::ApprovedValueTooLow);
+
Ok(allowance)
}
+ /// Returns `Some(amount)` if the `spender` have allowance to spend this amount.
+ /// Otherwise, it returns `None`.
+ fn compute_allowance_decrease(
+ collection: &FungibleHandle<T>,
+ from: &T::CrossAccountId,
+ spender: &T::CrossAccountId,
+ amount: u128,
+ ) -> Option<u128> {
+ <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount)
+ }
+
/// Transfer fungible tokens from one account to another.
/// Same as the [`transfer`][`Pallet::transfer`] but spender doesn't needs to be an owner of the token pieces.
/// The owner should set allowance for the spender to transfer pieces.
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -524,11 +524,6 @@
Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))
}
-
- /// @notice Returns collection helper contract address
- fn collection_helper_address(&self) -> Result<address> {
- Ok(T::ContractAddress::get())
- }
}
/// @title ERC721 Token that can be irreversibly burned (destroyed).
@@ -1058,6 +1053,11 @@
Ok(token_id.into())
}
+
+ /// @notice Returns collection helper contract address
+ fn collection_helper_address(&self) -> Result<address> {
+ Ok(T::ContractAddress::get())
+ }
}
#[solidity_interface(
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -577,20 +577,29 @@
})
}
- /// Batch operation to add, edit or remove properties for the token
- ///
- /// All affected properties should have mutable permission and sender should have
- /// permission to edit those properties.
+ /// A batch operation to add, edit or remove properties for a token.
+ /// It sets or removes a token's properties according to
+ /// `properties_updates` contents:
+ /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`
+ /// * removes a property under the <key> if the value is `None` `(<key>, None)`.
///
- /// - `nesting_budget`: Limit for searching parents in depth to check ownership.
+ /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.
/// - `is_token_create`: Indicates that method is called during token initialization.
/// Allows to bypass ownership check.
+ ///
+ /// All affected properties should have `mutable` permission
+ /// to be **deleted** or to be **set more than once**,
+ /// and the sender should have permission to edit those properties.
+ ///
+ /// This function fires an event for each property change.
+ /// In case of an error, all the changes (including the events) will be reverted
+ /// since the function is transactional.
#[transactional]
fn modify_token_properties(
collection: &NonfungibleHandle<T>,
sender: &T::CrossAccountId,
token_id: TokenId,
- properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
is_token_create: bool,
nesting_budget: &dyn Budget,
) -> DispatchResult {
@@ -614,15 +623,16 @@
})
};
- for (key, value) in properties {
- let permission = <PalletCommon<T>>::property_permissions(collection.id)
+ let mut stored_properties = <TokenProperties<T>>::get((collection.id, token_id));
+ let permissions = <PalletCommon<T>>::property_permissions(collection.id);
+
+ for (key, value) in properties_updates {
+ let permission = permissions
.get(&key)
.cloned()
.unwrap_or_else(PropertyPermission::none);
- let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))
- .get(&key)
- .is_some();
+ let is_property_exists = stored_properties.get(&key).is_some();
match permission {
PropertyPermission { mutable: false, .. } if is_property_exists => {
@@ -649,10 +659,9 @@
match value {
Some(value) => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.try_set(key.clone(), value)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .try_set(key.clone(), value)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
collection.id,
@@ -661,10 +670,9 @@
));
}
None => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.remove(&key)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .remove(&key)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(
collection.id,
@@ -683,6 +691,8 @@
);
}
+ <TokenProperties<T>>::set((collection.id, token_id), stored_properties);
+
Ok(())
}
@@ -784,7 +794,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- <PalletCommon<T>>::set_collection_properties(collection, sender, properties)
+ <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())
}
/// Remove properties from the collection
@@ -793,7 +803,11 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
+ <PalletCommon<T>>::delete_collection_properties(
+ collection,
+ sender,
+ property_keys.into_iter(),
+ )
}
/// Set property permissions for the token.
@@ -1232,7 +1246,7 @@
collection.check_allowlist(spender)?;
}
- if collection.limits.owner_can_transfer() && collection.is_owner_or_admin(spender) {
+ if collection.ignores_token_restrictions(spender) {
return Ok(());
}
@@ -1255,11 +1269,8 @@
if <CollectionAllowance<T>>::get((collection.id, from, spender)) {
return Ok(());
}
- ensure!(
- collection.ignores_allowance(spender),
- <CommonError<T>>::ApprovedValueTooLow
- );
- Ok(())
+
+ Err(<CommonError<T>>::ApprovedValueTooLow.into())
}
/// Transfer NFT token from one account to another.
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -785,7 +785,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
+/// @dev the ERC-165 identifier for this interface is 0x16de3152
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -986,6 +986,15 @@
dummy = 0;
return 0;
}
+
+ /// @notice Returns collection helper contract address
+ /// @dev EVM selector for this function is: 0x1896cce6,
+ /// or in textual repr: collectionHelperAddress()
+ function collectionHelperAddress() public view returns (address) {
+ require(false, stub_error);
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
}
/// @dev anonymous struct
@@ -1043,7 +1052,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x983a942b
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
contract ERC721 is Dummy, ERC165, ERC721Events {
/// @notice Count all NFTs assigned to an owner
/// @dev NFTs assigned to the zero address are considered invalid, and this
@@ -1175,15 +1184,6 @@
operator;
dummy;
return false;
- }
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() public view returns (address) {
- require(false, stub_error);
- dummy;
- return 0x0000000000000000000000000000000000000000;
}
}
pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -184,21 +184,21 @@
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_361_000 as u64)
- // Standard Error: 5_349_868
- .saturating_add(Weight::from_ref_time(637_246_356 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(31_850_484 as u64)
+ // Standard Error: 9_618
+ .saturating_add(Weight::from_ref_time(4_721_947 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_489_000 as u64)
- // Standard Error: 5_738_954
- .saturating_add(Weight::from_ref_time(689_912_822 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_795_000 as u64)
+ // Standard Error: 28_239
+ .saturating_add(Weight::from_ref_time(12_840_446 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
@@ -354,21 +354,21 @@
.saturating_add(RocksDbWeight::get().reads(1 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_361_000 as u64)
- // Standard Error: 5_349_868
- .saturating_add(Weight::from_ref_time(637_246_356 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(31_850_484 as u64)
+ // Standard Error: 9_618
+ .saturating_add(Weight::from_ref_time(4_721_947 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Nonfungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_489_000 as u64)
- // Standard Error: 5_738_954
- .saturating_add(Weight::from_ref_time(689_912_822 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_795_000 as u64)
+ // Standard Error: 28_239
+ .saturating_add(Weight::from_ref_time(12_840_446 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -295,7 +295,9 @@
MintingFinished {},
}
-#[solidity_interface(name = ERC721Metadata)]
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @dev See https://eips.ethereum.org/EIPS/eip-721
+#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]
impl<T: Config> RefungibleHandle<T>
where
T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
@@ -364,7 +366,7 @@
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
-#[solidity_interface(name = ERC721Enumerable)]
+#[solidity_interface(name = ERC721Enumerable, expect_selector = 0x780e9d63)]
impl<T: Config> RefungibleHandle<T> {
/// @notice Enumerate valid RFTs
/// @param index A counter less than `totalSupply()`
@@ -391,7 +393,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-#[solidity_interface(name = ERC721, events(ERC721Events))]
+#[solidity_interface(name = ERC721, events(ERC721Events), expect_selector = 0x80ac58cd)]
impl<T: Config> RefungibleHandle<T> {
/// @notice Count all RFTs assigned to an owner
/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -422,6 +424,7 @@
}
/// @dev Not implemented
+ #[solidity(rename_selector = "safeTransferFrom")]
fn safe_transfer_from_with_data(
&mut self,
_from: address,
@@ -434,6 +437,7 @@
}
/// @dev Not implemented
+ #[solidity(rename_selector = "safeTransferFrom")]
fn safe_transfer_from(
&mut self,
_from: address,
@@ -517,11 +521,6 @@
Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))
}
-
- /// @notice Returns collection helper contract address
- fn collection_helper_address(&self) -> Result<address> {
- Ok(T::ContractAddress::get())
- }
}
/// Returns amount of pieces of `token` that `owner` have
@@ -1116,6 +1115,11 @@
token.try_into().map_err(|_| "token id overflow")?,
))
}
+
+ /// @notice Returns collection helper contract address
+ fn collection_helper_address(&self) -> Result<address> {
+ Ok(T::ContractAddress::get())
+ }
}
#[solidity_interface(
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -515,12 +515,29 @@
Ok(())
}
+ /// A batch operation to add, edit or remove properties for a token.
+ /// It sets or removes a token's properties according to
+ /// `properties_updates` contents:
+ /// * sets a property under the <key> with the value provided `(<key>, Some(<value>))`
+ /// * removes a property under the <key> if the value is `None` `(<key>, None)`.
+ ///
+ /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.
+ /// - `is_token_create`: Indicates that method is called during token initialization.
+ /// Allows to bypass ownership check.
+ ///
+ /// All affected properties should have `mutable` permission
+ /// to be **deleted** or to be **set more than once**,
+ /// and the sender should have permission to edit those properties.
+ ///
+ /// This function fires an event for each property change.
+ /// In case of an error, all the changes (including the events) will be reverted
+ /// since the function is transactional.
#[transactional]
fn modify_token_properties(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
token_id: TokenId,
- properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
is_token_create: bool,
nesting_budget: &dyn Budget,
) -> DispatchResult {
@@ -544,15 +561,16 @@
Ok(is_bundle_owner)
};
- for (key, value) in properties {
- let permission = <PalletCommon<T>>::property_permissions(collection.id)
+ let mut stored_properties = <TokenProperties<T>>::get((collection.id, token_id));
+ let permissions = <PalletCommon<T>>::property_permissions(collection.id);
+
+ for (key, value) in properties_updates {
+ let permission = permissions
.get(&key)
.cloned()
.unwrap_or_else(PropertyPermission::none);
- let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))
- .get(&key)
- .is_some();
+ let is_property_exists = stored_properties.get(&key).is_some();
match permission {
PropertyPermission { mutable: false, .. } if is_property_exists => {
@@ -578,10 +596,9 @@
match value {
Some(value) => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.try_set(key.clone(), value)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .try_set(key.clone(), value)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
collection.id,
@@ -590,10 +607,9 @@
));
}
None => {
- <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
- properties.remove(&key)
- })
- .map_err(<CommonError<T>>::from)?;
+ stored_properties
+ .remove(&key)
+ .map_err(<CommonError<T>>::from)?;
<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(
collection.id,
@@ -612,6 +628,8 @@
);
}
+ <TokenProperties<T>>::set((collection.id, token_id), stored_properties);
+
Ok(())
}
@@ -1159,6 +1177,13 @@
// `from`, `to` checked in [`transfer`]
collection.check_allowlist(spender)?;
}
+
+ if collection.ignores_token_restrictions(spender) {
+ return Ok(Self::compute_allowance_decrease(
+ collection, token, from, &spender, amount,
+ ));
+ }
+
if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {
// TODO: should collection owner be allowed to perform this transfer?
ensure!(
@@ -1173,21 +1198,30 @@
);
return Ok(None);
}
- let allowance =
- <Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);
+ let allowance = Self::compute_allowance_decrease(collection, token, from, &spender, amount);
+ if allowance.is_some() {
+ return Ok(allowance);
+ }
+
// Allowance (if any) would be reduced if spender is also wallet operator
if <CollectionAllowance<T>>::get((collection.id, from, spender)) {
return Ok(allowance);
}
- if allowance.is_none() {
- ensure!(
- collection.ignores_allowance(spender),
- <CommonError<T>>::ApprovedValueTooLow
- );
- }
- Ok(allowance)
+ Err(<CommonError<T>>::ApprovedValueTooLow.into())
+ }
+
+ /// Returns `Some(amount)` if the `spender` have allowance to spend this amount.
+ /// Otherwise, it returns `None`.
+ fn compute_allowance_decrease(
+ collection: &RefungibleHandle<T>,
+ token: TokenId,
+ from: &T::CrossAccountId,
+ spender: &T::CrossAccountId,
+ amount: u128,
+ ) -> Option<u128> {
+ <Allowance<T>>::get((collection.id, token, from, spender)).checked_sub(amount)
}
/// Transfer RFT token pieces from one account to another.
@@ -1353,7 +1387,7 @@
sender: &T::CrossAccountId,
properties: Vec<Property>,
) -> DispatchResult {
- <PalletCommon<T>>::set_collection_properties(collection, sender, properties)
+ <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())
}
pub fn delete_collection_properties(
@@ -1361,7 +1395,11 @@
sender: &T::CrossAccountId,
property_keys: Vec<PropertyKey>,
) -> DispatchResult {
- <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
+ <PalletCommon<T>>::delete_collection_properties(
+ collection,
+ sender,
+ property_keys.into_iter(),
+ )
}
pub fn set_token_property_permissions(
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -641,6 +641,8 @@
TransferEnabled
}
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
contract ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -783,7 +785,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
+/// @dev the ERC-165 identifier for this interface is 0xb365c124
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -985,6 +987,15 @@
dummy;
return 0x0000000000000000000000000000000000000000;
}
+
+ /// @notice Returns collection helper contract address
+ /// @dev EVM selector for this function is: 0x1896cce6,
+ /// or in textual repr: collectionHelperAddress()
+ function collectionHelperAddress() public view returns (address) {
+ require(false, stub_error);
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
}
/// @dev anonymous struct
@@ -1042,7 +1053,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x4016cd87
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
contract ERC721 is Dummy, ERC165, ERC721Events {
/// @notice Count all RFTs assigned to an owner
/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -1075,9 +1086,9 @@
}
/// @dev Not implemented
- /// @dev EVM selector for this function is: 0x60a11672,
- /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)
- function safeTransferFromWithData(
+ /// @dev EVM selector for this function is: 0xb88d4fde,
+ /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)
+ function safeTransferFrom(
address from,
address to,
uint256 tokenId,
@@ -1172,15 +1183,6 @@
operator;
dummy;
return false;
- }
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() public view returns (address) {
- require(false, stub_error);
- dummy;
- return 0x0000000000000000000000000000000000000000;
}
}
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -246,21 +246,21 @@
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Refungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Refungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_578_000 as u64)
- // Standard Error: 5_396_287
- .saturating_add(Weight::from_ref_time(633_314_546 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(25_518_267 as u64)
+ // Standard Error: 20_451
+ .saturating_add(Weight::from_ref_time(5_041_089 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
+ // Storage: Refungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Refungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_583_000 as u64)
- // Standard Error: 5_762_380
- .saturating_add(Weight::from_ref_time(696_007_076 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_715_000 as u64)
+ // Standard Error: 28_323
+ .saturating_add(Weight::from_ref_time(13_113_351 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
@@ -478,21 +478,21 @@
.saturating_add(RocksDbWeight::get().reads(1 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Refungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Refungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_578_000 as u64)
- // Standard Error: 5_396_287
- .saturating_add(Weight::from_ref_time(633_314_546 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(25_518_267 as u64)
+ // Standard Error: 20_451
+ .saturating_add(Weight::from_ref_time(5_041_089 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
+ // Storage: Refungible TokenProperties (r:1 w:1)
// Storage: Common CollectionPropertyPermissions (r:1 w:0)
- // Storage: Refungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
- Weight::from_ref_time(4_583_000 as u64)
- // Standard Error: 5_762_380
- .saturating_add(Weight::from_ref_time(696_007_076 as u64).saturating_mul(b as u64))
+ Weight::from_ref_time(13_715_000 as u64)
+ // Standard Error: 28_323
+ .saturating_add(Weight::from_ref_time(13_113_351 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -33,7 +33,6 @@
};
use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};
-use sp_std::vec;
use up_data_structs::{
CollectionDescription, CollectionMode, CollectionName, CollectionTokenPrefix,
CreateCollectionData,
@@ -316,13 +315,14 @@
<PalletCommon<T>>::set_collection_properties(
&collection,
&caller,
- vec![up_data_structs::Property {
+ [up_data_structs::Property {
key: key::base_uri(),
value: base_uri
.into_bytes()
.try_into()
.map_err(|_| "base uri is too large")?,
- }],
+ }]
+ .into_iter(),
)
.map_err(dispatch_to_evm::<T>)?;
}
runtime/common/ethereum/sponsoring/refungible.rsdiffbeforeafterboth--- a/runtime/common/ethereum/sponsoring/refungible.rs
+++ b/runtime/common/ethereum/sponsoring/refungible.rs
@@ -139,8 +139,7 @@
| BalanceOf { .. }
| OwnerOf { .. }
| GetApproved { .. }
- | IsApprovedForAll { .. }
- | CollectionHelperAddress => None,
+ | IsApprovedForAll { .. } => None,
// Not sponsored
SafeTransferFromWithData { .. }
@@ -230,7 +229,8 @@
| CrossOwnerOf { .. }
| Properties { .. }
| NextTokenId
- | TokenContractAddress { .. } => None,
+ | TokenContractAddress { .. }
+ | CollectionHelperAddress => None,
// Not sponsored
BurnFrom { .. }
runtime/common/identity.rsdiffbeforeafterboth--- a/runtime/common/identity.rs
+++ b/runtime/common/identity.rs
@@ -24,6 +24,9 @@
transaction_validity::{TransactionValidity, ValidTransaction, TransactionValidityError},
};
+#[cfg(feature = "collator-selection")]
+use sp_runtime::transaction_validity::InvalidTransaction;
+
#[derive(Debug, Encode, Decode, PartialEq, Eq, Clone, TypeInfo)]
pub struct DisableIdentityCalls;
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -451,7 +451,9 @@
}
fn account_code_at(address: H160) -> Vec<u8> {
- EVM::account_codes(address)
+ use pallet_evm::OnMethodCall;
+ <Runtime as pallet_evm::Config>::OnMethodCall::get_code(&address)
+ .unwrap_or_else(|| EVM::account_codes(address))
}
fn author() -> H160 {
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -193,6 +193,7 @@
'refungible',
'rmrk',
'app-promotion',
+ 'collator-selection',
'foreign-assets',
'pallet-test-utils',
]
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -51,6 +51,12 @@
},
{
"anonymous": false,
+ "inputs": [],
+ "name": "MintingFinished",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -417,6 +423,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "finishMinting",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -504,6 +517,13 @@
},
{
"inputs": [],
+ "name": "mintingFinished",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -51,6 +51,12 @@
},
{
"anonymous": false,
+ "inputs": [],
+ "name": "MintingFinished",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -399,6 +405,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "finishMinting",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -486,6 +499,13 @@
},
{
"inputs": [],
+ "name": "mintingFinished",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
@@ -596,7 +616,7 @@
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" },
{ "internalType": "bytes", "name": "data", "type": "bytes" }
],
- "name": "safeTransferFromWithData",
+ "name": "safeTransferFrom",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
tests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -98,6 +98,16 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "from", "type": "address" },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
+ ],
+ "name": "burnFrom",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{
"components": [
{ "internalType": "address", "name": "eth", "type": "address" },
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -536,7 +536,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
+/// @dev the ERC-165 identifier for this interface is 0x16de3152
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -661,6 +661,11 @@
/// @dev EVM selector for this function is: 0xb904db03,
/// or in textual repr: mintCross((address,uint256),(string,bytes)[])
function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);
+
+ /// @notice Returns collection helper contract address
+ /// @dev EVM selector for this function is: 0x1896cce6,
+ /// or in textual repr: collectionHelperAddress()
+ function collectionHelperAddress() external view returns (address);
}
/// @dev anonymous struct
@@ -703,7 +708,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x983a942b
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
interface ERC721 is Dummy, ERC165, ERC721Events {
/// @notice Count all NFTs assigned to an owner
/// @dev NFTs assigned to the zero address are considered invalid, and this
@@ -786,11 +791,6 @@
/// @dev EVM selector for this function is: 0xe985e9c5,
/// or in textual repr: isApprovedForAll(address,address)
function isApprovedForAll(address owner, address operator) external view returns (bool);
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() external view returns (address);
}
interface UniqueNFT is
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -441,6 +441,8 @@
TransferEnabled
}
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
interface ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -534,7 +536,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
+/// @dev the ERC-165 identifier for this interface is 0xb365c124
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -660,6 +662,11 @@
/// @dev EVM selector for this function is: 0xab76fac6,
/// or in textual repr: tokenContractAddress(uint256)
function tokenContractAddress(uint256 token) external view returns (address);
+
+ /// @notice Returns collection helper contract address
+ /// @dev EVM selector for this function is: 0x1896cce6,
+ /// or in textual repr: collectionHelperAddress()
+ function collectionHelperAddress() external view returns (address);
}
/// @dev anonymous struct
@@ -702,7 +709,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x4016cd87
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
interface ERC721 is Dummy, ERC165, ERC721Events {
/// @notice Count all RFTs assigned to an owner
/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -725,9 +732,9 @@
function ownerOf(uint256 tokenId) external view returns (address);
/// @dev Not implemented
- /// @dev EVM selector for this function is: 0x60a11672,
- /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)
- function safeTransferFromWithData(
+ /// @dev EVM selector for this function is: 0xb88d4fde,
+ /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)
+ function safeTransferFrom(
address from,
address to,
uint256 tokenId,
@@ -783,11 +790,6 @@
/// @dev EVM selector for this function is: 0xe985e9c5,
/// or in textual repr: isApprovedForAll(address,address)
function isApprovedForAll(address owner, address operator) external view returns (bool);
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() external view returns (address);
}
interface UniqueRefungible is
tests/src/nesting/unnest.test.tsdiffbeforeafterboth--- a/tests/src/nesting/unnest.test.ts
+++ b/tests/src/nesting/unnest.test.ts
@@ -16,14 +16,17 @@
import {IKeyringPair} from '@polkadot/types/types';
import {expect, itSub, Pallets, usingPlaygrounds} from '../util';
+import {UniqueFTCollection, UniqueNFToken, UniqueRFToken} from '../util/playgrounds/unique';
describe('Integration Test: Unnesting', () => {
let alice: IKeyringPair;
+ let bob: IKeyringPair;
+ let charlie: IKeyringPair;
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
const donor = await privateKey({filename: __filename});
- [alice] = await helper.arrange.createAccounts([50n], donor);
+ [alice, bob, charlie] = await helper.arrange.createAccounts([200n, 50n, 50n], donor);
});
});
@@ -63,6 +66,208 @@
expect(await collectionFT.getBalance(targetToken.nestingAccount())).to.be.equal(0n);
expect(await targetToken.getChildren()).to.be.length(0);
});
+
+ itSub.ifWithPallets('ReFungible: allows the owner to successfully unnest a token', [Pallets.ReFungible], async ({helper}) => {
+ const collection = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}});
+ const targetToken = await collection.mintToken(alice);
+
+ const collectionRFT = await helper.rft.mintCollection(alice);
+
+ // Nest and unnest
+ const token = await collectionRFT.mintToken(alice, 10n, targetToken.nestingAccount());
+ await expect(token.transferFrom(alice, targetToken.nestingAccount(), {Substrate: alice.address}, 9n), 'while unnesting').to.be.fulfilled;
+ expect(await token.getBalance({Substrate: alice.address})).to.be.equal(9n);
+ expect(await token.getBalance(targetToken.nestingAccount())).to.be.equal(1n);
+
+ // Nest and burn
+ await token.transfer(alice, targetToken.nestingAccount(), 5n);
+ await expect(token.burnFrom(alice, targetToken.nestingAccount(), 6n), 'while burning').to.be.fulfilled;
+ expect(await token.getBalance({Substrate: alice.address})).to.be.equal(4n);
+ expect(await token.getBalance(targetToken.nestingAccount())).to.be.equal(0n);
+ expect(await targetToken.getChildren()).to.be.length(0);
+ });
+
+ async function checkNestedAmountState({
+ expectedBalance,
+ childrenShouldPresent,
+ nested,
+ targetNft,
+ }: {
+ expectedBalance: bigint,
+ childrenShouldPresent: boolean,
+ nested: UniqueFTCollection | UniqueRFToken,
+ targetNft: UniqueNFToken,
+ }) {
+ const balance = await nested.getBalance(targetNft.nestingAccount());
+ expect(balance).to.be.equal(expectedBalance);
+
+ const children = await targetNft.getChildren();
+
+ if (childrenShouldPresent) {
+ expect(children[0]).to.be.deep.equal({
+ collectionId: nested.collectionId,
+ tokenId: (nested instanceof UniqueFTCollection) ? 0 : nested.tokenId,
+ });
+ } else {
+ expect(children.length).to.be.equal(0);
+ }
+ }
+
+ function ownerOrAdminUnnestCases(modes: ('ft' | 'nft' | 'rft')[]): {
+ mode: 'ft' | 'nft' | 'rft',
+ sender: string,
+ op: 'transfer' | 'burn',
+ requiredPallets: Pallets[],
+ }[] {
+ const senders = ['owner', 'admin'];
+ const ops = ['transfer', 'burn'];
+
+ const cases = [];
+ for (const mode of modes) {
+ const requiredPallets = (mode === 'rft')
+ ? [Pallets.ReFungible]
+ : [];
+
+ for (const sender of senders) {
+ for (const op of ops) {
+ cases.push({
+ mode: mode as 'ft' | 'nft' | 'rft',
+ sender,
+ op: op as 'transfer' | 'burn',
+ requiredPallets,
+ });
+ }
+ }
+ }
+
+ return cases;
+ }
+
+ ownerOrAdminUnnestCases(['ft', 'rft']).map(testCase =>
+ itSub.ifWithPallets(`[${testCase.mode}]: allows a collection ${testCase.sender} to ${testCase.op} nested token`, testCase.requiredPallets, async({helper}) => {
+ const owner = alice;
+ const admin = bob;
+
+ const unnester = (testCase.sender === 'owner')
+ ? owner
+ : admin;
+
+ const collectionNFT = await helper.nft.mintCollection(owner);
+ await collectionNFT.setPermissions(owner, {nesting: {tokenOwner: true}});
+
+ const collectionNested = await helper[testCase.mode as 'ft' | 'rft'].mintCollection(owner, {
+ limits: {
+ ownerCanTransfer: true,
+ },
+ });
+ await collectionNested.addAdmin(owner, {Substrate: admin.address});
+
+ const targetNft = await collectionNFT.mintToken(owner, {Substrate: charlie.address});
+
+ let nested: UniqueFTCollection | UniqueRFToken;
+ const totalAmount = 5n;
+ const firstUnnestAmount = 2n;
+ const restUnnestAmount = totalAmount - firstUnnestAmount;
+
+ if (collectionNested instanceof UniqueFTCollection) {
+ await collectionNested.mint(owner, totalAmount, {Substrate: charlie.address});
+ nested = collectionNested;
+ } else {
+ nested = await collectionNested.mintToken(owner, totalAmount, {Substrate: charlie.address});
+ }
+
+ // transfer/burn `amount` of nested assets by `unnester`.
+ const doOperationAndCheck = async ({
+ amount,
+ shouldBeNestedAfterOp,
+ }: {
+ amount: bigint,
+ shouldBeNestedAfterOp: boolean,
+ }) => {
+ const nestedBalanceBeforeOp = await nested.getBalance(targetNft.nestingAccount());
+
+ if (testCase.op === 'transfer') {
+ const bobBalanceBeforeOp = await nested.getBalance({Substrate: bob.address});
+
+ await nested.transferFrom(unnester, targetNft.nestingAccount(), {Substrate: bob.address}, amount);
+ expect(await nested.getBalance({Substrate: bob.address})).to.be.equal(bobBalanceBeforeOp + amount);
+ } else {
+ if (nested instanceof UniqueFTCollection) {
+ await nested.burnTokensFrom(unnester, targetNft.nestingAccount(), amount);
+ } else {
+ await nested.burnFrom(unnester, targetNft.nestingAccount(), amount);
+ }
+ }
+
+ await checkNestedAmountState({
+ expectedBalance: nestedBalanceBeforeOp - amount,
+ childrenShouldPresent: shouldBeNestedAfterOp,
+ nested,
+ targetNft,
+ });
+ };
+
+ // Initial setup: nest (fungibles/rft parts).
+ // Check NFT's balance of nested assets and NFT's children.
+ await nested.transfer(charlie, targetNft.nestingAccount(), totalAmount);
+ await checkNestedAmountState({
+ expectedBalance: totalAmount,
+ childrenShouldPresent: true,
+ nested,
+ targetNft,
+ });
+
+ // Transfer/burn only a part of nested assets.
+ // Check that NFT's balance of the nested assets correctly decreased and NFT's children are not changed.
+ await doOperationAndCheck({
+ amount: firstUnnestAmount,
+ shouldBeNestedAfterOp: true,
+ });
+
+ // Transfer/burn all remaining nested assets.
+ // Check that NFT's balance of the nested assets is 0 and NFT has no more children.
+ await doOperationAndCheck({
+ amount: restUnnestAmount,
+ shouldBeNestedAfterOp: false,
+ });
+ }));
+
+ ownerOrAdminUnnestCases(['nft']).map(testCase =>
+ itSub(`[nft]: allows a collection ${testCase.sender} to ${testCase.op} nested token`, async ({helper}) => {
+ const owner = alice;
+ const admin = bob;
+
+ const unnester = (testCase.sender === 'owner')
+ ? owner
+ : admin;
+
+ const collectionNFT = await helper.nft.mintCollection(owner);
+ await collectionNFT.setPermissions(owner, {nesting: {tokenOwner: true}});
+
+ const collectionNested = await helper.nft.mintCollection(owner, {
+ limits: {
+ ownerCanTransfer: true,
+ },
+ });
+ await collectionNested.addAdmin(owner, {Substrate: admin.address});
+
+ const targetNft = await collectionNFT.mintToken(owner, {Substrate: charlie.address});
+ const nested = await collectionNested.mintToken(owner, {Substrate: charlie.address});
+
+ await nested.transfer(charlie, targetNft.nestingAccount());
+ expect(await targetNft.getChildren()).to.be.deep.equal([{
+ collectionId: nested.collectionId,
+ tokenId: nested.tokenId,
+ }]);
+
+ if (testCase.op === 'transfer') {
+ await nested.transferFrom(unnester, targetNft.nestingAccount(), {Substrate: bob.address});
+ } else {
+ await nested.burnFrom(unnester, targetNft.nestingAccount());
+ }
+
+ expect((await targetNft.getChildren()).length).to.be.equal(0);
+ }));
});
describe('Negative Test: Unnesting', () => {
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -76,6 +76,7 @@
appPromotion,
testUtils,
...rmrkPallets,
+ ...collatorSelection,
);
} else if (chain.eq('QUARTZ by UNIQUE') || chain.eq('SAPPHIRE by UNIQUE')) {
requiredPallets.push(
tests/src/util/playgrounds/unique.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -651,6 +651,9 @@
try {
result = await this.signTransaction(sender, this.constructApiCall(extrinsic, params), options, extrinsic) as ITransactionResult;
events = this.eventHelper.extractEvents(result.result.events);
+ const errorEvent = events.find((event) => event.method == 'ExecutedFailed' || event.method == 'CreatedFailed');
+ if (errorEvent)
+ throw Error(errorEvent.method + ': ' + extrinsic);
}
catch(e) {
if(!(e as object).hasOwnProperty('status')) throw e;