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.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -390,8 +390,10 @@
Ok(())
}
- /// Return **true** if `user` was not allowed to have tokens, and he can ignore such restrictions.
- pub fn ignores_allowance(&self, user: &T::CrossAccountId) -> bool {
+ /// Returns **true** if
+ /// * the `user`is a collection owner or admin
+ /// * the collection limits allow the owner/admins to transfer/burn any collection token
+ pub fn ignores_token_restrictions(&self, user: &T::CrossAccountId) -> bool {
self.limits.owner_can_transfer() && self.is_owner_or_admin(user)
}
@@ -1198,6 +1200,58 @@
Ok(())
}
+ /// This function sets or removes a collection 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)`.
+ ///
+ /// 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_collection_properties(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,
+ ) -> DispatchResult {
+ collection.check_is_owner_or_admin(sender)?;
+
+ let mut stored_properties = <CollectionProperties<T>>::get(collection.id);
+
+ for (key, value) in properties_updates {
+ match value {
+ Some(value) => {
+ stored_properties
+ .try_set(key.clone(), value)
+ .map_err(<Error<T>>::from)?;
+
+ Self::deposit_event(Event::CollectionPropertySet(collection.id, key));
+ <PalletEvm<T>>::deposit_log(
+ erc::CollectionHelpersEvents::CollectionChanged {
+ collection_id: eth::collection_id_to_address(collection.id),
+ }
+ .to_log(T::ContractAddress::get()),
+ );
+ }
+ None => {
+ stored_properties.remove(&key).map_err(<Error<T>>::from)?;
+
+ Self::deposit_event(Event::CollectionPropertyDeleted(collection.id, key));
+ <PalletEvm<T>>::deposit_log(
+ erc::CollectionHelpersEvents::CollectionChanged {
+ collection_id: eth::collection_id_to_address(collection.id),
+ }
+ .to_log(T::ContractAddress::get()),
+ );
+ }
+ }
+ }
+
+ <CollectionProperties<T>>::set(collection.id, stored_properties);
+
+ Ok(())
+ }
+
/// Set collection property.
///
/// * `collection` - Collection handler.
@@ -1208,23 +1262,7 @@
sender: &T::CrossAccountId,
property: Property,
) -> DispatchResult {
- collection.check_is_owner_or_admin(sender)?;
-
- CollectionProperties::<T>::try_mutate(collection.id, |properties| {
- let property = property.clone();
- properties.try_set(property.key, property.value)
- })
- .map_err(<Error<T>>::from)?;
-
- Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));
- <PalletEvm<T>>::deposit_log(
- erc::CollectionHelpersEvents::CollectionChanged {
- collection_id: eth::collection_id_to_address(collection.id),
- }
- .to_log(T::ContractAddress::get()),
- );
-
- Ok(())
+ Self::set_collection_properties(collection, sender, [property].into_iter())
}
/// Set a scoped collection property, where the scope is a special prefix
@@ -1270,17 +1308,16 @@
/// * `collection` - Collection handler.
/// * `sender` - The owner or administrator of the collection.
/// * `properties` - The properties to set.
- #[transactional]
pub fn set_collection_properties(
collection: &CollectionHandle<T>,
sender: &T::CrossAccountId,
- properties: Vec<Property>,
+ properties: impl Iterator<Item = Property>,
) -> DispatchResult {
- for property in properties {
- Self::set_collection_property(collection, sender, property)?;
- }
-
- Ok(())
+ Self::modify_collection_properties(
+ collection,
+ sender,
+ properties.map(|property| (property.key, Some(property.value))),
+ )
}
/// Delete collection property.
@@ -1293,25 +1330,7 @@
sender: &T::CrossAccountId,
property_key: PropertyKey,
) -> DispatchResult {
- collection.check_is_owner_or_admin(sender)?;
-
- CollectionProperties::<T>::try_mutate(collection.id, |properties| {
- properties.remove(&property_key)
- })
- .map_err(<Error<T>>::from)?;
-
- Self::deposit_event(Event::CollectionPropertyDeleted(
- collection.id,
- property_key,
- ));
- <PalletEvm<T>>::deposit_log(
- erc::CollectionHelpersEvents::CollectionChanged {
- collection_id: eth::collection_id_to_address(collection.id),
- }
- .to_log(T::ContractAddress::get()),
- );
-
- Ok(())
+ Self::delete_collection_properties(collection, sender, [property_key].into_iter())
}
/// Delete collection properties.
@@ -1319,17 +1338,12 @@
/// * `collection` - Collection handler.
/// * `sender` - The owner or administrator of the collection.
/// * `properties` - The properties to delete.
- #[transactional]
pub fn delete_collection_properties(
collection: &CollectionHandle<T>,
sender: &T::CrossAccountId,
- property_keys: Vec<PropertyKey>,
+ property_keys: impl Iterator<Item = PropertyKey>,
) -> DispatchResult {
- for key in property_keys {
- Self::delete_collection_property(collection, sender, key)?;
- }
-
- Ok(())
+ Self::modify_collection_properties(collection, sender, property_keys.map(|key| (key, None)))
}
/// Set collection propetry permission without any checks.
pallets/fungible/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//! # Fungible Pallet18//!19//! The Fungible pallet provides functionality for dealing with fungible assets.20//!21//! - [`CreateItemData`]22//! - [`Config`]23//! - [`FungibleHandle`]24//! - [`Pallet`]25//! - [`TotalSupply`]26//! - [`Balance`]27//! - [`Allowance`]28//! - [`Error`]29//!30//! ## Fungible tokens31//!32//! Fungible tokens or assets are divisible and non-unique. For instance,33//! fiat currencies like the dollar are fungible: A $1 bill34//! in New York City has the same value as a $1 bill in Miami.35//! A fungible token can also be a cryptocurrency like Bitcoin: 1 BTC is worth 1 BTC,36//! no matter where it is issued. Thus, the fungibility refers to a specific currency’s37//! ability to maintain one standard value. As well, it needs to have uniform acceptance.38//! This means that a currency’s history should not be able to affect its value,39//! and this is due to the fact that each piece that is a part of the currency is equal40//! in value when compared to every other piece of that exact same currency.41//! In the world of cryptocurrencies, this is essentially a coin or a token42//! that can be replaced by another identical coin or token, and they are43//! both mutually interchangeable. A popular implementation of fungible tokens is44//! the ERC-20 token standard.45//!46//! ### ERC-2047//!48//! The [ERC-20](https://ethereum.org/en/developers/docs/standards/tokens/erc-20/) (Ethereum Request for Comments 20), proposed by Fabian Vogelsteller in November 2015,49//! is a Token Standard that implements an API for tokens within Smart Contracts.50//!51//! Example functionalities ERC-20 provides:52//!53//! * transfer tokens from one account to another54//! * get the current token balance of an account55//! * get the total supply of the token available on the network56//! * approve whether an amount of token from an account can be spent by a third-party account57//!58//! ## Overview59//!60//! The module provides functionality for asset management of fungible asset, supports ERC-20 standart, includes:61//!62//! * Asset Issuance63//! * Asset Transferal64//! * Asset Destruction65//! * Delegated Asset Transfers66//!67//! **NOTE:** The created fungible asset always has `token_id` = 0.68//! So `tokenA` and `tokenB` will have different `collection_id`.69//!70//! ### Implementations71//!72//! The Fungible pallet provides implementations for the following traits.73//!74//! - [`WithRecorder`](pallet_evm_coder_substrate::WithRecorder): Trait for EVM support75//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing with collections76//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight77//! - [`CommonEvmHandler`](pallet_common::erc::CommonEvmHandler): Function for handling EVM runtime calls7879#![cfg_attr(not(feature = "std"), no_std)]8081use core::ops::Deref;82use evm_coder::ToLog;83use frame_support::ensure;84use pallet_evm::account::CrossAccountId;85use up_data_structs::{86 AccessMode, CollectionId, CollectionFlags, TokenId, CreateCollectionData,87 mapping::TokenAddressMapping, budget::Budget, PropertyKey, Property,88};89use pallet_common::{90 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,91 eth::collection_id_to_address,92};93use pallet_evm::Pallet as PalletEvm;94use pallet_structure::Pallet as PalletStructure;95use pallet_evm_coder_substrate::WithRecorder;96use sp_core::H160;97use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};98use sp_std::{collections::btree_map::BTreeMap, vec::Vec};99100pub use pallet::*;101102use crate::erc::ERC20Events;103#[cfg(feature = "runtime-benchmarks")]104pub mod benchmarking;105pub mod common;106pub mod erc;107pub mod weights;108109pub type CreateItemData<T> = (<T as pallet_evm::Config>::CrossAccountId, u128);110pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;111112#[frame_support::pallet]113pub mod pallet {114 use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};115 use up_data_structs::CollectionId;116 use super::weights::WeightInfo;117118 #[pallet::error]119 pub enum Error<T> {120 /// Not Fungible item data used to mint in Fungible collection.121 NotFungibleDataUsedToMintFungibleCollectionToken,122 /// Fungible tokens hold no ID, and the default value of TokenId for Fungible collection is 0.123 FungibleItemsHaveNoId,124 /// Tried to set data for fungible item.125 FungibleItemsDontHaveData,126 /// Fungible token does not support nesting.127 FungibleDisallowsNesting,128 /// Setting item properties is not allowed.129 SettingPropertiesNotAllowed,130 /// Setting allowance for all is not allowed.131 SettingAllowanceForAllNotAllowed,132 /// Only a fungible collection could be possibly broken; any fungible token is valid.133 FungibleTokensAreAlwaysValid,134 }135136 #[pallet::config]137 pub trait Config:138 frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config139 {140 type WeightInfo: WeightInfo;141 }142143 #[pallet::pallet]144 #[pallet::generate_store(pub(super) trait Store)]145 pub struct Pallet<T>(_);146147 /// Total amount of fungible tokens inside a collection.148 #[pallet::storage]149 pub type TotalSupply<T: Config> =150 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u128, QueryKind = ValueQuery>;151152 /// Amount of tokens owned by an account inside a collection.153 #[pallet::storage]154 pub type Balance<T: Config> = StorageNMap<155 Key = (156 Key<Twox64Concat, CollectionId>,157 Key<Blake2_128Concat, T::CrossAccountId>,158 ),159 Value = u128,160 QueryKind = ValueQuery,161 >;162163 /// Storage for assets delegated to a limited extent to other users.164 #[pallet::storage]165 pub type Allowance<T: Config> = StorageNMap<166 Key = (167 Key<Twox64Concat, CollectionId>,168 Key<Blake2_128, T::CrossAccountId>,169 Key<Blake2_128Concat, T::CrossAccountId>,170 ),171 Value = u128,172 QueryKind = ValueQuery,173 >;174}175176/// Wrapper around untyped collection handle, asserting inner collection is of fungible type.177/// Required for interaction with Fungible collections, type safety and implementation [`solidity_interface`][`evm_coder::solidity_interface`].178pub struct FungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);179180/// Implementation of methods required for dispatching during runtime.181impl<T: Config> FungibleHandle<T> {182 /// Casts [`CollectionHandle`][`pallet_common::CollectionHandle`] into [`FungibleHandle`].183 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {184 Self(inner)185 }186187 /// Casts [`FungibleHandle`] into [`CollectionHandle`][`pallet_common::CollectionHandle`].188 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {189 self.0190 }191 /// Returns a mutable reference to the internal [`CollectionHandle`][`pallet_common::CollectionHandle`].192 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {193 &mut self.0194 }195}196impl<T: Config> WithRecorder<T> for FungibleHandle<T> {197 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {198 self.0.recorder()199 }200 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {201 self.0.into_recorder()202 }203}204impl<T: Config> Deref for FungibleHandle<T> {205 type Target = pallet_common::CollectionHandle<T>;206207 fn deref(&self) -> &Self::Target {208 &self.0209 }210}211212/// Pallet implementation for fungible assets213impl<T: Config> Pallet<T> {214 /// Initializes the collection. Returns [CollectionId] on success, [DispatchError] otherwise.215 pub fn init_collection(216 owner: T::CrossAccountId,217 payer: T::CrossAccountId,218 data: CreateCollectionData<T::AccountId>,219 flags: CollectionFlags,220 ) -> Result<CollectionId, DispatchError> {221 <PalletCommon<T>>::init_collection(owner, payer, data, flags)222 }223224 /// Initializes the collection with ForeignCollection flag. Returns [CollectionId] on success, [DispatchError] otherwise.225 pub fn init_foreign_collection(226 owner: T::CrossAccountId,227 payer: T::CrossAccountId,228 data: CreateCollectionData<T::AccountId>,229 ) -> Result<CollectionId, DispatchError> {230 let id = <PalletCommon<T>>::init_collection(231 owner,232 payer,233 data,234 CollectionFlags {235 foreign: true,236 ..Default::default()237 },238 )?;239 Ok(id)240 }241242 /// Destroys a collection.243 pub fn destroy_collection(244 collection: FungibleHandle<T>,245 sender: &T::CrossAccountId,246 ) -> DispatchResult {247 let id = collection.id;248249 if Self::collection_has_tokens(id) {250 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());251 }252253 // =========254255 PalletCommon::destroy_collection(collection.0, sender)?;256257 <TotalSupply<T>>::remove(id);258 let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);259 let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);260 Ok(())261 }262263 /// Add properties to the collection.264 pub fn set_collection_properties(265 collection: &FungibleHandle<T>,266 sender: &T::CrossAccountId,267 properties: Vec<Property>,268 ) -> DispatchResult {269 <PalletCommon<T>>::set_collection_properties(collection, sender, properties)270 }271272 /// Delete properties of the collection, associated with the provided keys.273 pub fn delete_collection_properties(274 collection: &FungibleHandle<T>,275 sender: &T::CrossAccountId,276 property_keys: Vec<PropertyKey>,277 ) -> DispatchResult {278 <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)279 }280281 /// Checks if collection has tokens. Return `true` if it has.282 fn collection_has_tokens(collection_id: CollectionId) -> bool {283 <TotalSupply<T>>::get(collection_id) != 0284 }285286 /// Burns the specified amount of the token. If the token balance287 /// or total supply is less than the given value,288 /// it will return [DispatchError].289 pub fn burn(290 collection: &FungibleHandle<T>,291 owner: &T::CrossAccountId,292 amount: u128,293 ) -> DispatchResult {294 let total_supply = <TotalSupply<T>>::get(collection.id)295 .checked_sub(amount)296 .ok_or(<CommonError<T>>::TokenValueTooLow)?;297298 let balance = <Balance<T>>::get((collection.id, owner))299 .checked_sub(amount)300 .ok_or(<CommonError<T>>::TokenValueTooLow)?;301302 // Foreign collection check303 ensure!(!collection.flags.foreign, <CommonError<T>>::NoPermission);304305 if collection.permissions.access() == AccessMode::AllowList {306 collection.check_allowlist(owner)?;307 }308309 // =========310311 if balance == 0 {312 <Balance<T>>::remove((collection.id, owner));313 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, TokenId::default());314 } else {315 <Balance<T>>::insert((collection.id, owner), balance);316 }317 <TotalSupply<T>>::insert(collection.id, total_supply);318319 <PalletEvm<T>>::deposit_log(320 ERC20Events::Transfer {321 from: *owner.as_eth(),322 to: H160::default(),323 value: amount.into(),324 }325 .to_log(collection_id_to_address(collection.id)),326 );327 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(328 collection.id,329 TokenId::default(),330 owner.clone(),331 amount,332 ));333 Ok(())334 }335336 /// Burns the specified amount of the token.337 pub fn burn_foreign(338 collection: &FungibleHandle<T>,339 owner: &T::CrossAccountId,340 amount: u128,341 ) -> DispatchResult {342 let total_supply = <TotalSupply<T>>::get(collection.id)343 .checked_sub(amount)344 .ok_or(<CommonError<T>>::TokenValueTooLow)?;345346 let balance = <Balance<T>>::get((collection.id, owner))347 .checked_sub(amount)348 .ok_or(<CommonError<T>>::TokenValueTooLow)?;349 // =========350351 if balance == 0 {352 <Balance<T>>::remove((collection.id, owner));353 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, TokenId::default());354 } else {355 <Balance<T>>::insert((collection.id, owner), balance);356 }357 <TotalSupply<T>>::insert(collection.id, total_supply);358359 <PalletEvm<T>>::deposit_log(360 ERC20Events::Transfer {361 from: *owner.as_eth(),362 to: H160::default(),363 value: amount.into(),364 }365 .to_log(collection_id_to_address(collection.id)),366 );367 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(368 collection.id,369 TokenId::default(),370 owner.clone(),371 amount,372 ));373 Ok(())374 }375376 /// Transfers the specified amount of tokens. Will check that377 /// the transfer is allowed for the token.378 ///379 /// - `from`: Owner of tokens to transfer.380 /// - `to`: Recepient of transfered tokens.381 /// - `amount`: Amount of tokens to transfer.382 /// - `collection`: Collection that contains the token383 pub fn transfer(384 collection: &FungibleHandle<T>,385 from: &T::CrossAccountId,386 to: &T::CrossAccountId,387 amount: u128,388 nesting_budget: &dyn Budget,389 ) -> DispatchResult {390 ensure!(391 collection.limits.transfers_enabled(),392 <CommonError<T>>::TransferNotAllowed,393 );394395 if collection.permissions.access() == AccessMode::AllowList {396 collection.check_allowlist(from)?;397 collection.check_allowlist(to)?;398 }399 <PalletCommon<T>>::ensure_correct_receiver(to)?;400401 let balance_from = <Balance<T>>::get((collection.id, from))402 .checked_sub(amount)403 .ok_or(<CommonError<T>>::TokenValueTooLow)?;404 let balance_to = if from != to && amount != 0 {405 Some(406 <Balance<T>>::get((collection.id, to))407 .checked_add(amount)408 .ok_or(ArithmeticError::Overflow)?,409 )410 } else {411 None412 };413414 // =========415416 if let Some(balance_to) = balance_to {417 // from != to && amount != 0418419 <PalletStructure<T>>::nest_if_sent_to_token(420 from.clone(),421 to,422 collection.id,423 TokenId::default(),424 nesting_budget,425 )?;426427 if balance_from == 0 {428 <Balance<T>>::remove((collection.id, from));429 <PalletStructure<T>>::unnest_if_nested(from, collection.id, TokenId::default());430 } else {431 <Balance<T>>::insert((collection.id, from), balance_from);432 }433 <Balance<T>>::insert((collection.id, to), balance_to);434 }435436 <PalletEvm<T>>::deposit_log(437 ERC20Events::Transfer {438 from: *from.as_eth(),439 to: *to.as_eth(),440 value: amount.into(),441 }442 .to_log(collection_id_to_address(collection.id)),443 );444 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(445 collection.id,446 TokenId::default(),447 from.clone(),448 to.clone(),449 amount,450 ));451 Ok(())452 }453454 /// Minting tokens for multiple IDs.455 /// It is a utility function used in [`create_multiple_items`][`Pallet::create_multiple_items`]456 /// and [`create_multiple_items_foreign`][`Pallet::create_multiple_items_foreign`]457 pub fn create_multiple_items_common(458 collection: &FungibleHandle<T>,459 sender: &T::CrossAccountId,460 data: BTreeMap<T::CrossAccountId, u128>,461 nesting_budget: &dyn Budget,462 ) -> DispatchResult {463 let total_supply = data464 .iter()465 .map(|(_, v)| *v)466 .try_fold(<TotalSupply<T>>::get(collection.id), |acc, v| {467 acc.checked_add(v)468 })469 .ok_or(ArithmeticError::Overflow)?;470471 for (to, _) in data.iter() {472 <PalletStructure<T>>::check_nesting(473 sender.clone(),474 to,475 collection.id,476 TokenId::default(),477 nesting_budget,478 )?;479 }480481 let updated_balances = data482 .into_iter()483 .map(|(user, amount)| {484 let updated_balance = <Balance<T>>::get((collection.id, &user))485 .checked_add(amount)486 .ok_or(ArithmeticError::Overflow)?;487 Ok((user, amount, updated_balance))488 })489 .collect::<Result<Vec<_>, DispatchError>>()?;490491 // =========492493 <TotalSupply<T>>::insert(collection.id, total_supply);494 for (user, amount, updated_balance) in updated_balances {495 <Balance<T>>::insert((collection.id, &user), updated_balance);496 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(497 &user,498 collection.id,499 TokenId::default(),500 );501 <PalletEvm<T>>::deposit_log(502 ERC20Events::Transfer {503 from: H160::default(),504 to: *user.as_eth(),505 value: amount.into(),506 }507 .to_log(collection_id_to_address(collection.id)),508 );509 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(510 collection.id,511 TokenId::default(),512 user.clone(),513 amount,514 ));515 }516517 Ok(())518 }519520 /// Minting tokens for multiple IDs.521 /// See [`create_item`][`Pallet::create_item`] for more details.522 pub fn create_multiple_items(523 collection: &FungibleHandle<T>,524 sender: &T::CrossAccountId,525 data: BTreeMap<T::CrossAccountId, u128>,526 nesting_budget: &dyn Budget,527 ) -> DispatchResult {528 // Foreign collection check529 ensure!(!collection.flags.foreign, <CommonError<T>>::NoPermission);530531 if !collection.is_owner_or_admin(sender) {532 ensure!(533 collection.permissions.mint_mode(),534 <CommonError<T>>::PublicMintingNotAllowed535 );536 collection.check_allowlist(sender)?;537538 for (owner, _) in data.iter() {539 collection.check_allowlist(owner)?;540 }541 }542543 Self::create_multiple_items_common(collection, sender, data, nesting_budget)544 }545546 /// Minting tokens for multiple IDs.547 /// See [`create_item_foreign`][`Pallet::create_item_foreign`] for more details.548 pub fn create_multiple_items_foreign(549 collection: &FungibleHandle<T>,550 sender: &T::CrossAccountId,551 data: BTreeMap<T::CrossAccountId, u128>,552 nesting_budget: &dyn Budget,553 ) -> DispatchResult {554 Self::create_multiple_items_common(collection, sender, data, nesting_budget)555 }556557 fn set_allowance_unchecked(558 collection: &FungibleHandle<T>,559 owner: &T::CrossAccountId,560 spender: &T::CrossAccountId,561 amount: u128,562 ) {563 if amount == 0 {564 <Allowance<T>>::remove((collection.id, owner, spender));565 } else {566 <Allowance<T>>::insert((collection.id, owner, spender), amount);567 }568569 <PalletEvm<T>>::deposit_log(570 ERC20Events::Approval {571 owner: *owner.as_eth(),572 spender: *spender.as_eth(),573 value: amount.into(),574 }575 .to_log(collection_id_to_address(collection.id)),576 );577 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(578 collection.id,579 TokenId(0),580 owner.clone(),581 spender.clone(),582 amount,583 ));584 }585586 /// Set allowance for the spender to `transfer` or `burn` owner's tokens.587 ///588 /// - `collection`: Collection that contains the token589 /// - `owner`: Owner of tokens that sets the allowance.590 /// - `spender`: Recipient of the allowance rights.591 /// - `amount`: Amount of tokens the spender is allowed to `transfer` or `burn`.592 pub fn set_allowance(593 collection: &FungibleHandle<T>,594 owner: &T::CrossAccountId,595 spender: &T::CrossAccountId,596 amount: u128,597 ) -> DispatchResult {598 if collection.permissions.access() == AccessMode::AllowList {599 collection.check_allowlist(owner)?;600 collection.check_allowlist(spender)?;601 }602603 if <Balance<T>>::get((collection.id, owner)) < amount {604 ensure!(605 collection.ignores_owned_amount(owner),606 <CommonError<T>>::CantApproveMoreThanOwned607 );608 }609610 // =========611612 Self::set_allowance_unchecked(collection, owner, spender, amount);613 Ok(())614 }615616 /// Set allowance for the spender to `transfer` or `burn` owner's tokens from eth mirror.617 ///618 /// - `collection`: Collection that contains the token619 /// - `sender`: Owner of tokens that sets the allowance.620 /// - `from`: Owner's eth mirror.621 /// - `to`: Recipient of the allowance rights.622 /// - `amount`: Amount of tokens the spender is allowed to `transfer` or `burn`.623 pub fn set_allowance_from(624 collection: &FungibleHandle<T>,625 sender: &T::CrossAccountId,626 from: &T::CrossAccountId,627 to: &T::CrossAccountId,628 amount: u128,629 ) -> DispatchResult {630 if collection.permissions.access() == AccessMode::AllowList {631 collection.check_allowlist(sender)?;632 collection.check_allowlist(from)?;633 collection.check_allowlist(to)?;634 }635636 ensure!(637 sender.conv_eq(from),638 <CommonError<T>>::AddressIsNotEthMirror639 );640641 if <Balance<T>>::get((collection.id, from)) < amount {642 ensure!(643 collection.limits.owner_can_transfer()644 && (collection.is_owner_or_admin(sender) || collection.is_owner_or_admin(from)),645 <CommonError<T>>::CantApproveMoreThanOwned646 );647 }648649 // =========650651 Self::set_allowance_unchecked(collection, from, to, amount);652 Ok(())653 }654655 /// Checks if a non-owner has (enough) allowance from the owner to perform operations on the tokens.656 /// Returns the expected remaining allowance - it should be set manually if the transaction proceeds.657 ///658 /// - `collection`: Collection that contains the token.659 /// - `spender`: CrossAccountId who has the allowance rights.660 /// - `from`: The owner of the tokens who sets the allowance.661 /// - `amount`: Amount of tokens by which the allowance sholud be reduced.662 fn check_allowed(663 collection: &FungibleHandle<T>,664 spender: &T::CrossAccountId,665 from: &T::CrossAccountId,666 amount: u128,667 nesting_budget: &dyn Budget,668 ) -> Result<Option<u128>, DispatchError> {669 if spender.conv_eq(from) {670 return Ok(None);671 }672 if collection.permissions.access() == AccessMode::AllowList {673 // `from`, `to` checked in [`transfer`]674 collection.check_allowlist(spender)?;675 }676 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {677 // TODO: should collection owner be allowed to perform this transfer?678 ensure!(679 <PalletStructure<T>>::check_indirectly_owned(680 spender.clone(),681 source.0,682 source.1,683 None,684 nesting_budget685 )?,686 <CommonError<T>>::ApprovedValueTooLow,687 );688 return Ok(None);689 }690 let allowance = <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount);691 if allowance.is_none() {692 ensure!(693 collection.ignores_allowance(spender),694 <CommonError<T>>::ApprovedValueTooLow695 );696 }697698 Ok(allowance)699 }700701 /// Transfer fungible tokens from one account to another.702 /// Same as the [`transfer`][`Pallet::transfer`] but spender doesn't needs to be an owner of the token pieces.703 /// The owner should set allowance for the spender to transfer pieces.704 /// See [`set_allowance`][`Pallet::set_allowance`] for more details.705706 pub fn transfer_from(707 collection: &FungibleHandle<T>,708 spender: &T::CrossAccountId,709 from: &T::CrossAccountId,710 to: &T::CrossAccountId,711 amount: u128,712 nesting_budget: &dyn Budget,713 ) -> DispatchResult {714 let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;715716 // =========717718 Self::transfer(collection, from, to, amount, nesting_budget)?;719 if let Some(allowance) = allowance {720 Self::set_allowance_unchecked(collection, from, spender, allowance);721 }722 Ok(())723 }724725 /// Burn fungible tokens from the account.726 ///727 /// Same as the [`burn`][`Pallet::burn`] but spender doesn't need to be an owner of the tokens. The `from` should728 /// set allowance for the spender to burn tokens.729 /// See [`set_allowance`][`Pallet::set_allowance`] for more details.730 pub fn burn_from(731 collection: &FungibleHandle<T>,732 spender: &T::CrossAccountId,733 from: &T::CrossAccountId,734 amount: u128,735 nesting_budget: &dyn Budget,736 ) -> DispatchResult {737 let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;738739 // =========740741 Self::burn(collection, from, amount)?;742 if let Some(allowance) = allowance {743 Self::set_allowance_unchecked(collection, from, spender, allowance);744 }745 Ok(())746 }747748 /// Creates fungible token.749 ///750 /// The sender should be the owner/admin of the collection or collection should be configured751 /// to allow public minting.752 ///753 /// - `data`: Contains user who will become the owners of the tokens and amount754 /// of tokens he will receive.755 pub fn create_item(756 collection: &FungibleHandle<T>,757 sender: &T::CrossAccountId,758 data: CreateItemData<T>,759 nesting_budget: &dyn Budget,760 ) -> DispatchResult {761 Self::create_multiple_items(762 collection,763 sender,764 [(data.0, data.1)].into_iter().collect(),765 nesting_budget,766 )767 }768769 /// Creates fungible token.770 ///771 /// - `data`: Contains user who will become the owners of the tokens and amount772 /// of tokens he will receive.773 pub fn create_item_foreign(774 collection: &FungibleHandle<T>,775 sender: &T::CrossAccountId,776 data: CreateItemData<T>,777 nesting_budget: &dyn Budget,778 ) -> DispatchResult {779 Self::create_multiple_items_foreign(780 collection,781 sender,782 [(data.0, data.1)].into_iter().collect(),783 nesting_budget,784 )785 }786787 /// Returns 10 tokens owners in no particular order788 ///789 /// There is no direct way to get token holders in ascending order,790 /// since `iter_prefix` returns values in no particular order.791 /// Therefore, getting the 10 largest holders with a large value of holders792 /// can lead to impact memory allocation + sorting with `n * log (n)`.793 pub fn token_owners(794 collection: CollectionId,795 _token: TokenId,796 ) -> Option<Vec<T::CrossAccountId>> {797 let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection,))798 .map(|(owner, _amount)| owner)799 .take(10)800 .collect();801802 if res.is_empty() {803 None804 } else {805 Some(res)806 }807 }808}1// 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//! # Fungible Pallet18//!19//! The Fungible pallet provides functionality for dealing with fungible assets.20//!21//! - [`CreateItemData`]22//! - [`Config`]23//! - [`FungibleHandle`]24//! - [`Pallet`]25//! - [`TotalSupply`]26//! - [`Balance`]27//! - [`Allowance`]28//! - [`Error`]29//!30//! ## Fungible tokens31//!32//! Fungible tokens or assets are divisible and non-unique. For instance,33//! fiat currencies like the dollar are fungible: A $1 bill34//! in New York City has the same value as a $1 bill in Miami.35//! A fungible token can also be a cryptocurrency like Bitcoin: 1 BTC is worth 1 BTC,36//! no matter where it is issued. Thus, the fungibility refers to a specific currency’s37//! ability to maintain one standard value. As well, it needs to have uniform acceptance.38//! This means that a currency’s history should not be able to affect its value,39//! and this is due to the fact that each piece that is a part of the currency is equal40//! in value when compared to every other piece of that exact same currency.41//! In the world of cryptocurrencies, this is essentially a coin or a token42//! that can be replaced by another identical coin or token, and they are43//! both mutually interchangeable. A popular implementation of fungible tokens is44//! the ERC-20 token standard.45//!46//! ### ERC-2047//!48//! The [ERC-20](https://ethereum.org/en/developers/docs/standards/tokens/erc-20/) (Ethereum Request for Comments 20), proposed by Fabian Vogelsteller in November 2015,49//! is a Token Standard that implements an API for tokens within Smart Contracts.50//!51//! Example functionalities ERC-20 provides:52//!53//! * transfer tokens from one account to another54//! * get the current token balance of an account55//! * get the total supply of the token available on the network56//! * approve whether an amount of token from an account can be spent by a third-party account57//!58//! ## Overview59//!60//! The module provides functionality for asset management of fungible asset, supports ERC-20 standart, includes:61//!62//! * Asset Issuance63//! * Asset Transferal64//! * Asset Destruction65//! * Delegated Asset Transfers66//!67//! **NOTE:** The created fungible asset always has `token_id` = 0.68//! So `tokenA` and `tokenB` will have different `collection_id`.69//!70//! ### Implementations71//!72//! The Fungible pallet provides implementations for the following traits.73//!74//! - [`WithRecorder`](pallet_evm_coder_substrate::WithRecorder): Trait for EVM support75//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing with collections76//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight77//! - [`CommonEvmHandler`](pallet_common::erc::CommonEvmHandler): Function for handling EVM runtime calls7879#![cfg_attr(not(feature = "std"), no_std)]8081use core::ops::Deref;82use evm_coder::ToLog;83use frame_support::ensure;84use pallet_evm::account::CrossAccountId;85use up_data_structs::{86 AccessMode, CollectionId, CollectionFlags, TokenId, CreateCollectionData,87 mapping::TokenAddressMapping, budget::Budget, PropertyKey, Property,88};89use pallet_common::{90 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,91 eth::collection_id_to_address,92};93use pallet_evm::Pallet as PalletEvm;94use pallet_structure::Pallet as PalletStructure;95use pallet_evm_coder_substrate::WithRecorder;96use sp_core::H160;97use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};98use sp_std::{collections::btree_map::BTreeMap, vec::Vec};99100pub use pallet::*;101102use crate::erc::ERC20Events;103#[cfg(feature = "runtime-benchmarks")]104pub mod benchmarking;105pub mod common;106pub mod erc;107pub mod weights;108109pub type CreateItemData<T> = (<T as pallet_evm::Config>::CrossAccountId, u128);110pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;111112#[frame_support::pallet]113pub mod pallet {114 use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};115 use up_data_structs::CollectionId;116 use super::weights::WeightInfo;117118 #[pallet::error]119 pub enum Error<T> {120 /// Not Fungible item data used to mint in Fungible collection.121 NotFungibleDataUsedToMintFungibleCollectionToken,122 /// Fungible tokens hold no ID, and the default value of TokenId for Fungible collection is 0.123 FungibleItemsHaveNoId,124 /// Tried to set data for fungible item.125 FungibleItemsDontHaveData,126 /// Fungible token does not support nesting.127 FungibleDisallowsNesting,128 /// Setting item properties is not allowed.129 SettingPropertiesNotAllowed,130 /// Setting allowance for all is not allowed.131 SettingAllowanceForAllNotAllowed,132 /// Only a fungible collection could be possibly broken; any fungible token is valid.133 FungibleTokensAreAlwaysValid,134 }135136 #[pallet::config]137 pub trait Config:138 frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config139 {140 type WeightInfo: WeightInfo;141 }142143 #[pallet::pallet]144 #[pallet::generate_store(pub(super) trait Store)]145 pub struct Pallet<T>(_);146147 /// Total amount of fungible tokens inside a collection.148 #[pallet::storage]149 pub type TotalSupply<T: Config> =150 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u128, QueryKind = ValueQuery>;151152 /// Amount of tokens owned by an account inside a collection.153 #[pallet::storage]154 pub type Balance<T: Config> = StorageNMap<155 Key = (156 Key<Twox64Concat, CollectionId>,157 Key<Blake2_128Concat, T::CrossAccountId>,158 ),159 Value = u128,160 QueryKind = ValueQuery,161 >;162163 /// Storage for assets delegated to a limited extent to other users.164 #[pallet::storage]165 pub type Allowance<T: Config> = StorageNMap<166 Key = (167 Key<Twox64Concat, CollectionId>,168 Key<Blake2_128, T::CrossAccountId>,169 Key<Blake2_128Concat, T::CrossAccountId>,170 ),171 Value = u128,172 QueryKind = ValueQuery,173 >;174}175176/// Wrapper around untyped collection handle, asserting inner collection is of fungible type.177/// Required for interaction with Fungible collections, type safety and implementation [`solidity_interface`][`evm_coder::solidity_interface`].178pub struct FungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);179180/// Implementation of methods required for dispatching during runtime.181impl<T: Config> FungibleHandle<T> {182 /// Casts [`CollectionHandle`][`pallet_common::CollectionHandle`] into [`FungibleHandle`].183 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {184 Self(inner)185 }186187 /// Casts [`FungibleHandle`] into [`CollectionHandle`][`pallet_common::CollectionHandle`].188 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {189 self.0190 }191 /// Returns a mutable reference to the internal [`CollectionHandle`][`pallet_common::CollectionHandle`].192 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {193 &mut self.0194 }195}196impl<T: Config> WithRecorder<T> for FungibleHandle<T> {197 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {198 self.0.recorder()199 }200 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {201 self.0.into_recorder()202 }203}204impl<T: Config> Deref for FungibleHandle<T> {205 type Target = pallet_common::CollectionHandle<T>;206207 fn deref(&self) -> &Self::Target {208 &self.0209 }210}211212/// Pallet implementation for fungible assets213impl<T: Config> Pallet<T> {214 /// Initializes the collection. Returns [CollectionId] on success, [DispatchError] otherwise.215 pub fn init_collection(216 owner: T::CrossAccountId,217 payer: T::CrossAccountId,218 data: CreateCollectionData<T::AccountId>,219 flags: CollectionFlags,220 ) -> Result<CollectionId, DispatchError> {221 <PalletCommon<T>>::init_collection(owner, payer, data, flags)222 }223224 /// Initializes the collection with ForeignCollection flag. Returns [CollectionId] on success, [DispatchError] otherwise.225 pub fn init_foreign_collection(226 owner: T::CrossAccountId,227 payer: T::CrossAccountId,228 data: CreateCollectionData<T::AccountId>,229 ) -> Result<CollectionId, DispatchError> {230 let id = <PalletCommon<T>>::init_collection(231 owner,232 payer,233 data,234 CollectionFlags {235 foreign: true,236 ..Default::default()237 },238 )?;239 Ok(id)240 }241242 /// Destroys a collection.243 pub fn destroy_collection(244 collection: FungibleHandle<T>,245 sender: &T::CrossAccountId,246 ) -> DispatchResult {247 let id = collection.id;248249 if Self::collection_has_tokens(id) {250 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());251 }252253 // =========254255 PalletCommon::destroy_collection(collection.0, sender)?;256257 <TotalSupply<T>>::remove(id);258 let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);259 let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);260 Ok(())261 }262263 /// Add properties to the collection.264 pub fn set_collection_properties(265 collection: &FungibleHandle<T>,266 sender: &T::CrossAccountId,267 properties: Vec<Property>,268 ) -> DispatchResult {269 <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())270 }271272 /// Delete properties of the collection, associated with the provided keys.273 pub fn delete_collection_properties(274 collection: &FungibleHandle<T>,275 sender: &T::CrossAccountId,276 property_keys: Vec<PropertyKey>,277 ) -> DispatchResult {278 <PalletCommon<T>>::delete_collection_properties(279 collection,280 sender,281 property_keys.into_iter(),282 )283 }284285 /// Checks if collection has tokens. Return `true` if it has.286 fn collection_has_tokens(collection_id: CollectionId) -> bool {287 <TotalSupply<T>>::get(collection_id) != 0288 }289290 /// Burns the specified amount of the token. If the token balance291 /// or total supply is less than the given value,292 /// it will return [DispatchError].293 pub fn burn(294 collection: &FungibleHandle<T>,295 owner: &T::CrossAccountId,296 amount: u128,297 ) -> DispatchResult {298 let total_supply = <TotalSupply<T>>::get(collection.id)299 .checked_sub(amount)300 .ok_or(<CommonError<T>>::TokenValueTooLow)?;301302 let balance = <Balance<T>>::get((collection.id, owner))303 .checked_sub(amount)304 .ok_or(<CommonError<T>>::TokenValueTooLow)?;305306 // Foreign collection check307 ensure!(!collection.flags.foreign, <CommonError<T>>::NoPermission);308309 if collection.permissions.access() == AccessMode::AllowList {310 collection.check_allowlist(owner)?;311 }312313 // =========314315 if balance == 0 {316 <Balance<T>>::remove((collection.id, owner));317 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, TokenId::default());318 } else {319 <Balance<T>>::insert((collection.id, owner), balance);320 }321 <TotalSupply<T>>::insert(collection.id, total_supply);322323 <PalletEvm<T>>::deposit_log(324 ERC20Events::Transfer {325 from: *owner.as_eth(),326 to: H160::default(),327 value: amount.into(),328 }329 .to_log(collection_id_to_address(collection.id)),330 );331 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(332 collection.id,333 TokenId::default(),334 owner.clone(),335 amount,336 ));337 Ok(())338 }339340 /// Burns the specified amount of the token.341 pub fn burn_foreign(342 collection: &FungibleHandle<T>,343 owner: &T::CrossAccountId,344 amount: u128,345 ) -> DispatchResult {346 let total_supply = <TotalSupply<T>>::get(collection.id)347 .checked_sub(amount)348 .ok_or(<CommonError<T>>::TokenValueTooLow)?;349350 let balance = <Balance<T>>::get((collection.id, owner))351 .checked_sub(amount)352 .ok_or(<CommonError<T>>::TokenValueTooLow)?;353 // =========354355 if balance == 0 {356 <Balance<T>>::remove((collection.id, owner));357 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, TokenId::default());358 } else {359 <Balance<T>>::insert((collection.id, owner), balance);360 }361 <TotalSupply<T>>::insert(collection.id, total_supply);362363 <PalletEvm<T>>::deposit_log(364 ERC20Events::Transfer {365 from: *owner.as_eth(),366 to: H160::default(),367 value: amount.into(),368 }369 .to_log(collection_id_to_address(collection.id)),370 );371 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(372 collection.id,373 TokenId::default(),374 owner.clone(),375 amount,376 ));377 Ok(())378 }379380 /// Transfers the specified amount of tokens. Will check that381 /// the transfer is allowed for the token.382 ///383 /// - `from`: Owner of tokens to transfer.384 /// - `to`: Recepient of transfered tokens.385 /// - `amount`: Amount of tokens to transfer.386 /// - `collection`: Collection that contains the token387 pub fn transfer(388 collection: &FungibleHandle<T>,389 from: &T::CrossAccountId,390 to: &T::CrossAccountId,391 amount: u128,392 nesting_budget: &dyn Budget,393 ) -> DispatchResult {394 ensure!(395 collection.limits.transfers_enabled(),396 <CommonError<T>>::TransferNotAllowed,397 );398399 if collection.permissions.access() == AccessMode::AllowList {400 collection.check_allowlist(from)?;401 collection.check_allowlist(to)?;402 }403 <PalletCommon<T>>::ensure_correct_receiver(to)?;404405 let balance_from = <Balance<T>>::get((collection.id, from))406 .checked_sub(amount)407 .ok_or(<CommonError<T>>::TokenValueTooLow)?;408 let balance_to = if from != to && amount != 0 {409 Some(410 <Balance<T>>::get((collection.id, to))411 .checked_add(amount)412 .ok_or(ArithmeticError::Overflow)?,413 )414 } else {415 None416 };417418 // =========419420 if let Some(balance_to) = balance_to {421 // from != to && amount != 0422423 <PalletStructure<T>>::nest_if_sent_to_token(424 from.clone(),425 to,426 collection.id,427 TokenId::default(),428 nesting_budget,429 )?;430431 if balance_from == 0 {432 <Balance<T>>::remove((collection.id, from));433 <PalletStructure<T>>::unnest_if_nested(from, collection.id, TokenId::default());434 } else {435 <Balance<T>>::insert((collection.id, from), balance_from);436 }437 <Balance<T>>::insert((collection.id, to), balance_to);438 }439440 <PalletEvm<T>>::deposit_log(441 ERC20Events::Transfer {442 from: *from.as_eth(),443 to: *to.as_eth(),444 value: amount.into(),445 }446 .to_log(collection_id_to_address(collection.id)),447 );448 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(449 collection.id,450 TokenId::default(),451 from.clone(),452 to.clone(),453 amount,454 ));455 Ok(())456 }457458 /// Minting tokens for multiple IDs.459 /// It is a utility function used in [`create_multiple_items`][`Pallet::create_multiple_items`]460 /// and [`create_multiple_items_foreign`][`Pallet::create_multiple_items_foreign`]461 pub fn create_multiple_items_common(462 collection: &FungibleHandle<T>,463 sender: &T::CrossAccountId,464 data: BTreeMap<T::CrossAccountId, u128>,465 nesting_budget: &dyn Budget,466 ) -> DispatchResult {467 let total_supply = data468 .iter()469 .map(|(_, v)| *v)470 .try_fold(<TotalSupply<T>>::get(collection.id), |acc, v| {471 acc.checked_add(v)472 })473 .ok_or(ArithmeticError::Overflow)?;474475 for (to, _) in data.iter() {476 <PalletStructure<T>>::check_nesting(477 sender.clone(),478 to,479 collection.id,480 TokenId::default(),481 nesting_budget,482 )?;483 }484485 let updated_balances = data486 .into_iter()487 .map(|(user, amount)| {488 let updated_balance = <Balance<T>>::get((collection.id, &user))489 .checked_add(amount)490 .ok_or(ArithmeticError::Overflow)?;491 Ok((user, amount, updated_balance))492 })493 .collect::<Result<Vec<_>, DispatchError>>()?;494495 // =========496497 <TotalSupply<T>>::insert(collection.id, total_supply);498 for (user, amount, updated_balance) in updated_balances {499 <Balance<T>>::insert((collection.id, &user), updated_balance);500 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(501 &user,502 collection.id,503 TokenId::default(),504 );505 <PalletEvm<T>>::deposit_log(506 ERC20Events::Transfer {507 from: H160::default(),508 to: *user.as_eth(),509 value: amount.into(),510 }511 .to_log(collection_id_to_address(collection.id)),512 );513 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(514 collection.id,515 TokenId::default(),516 user.clone(),517 amount,518 ));519 }520521 Ok(())522 }523524 /// Minting tokens for multiple IDs.525 /// See [`create_item`][`Pallet::create_item`] for more details.526 pub fn create_multiple_items(527 collection: &FungibleHandle<T>,528 sender: &T::CrossAccountId,529 data: BTreeMap<T::CrossAccountId, u128>,530 nesting_budget: &dyn Budget,531 ) -> DispatchResult {532 // Foreign collection check533 ensure!(!collection.flags.foreign, <CommonError<T>>::NoPermission);534535 if !collection.is_owner_or_admin(sender) {536 ensure!(537 collection.permissions.mint_mode(),538 <CommonError<T>>::PublicMintingNotAllowed539 );540 collection.check_allowlist(sender)?;541542 for (owner, _) in data.iter() {543 collection.check_allowlist(owner)?;544 }545 }546547 Self::create_multiple_items_common(collection, sender, data, nesting_budget)548 }549550 /// Minting tokens for multiple IDs.551 /// See [`create_item_foreign`][`Pallet::create_item_foreign`] for more details.552 pub fn create_multiple_items_foreign(553 collection: &FungibleHandle<T>,554 sender: &T::CrossAccountId,555 data: BTreeMap<T::CrossAccountId, u128>,556 nesting_budget: &dyn Budget,557 ) -> DispatchResult {558 Self::create_multiple_items_common(collection, sender, data, nesting_budget)559 }560561 fn set_allowance_unchecked(562 collection: &FungibleHandle<T>,563 owner: &T::CrossAccountId,564 spender: &T::CrossAccountId,565 amount: u128,566 ) {567 if amount == 0 {568 <Allowance<T>>::remove((collection.id, owner, spender));569 } else {570 <Allowance<T>>::insert((collection.id, owner, spender), amount);571 }572573 <PalletEvm<T>>::deposit_log(574 ERC20Events::Approval {575 owner: *owner.as_eth(),576 spender: *spender.as_eth(),577 value: amount.into(),578 }579 .to_log(collection_id_to_address(collection.id)),580 );581 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(582 collection.id,583 TokenId(0),584 owner.clone(),585 spender.clone(),586 amount,587 ));588 }589590 /// Set allowance for the spender to `transfer` or `burn` owner's tokens.591 ///592 /// - `collection`: Collection that contains the token593 /// - `owner`: Owner of tokens that sets the allowance.594 /// - `spender`: Recipient of the allowance rights.595 /// - `amount`: Amount of tokens the spender is allowed to `transfer` or `burn`.596 pub fn set_allowance(597 collection: &FungibleHandle<T>,598 owner: &T::CrossAccountId,599 spender: &T::CrossAccountId,600 amount: u128,601 ) -> DispatchResult {602 if collection.permissions.access() == AccessMode::AllowList {603 collection.check_allowlist(owner)?;604 collection.check_allowlist(spender)?;605 }606607 if <Balance<T>>::get((collection.id, owner)) < amount {608 ensure!(609 collection.ignores_owned_amount(owner),610 <CommonError<T>>::CantApproveMoreThanOwned611 );612 }613614 // =========615616 Self::set_allowance_unchecked(collection, owner, spender, amount);617 Ok(())618 }619620 /// Set allowance for the spender to `transfer` or `burn` owner's tokens from eth mirror.621 ///622 /// - `collection`: Collection that contains the token623 /// - `sender`: Owner of tokens that sets the allowance.624 /// - `from`: Owner's eth mirror.625 /// - `to`: Recipient of the allowance rights.626 /// - `amount`: Amount of tokens the spender is allowed to `transfer` or `burn`.627 pub fn set_allowance_from(628 collection: &FungibleHandle<T>,629 sender: &T::CrossAccountId,630 from: &T::CrossAccountId,631 to: &T::CrossAccountId,632 amount: u128,633 ) -> DispatchResult {634 if collection.permissions.access() == AccessMode::AllowList {635 collection.check_allowlist(sender)?;636 collection.check_allowlist(from)?;637 collection.check_allowlist(to)?;638 }639640 ensure!(641 sender.conv_eq(from),642 <CommonError<T>>::AddressIsNotEthMirror643 );644645 if <Balance<T>>::get((collection.id, from)) < amount {646 ensure!(647 collection.limits.owner_can_transfer()648 && (collection.is_owner_or_admin(sender) || collection.is_owner_or_admin(from)),649 <CommonError<T>>::CantApproveMoreThanOwned650 );651 }652653 // =========654655 Self::set_allowance_unchecked(collection, from, to, amount);656 Ok(())657 }658659 /// Checks if a non-owner has (enough) allowance from the owner to perform operations on the tokens.660 /// Returns the expected remaining allowance - it should be set manually if the transaction proceeds.661 ///662 /// - `collection`: Collection that contains the token.663 /// - `spender`: CrossAccountId who has the allowance rights.664 /// - `from`: The owner of the tokens who sets the allowance.665 /// - `amount`: Amount of tokens by which the allowance sholud be reduced.666 fn check_allowed(667 collection: &FungibleHandle<T>,668 spender: &T::CrossAccountId,669 from: &T::CrossAccountId,670 amount: u128,671 nesting_budget: &dyn Budget,672 ) -> Result<Option<u128>, DispatchError> {673 if spender.conv_eq(from) {674 return Ok(None);675 }676 if collection.permissions.access() == AccessMode::AllowList {677 // `from`, `to` checked in [`transfer`]678 collection.check_allowlist(spender)?;679 }680681 if collection.ignores_token_restrictions(spender) {682 return Ok(Self::compute_allowance_decrease(683 collection, from, spender, amount,684 ));685 }686687 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {688 ensure!(689 <PalletStructure<T>>::check_indirectly_owned(690 spender.clone(),691 source.0,692 source.1,693 None,694 nesting_budget695 )?,696 <CommonError<T>>::ApprovedValueTooLow,697 );698 return Ok(None);699 }700701 let allowance = Self::compute_allowance_decrease(collection, from, spender, amount);702 ensure!(allowance.is_some(), <CommonError<T>>::ApprovedValueTooLow);703704 Ok(allowance)705 }706707 /// Returns `Some(amount)` if the `spender` have allowance to spend this amount.708 /// Otherwise, it returns `None`.709 fn compute_allowance_decrease(710 collection: &FungibleHandle<T>,711 from: &T::CrossAccountId,712 spender: &T::CrossAccountId,713 amount: u128,714 ) -> Option<u128> {715 <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount)716 }717718 /// Transfer fungible tokens from one account to another.719 /// Same as the [`transfer`][`Pallet::transfer`] but spender doesn't needs to be an owner of the token pieces.720 /// The owner should set allowance for the spender to transfer pieces.721 /// See [`set_allowance`][`Pallet::set_allowance`] for more details.722723 pub fn transfer_from(724 collection: &FungibleHandle<T>,725 spender: &T::CrossAccountId,726 from: &T::CrossAccountId,727 to: &T::CrossAccountId,728 amount: u128,729 nesting_budget: &dyn Budget,730 ) -> DispatchResult {731 let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;732733 // =========734735 Self::transfer(collection, from, to, amount, nesting_budget)?;736 if let Some(allowance) = allowance {737 Self::set_allowance_unchecked(collection, from, spender, allowance);738 }739 Ok(())740 }741742 /// Burn fungible tokens from the account.743 ///744 /// Same as the [`burn`][`Pallet::burn`] but spender doesn't need to be an owner of the tokens. The `from` should745 /// set allowance for the spender to burn tokens.746 /// See [`set_allowance`][`Pallet::set_allowance`] for more details.747 pub fn burn_from(748 collection: &FungibleHandle<T>,749 spender: &T::CrossAccountId,750 from: &T::CrossAccountId,751 amount: u128,752 nesting_budget: &dyn Budget,753 ) -> DispatchResult {754 let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;755756 // =========757758 Self::burn(collection, from, amount)?;759 if let Some(allowance) = allowance {760 Self::set_allowance_unchecked(collection, from, spender, allowance);761 }762 Ok(())763 }764765 /// Creates fungible token.766 ///767 /// The sender should be the owner/admin of the collection or collection should be configured768 /// to allow public minting.769 ///770 /// - `data`: Contains user who will become the owners of the tokens and amount771 /// of tokens he will receive.772 pub fn create_item(773 collection: &FungibleHandle<T>,774 sender: &T::CrossAccountId,775 data: CreateItemData<T>,776 nesting_budget: &dyn Budget,777 ) -> DispatchResult {778 Self::create_multiple_items(779 collection,780 sender,781 [(data.0, data.1)].into_iter().collect(),782 nesting_budget,783 )784 }785786 /// Creates fungible token.787 ///788 /// - `data`: Contains user who will become the owners of the tokens and amount789 /// of tokens he will receive.790 pub fn create_item_foreign(791 collection: &FungibleHandle<T>,792 sender: &T::CrossAccountId,793 data: CreateItemData<T>,794 nesting_budget: &dyn Budget,795 ) -> DispatchResult {796 Self::create_multiple_items_foreign(797 collection,798 sender,799 [(data.0, data.1)].into_iter().collect(),800 nesting_budget,801 )802 }803804 /// Returns 10 tokens owners in no particular order805 ///806 /// There is no direct way to get token holders in ascending order,807 /// since `iter_prefix` returns values in no particular order.808 /// Therefore, getting the 10 largest holders with a large value of holders809 /// can lead to impact memory allocation + sorting with `n * log (n)`.810 pub fn token_owners(811 collection: CollectionId,812 _token: TokenId,813 ) -> Option<Vec<T::CrossAccountId>> {814 let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection,))815 .map(|(owner, _amount)| owner)816 .take(10)817 .collect();818819 if res.is_empty() {820 None821 } else {822 Some(res)823 }824 }825}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;