difftreelog
CORE-300 Adapt to CrossAccountId
in: master
20 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2554,7 +2554,7 @@
"fc-db",
"fc-rpc-core",
"fp-consensus",
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
"fp-rpc",
"fp-storage",
"futures 0.3.21",
@@ -2565,7 +2565,7 @@
"log",
"lru 0.6.6",
"pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"parity-scale-codec",
"parking_lot 0.11.2",
"rand 0.7.3",
@@ -2757,7 +2757,7 @@
dependencies = [
"ethereum",
"ethereum-types",
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
"parity-scale-codec",
"scale-info",
"sp-api",
@@ -2853,21 +2853,6 @@
]
[[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"
@@ -5850,7 +5835,7 @@
dependencies = [
"frame-support",
"frame-system",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"parity-scale-codec",
"scale-info",
"serde",
@@ -5999,10 +5984,9 @@
version = "0.1.0"
dependencies = [
"evm-coder",
- "frame-common",
"frame-support",
"frame-system",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6080,7 +6064,7 @@
"ethereum-types",
"evm",
"fp-consensus",
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
"fp-rpc",
"fp-self-contained",
"fp-storage",
@@ -6088,7 +6072,7 @@
"frame-system",
"log",
"pallet-balances",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"pallet-timestamp",
"parity-scale-codec",
"rlp",
@@ -6109,7 +6093,7 @@
"evm",
"evm-gasometer",
"evm-runtime",
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -6140,7 +6124,7 @@
"frame-support",
"frame-system",
"pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6155,7 +6139,7 @@
"frame-support",
"frame-system",
"log",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6170,11 +6154,11 @@
name = "pallet-evm-migration"
version = "0.1.0"
dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
"frame-benchmarking",
"frame-support",
"frame-system",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6187,11 +6171,11 @@
name = "pallet-evm-transaction-payment"
version = "0.1.0"
dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
"frame-support",
"frame-system",
"pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6209,10 +6193,10 @@
"ethereum",
"evm-coder",
"frame-benchmarking",
- "frame-common",
"frame-support",
"frame-system",
"pallet-common",
+ "pallet-evm",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6436,10 +6420,10 @@
"ethereum",
"evm-coder",
"frame-benchmarking",
- "frame-common",
"frame-support",
"frame-system",
"pallet-common",
+ "pallet-evm",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6553,10 +6537,10 @@
version = "0.1.0"
dependencies = [
"frame-benchmarking",
- "frame-common",
"frame-support",
"frame-system",
"pallet-common",
+ "pallet-evm",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6814,16 +6798,15 @@
dependencies = [
"ethereum",
"evm-coder",
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "fp-evm",
"frame-benchmarking",
- "frame-common",
"frame-support",
"frame-system",
"hex-literal",
"pallet-balances",
"pallet-common",
"pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"pallet-evm-coder-substrate",
"pallet-fungible",
"pallet-nonfungible",
@@ -12353,11 +12336,11 @@
name = "uc-rpc"
version = "0.1.0"
dependencies = [
- "frame-common",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
"pallet-common",
+ "pallet-evm",
"parity-scale-codec",
"sp-api",
"sp-blockchain",
@@ -12570,7 +12553,6 @@
"fp-rpc",
"fp-self-contained",
"frame-benchmarking",
- "frame-common",
"frame-executive",
"frame-support",
"frame-system",
@@ -12583,7 +12565,7 @@
"pallet-base-fee",
"pallet-common",
"pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
+ "pallet-evm",
"pallet-evm-coder-substrate",
"pallet-evm-contract-helpers",
"pallet-evm-migration",
@@ -12720,8 +12702,8 @@
name = "up-rpc"
version = "0.1.0"
dependencies = [
- "frame-common",
"pallet-common",
+ "pallet-evm",
"parity-scale-codec",
"sp-api",
"sp-core",
client/rpc/Cargo.tomldiffbeforeafterboth--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -18,4 +18,5 @@
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" }
+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" }
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: frame_common::account::CrossAccountId<AccountId>,
+ CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,
{
pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);
pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);
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 frame_common::account::CrossAccountId;
+use pallet_evm::account::CrossAccountId;
use frame_support::{
dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo},
ensure, fail,
@@ -162,19 +162,14 @@
pub mod pallet {
use super::*;
use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key};
- use frame_common::account::CrossAccountId;
+ use pallet_evm::account;
use frame_support::traits::Currency;
use up_data_structs::TokenId;
use scale_info::TypeInfo;
#[pallet::config]
- pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo {
+ pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config {
type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;
-
- type CrossAccountId: CrossAccountId<Self::AccountId>;
-
- type EvmAddressMapping: pallet_evm::AddressMapping<Self::AccountId>;
- type EvmBackwardsAddressMapping: up_evm_mapping::EvmBackwardsAddressMapping<Self::AccountId>;
type Currency: Currency<Self::AccountId>;
pallets/evm-transaction-payment/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-transaction-payment/src/lib.rs
+++ b/pallets/evm-transaction-payment/src/lib.rs
@@ -20,7 +20,7 @@
use fp_evm::WithdrawReason;
use frame_support::traits::{Currency, IsSubType};
pub use pallet::*;
-use pallet_evm::{EVMCurrencyAdapter, EnsureAddressOrigin};
+use pallet_evm::{EVMCurrencyAdapter, EnsureAddressOrigin, account::CrossAccountId};
use sp_core::{H160, U256};
use sp_runtime::TransactionOutcome;
use up_sponsorship::SponsorshipHandler;
@@ -35,11 +35,9 @@
use sp_std::vec::Vec;
#[pallet::config]
- pub trait Config: frame_system::Config {
+ pub trait Config: frame_system::Config + pallet_evm::account::Config {
type EvmSponsorshipHandler: SponsorshipHandler<Self::AccountId, (H160, Vec<u8>)>;
type Currency: Currency<Self::AccountId>;
- type EvmBackwardsAddressMapping: EvmBackwardsAddressMapping<Self::AccountId>;
- type EvmAddressMapping: AddressMapping<Self::AccountId>;
}
#[pallet::pallet]
@@ -86,14 +84,16 @@
type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;
fn withdraw_fee(
- who: &T::AccountId,
+ who: &T::CrossAccountId,
reason: WithdrawReason,
fee: U256,
) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
- let mut who_pays_fee = who.clone();
+ let who_pays_fee;
if let WithdrawReason::Call { target, input } = &reason {
- who_pays_fee = T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))
- .unwrap_or(who_pays_fee);
+ who_pays_fee = <T as pallet_evm::account::Config>::CrossAccountId::from_sub(T::EvmSponsorshipHandler::get_sponsor(&who.as_sub(), &(*target, input.clone()))
+ .unwrap_or(who.as_sub().clone()));
+ } else {
+ who_pays_fee = who.clone();
}
let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(
@@ -102,20 +102,19 @@
fee,
)?;
- let who_pays_fee_eth = T::EvmBackwardsAddressMapping::from_account_id(who_pays_fee);
Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {
- who: who_pays_fee_eth,
+ who: who_pays_fee.as_eth().clone(),
negative_imbalance: i,
}))
}
fn correct_and_deposit_fee(
- who: &T::AccountId,
+ who: &T::CrossAccountId,
corrected_fee: U256,
already_withdrawn: Self::LiquidityInfo,
) {
<EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::correct_and_deposit_fee(
- &already_withdrawn.as_ref().map(|e| T::EvmAddressMapping::into_account_id(e.who)).unwrap_or(who.clone()),
+ &already_withdrawn.as_ref().map(|e| T::CrossAccountId::from_eth(e.who)).unwrap_or(who.clone()),
corrected_fee,
already_withdrawn.map(|e| e.negative_imbalance),
)
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -22,10 +22,10 @@
pallet-evm-coder-substrate = { default-features = false, path = '../evm-coder-substrate' }
ethereum = { version = "0.12.0", default-features = false }
frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
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"]
@@ -40,5 +40,6 @@
"ethereum/std",
"pallet-evm-coder-substrate/std",
'frame-benchmarking/std',
+ "pallet-evm/std"
]
runtime-benchmarks = ['frame-benchmarking', 'pallet-common/runtime-benchmarks']
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 frame_common::account::CrossAccountId;
+use pallet_evm::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
@@ -22,7 +22,7 @@
use pallet_common::{
Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
};
-use frame_common::account::CrossAccountId;
+use pallet_evm::account::CrossAccountId;
use pallet_evm_coder_substrate::WithRecorder;
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
@@ -37,7 +37,7 @@
pub mod erc;
pub mod weights;
-pub type CreateItemData<T> = (<T as pallet_common::Config>::CrossAccountId, u128);
+pub type CreateItemData<T> = (<T as pallet_evm::account::Config>::CrossAccountId, u128);
pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
#[frame_support::pallet]
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -16,6 +16,7 @@
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' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
pallet-common = { default-features = false, path = '../common' }
up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
@@ -25,7 +26,6 @@
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"]
@@ -40,6 +40,7 @@
"ethereum/std",
"pallet-evm-coder-substrate/std",
'frame-benchmarking/std',
+ "pallet-evm/std"
]
runtime-benchmarks = [
'frame-benchmarking',
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -27,7 +27,7 @@
use pallet_common::{
erc::{CommonEvmHandler, PrecompileResult},
};
-use frame_common::account::CrossAccountId;
+use pallet_evm::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,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}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 pallet_evm::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_evm::account::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
@@ -16,13 +16,13 @@
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' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
pallet-common = { default-features = false, path = '../common' }
up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
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"]
@@ -34,6 +34,7 @@
"up-data-structs/std",
"pallet-common/std",
'frame-benchmarking/std',
+ "pallet-evm/std",
]
runtime-benchmarks = [
'frame-benchmarking',
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -24,7 +24,7 @@
use pallet_common::{
Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
};
-use frame_common::account::CrossAccountId;
+use pallet_evm::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
@@ -133,7 +133,6 @@
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, 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,7 +25,7 @@
use core::marker::PhantomData;
use core::convert::TryInto;
use up_data_structs::TokenId;
-use frame_common::account::CrossAccountId;
+use pallet_evm::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
@@ -57,7 +57,7 @@
CollectionHandle, Pallet as PalletCommon, Error as CommonError,
CommonWeightInfo,
};
-use frame_common::account::CrossAccountId;
+use pallet_evm::account::CrossAccountId;
use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle};
use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};
use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle};
@@ -117,7 +117,7 @@
pub enum Event<T>
where
<T as frame_system::Config>::AccountId,
- <T as pallet_common::Config>::CrossAccountId,
+ <T as pallet_evm::account::Config>::CrossAccountId,
{
/// Collection sponsor was removed
///
pallets/unique/src/mock.rsdiffbeforeafterboth--- a/pallets/unique/src/mock.rs
+++ b/pallets/unique/src/mock.rs
@@ -27,7 +27,7 @@
use frame_system as system;
use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};
use up_evm_mapping::EvmBackwardsAddressMapping;
-use frame_common::account::CrossAccountId;
+use pallet_evm::account::CrossAccountId;
use codec::{Encode, Decode, MaxEncodedLen};
use scale_info::TypeInfo;
use up_data_structs::ConstU32;
@@ -192,15 +192,17 @@
impl pallet_common::Config for Test {
type Event = ();
- type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping;
- type EvmAddressMapping = TestEvmAddressMapping;
- type CrossAccountId = TestCrossAccountId;
-
type Currency = Balances;
type CollectionCreationPrice = CollectionCreationPrice;
type TreasuryAccountId = TreasuryAccountId;
}
+impl pallet_evm::account::Config for Test {
+ type CrossAccountId = TestCrossAccountId;
+ type EvmAddressMapping = TestEvmAddressMapping;
+ type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping;
+}
+
impl pallet_fungible::Config for Test {
type WeightInfo = ();
}
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 frame_common::account::CrossAccountId;
+use pallet_evm::account::CrossAccountId;
pub fn withdraw_transfer<T: Config>(
collection: &CollectionHandle<T>,
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: frame_common::account::CrossAccountId<AccountId>,
+ CrossAccountId: pallet_evm::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
@@ -127,6 +127,22 @@
}
}
+/// The type for looking up accounts. We don't expect more than 4 billion of them, but you
+/// never know...
+pub type AccountIndex = u32;
+
+/// Balance of an account.
+pub type Balance = u128;
+
+/// Index of a transaction in the chain.
+pub type Index = u32;
+
+/// A hash of some data used by the chain.
+pub type Hash = sp_core::H256;
+
+/// Digest item type.
+pub type DigestItem = generic::DigestItem;
+
/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
/// the specifics of the runtime. They can then be made to be agnostic over specific formats
/// of data like extrinsics, allowing for them to continue syncing the network through upgrades
@@ -256,6 +272,12 @@
}
}
+impl pallet_evm::account::Config for Runtime {
+ type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;
+ type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
+ type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
+}
+
impl pallet_evm::Config for Runtime {
type BlockGasLimit = BlockGasLimit;
type FeeCalculator = FixedFee;
@@ -283,11 +305,6 @@
impl pallet_evm_migration::Config for Runtime {
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>);
@@ -848,10 +865,6 @@
impl pallet_common::Config for Runtime {
type Event = Event;
- type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
- type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
- type CrossAccountId = frame_common::account::BasicCrossAccountId<Self>;
-
type Currency = Balances;
type CollectionCreationPrice = CollectionCreationPrice;
type TreasuryAccountId = TreasuryAccountId;
@@ -915,8 +928,6 @@
impl pallet_evm_transaction_payment::Config for Runtime {
type EvmSponsorshipHandler = EvmSponsorshipHandler;
type Currency = Balances;
- type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
- type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
}
impl pallet_charge_transaction::Config for Runtime {