difftreelog
CORE-300 Move CrossAccountId to frontier
in: master
27 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2554,7 +2554,7 @@
"fc-db",
"fc-rpc-core",
"fp-consensus",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"fp-rpc",
"fp-storage",
"futures 0.3.21",
@@ -2565,7 +2565,7 @@
"log",
"lru 0.6.6",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"parking_lot 0.11.2",
"rand 0.7.3",
@@ -2757,7 +2757,7 @@
dependencies = [
"ethereum",
"ethereum-types",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-api",
@@ -2853,6 +2853,21 @@
]
[[package]]
+name = "frame-common"
+version = "0.1.0"
+source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
+dependencies = [
+ "frame-system",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=feature/300)",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-std",
+ "up-evm-mapping",
+]
+
+[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65"
@@ -5835,7 +5850,7 @@
dependencies = [
"frame-support",
"frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"serde",
@@ -5984,9 +5999,10 @@
version = "0.1.0"
dependencies = [
"evm-coder",
+ "frame-common",
"frame-support",
"frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6064,7 +6080,7 @@
"ethereum-types",
"evm",
"fp-consensus",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"fp-rpc",
"fp-self-contained",
"fp-storage",
@@ -6072,7 +6088,7 @@
"frame-system",
"log",
"pallet-balances",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-timestamp",
"parity-scale-codec",
"rlp",
@@ -6093,7 +6109,7 @@
"evm",
"evm-gasometer",
"evm-runtime",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -6124,7 +6140,7 @@
"frame-support",
"frame-system",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6139,7 +6155,7 @@
"frame-support",
"frame-system",
"log",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6154,11 +6170,11 @@
name = "pallet-evm-migration"
version = "0.1.0"
dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-benchmarking",
"frame-support",
"frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6171,11 +6187,11 @@
name = "pallet-evm-transaction-payment"
version = "0.1.0"
dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-support",
"frame-system",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6193,6 +6209,7 @@
"ethereum",
"evm-coder",
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"pallet-common",
@@ -6419,6 +6436,7 @@
"ethereum",
"evm-coder",
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"pallet-common",
@@ -6535,6 +6553,7 @@
version = "0.1.0"
dependencies = [
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"pallet-common",
@@ -6795,15 +6814,16 @@
dependencies = [
"ethereum",
"evm-coder",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"hex-literal",
"pallet-balances",
"pallet-common",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"pallet-fungible",
"pallet-nonfungible",
@@ -12186,7 +12206,7 @@
"chrono",
"lazy_static",
"matchers",
- "parking_lot 0.11.2",
+ "parking_lot 0.10.2",
"regex",
"serde",
"serde_json",
@@ -12333,6 +12353,7 @@
name = "uc-rpc"
version = "0.1.0"
dependencies = [
+ "frame-common",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -12549,6 +12570,7 @@
"fp-rpc",
"fp-self-contained",
"frame-benchmarking",
+ "frame-common",
"frame-executive",
"frame-support",
"frame-system",
@@ -12561,7 +12583,7 @@
"pallet-base-fee",
"pallet-common",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"pallet-evm-contract-helpers",
"pallet-evm-migration",
@@ -12688,6 +12710,7 @@
[[package]]
name = "up-evm-mapping"
version = "0.1.0"
+source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
dependencies = [
"frame-support",
"sp-core",
@@ -12697,6 +12720,7 @@
name = "up-rpc"
version = "0.1.0"
dependencies = [
+ "frame-common",
"pallet-common",
"parity-scale-codec",
"sp-api",
client/rpc/Cargo.tomldiffbeforeafterboth--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -18,3 +18,4 @@
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -201,7 +201,7 @@
AccountId: Decode,
C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,
- CrossAccountId: pallet_common::account::CrossAccountId<AccountId>,
+ CrossAccountId: frame_common::account::CrossAccountId<AccountId>,
{
pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);
pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -16,11 +16,12 @@
sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = '../../primitives/evm-mapping' }
up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
serde = { version = "1.0.130", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
pallets/common/src/account.rsdiffbeforeafterboth--- a/pallets/common/src/account.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use crate::Config;
-use codec::{Encode, EncodeLike, Decode, MaxEncodedLen};
-use sp_core::H160;
-use scale_info::{Type, TypeInfo};
-use core::cmp::Ordering;
-use serde::{Serialize, Deserialize};
-use pallet_evm::AddressMapping;
-use sp_std::vec::Vec;
-use sp_std::clone::Clone;
-
-pub use up_evm_mapping::EvmBackwardsAddressMapping;
-
-pub trait CrossAccountId<AccountId>:
- Encode + EncodeLike + Decode + TypeInfo + MaxEncodedLen + Clone + PartialEq + Ord + core::fmt::Debug
-// +
-// Serialize + Deserialize<'static>
-{
- fn as_sub(&self) -> &AccountId;
- fn as_eth(&self) -> &H160;
-
- fn from_sub(account: AccountId) -> Self;
- fn from_eth(account: H160) -> Self;
-
- fn conv_eq(&self, other: &Self) -> bool;
-}
-
-#[derive(Encode, Decode, Serialize, Deserialize, TypeInfo, MaxEncodedLen)]
-#[serde(rename_all = "camelCase")]
-enum BasicCrossAccountIdRepr<AccountId> {
- Substrate(AccountId),
- Ethereum(H160),
-}
-
-#[derive(PartialEq, Eq)]
-pub struct BasicCrossAccountId<T: Config> {
- /// If true - then ethereum is canonical encoding
- from_ethereum: bool,
- substrate: T::AccountId,
- ethereum: H160,
-}
-
-impl<T: Config> MaxEncodedLen for BasicCrossAccountId<T> {
- fn max_encoded_len() -> usize {
- <BasicCrossAccountIdRepr<T::AccountId>>::max_encoded_len()
- }
-}
-
-impl<T: Config> TypeInfo for BasicCrossAccountId<T> {
- type Identity = Self;
-
- fn type_info() -> Type {
- <BasicCrossAccountIdRepr<T::AccountId>>::type_info()
- }
-}
-
-impl<T: Config> core::fmt::Debug for BasicCrossAccountId<T> {
- fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
- if self.from_ethereum {
- fmt.debug_tuple("CrossAccountId::Ethereum")
- .field(&self.ethereum)
- .finish()
- } else {
- fmt.debug_tuple("CrossAccountId::Substrate")
- .field(&self.substrate)
- .finish()
- }
- }
-}
-
-impl<T: Config> PartialOrd for BasicCrossAccountId<T> {
- fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
- Some(self.substrate.cmp(&other.substrate))
- }
-}
-
-impl<T: Config> Ord for BasicCrossAccountId<T> {
- fn cmp(&self, other: &Self) -> Ordering {
- self.partial_cmp(other)
- .expect("substrate account is total ordered")
- }
-}
-
-impl<T: Config> Clone for BasicCrossAccountId<T> {
- fn clone(&self) -> Self {
- Self {
- from_ethereum: self.from_ethereum,
- substrate: self.substrate.clone(),
- ethereum: self.ethereum,
- }
- }
-}
-impl<T: Config> Encode for BasicCrossAccountId<T> {
- fn encode(&self) -> Vec<u8> {
- BasicCrossAccountIdRepr::from(self.clone()).encode()
- }
-}
-impl<T: Config> EncodeLike for BasicCrossAccountId<T> {}
-impl<T: Config> Decode for BasicCrossAccountId<T> {
- fn decode<I>(input: &mut I) -> Result<Self, codec::Error>
- where
- I: codec::Input,
- {
- Ok(BasicCrossAccountIdRepr::decode(input)?.into())
- }
-}
-impl<T> Serialize for BasicCrossAccountId<T>
-where
- T: Config,
- T::AccountId: Serialize,
-{
- fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
- where
- S: serde::Serializer,
- {
- let repr = BasicCrossAccountIdRepr::from(self.clone());
- (&repr).serialize(serializer)
- }
-}
-impl<'de, T> Deserialize<'de> for BasicCrossAccountId<T>
-where
- T: Config,
- T::AccountId: Deserialize<'de>,
-{
- fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
- where
- D: serde::Deserializer<'de>,
- {
- Ok(BasicCrossAccountIdRepr::deserialize(deserializer)?.into())
- }
-}
-impl<T: Config> CrossAccountId<T::AccountId> for BasicCrossAccountId<T> {
- fn as_sub(&self) -> &T::AccountId {
- &self.substrate
- }
- fn as_eth(&self) -> &H160 {
- &self.ethereum
- }
- fn from_sub(substrate: T::AccountId) -> Self {
- Self {
- ethereum: T::EvmBackwardsAddressMapping::from_account_id(substrate.clone()),
- substrate,
- from_ethereum: false,
- }
- }
- fn from_eth(ethereum: H160) -> Self {
- Self {
- ethereum,
- substrate: T::EvmAddressMapping::into_account_id(ethereum),
- from_ethereum: true,
- }
- }
- fn conv_eq(&self, other: &Self) -> bool {
- if self.from_ethereum == other.from_ethereum {
- self.substrate == other.substrate && self.ethereum == other.ethereum
- } else if self.from_ethereum {
- // ethereum is canonical encoding, but we need to compare derived address
- self.substrate == other.substrate
- } else {
- self.ethereum == other.ethereum
- }
- }
-}
-impl<T: Config> From<BasicCrossAccountIdRepr<T::AccountId>> for BasicCrossAccountId<T> {
- fn from(repr: BasicCrossAccountIdRepr<T::AccountId>) -> Self {
- match repr {
- BasicCrossAccountIdRepr::Substrate(s) => Self::from_sub(s),
- BasicCrossAccountIdRepr::Ethereum(e) => Self::from_eth(e),
- }
- }
-}
-impl<T: Config> From<BasicCrossAccountId<T>> for BasicCrossAccountIdRepr<T::AccountId> {
- fn from(v: BasicCrossAccountId<T>) -> Self {
- if v.from_ethereum {
- BasicCrossAccountIdRepr::Ethereum(*v.as_eth())
- } else {
- BasicCrossAccountIdRepr::Substrate(v.as_sub().clone())
- }
- }
-}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -19,7 +19,7 @@
use core::ops::{Deref, DerefMut};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use sp_std::vec::Vec;
-use account::CrossAccountId;
+use frame_common::account::CrossAccountId;
use frame_support::{
dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo},
ensure, fail,
@@ -38,7 +38,6 @@
pub use pallet::*;
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
-pub mod account;
#[cfg(feature = "runtime-benchmarks")]
pub mod benchmarking;
pub mod erc;
@@ -163,7 +162,7 @@
pub mod pallet {
use super::*;
use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key};
- use account::CrossAccountId;
+ use frame_common::account::CrossAccountId;
use frame_support::traits::Currency;
use up_data_structs::TokenId;
use scale_info::TypeInfo;
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -17,7 +17,7 @@
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
log = "0.4.14"
[dependencies.codec]
pallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-transaction-payment/Cargo.toml
+++ b/pallets/evm-transaction-payment/Cargo.toml
@@ -18,7 +18,7 @@
fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[dependencies.codec]
default-features = false
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -25,6 +25,7 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -21,7 +21,7 @@
use pallet_common::erc::{CommonEvmHandler, PrecompileResult};
use sp_core::{H160, U256};
use sp_std::vec::Vec;
-use pallet_common::account::CrossAccountId;
+use frame_common::account::CrossAccountId;
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
use crate::{
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -20,8 +20,9 @@
use frame_support::{ensure};
use up_data_structs::{AccessMode, CollectionId, TokenId, CreateCollectionData};
use pallet_common::{
- Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,
+ Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
};
+use frame_common::account::CrossAccountId;
use pallet_evm_coder_substrate::WithRecorder;
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -25,6 +25,7 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -25,9 +25,9 @@
use sp_core::{H160, U256};
use sp_std::{vec::Vec, vec};
use pallet_common::{
- account::CrossAccountId,
erc::{CommonEvmHandler, PrecompileResult},
};
+use frame_common::account::CrossAccountId;
use pallet_evm_coder_substrate::call;
use crate::{
pallets/nonfungible/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#![cfg_attr(not(feature = "std"), no_std)]1819use erc::ERC721Events;20use frame_support::{BoundedVec, ensure};21use up_data_structs::{22 AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,23};24use pallet_common::{25 Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, account::CrossAccountId,26};27use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};28use sp_core::H160;29use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};30use sp_std::{vec::Vec, vec};31use core::ops::Deref;32use sp_std::collections::btree_map::BTreeMap;33use codec::{Encode, Decode, MaxEncodedLen};34use scale_info::TypeInfo;3536pub use pallet::*;37#[cfg(feature = "runtime-benchmarks")]38pub mod benchmarking;39pub mod common;40pub mod erc;41pub mod weights;4243pub type CreateItemData<T> = CreateNftExData<<T as pallet_common::Config>::CrossAccountId>;44pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;4546#[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]47pub struct ItemData<CrossAccountId> {48 pub const_data: BoundedVec<u8, CustomDataLimit>,49 pub variable_data: BoundedVec<u8, CustomDataLimit>,50 pub owner: CrossAccountId,51}5253#[frame_support::pallet]54pub mod pallet {55 use super::*;56 use frame_support::{Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};57 use up_data_structs::{CollectionId, TokenId};58 use super::weights::WeightInfo;5960 #[pallet::error]61 pub enum Error<T> {62 /// Not Nonfungible item data used to mint in Nonfungible collection.63 NotNonfungibleDataUsedToMintFungibleCollectionToken,64 /// Used amount > 1 with NFT65 NonfungibleItemsHaveNoAmount,66 }6768 #[pallet::config]69 pub trait Config: frame_system::Config + pallet_common::Config {70 type WeightInfo: WeightInfo;71 }7273 #[pallet::pallet]74 #[pallet::generate_store(pub(super) trait Store)]75 pub struct Pallet<T>(_);7677 #[pallet::storage]78 pub type TokensMinted<T: Config> =79 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;80 #[pallet::storage]81 pub type TokensBurnt<T: Config> =82 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;8384 #[pallet::storage]85 pub type TokenData<T: Config> = StorageNMap<86 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),87 Value = ItemData<T::CrossAccountId>,88 QueryKind = OptionQuery,89 >;9091 /// Used to enumerate tokens owned by account92 #[pallet::storage]93 pub type Owned<T: Config> = StorageNMap<94 Key = (95 Key<Twox64Concat, CollectionId>,96 Key<Blake2_128Concat, T::CrossAccountId>,97 Key<Twox64Concat, TokenId>,98 ),99 Value = bool,100 QueryKind = ValueQuery,101 >;102103 #[pallet::storage]104 pub type AccountBalance<T: Config> = StorageNMap<105 Key = (106 Key<Twox64Concat, CollectionId>,107 Key<Blake2_128Concat, T::CrossAccountId>,108 ),109 Value = u32,110 QueryKind = ValueQuery,111 >;112113 #[pallet::storage]114 pub type Allowance<T: Config> = StorageNMap<115 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),116 Value = T::CrossAccountId,117 QueryKind = OptionQuery,118 >;119}120121pub struct NonfungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);122impl<T: Config> NonfungibleHandle<T> {123 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {124 Self(inner)125 }126 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {127 self.0128 }129}130impl<T: Config> WithRecorder<T> for NonfungibleHandle<T> {131 fn recorder(&self) -> &SubstrateRecorder<T> {132 self.0.recorder()133 }134 fn into_recorder(self) -> SubstrateRecorder<T> {135 self.0.into_recorder()136 }137}138impl<T: Config> Deref for NonfungibleHandle<T> {139 type Target = pallet_common::CollectionHandle<T>;140141 fn deref(&self) -> &Self::Target {142 &self.0143 }144}145146impl<T: Config> Pallet<T> {147 pub fn total_supply(collection: &NonfungibleHandle<T>) -> u32 {148 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)149 }150 pub fn token_exists(collection: &NonfungibleHandle<T>, token: TokenId) -> bool {151 <TokenData<T>>::contains_key((collection.id, token))152 }153}154155// unchecked calls skips any permission checks156impl<T: Config> Pallet<T> {157 pub fn init_collection(158 owner: T::AccountId,159 data: CreateCollectionData<T::AccountId>,160 ) -> Result<CollectionId, DispatchError> {161 <PalletCommon<T>>::init_collection(owner, data)162 }163 pub fn destroy_collection(164 collection: NonfungibleHandle<T>,165 sender: &T::CrossAccountId,166 ) -> DispatchResult {167 let id = collection.id;168169 // =========170171 PalletCommon::destroy_collection(collection.0, sender)?;172173 <TokenData<T>>::remove_prefix((id,), None);174 <Owned<T>>::remove_prefix((id,), None);175 <TokensMinted<T>>::remove(id);176 <TokensBurnt<T>>::remove(id);177 <Allowance<T>>::remove_prefix((id,), None);178 <AccountBalance<T>>::remove_prefix((id,), None);179 Ok(())180 }181182 pub fn burn(183 collection: &NonfungibleHandle<T>,184 sender: &T::CrossAccountId,185 token: TokenId,186 ) -> DispatchResult {187 let token_data =188 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;189 ensure!(190 &token_data.owner == sender191 || (collection.limits.owner_can_transfer() && collection.is_owner_or_admin(sender)),192 <CommonError<T>>::NoPermission193 );194195 if collection.access == AccessMode::AllowList {196 collection.check_allowlist(sender)?;197 }198199 let burnt = <TokensBurnt<T>>::get(collection.id)200 .checked_add(1)201 .ok_or(ArithmeticError::Overflow)?;202203 let balance = <AccountBalance<T>>::get((collection.id, token_data.owner.clone()))204 .checked_sub(1)205 .ok_or(ArithmeticError::Overflow)?;206207 if balance == 0 {208 <AccountBalance<T>>::remove((collection.id, token_data.owner.clone()));209 } else {210 <AccountBalance<T>>::insert((collection.id, token_data.owner.clone()), balance);211 }212 // =========213214 <Owned<T>>::remove((collection.id, &token_data.owner, token));215 <TokensBurnt<T>>::insert(collection.id, burnt);216 <TokenData<T>>::remove((collection.id, token));217 let old_spender = <Allowance<T>>::take((collection.id, token));218219 if let Some(old_spender) = old_spender {220 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(221 collection.id,222 token,223 sender.clone(),224 old_spender,225 0,226 ));227 }228229 collection.log_mirrored(ERC721Events::Transfer {230 from: *token_data.owner.as_eth(),231 to: H160::default(),232 token_id: token.into(),233 });234 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(235 collection.id,236 token,237 token_data.owner,238 1,239 ));240 Ok(())241 }242243 pub fn transfer(244 collection: &NonfungibleHandle<T>,245 from: &T::CrossAccountId,246 to: &T::CrossAccountId,247 token: TokenId,248 ) -> DispatchResult {249 ensure!(250 collection.limits.transfers_enabled(),251 <CommonError<T>>::TransferNotAllowed252 );253254 let token_data =255 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;256 ensure!(257 &token_data.owner == from258 || (collection.limits.owner_can_transfer() && collection.is_owner_or_admin(from)),259 <CommonError<T>>::NoPermission260 );261262 if collection.access == AccessMode::AllowList {263 collection.check_allowlist(from)?;264 collection.check_allowlist(to)?;265 }266 <PalletCommon<T>>::ensure_correct_receiver(to)?;267268 let balance_from = <AccountBalance<T>>::get((collection.id, from))269 .checked_sub(1)270 .ok_or(<CommonError<T>>::TokenValueTooLow)?;271 let balance_to = if from != to {272 let balance_to = <AccountBalance<T>>::get((collection.id, to))273 .checked_add(1)274 .ok_or(ArithmeticError::Overflow)?;275276 ensure!(277 balance_to < collection.limits.account_token_ownership_limit(),278 <CommonError<T>>::AccountTokenLimitExceeded,279 );280281 Some(balance_to)282 } else {283 None284 };285286 // =========287288 <TokenData<T>>::insert(289 (collection.id, token),290 ItemData {291 owner: to.clone(),292 ..token_data293 },294 );295296 if let Some(balance_to) = balance_to {297 // from != to298 if balance_from == 0 {299 <AccountBalance<T>>::remove((collection.id, from));300 } else {301 <AccountBalance<T>>::insert((collection.id, from), balance_from);302 }303 <AccountBalance<T>>::insert((collection.id, to), balance_to);304 <Owned<T>>::remove((collection.id, from, token));305 <Owned<T>>::insert((collection.id, to, token), true);306 }307 Self::set_allowance_unchecked(collection, from, token, None, true);308309 collection.log_mirrored(ERC721Events::Transfer {310 from: *from.as_eth(),311 to: *to.as_eth(),312 token_id: token.into(),313 });314 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(315 collection.id,316 token,317 from.clone(),318 to.clone(),319 1,320 ));321 Ok(())322 }323324 pub fn create_multiple_items(325 collection: &NonfungibleHandle<T>,326 sender: &T::CrossAccountId,327 data: Vec<CreateItemData<T>>,328 ) -> DispatchResult {329 if !collection.is_owner_or_admin(sender) {330 ensure!(331 collection.mint_mode,332 <CommonError<T>>::PublicMintingNotAllowed333 );334 collection.check_allowlist(sender)?;335336 for item in data.iter() {337 collection.check_allowlist(&item.owner)?;338 }339 }340341 for data in data.iter() {342 <PalletCommon<T>>::ensure_correct_receiver(&data.owner)?;343 }344345 let first_token = <TokensMinted<T>>::get(collection.id);346 let tokens_minted = first_token347 .checked_add(data.len() as u32)348 .ok_or(ArithmeticError::Overflow)?;349 ensure!(350 tokens_minted <= collection.limits.token_limit(),351 <CommonError<T>>::CollectionTokenLimitExceeded352 );353354 let mut balances = BTreeMap::new();355 for data in &data {356 let balance = balances357 .entry(&data.owner)358 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, &data.owner)));359 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;360361 ensure!(362 *balance <= collection.limits.account_token_ownership_limit(),363 <CommonError<T>>::AccountTokenLimitExceeded,364 );365 }366367 // =========368369 <TokensMinted<T>>::insert(collection.id, tokens_minted);370 for (account, balance) in balances {371 <AccountBalance<T>>::insert((collection.id, account), balance);372 }373 for (i, data) in data.into_iter().enumerate() {374 let token = first_token + i as u32 + 1;375376 <TokenData<T>>::insert(377 (collection.id, token),378 ItemData {379 const_data: data.const_data,380 variable_data: data.variable_data,381 owner: data.owner.clone(),382 },383 );384 <Owned<T>>::insert((collection.id, &data.owner, token), true);385386 collection.log_mirrored(ERC721Events::Transfer {387 from: H160::default(),388 to: *data.owner.as_eth(),389 token_id: token.into(),390 });391 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(392 collection.id,393 TokenId(token),394 data.owner.clone(),395 1,396 ));397 }398 Ok(())399 }400401 pub fn set_allowance_unchecked(402 collection: &NonfungibleHandle<T>,403 sender: &T::CrossAccountId,404 token: TokenId,405 spender: Option<&T::CrossAccountId>,406 assume_implicit_eth: bool,407 ) {408 if let Some(spender) = spender {409 let old_spender = <Allowance<T>>::get((collection.id, token));410 <Allowance<T>>::insert((collection.id, token), spender);411 // In ERC721 there is only one possible approved user of token, so we set412 // approved user to spender413 collection.log_mirrored(ERC721Events::Approval {414 owner: *sender.as_eth(),415 approved: *spender.as_eth(),416 token_id: token.into(),417 });418 // In Unique chain, any token can have any amount of approved users, so we need to419 // set allowance of old owner to 0, and allowance of new owner to 1420 if old_spender.as_ref() != Some(spender) {421 if let Some(old_owner) = old_spender {422 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(423 collection.id,424 token,425 sender.clone(),426 old_owner,427 0,428 ));429 }430 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(431 collection.id,432 token,433 sender.clone(),434 spender.clone(),435 1,436 ));437 }438 } else {439 let old_spender = <Allowance<T>>::take((collection.id, token));440 if !assume_implicit_eth {441 // In ERC721 there is only one possible approved user of token, so we set442 // approved user to zero address443 collection.log_mirrored(ERC721Events::Approval {444 owner: *sender.as_eth(),445 approved: H160::default(),446 token_id: token.into(),447 });448 }449 // In Unique chain, any token can have any amount of approved users, so we need to450 // set allowance of old owner to 0451 if let Some(old_spender) = old_spender {452 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(453 collection.id,454 token,455 sender.clone(),456 old_spender,457 0,458 ));459 }460 }461 }462463 pub fn set_allowance(464 collection: &NonfungibleHandle<T>,465 sender: &T::CrossAccountId,466 token: TokenId,467 spender: Option<&T::CrossAccountId>,468 ) -> DispatchResult {469 if collection.access == AccessMode::AllowList {470 collection.check_allowlist(sender)?;471 if let Some(spender) = spender {472 collection.check_allowlist(spender)?;473 }474 }475476 if let Some(spender) = spender {477 <PalletCommon<T>>::ensure_correct_receiver(spender)?;478 }479 let token_data =480 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;481 if &token_data.owner != sender {482 ensure!(483 collection.ignores_owned_amount(sender),484 <CommonError<T>>::CantApproveMoreThanOwned485 );486 }487488 // =========489490 Self::set_allowance_unchecked(collection, sender, token, spender, false);491 Ok(())492 }493494 pub fn transfer_from(495 collection: &NonfungibleHandle<T>,496 spender: &T::CrossAccountId,497 from: &T::CrossAccountId,498 to: &T::CrossAccountId,499 token: TokenId,500 ) -> DispatchResult {501 if spender.conv_eq(from) {502 return Self::transfer(collection, from, to, token);503 }504 if collection.access == AccessMode::AllowList {505 // `from`, `to` checked in [`transfer`]506 collection.check_allowlist(spender)?;507 }508509 if <Allowance<T>>::get((collection.id, token)).as_ref() != Some(spender) {510 ensure!(511 collection.ignores_allowance(spender),512 <CommonError<T>>::ApprovedValueTooLow513 );514 }515516 // =========517518 Self::transfer(collection, from, to, token)?;519 // Allowance is reset in [`transfer`]520 Ok(())521 }522523 pub fn burn_from(524 collection: &NonfungibleHandle<T>,525 spender: &T::CrossAccountId,526 from: &T::CrossAccountId,527 token: TokenId,528 ) -> DispatchResult {529 if spender.conv_eq(from) {530 return Self::burn(collection, from, token);531 }532 if collection.access == AccessMode::AllowList {533 // `from` checked in [`burn`]534 collection.check_allowlist(spender)?;535 }536537 if <Allowance<T>>::get((collection.id, token)).as_ref() != Some(spender) {538 ensure!(539 collection.ignores_allowance(spender),540 <CommonError<T>>::ApprovedValueTooLow541 );542 }543544 // =========545546 Self::burn(collection, from, token)547 }548549 pub fn set_variable_metadata(550 collection: &NonfungibleHandle<T>,551 sender: &T::CrossAccountId,552 token: TokenId,553 data: BoundedVec<u8, CustomDataLimit>,554 ) -> DispatchResult {555 let token_data =556 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;557 collection.check_can_update_meta(sender, &token_data.owner)?;558559 // =========560561 <TokenData<T>>::insert(562 (collection.id, token),563 ItemData {564 variable_data: data,565 ..token_data566 },567 );568 Ok(())569 }570571 /// Delegated to `create_multiple_items`572 pub fn create_item(573 collection: &NonfungibleHandle<T>,574 sender: &T::CrossAccountId,575 data: CreateItemData<T>,576 ) -> DispatchResult {577 Self::create_multiple_items(collection, sender, vec![data])578 }579}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#![cfg_attr(not(feature = "std"), no_std)]1819use erc::ERC721Events;20use frame_support::{BoundedVec, ensure};21use up_data_structs::{22 AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,23};24use pallet_common::{25 Error as CommonError, Pallet as PalletCommon, Event as CommonEvent,26};27use frame_common::account::CrossAccountId;28use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};29use sp_core::H160;30use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};31use sp_std::{vec::Vec, vec};32use core::ops::Deref;33use sp_std::collections::btree_map::BTreeMap;34use codec::{Encode, Decode, MaxEncodedLen};35use scale_info::TypeInfo;3637pub use pallet::*;38#[cfg(feature = "runtime-benchmarks")]39pub mod benchmarking;40pub mod common;41pub mod erc;42pub mod weights;4344pub type CreateItemData<T> = CreateNftExData<<T as pallet_common::Config>::CrossAccountId>;45pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;4647#[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]48pub struct ItemData<CrossAccountId> {49 pub const_data: BoundedVec<u8, CustomDataLimit>,50 pub variable_data: BoundedVec<u8, CustomDataLimit>,51 pub owner: CrossAccountId,52}5354#[frame_support::pallet]55pub mod pallet {56 use super::*;57 use frame_support::{Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};58 use up_data_structs::{CollectionId, TokenId};59 use super::weights::WeightInfo;6061 #[pallet::error]62 pub enum Error<T> {63 /// Not Nonfungible item data used to mint in Nonfungible collection.64 NotNonfungibleDataUsedToMintFungibleCollectionToken,65 /// Used amount > 1 with NFT66 NonfungibleItemsHaveNoAmount,67 }6869 #[pallet::config]70 pub trait Config: frame_system::Config + pallet_common::Config {71 type WeightInfo: WeightInfo;72 }7374 #[pallet::pallet]75 #[pallet::generate_store(pub(super) trait Store)]76 pub struct Pallet<T>(_);7778 #[pallet::storage]79 pub type TokensMinted<T: Config> =80 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;81 #[pallet::storage]82 pub type TokensBurnt<T: Config> =83 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;8485 #[pallet::storage]86 pub type TokenData<T: Config> = StorageNMap<87 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),88 Value = ItemData<T::CrossAccountId>,89 QueryKind = OptionQuery,90 >;9192 /// Used to enumerate tokens owned by account93 #[pallet::storage]94 pub type Owned<T: Config> = StorageNMap<95 Key = (96 Key<Twox64Concat, CollectionId>,97 Key<Blake2_128Concat, T::CrossAccountId>,98 Key<Twox64Concat, TokenId>,99 ),100 Value = bool,101 QueryKind = ValueQuery,102 >;103104 #[pallet::storage]105 pub type AccountBalance<T: Config> = StorageNMap<106 Key = (107 Key<Twox64Concat, CollectionId>,108 Key<Blake2_128Concat, T::CrossAccountId>,109 ),110 Value = u32,111 QueryKind = ValueQuery,112 >;113114 #[pallet::storage]115 pub type Allowance<T: Config> = StorageNMap<116 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),117 Value = T::CrossAccountId,118 QueryKind = OptionQuery,119 >;120}121122pub struct NonfungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);123impl<T: Config> NonfungibleHandle<T> {124 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {125 Self(inner)126 }127 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {128 self.0129 }130}131impl<T: Config> WithRecorder<T> for NonfungibleHandle<T> {132 fn recorder(&self) -> &SubstrateRecorder<T> {133 self.0.recorder()134 }135 fn into_recorder(self) -> SubstrateRecorder<T> {136 self.0.into_recorder()137 }138}139impl<T: Config> Deref for NonfungibleHandle<T> {140 type Target = pallet_common::CollectionHandle<T>;141142 fn deref(&self) -> &Self::Target {143 &self.0144 }145}146147impl<T: Config> Pallet<T> {148 pub fn total_supply(collection: &NonfungibleHandle<T>) -> u32 {149 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)150 }151 pub fn token_exists(collection: &NonfungibleHandle<T>, token: TokenId) -> bool {152 <TokenData<T>>::contains_key((collection.id, token))153 }154}155156// unchecked calls skips any permission checks157impl<T: Config> Pallet<T> {158 pub fn init_collection(159 owner: T::AccountId,160 data: CreateCollectionData<T::AccountId>,161 ) -> Result<CollectionId, DispatchError> {162 <PalletCommon<T>>::init_collection(owner, data)163 }164 pub fn destroy_collection(165 collection: NonfungibleHandle<T>,166 sender: &T::CrossAccountId,167 ) -> DispatchResult {168 let id = collection.id;169170 // =========171172 PalletCommon::destroy_collection(collection.0, sender)?;173174 <TokenData<T>>::remove_prefix((id,), None);175 <Owned<T>>::remove_prefix((id,), None);176 <TokensMinted<T>>::remove(id);177 <TokensBurnt<T>>::remove(id);178 <Allowance<T>>::remove_prefix((id,), None);179 <AccountBalance<T>>::remove_prefix((id,), None);180 Ok(())181 }182183 pub fn burn(184 collection: &NonfungibleHandle<T>,185 sender: &T::CrossAccountId,186 token: TokenId,187 ) -> DispatchResult {188 let token_data =189 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;190 ensure!(191 &token_data.owner == sender192 || (collection.limits.owner_can_transfer() && collection.is_owner_or_admin(sender)),193 <CommonError<T>>::NoPermission194 );195196 if collection.access == AccessMode::AllowList {197 collection.check_allowlist(sender)?;198 }199200 let burnt = <TokensBurnt<T>>::get(collection.id)201 .checked_add(1)202 .ok_or(ArithmeticError::Overflow)?;203204 let balance = <AccountBalance<T>>::get((collection.id, token_data.owner.clone()))205 .checked_sub(1)206 .ok_or(ArithmeticError::Overflow)?;207208 if balance == 0 {209 <AccountBalance<T>>::remove((collection.id, token_data.owner.clone()));210 } else {211 <AccountBalance<T>>::insert((collection.id, token_data.owner.clone()), balance);212 }213 // =========214215 <Owned<T>>::remove((collection.id, &token_data.owner, token));216 <TokensBurnt<T>>::insert(collection.id, burnt);217 <TokenData<T>>::remove((collection.id, token));218 let old_spender = <Allowance<T>>::take((collection.id, token));219220 if let Some(old_spender) = old_spender {221 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(222 collection.id,223 token,224 sender.clone(),225 old_spender,226 0,227 ));228 }229230 collection.log_mirrored(ERC721Events::Transfer {231 from: *token_data.owner.as_eth(),232 to: H160::default(),233 token_id: token.into(),234 });235 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(236 collection.id,237 token,238 token_data.owner,239 1,240 ));241 Ok(())242 }243244 pub fn transfer(245 collection: &NonfungibleHandle<T>,246 from: &T::CrossAccountId,247 to: &T::CrossAccountId,248 token: TokenId,249 ) -> DispatchResult {250 ensure!(251 collection.limits.transfers_enabled(),252 <CommonError<T>>::TransferNotAllowed253 );254255 let token_data =256 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;257 ensure!(258 &token_data.owner == from259 || (collection.limits.owner_can_transfer() && collection.is_owner_or_admin(from)),260 <CommonError<T>>::NoPermission261 );262263 if collection.access == AccessMode::AllowList {264 collection.check_allowlist(from)?;265 collection.check_allowlist(to)?;266 }267 <PalletCommon<T>>::ensure_correct_receiver(to)?;268269 let balance_from = <AccountBalance<T>>::get((collection.id, from))270 .checked_sub(1)271 .ok_or(<CommonError<T>>::TokenValueTooLow)?;272 let balance_to = if from != to {273 let balance_to = <AccountBalance<T>>::get((collection.id, to))274 .checked_add(1)275 .ok_or(ArithmeticError::Overflow)?;276277 ensure!(278 balance_to < collection.limits.account_token_ownership_limit(),279 <CommonError<T>>::AccountTokenLimitExceeded,280 );281282 Some(balance_to)283 } else {284 None285 };286287 // =========288289 <TokenData<T>>::insert(290 (collection.id, token),291 ItemData {292 owner: to.clone(),293 ..token_data294 },295 );296297 if let Some(balance_to) = balance_to {298 // from != to299 if balance_from == 0 {300 <AccountBalance<T>>::remove((collection.id, from));301 } else {302 <AccountBalance<T>>::insert((collection.id, from), balance_from);303 }304 <AccountBalance<T>>::insert((collection.id, to), balance_to);305 <Owned<T>>::remove((collection.id, from, token));306 <Owned<T>>::insert((collection.id, to, token), true);307 }308 Self::set_allowance_unchecked(collection, from, token, None, true);309310 collection.log_mirrored(ERC721Events::Transfer {311 from: *from.as_eth(),312 to: *to.as_eth(),313 token_id: token.into(),314 });315 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(316 collection.id,317 token,318 from.clone(),319 to.clone(),320 1,321 ));322 Ok(())323 }324325 pub fn create_multiple_items(326 collection: &NonfungibleHandle<T>,327 sender: &T::CrossAccountId,328 data: Vec<CreateItemData<T>>,329 ) -> DispatchResult {330 if !collection.is_owner_or_admin(sender) {331 ensure!(332 collection.mint_mode,333 <CommonError<T>>::PublicMintingNotAllowed334 );335 collection.check_allowlist(sender)?;336337 for item in data.iter() {338 collection.check_allowlist(&item.owner)?;339 }340 }341342 for data in data.iter() {343 <PalletCommon<T>>::ensure_correct_receiver(&data.owner)?;344 }345346 let first_token = <TokensMinted<T>>::get(collection.id);347 let tokens_minted = first_token348 .checked_add(data.len() as u32)349 .ok_or(ArithmeticError::Overflow)?;350 ensure!(351 tokens_minted <= collection.limits.token_limit(),352 <CommonError<T>>::CollectionTokenLimitExceeded353 );354355 let mut balances = BTreeMap::new();356 for data in &data {357 let balance = balances358 .entry(&data.owner)359 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, &data.owner)));360 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;361362 ensure!(363 *balance <= collection.limits.account_token_ownership_limit(),364 <CommonError<T>>::AccountTokenLimitExceeded,365 );366 }367368 // =========369370 <TokensMinted<T>>::insert(collection.id, tokens_minted);371 for (account, balance) in balances {372 <AccountBalance<T>>::insert((collection.id, account), balance);373 }374 for (i, data) in data.into_iter().enumerate() {375 let token = first_token + i as u32 + 1;376377 <TokenData<T>>::insert(378 (collection.id, token),379 ItemData {380 const_data: data.const_data,381 variable_data: data.variable_data,382 owner: data.owner.clone(),383 },384 );385 <Owned<T>>::insert((collection.id, &data.owner, token), true);386387 collection.log_mirrored(ERC721Events::Transfer {388 from: H160::default(),389 to: *data.owner.as_eth(),390 token_id: token.into(),391 });392 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(393 collection.id,394 TokenId(token),395 data.owner.clone(),396 1,397 ));398 }399 Ok(())400 }401402 pub fn set_allowance_unchecked(403 collection: &NonfungibleHandle<T>,404 sender: &T::CrossAccountId,405 token: TokenId,406 spender: Option<&T::CrossAccountId>,407 assume_implicit_eth: bool,408 ) {409 if let Some(spender) = spender {410 let old_spender = <Allowance<T>>::get((collection.id, token));411 <Allowance<T>>::insert((collection.id, token), spender);412 // In ERC721 there is only one possible approved user of token, so we set413 // approved user to spender414 collection.log_mirrored(ERC721Events::Approval {415 owner: *sender.as_eth(),416 approved: *spender.as_eth(),417 token_id: token.into(),418 });419 // In Unique chain, any token can have any amount of approved users, so we need to420 // set allowance of old owner to 0, and allowance of new owner to 1421 if old_spender.as_ref() != Some(spender) {422 if let Some(old_owner) = old_spender {423 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(424 collection.id,425 token,426 sender.clone(),427 old_owner,428 0,429 ));430 }431 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(432 collection.id,433 token,434 sender.clone(),435 spender.clone(),436 1,437 ));438 }439 } else {440 let old_spender = <Allowance<T>>::take((collection.id, token));441 if !assume_implicit_eth {442 // In ERC721 there is only one possible approved user of token, so we set443 // approved user to zero address444 collection.log_mirrored(ERC721Events::Approval {445 owner: *sender.as_eth(),446 approved: H160::default(),447 token_id: token.into(),448 });449 }450 // In Unique chain, any token can have any amount of approved users, so we need to451 // set allowance of old owner to 0452 if let Some(old_spender) = old_spender {453 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(454 collection.id,455 token,456 sender.clone(),457 old_spender,458 0,459 ));460 }461 }462 }463464 pub fn set_allowance(465 collection: &NonfungibleHandle<T>,466 sender: &T::CrossAccountId,467 token: TokenId,468 spender: Option<&T::CrossAccountId>,469 ) -> DispatchResult {470 if collection.access == AccessMode::AllowList {471 collection.check_allowlist(sender)?;472 if let Some(spender) = spender {473 collection.check_allowlist(spender)?;474 }475 }476477 if let Some(spender) = spender {478 <PalletCommon<T>>::ensure_correct_receiver(spender)?;479 }480 let token_data =481 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;482 if &token_data.owner != sender {483 ensure!(484 collection.ignores_owned_amount(sender),485 <CommonError<T>>::CantApproveMoreThanOwned486 );487 }488489 // =========490491 Self::set_allowance_unchecked(collection, sender, token, spender, false);492 Ok(())493 }494495 pub fn transfer_from(496 collection: &NonfungibleHandle<T>,497 spender: &T::CrossAccountId,498 from: &T::CrossAccountId,499 to: &T::CrossAccountId,500 token: TokenId,501 ) -> DispatchResult {502 if spender.conv_eq(from) {503 return Self::transfer(collection, from, to, token);504 }505 if collection.access == AccessMode::AllowList {506 // `from`, `to` checked in [`transfer`]507 collection.check_allowlist(spender)?;508 }509510 if <Allowance<T>>::get((collection.id, token)).as_ref() != Some(spender) {511 ensure!(512 collection.ignores_allowance(spender),513 <CommonError<T>>::ApprovedValueTooLow514 );515 }516517 // =========518519 Self::transfer(collection, from, to, token)?;520 // Allowance is reset in [`transfer`]521 Ok(())522 }523524 pub fn burn_from(525 collection: &NonfungibleHandle<T>,526 spender: &T::CrossAccountId,527 from: &T::CrossAccountId,528 token: TokenId,529 ) -> DispatchResult {530 if spender.conv_eq(from) {531 return Self::burn(collection, from, token);532 }533 if collection.access == AccessMode::AllowList {534 // `from` checked in [`burn`]535 collection.check_allowlist(spender)?;536 }537538 if <Allowance<T>>::get((collection.id, token)).as_ref() != Some(spender) {539 ensure!(540 collection.ignores_allowance(spender),541 <CommonError<T>>::ApprovedValueTooLow542 );543 }544545 // =========546547 Self::burn(collection, from, token)548 }549550 pub fn set_variable_metadata(551 collection: &NonfungibleHandle<T>,552 sender: &T::CrossAccountId,553 token: TokenId,554 data: BoundedVec<u8, CustomDataLimit>,555 ) -> DispatchResult {556 let token_data =557 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;558 collection.check_can_update_meta(sender, &token_data.owner)?;559560 // =========561562 <TokenData<T>>::insert(563 (collection.id, token),564 ItemData {565 variable_data: data,566 ..token_data567 },568 );569 Ok(())570 }571572 /// Delegated to `create_multiple_items`573 pub fn create_item(574 collection: &NonfungibleHandle<T>,575 sender: &T::CrossAccountId,576 data: CreateItemData<T>,577 ) -> DispatchResult {578 Self::create_multiple_items(collection, sender, vec![data])579 }580}pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -22,6 +22,7 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -22,8 +22,9 @@
CreateCollectionData, CreateRefungibleExData,
};
use pallet_common::{
- Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,
+ Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
};
+use frame_common::account::CrossAccountId;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
use core::ops::Deref;
pallets/unique/Cargo.tomldiffbeforeafterboth--- a/pallets/unique/Cargo.toml
+++ b/pallets/unique/Cargo.toml
@@ -132,7 +132,8 @@
sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
evm-coder = { default-features = false, path = "../../crates/evm-coder" }
pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
primitive-types = { version = "0.11.1", default-features = false, features = [
pallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -25,8 +25,7 @@
use core::marker::PhantomData;
use core::convert::TryInto;
use up_data_structs::TokenId;
-use up_evm_mapping::EvmBackwardsAddressMapping;
-use pallet_common::account::CrossAccountId;
+use frame_common::account::CrossAccountId;
use pallet_nonfungible::erc::{UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721Call};
use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -54,9 +54,10 @@
CreateCollectionData, CustomDataLimit, CreateItemExData,
};
use pallet_common::{
- account::CrossAccountId, CollectionHandle, Pallet as PalletCommon, Error as CommonError,
+ CollectionHandle, Pallet as PalletCommon, Error as CommonError,
CommonWeightInfo,
};
+use frame_common::account::CrossAccountId;
use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle};
use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};
use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle};
pallets/unique/src/mock.rsdiffbeforeafterboth--- a/pallets/unique/src/mock.rs
+++ b/pallets/unique/src/mock.rs
@@ -26,7 +26,8 @@
use pallet_transaction_payment::{CurrencyAdapter};
use frame_system as system;
use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};
-use pallet_common::account::{EvmBackwardsAddressMapping, CrossAccountId};
+use up_evm_mapping::EvmBackwardsAddressMapping;
+use frame_common::account::CrossAccountId;
use codec::{Encode, Decode, MaxEncodedLen};
use scale_info::TypeInfo;
use up_data_structs::ConstU32;
pallets/unique/src/sponsorship.rsdiffbeforeafterboth--- a/pallets/unique/src/sponsorship.rs
+++ b/pallets/unique/src/sponsorship.rs
@@ -30,7 +30,7 @@
NFT_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, TokenId,
};
use pallet_common::{CollectionHandle};
-use pallet_common::account::CrossAccountId;
+use frame_common::account::CrossAccountId;
pub fn withdraw_transfer<T: Config>(
collection: &CollectionHandle<T>,
primitives/evm-mapping/Cargo.tomldiffbeforeafterboth--- a/primitives/evm-mapping/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "up-evm-mapping"
-version = "0.1.0"
-license = "GPLv3"
-edition = "2021"
-
-[dependencies]
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-
-[features]
-default = ["std"]
-std = ["sp-core/std", "frame-support/std"]
primitives/evm-mapping/src/lib.rsdiffbeforeafterboth--- a/primitives/evm-mapping/src/lib.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use frame_support::sp_runtime::AccountId32;
-use sp_core::H160;
-
-/// Transforms substrate addresses to ethereum (Reverse of `EvmAddressMapping`)
-/// pallet_evm doesn't have this, as it only checks if eth address
-/// is owned by substrate via `EnsureAddressOrigin` trait
-///
-/// This trait implementations shouldn't conflict with used `EnsureAddressOrigin`
-pub trait EvmBackwardsAddressMapping<AccountId> {
- fn from_account_id(account_id: AccountId) -> H160;
-}
-
-/// Should have same mapping as EnsureAddressTruncated
-pub struct MapBackwardsAddressTruncated;
-impl EvmBackwardsAddressMapping<AccountId32> for MapBackwardsAddressTruncated {
- fn from_account_id(account_id: AccountId32) -> H160 {
- let mut out = [0; 20];
- out.copy_from_slice(&(account_id.as_ref() as &[u8])[0..20]);
- H160(out)
- }
-}
primitives/rpc/Cargo.tomldiffbeforeafterboth--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -14,6 +14,7 @@
sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-api = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
primitives/rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -28,7 +28,7 @@
#[api_version(2)]
pub trait UniqueApi<CrossAccountId, AccountId> where
AccountId: Decode,
- CrossAccountId: pallet_common::account::CrossAccountId<AccountId>,
+ CrossAccountId: frame_common::account::CrossAccountId<AccountId>,
{
#[changed_in(2)]
fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -116,11 +116,10 @@
pub const RUNTIME_NAME: &str = "Opal";
-type CrossAccountId = pallet_common::account::BasicCrossAccountId<Runtime>;
+type CrossAccountId = frame_common::account::BasicCrossAccountId<Runtime>;
impl RuntimeInstance for Runtime {
type CrossAccountId = self::CrossAccountId;
-
type TransactionConverter = self::TransactionConverter;
fn get_transaction_converter() -> TransactionConverter {
@@ -286,6 +285,11 @@
type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;
}
+impl frame_common::account::Config for Runtime {
+ type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
+ type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
+}
+
pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);
impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {
fn find_author<'a, I>(digests: I) -> Option<H160>
@@ -846,7 +850,7 @@
type Event = Event;
type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
- type CrossAccountId = pallet_common::account::BasicCrossAccountId<Self>;
+ type CrossAccountId = frame_common::account::BasicCrossAccountId<Self>;
type Currency = Balances;
type CollectionCreationPrice = CollectionCreationPrice;
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -382,7 +382,6 @@
derivative = "2.2.0"
pallet-unique = { path = '../../pallets/unique', default-features = false }
up-rpc = { path = "../../primitives/rpc", default-features = false }
-up-evm-mapping = { path = "../../primitives/evm-mapping", default-features = false }
pallet-inflation = { path = '../../pallets/inflation', default-features = false }
up-data-structs = { path = '../../primitives/data-structs', default-features = false }
pallet-common = { default-features = false, path = "../../pallets/common" }
@@ -401,6 +400,8 @@
pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
################################################################################
# Build Dependencies