difftreelog
refactor switch to new eth log logic
in: master
33 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2555,7 +2555,7 @@
[[package]]
name = "fc-consensus"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"async-trait",
"fc-db",
@@ -2574,7 +2574,7 @@
[[package]]
name = "fc-db"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"fp-storage",
"kvdb-rocksdb",
@@ -2588,7 +2588,7 @@
[[package]]
name = "fc-mapping-sync"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"fc-db",
"fp-consensus",
@@ -2605,7 +2605,7 @@
[[package]]
name = "fc-rpc"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"ethereum",
"ethereum-types",
@@ -2644,7 +2644,7 @@
[[package]]
name = "fc-rpc-core"
version = "1.1.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"ethereum",
"ethereum-types",
@@ -2777,7 +2777,7 @@
[[package]]
name = "fp-consensus"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"ethereum",
"parity-scale-codec",
@@ -2789,7 +2789,7 @@
[[package]]
name = "fp-evm"
version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"evm",
"impl-trait-for-tuples",
@@ -2802,7 +2802,7 @@
[[package]]
name = "fp-evm-mapping"
version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"frame-support",
"sp-core",
@@ -2811,7 +2811,7 @@
[[package]]
name = "fp-rpc"
version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"ethereum",
"ethereum-types",
@@ -2828,7 +2828,7 @@
[[package]]
name = "fp-self-contained"
version = "1.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"ethereum",
"frame-support",
@@ -2844,7 +2844,7 @@
[[package]]
name = "fp-storage"
version = "2.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"parity-scale-codec",
]
@@ -5741,7 +5741,7 @@
[[package]]
name = "pallet-base-fee"
version = "1.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"fp-evm",
"frame-support",
@@ -5999,7 +5999,7 @@
[[package]]
name = "pallet-ethereum"
version = "4.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"ethereum",
"ethereum-types",
@@ -6029,7 +6029,7 @@
[[package]]
name = "pallet-evm"
version = "6.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21#4c0dea347d0388a7b261cbc36568170e288f3e7a"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.21-logs#79cd4c4cf29106c431facd6779783fc887b21475"
dependencies = [
"evm",
"fp-evm",
client/rpc/Cargo.tomldiffbeforeafterboth--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -18,4 +18,4 @@
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -306,13 +306,13 @@
jsonrpc-pubsub = "18.0.0"
tokio = { version = "1.17.0", features = ["time"] }
-fc-rpc-core = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fc-consensus = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fc-mapping-sync = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fc-rpc = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fc-db = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-rpc = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+fc-rpc-core = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fc-consensus = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fc-mapping-sync = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fc-rpc = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fc-db = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-rpc = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
unique-rpc = { default-features = false, path = "../rpc" }
node/rpc/Cargo.tomldiffbeforeafterboth--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -41,13 +41,13 @@
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
tokio = { version = "0.2.25", features = ["macros", "sync"] }
-pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fc-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-storage = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fc-rpc-core = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fc-db = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fc-mapping-sync = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fc-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-storage = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fc-rpc-core = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fc-db = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fc-mapping-sync = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
pallet-common = { default-features = false, path = "../../pallets/common" }
unique-runtime-common = { default-features = false, path = "../../runtime/common" }
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -16,11 +16,11 @@
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
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", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
serde = { version = "1.0.130", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
pallets/common/src/dispatch.rsdiffbeforeafterboth--- a/pallets/common/src/dispatch.rs
+++ b/pallets/common/src/dispatch.rs
@@ -52,8 +52,6 @@
}) => *weight += dispatch_weight::<T>(),
_ => {}
}
-
- dispatched.into_inner().submit_logs();
result
}
pallets/common/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use core::ops::{Deref, DerefMut};20use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};21use sp_std::vec::Vec;22use pallet_evm::account::CrossAccountId;23use frame_support::{24 dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},25 ensure, fail,26 traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},27 BoundedVec,28 weights::Pays,29};30use pallet_evm::GasWeightMapping;31use up_data_structs::{32 COLLECTION_NUMBER_LIMIT, Collection, RpcCollection, CollectionId, CreateItemData,33 MAX_TOKEN_PREFIX_LENGTH, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, TokenId,34 CollectionStats, MAX_TOKEN_OWNERSHIP, CollectionMode, NFT_SPONSOR_TRANSFER_TIMEOUT,35 FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT,36 CUSTOM_DATA_LIMIT, CollectionLimits, CustomDataLimit, CreateCollectionData, SponsorshipState,37 CreateItemExData, SponsoringRateLimit, budget::Budget, COLLECTION_FIELD_LIMIT, CollectionField,38 PhantomType, Property, Properties, PropertiesPermissionMap, PropertyKey, PropertyPermission,39 PropertiesError, PropertyKeyPermission, TokenData, TrySet,40};41pub use pallet::*;42use sp_core::H160;43use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};44#[cfg(feature = "runtime-benchmarks")]45pub mod benchmarking;46pub mod dispatch;47pub mod erc;48pub mod eth;4950#[must_use = "Should call submit_logs or save, otherwise some data will be lost for evm side"]51pub struct CollectionHandle<T: Config> {52 pub id: CollectionId,53 collection: Collection<T::AccountId>,54 pub recorder: SubstrateRecorder<T>,55}56impl<T: Config> WithRecorder<T> for CollectionHandle<T> {57 fn recorder(&self) -> &SubstrateRecorder<T> {58 &self.recorder59 }60 fn into_recorder(self) -> SubstrateRecorder<T> {61 self.recorder62 }63}64impl<T: Config> CollectionHandle<T> {65 pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {66 <CollectionById<T>>::get(id).map(|collection| Self {67 id,68 collection,69 recorder: SubstrateRecorder::new(eth::collection_id_to_address(id), gas_limit),70 })71 }72 pub fn new(id: CollectionId) -> Option<Self> {73 Self::new_with_gas_limit(id, u64::MAX)74 }75 pub fn try_get(id: CollectionId) -> Result<Self, DispatchError> {76 Ok(Self::new(id).ok_or(<Error<T>>::CollectionNotFound)?)77 }78 pub fn log_mirrored(&self, log: impl evm_coder::ToLog) {79 self.recorder.log_mirrored(log)80 }81 pub fn log_direct(&self, log: impl evm_coder::ToLog) {82 self.recorder.log_direct(log)83 }84 pub fn consume_store_reads(&self, reads: u64) -> evm_coder::execution::Result<()> {85 self.recorder86 .consume_gas(T::GasWeightMapping::weight_to_gas(87 <T as frame_system::Config>::DbWeight::get()88 .read89 .saturating_mul(reads),90 ))91 }92 pub fn consume_store_writes(&self, writes: u64) -> evm_coder::execution::Result<()> {93 self.recorder94 .consume_gas(T::GasWeightMapping::weight_to_gas(95 <T as frame_system::Config>::DbWeight::get()96 .write97 .saturating_mul(writes),98 ))99 }100 pub fn submit_logs(self) {101 self.recorder.submit_logs()102 }103 pub fn save(self) -> DispatchResult {104 self.recorder.submit_logs();105 <CollectionById<T>>::insert(self.id, self.collection);106 Ok(())107 }108}109impl<T: Config> Deref for CollectionHandle<T> {110 type Target = Collection<T::AccountId>;111112 fn deref(&self) -> &Self::Target {113 &self.collection114 }115}116117impl<T: Config> DerefMut for CollectionHandle<T> {118 fn deref_mut(&mut self) -> &mut Self::Target {119 &mut self.collection120 }121}122123impl<T: Config> CollectionHandle<T> {124 pub fn check_is_owner(&self, subject: &T::CrossAccountId) -> DispatchResult {125 ensure!(*subject.as_sub() == self.owner, <Error<T>>::NoPermission);126 Ok(())127 }128 pub fn is_owner_or_admin(&self, subject: &T::CrossAccountId) -> bool {129 *subject.as_sub() == self.owner || <IsAdmin<T>>::get((self.id, subject))130 }131 pub fn check_is_owner_or_admin(&self, subject: &T::CrossAccountId) -> DispatchResult {132 ensure!(self.is_owner_or_admin(subject), <Error<T>>::NoPermission);133 Ok(())134 }135 pub fn ignores_allowance(&self, user: &T::CrossAccountId) -> bool {136 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)137 }138 pub fn ignores_owned_amount(&self, user: &T::CrossAccountId) -> bool {139 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)140 }141 pub fn check_allowlist(&self, user: &T::CrossAccountId) -> DispatchResult {142 ensure!(143 <Allowlist<T>>::get((self.id, user)),144 <Error<T>>::AddressNotInAllowlist145 );146 Ok(())147 }148149 pub fn check_can_update_meta(150 &self,151 subject: &T::CrossAccountId,152 item_owner: &T::CrossAccountId,153 ) -> DispatchResult {154 match self.meta_update_permission {155 MetaUpdatePermission::ItemOwner => {156 ensure!(subject == item_owner, <Error<T>>::NoPermission);157 Ok(())158 }159 MetaUpdatePermission::Admin => self.check_is_owner_or_admin(subject),160 MetaUpdatePermission::None => fail!(<Error<T>>::NoPermission),161 }162 }163}164165#[frame_support::pallet]166pub mod pallet {167 use super::*;168 use pallet_evm::account;169 use dispatch::CollectionDispatch;170 use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};171 use frame_system::pallet_prelude::*;172 use frame_support::traits::Currency;173 use up_data_structs::{TokenId, mapping::TokenAddressMapping};174 use scale_info::TypeInfo;175176 #[pallet::config]177 pub trait Config:178 frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config179 {180 type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;181182 type Currency: Currency<Self::AccountId>;183184 #[pallet::constant]185 type CollectionCreationPrice: Get<186 <<Self as Config>::Currency as Currency<Self::AccountId>>::Balance,187 >;188 type CollectionDispatch: CollectionDispatch<Self>;189190 type TreasuryAccountId: Get<Self::AccountId>;191192 type EvmTokenAddressMapping: TokenAddressMapping<H160>;193 type CrossTokenAddressMapping: TokenAddressMapping<Self::CrossAccountId>;194 }195196 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);197198 #[pallet::pallet]199 #[pallet::storage_version(STORAGE_VERSION)]200 #[pallet::generate_store(pub(super) trait Store)]201 pub struct Pallet<T>(_);202203 #[pallet::extra_constants]204 impl<T: Config> Pallet<T> {205 pub fn collection_admins_limit() -> u32 {206 COLLECTION_ADMINS_LIMIT207 }208 }209210 #[pallet::event]211 #[pallet::generate_deposit(pub fn deposit_event)]212 pub enum Event<T: Config> {213 /// New collection was created214 ///215 /// # Arguments216 ///217 /// * collection_id: Globally unique identifier of newly created collection.218 ///219 /// * mode: [CollectionMode] converted into u8.220 ///221 /// * account_id: Collection owner.222 CollectionCreated(CollectionId, u8, T::AccountId),223224 /// New collection was destroyed225 ///226 /// # Arguments227 ///228 /// * collection_id: Globally unique identifier of collection.229 CollectionDestroyed(CollectionId),230231 /// New item was created.232 ///233 /// # Arguments234 ///235 /// * collection_id: Id of the collection where item was created.236 ///237 /// * item_id: Id of an item. Unique within the collection.238 ///239 /// * recipient: Owner of newly created item240 ///241 /// * amount: Always 1 for NFT242 ItemCreated(CollectionId, TokenId, T::CrossAccountId, u128),243244 /// Collection item was burned.245 ///246 /// # Arguments247 ///248 /// * collection_id.249 ///250 /// * item_id: Identifier of burned NFT.251 ///252 /// * owner: which user has destroyed its tokens253 ///254 /// * amount: Always 1 for NFT255 ItemDestroyed(CollectionId, TokenId, T::CrossAccountId, u128),256257 /// Item was transferred258 ///259 /// * collection_id: Id of collection to which item is belong260 ///261 /// * item_id: Id of an item262 ///263 /// * sender: Original owner of item264 ///265 /// * recipient: New owner of item266 ///267 /// * amount: Always 1 for NFT268 Transfer(269 CollectionId,270 TokenId,271 T::CrossAccountId,272 T::CrossAccountId,273 u128,274 ),275276 /// * collection_id277 ///278 /// * item_id279 ///280 /// * sender281 ///282 /// * spender283 ///284 /// * amount285 Approved(286 CollectionId,287 TokenId,288 T::CrossAccountId,289 T::CrossAccountId,290 u128,291 ),292293 CollectionPropertySet(CollectionId, PropertyKey),294295 CollectionPropertyDeleted(CollectionId, PropertyKey),296297 TokenPropertySet(CollectionId, TokenId, PropertyKey),298299 TokenPropertyDeleted(CollectionId, TokenId, PropertyKey),300301 PropertyPermissionSet(CollectionId, PropertyKey),302 }303304 #[pallet::error]305 pub enum Error<T> {306 /// This collection does not exist.307 CollectionNotFound,308 /// Sender parameter and item owner must be equal.309 MustBeTokenOwner,310 /// No permission to perform action311 NoPermission,312 /// Collection is not in mint mode.313 PublicMintingNotAllowed,314 /// Address is not in allow list.315 AddressNotInAllowlist,316317 /// Collection name can not be longer than 63 char.318 CollectionNameLimitExceeded,319 /// Collection description can not be longer than 255 char.320 CollectionDescriptionLimitExceeded,321 /// Token prefix can not be longer than 15 char.322 CollectionTokenPrefixLimitExceeded,323 /// Total collections bound exceeded.324 TotalCollectionsLimitExceeded,325 /// variable_data exceeded data limit.326 TokenVariableDataLimitExceeded,327 /// Exceeded max admin count328 CollectionAdminCountExceeded,329 /// Collection limit bounds per collection exceeded330 CollectionLimitBoundsExceeded,331 /// Tried to enable permissions which are only permitted to be disabled332 OwnerPermissionsCantBeReverted,333 /// Collection settings not allowing items transferring334 TransferNotAllowed,335 /// Account token limit exceeded per collection336 AccountTokenLimitExceeded,337 /// Collection token limit exceeded338 CollectionTokenLimitExceeded,339 /// Metadata flag frozen340 MetadataFlagFrozen,341342 /// Item not exists.343 TokenNotFound,344 /// Item balance not enough.345 TokenValueTooLow,346 /// Requested value more than approved.347 ApprovedValueTooLow,348 /// Tried to approve more than owned349 CantApproveMoreThanOwned,350351 /// Can't transfer tokens to ethereum zero address352 AddressIsZero,353 /// Target collection doesn't supports this operation354 UnsupportedOperation,355356 /// Not sufficient founds to perform action357 NotSufficientFounds,358359 /// Collection has nesting disabled360 NestingIsDisabled,361 /// Only owner may nest tokens under this collection362 OnlyOwnerAllowedToNest,363 /// Only tokens from specific collections may nest tokens under this364 SourceCollectionIsNotAllowedToNest,365366 /// Tried to store more data than allowed in collection field367 CollectionFieldSizeExceeded,368369 /// Tried to store more property data than allowed370 NoSpaceForProperty,371372 /// Tried to store more property keys than allowed373 PropertyLimitReached,374375 /// Unable to read array of unbounded keys376 UnableToReadUnboundedKeys,377378 /// Only ASCII letters, digits, and '_', '-' are allowed379 InvalidCharacterInPropertyKey,380381 /// Empty property keys are forbidden382 EmptyPropertyKey,383 }384385 #[pallet::storage]386 pub type CreatedCollectionCount<T> = StorageValue<Value = CollectionId, QueryKind = ValueQuery>;387 #[pallet::storage]388 pub type DestroyedCollectionCount<T> =389 StorageValue<Value = CollectionId, QueryKind = ValueQuery>;390391 /// Collection info392 #[pallet::storage]393 pub type CollectionById<T> = StorageMap<394 Hasher = Blake2_128Concat,395 Key = CollectionId,396 Value = Collection<<T as frame_system::Config>::AccountId>,397 QueryKind = OptionQuery,398 >;399400 /// Collection properties401 #[pallet::storage]402 #[pallet::getter(fn collection_properties)]403 pub type CollectionProperties<T> = StorageMap<404 Hasher = Blake2_128Concat,405 Key = CollectionId,406 Value = Properties,407 QueryKind = ValueQuery,408 OnEmpty = up_data_structs::CollectionProperties,409 >;410411 #[pallet::storage]412 #[pallet::getter(fn property_permissions)]413 pub type CollectionPropertyPermissions<T> = StorageMap<414 Hasher = Blake2_128Concat,415 Key = CollectionId,416 Value = PropertiesPermissionMap,417 QueryKind = ValueQuery,418 >;419420 /// Large variable-size collection fields are extracted here421 #[pallet::storage]422 pub type CollectionData<T> = StorageNMap<423 Key = (424 Key<Twox64Concat, CollectionId>,425 Key<Twox64Concat, CollectionField>,426 ),427 Value = BoundedVec<u8, ConstU32<COLLECTION_FIELD_LIMIT>>,428 QueryKind = ValueQuery,429 >;430431 #[pallet::storage]432 pub type AdminAmount<T> = StorageMap<433 Hasher = Blake2_128Concat,434 Key = CollectionId,435 Value = u32,436 QueryKind = ValueQuery,437 >;438439 /// List of collection admins440 #[pallet::storage]441 pub type IsAdmin<T: Config> = StorageNMap<442 Key = (443 Key<Blake2_128Concat, CollectionId>,444 Key<Blake2_128Concat, T::CrossAccountId>,445 ),446 Value = bool,447 QueryKind = ValueQuery,448 >;449450 /// Allowlisted collection users451 #[pallet::storage]452 pub type Allowlist<T: Config> = StorageNMap<453 Key = (454 Key<Blake2_128Concat, CollectionId>,455 Key<Blake2_128Concat, T::CrossAccountId>,456 ),457 Value = bool,458 QueryKind = ValueQuery,459 >;460461 /// Not used by code, exists only to provide some types to metadata462 #[pallet::storage]463 pub type DummyStorageValue<T: Config> = StorageValue<464 Value = (465 CollectionStats,466 CollectionId,467 TokenId,468 PhantomType<TokenData<T::CrossAccountId>>,469 PhantomType<RpcCollection<T::AccountId>>,470 ),471 QueryKind = OptionQuery,472 >;473474 #[pallet::hooks]475 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {476 fn on_runtime_upgrade() -> Weight {477 if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {478 use up_data_structs::{CollectionVersion1, CollectionVersion2};479 <CollectionById<T>>::translate::<CollectionVersion1<T::AccountId>, _>(|id, v| {480 Self::set_field_raw(481 id,482 CollectionField::OffchainSchema,483 v.offchain_schema.clone().into_inner(),484 )485 .expect("data has lower bounds than field");486 Self::set_field_raw(487 id,488 CollectionField::ConstOnChainSchema,489 v.const_on_chain_schema.clone().into_inner(),490 )491 .expect("data has lower bounds than field");492493 Some(CollectionVersion2::from(v))494 });495 }496497 0498 }499 }500}501502impl<T: Config> Pallet<T> {503 /// Ethereum receiver 0x0000000000000000000000000000000000000000 is reserved, and shouldn't own tokens504 pub fn ensure_correct_receiver(receiver: &T::CrossAccountId) -> DispatchResult {505 ensure!(506 &T::CrossAccountId::from_eth(H160([0; 20])) != receiver,507 <Error<T>>::AddressIsZero508 );509 Ok(())510 }511 pub fn adminlist(collection: CollectionId) -> Vec<T::CrossAccountId> {512 <IsAdmin<T>>::iter_prefix((collection,))513 .map(|(a, _)| a)514 .collect()515 }516 pub fn allowlist(collection: CollectionId) -> Vec<T::CrossAccountId> {517 <Allowlist<T>>::iter_prefix((collection,))518 .map(|(a, _)| a)519 .collect()520 }521 pub fn allowed(collection: CollectionId, user: T::CrossAccountId) -> bool {522 <Allowlist<T>>::get((collection, user))523 }524 pub fn collection_stats() -> CollectionStats {525 let created = <CreatedCollectionCount<T>>::get();526 let destroyed = <DestroyedCollectionCount<T>>::get();527 CollectionStats {528 created: created.0,529 destroyed: destroyed.0,530 alive: created.0 - destroyed.0,531 }532 }533534 pub fn effective_collection_limits(collection: CollectionId) -> Option<CollectionLimits> {535 let collection = <CollectionById<T>>::get(collection);536 if collection.is_none() {537 return None;538 }539540 let collection = collection.unwrap();541 let limits = collection.limits;542 let effective_limits = CollectionLimits {543 account_token_ownership_limit: Some(limits.account_token_ownership_limit()),544 sponsored_data_size: Some(limits.sponsored_data_size()),545 sponsored_data_rate_limit: Some(546 limits547 .sponsored_data_rate_limit548 .unwrap_or(SponsoringRateLimit::SponsoringDisabled),549 ),550 token_limit: Some(limits.token_limit()),551 sponsor_transfer_timeout: Some(limits.sponsor_transfer_timeout(552 match collection.mode {553 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,554 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,555 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,556 },557 )),558 sponsor_approve_timeout: Some(limits.sponsor_approve_timeout()),559 owner_can_transfer: Some(limits.owner_can_transfer()),560 owner_can_destroy: Some(limits.owner_can_destroy()),561 transfers_enabled: Some(limits.transfers_enabled()),562 nesting_rule: Some(limits.nesting_rule().clone()),563 };564565 Some(effective_limits)566 }567568 pub fn rpc_collection(collection: CollectionId) -> Option<RpcCollection<T::AccountId>> {569 let Collection {570 name,571 description,572 owner,573 mode,574 access,575 token_prefix,576 mint_mode,577 schema_version,578 sponsorship,579 limits,580 meta_update_permission,581 } = <CollectionById<T>>::get(collection)?;582583 let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)584 .iter()585 .map(|(key, permission)| PropertyKeyPermission {586 key: key.clone(),587 permission: permission.clone(),588 })589 .collect();590591 let properties = <CollectionProperties<T>>::get(collection)592 .iter()593 .map(|(key, value)| Property {594 key: key.clone(),595 value: value.clone(),596 })597 .collect();598599 Some(RpcCollection {600 name: name.into_inner(),601 description: description.into_inner(),602 owner,603 mode,604 access,605 token_prefix: token_prefix.into_inner(),606 mint_mode,607 schema_version,608 sponsorship,609 limits,610 meta_update_permission,611 offchain_schema: <CollectionData<T>>::get((612 collection,613 CollectionField::OffchainSchema,614 ))615 .into_inner(),616 const_on_chain_schema: <CollectionData<T>>::get((617 collection,618 CollectionField::ConstOnChainSchema,619 ))620 .into_inner(),621 token_property_permissions,622 properties,623 })624 }625}626627impl<T: Config> Pallet<T> {628 pub fn init_collection(629 owner: T::AccountId,630 data: CreateCollectionData<T::AccountId>,631 ) -> Result<CollectionId, DispatchError> {632 {633 ensure!(634 data.token_prefix.len() <= MAX_TOKEN_PREFIX_LENGTH as usize,635 Error::<T>::CollectionTokenPrefixLimitExceeded636 );637 }638639 let created_count = <CreatedCollectionCount<T>>::get()640 .0641 .checked_add(1)642 .ok_or(ArithmeticError::Overflow)?;643 let destroyed_count = <DestroyedCollectionCount<T>>::get().0;644 let id = CollectionId(created_count);645646 // bound Total number of collections647 ensure!(648 created_count - destroyed_count <= COLLECTION_NUMBER_LIMIT,649 <Error<T>>::TotalCollectionsLimitExceeded650 );651652 // =========653654 let collection = Collection {655 owner: owner.clone(),656 name: data.name,657 mode: data.mode.clone(),658 mint_mode: false,659 access: data.access.unwrap_or_default(),660 description: data.description,661 token_prefix: data.token_prefix,662 schema_version: data.schema_version.unwrap_or_default(),663 sponsorship: data664 .pending_sponsor665 .map(SponsorshipState::Unconfirmed)666 .unwrap_or_default(),667 limits: data668 .limits669 .map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))670 .unwrap_or_else(|| Ok(CollectionLimits::default()))?,671 meta_update_permission: data.meta_update_permission.unwrap_or_default(),672 };673674 let mut collection_properties = up_data_structs::CollectionProperties::get();675 collection_properties676 .try_set_from_iter(data.properties.into_iter().map(|p| (p.key, p.value)))677 .map_err(<Error<T>>::from)?;678679 CollectionProperties::<T>::insert(id, collection_properties);680681 let mut token_props_permissions = PropertiesPermissionMap::new();682 token_props_permissions683 .try_set_from_iter(684 data.token_property_permissions685 .into_iter()686 .map(|property| (property.key, property.permission)),687 )688 .map_err(<Error<T>>::from)?;689690 CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);691692 // Take a (non-refundable) deposit of collection creation693 {694 let mut imbalance =695 <<<T as Config>::Currency as Currency<T::AccountId>>::PositiveImbalance>::zero();696 imbalance.subsume(697 <<T as Config>::Currency as Currency<T::AccountId>>::deposit_creating(698 &T::TreasuryAccountId::get(),699 T::CollectionCreationPrice::get(),700 ),701 );702 <T as Config>::Currency::settle(703 &owner,704 imbalance,705 WithdrawReasons::TRANSFER,706 ExistenceRequirement::KeepAlive,707 )708 .map_err(|_| Error::<T>::NotSufficientFounds)?;709 }710711 <CreatedCollectionCount<T>>::put(created_count);712 <Pallet<T>>::deposit_event(Event::CollectionCreated(id, data.mode.id(), owner.clone()));713 <CollectionById<T>>::insert(id, collection);714 Self::set_field_raw(715 id,716 CollectionField::OffchainSchema,717 data.offchain_schema.into_inner(),718 )719 .expect("data has lower bounds than field");720 Self::set_field_raw(721 id,722 CollectionField::ConstOnChainSchema,723 data.const_on_chain_schema.into_inner(),724 )725 .expect("data has lower bounds than field");726 Ok(id)727 }728729 pub fn destroy_collection(730 collection: CollectionHandle<T>,731 sender: &T::CrossAccountId,732 ) -> DispatchResult {733 ensure!(734 collection.limits.owner_can_destroy(),735 <Error<T>>::NoPermission,736 );737 collection.check_is_owner(sender)?;738739 let destroyed_collections = <DestroyedCollectionCount<T>>::get()740 .0741 .checked_add(1)742 .ok_or(ArithmeticError::Overflow)?;743744 // =========745746 <DestroyedCollectionCount<T>>::put(destroyed_collections);747 <CollectionById<T>>::remove(collection.id);748 <CollectionData<T>>::remove_prefix((collection.id,), None);749 <AdminAmount<T>>::remove(collection.id);750 <IsAdmin<T>>::remove_prefix((collection.id,), None);751 <Allowlist<T>>::remove_prefix((collection.id,), None);752753 <Pallet<T>>::deposit_event(Event::CollectionDestroyed(collection.id));754 Ok(())755 }756757 pub fn set_collection_property(758 collection: &CollectionHandle<T>,759 sender: &T::CrossAccountId,760 property: Property,761 ) -> DispatchResult {762 collection.check_is_owner_or_admin(sender)?;763764 CollectionProperties::<T>::try_mutate(collection.id, |properties| {765 let property = property.clone();766 properties.try_set(property.key, property.value)767 })768 .map_err(<Error<T>>::from)?;769770 Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));771772 Ok(())773 }774775 pub fn set_collection_properties(776 collection: &CollectionHandle<T>,777 sender: &T::CrossAccountId,778 properties: Vec<Property>,779 ) -> DispatchResult {780 for property in properties {781 Self::set_collection_property(collection, sender, property)?;782 }783784 Ok(())785 }786787 pub fn delete_collection_property(788 collection: &CollectionHandle<T>,789 sender: &T::CrossAccountId,790 property_key: PropertyKey,791 ) -> DispatchResult {792 collection.check_is_owner_or_admin(sender)?;793794 CollectionProperties::<T>::try_mutate(collection.id, |properties| {795 properties.remove(&property_key)796 })797 .map_err(<Error<T>>::from)?;798799 Self::deposit_event(Event::CollectionPropertyDeleted(800 collection.id,801 property_key,802 ));803804 Ok(())805 }806807 pub fn delete_collection_properties(808 collection: &CollectionHandle<T>,809 sender: &T::CrossAccountId,810 property_keys: Vec<PropertyKey>,811 ) -> DispatchResult {812 for key in property_keys {813 Self::delete_collection_property(collection, sender, key)?;814 }815816 Ok(())817 }818819 pub fn set_property_permission(820 collection: &CollectionHandle<T>,821 sender: &T::CrossAccountId,822 property_permission: PropertyKeyPermission,823 ) -> DispatchResult {824 collection.check_is_owner_or_admin(sender)?;825826 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);827 let current_permission = all_permissions.get(&property_permission.key);828 if matches![829 current_permission,830 Some(PropertyPermission { mutable: false, .. })831 ] {832 return Err(<Error<T>>::NoPermission.into());833 }834835 CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {836 let property_permission = property_permission.clone();837 permissions.try_set(property_permission.key, property_permission.permission)838 })839 .map_err(<Error<T>>::from)?;840841 Self::deposit_event(Event::PropertyPermissionSet(842 collection.id,843 property_permission.key,844 ));845846 Ok(())847 }848849 pub fn set_property_permissions(850 collection: &CollectionHandle<T>,851 sender: &T::CrossAccountId,852 property_permissions: Vec<PropertyKeyPermission>,853 ) -> DispatchResult {854 for prop_pemission in property_permissions {855 Self::set_property_permission(collection, sender, prop_pemission)?;856 }857858 Ok(())859 }860861 pub fn bytes_keys_to_property_keys(862 keys: Vec<Vec<u8>>,863 ) -> Result<Vec<PropertyKey>, DispatchError> {864 keys.into_iter()865 .map(|key| -> Result<PropertyKey, DispatchError> {866 key.try_into()867 .map_err(|_| <Error<T>>::UnableToReadUnboundedKeys.into())868 })869 .collect::<Result<Vec<PropertyKey>, DispatchError>>()870 }871872 pub fn check_property_key(key: &PropertyKey) -> Result<(), DispatchError> {873 let key_str = sp_std::str::from_utf8(key.as_slice())874 .map_err(|_| <Error<T>>::InvalidCharacterInPropertyKey)?;875876 for ch in key_str.chars() {877 if !ch.is_ascii_alphanumeric() && ch != '_' && ch != '-' {878 return Err(<Error<T>>::InvalidCharacterInPropertyKey.into());879 }880 }881882 Ok(())883 }884885 pub fn filter_collection_properties(886 collection_id: CollectionId,887 keys: Vec<PropertyKey>,888 ) -> Result<Vec<Property>, DispatchError> {889 let properties = Self::collection_properties(collection_id);890891 let properties = keys892 .into_iter()893 .filter_map(|key| {894 properties.get(&key).map(|value| Property {895 key,896 value: value.clone(),897 })898 })899 .collect();900901 Ok(properties)902 }903904 pub fn filter_property_permissions(905 collection_id: CollectionId,906 keys: Vec<PropertyKey>,907 ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {908 let permissions = Self::property_permissions(collection_id);909910 let key_permissions = keys911 .into_iter()912 .filter_map(|key| {913 permissions914 .get(&key)915 .map(|permission| PropertyKeyPermission {916 key,917 permission: permission.clone(),918 })919 })920 .collect();921922 Ok(key_permissions)923 }924925 fn set_field_raw(926 collection_id: CollectionId,927 field: CollectionField,928 value: Vec<u8>,929 ) -> DispatchResult {930 if !value.is_empty() {931 <CollectionData<T>>::insert(932 (collection_id, field),933 BoundedVec::try_from(value).map_err(|_| <Error<T>>::CollectionFieldSizeExceeded)?,934 )935 } else {936 <CollectionData<T>>::remove((collection_id, field));937 }938 Ok(())939 }940941 pub fn set_field(942 collection: &CollectionHandle<T>,943 sender: &T::CrossAccountId,944 field: CollectionField,945 value: Vec<u8>,946 ) -> DispatchResult {947 collection.check_is_owner_or_admin(sender)?;948949 // =========950951 Self::set_field_raw(collection.id, field, value)952 }953954 pub fn toggle_allowlist(955 collection: &CollectionHandle<T>,956 sender: &T::CrossAccountId,957 user: &T::CrossAccountId,958 allowed: bool,959 ) -> DispatchResult {960 collection.check_is_owner_or_admin(sender)?;961962 // =========963964 if allowed {965 <Allowlist<T>>::insert((collection.id, user), true);966 } else {967 <Allowlist<T>>::remove((collection.id, user));968 }969970 Ok(())971 }972973 pub fn toggle_admin(974 collection: &CollectionHandle<T>,975 sender: &T::CrossAccountId,976 user: &T::CrossAccountId,977 admin: bool,978 ) -> DispatchResult {979 collection.check_is_owner_or_admin(sender)?;980981 let was_admin = <IsAdmin<T>>::get((collection.id, user));982 if was_admin == admin {983 return Ok(());984 }985 let amount = <AdminAmount<T>>::get(collection.id);986987 if admin {988 let amount = amount989 .checked_add(1)990 .ok_or(<Error<T>>::CollectionAdminCountExceeded)?;991 ensure!(992 amount <= Self::collection_admins_limit(),993 <Error<T>>::CollectionAdminCountExceeded,994 );995996 // =========997998 <AdminAmount<T>>::insert(collection.id, amount);999 <IsAdmin<T>>::insert((collection.id, user), true);1000 } else {1001 <AdminAmount<T>>::insert(collection.id, amount.saturating_sub(1));1002 <IsAdmin<T>>::remove((collection.id, user));1003 }10041005 Ok(())1006 }10071008 pub fn clamp_limits(1009 mode: CollectionMode,1010 old_limit: &CollectionLimits,1011 mut new_limit: CollectionLimits,1012 ) -> Result<CollectionLimits, DispatchError> {1013 macro_rules! limit_default {1014 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{1015 $(1016 if let Some($new) = $new.$field {1017 let $old = $old.$field($($arg)?);1018 let _ = $new;1019 let _ = $old;1020 $check1021 } else {1022 $new.$field = $old.$field1023 }1024 )*1025 }};1026 }10271028 limit_default!(old_limit, new_limit,1029 account_token_ownership_limit => ensure!(1030 new_limit <= MAX_TOKEN_OWNERSHIP,1031 <Error<T>>::CollectionLimitBoundsExceeded,1032 ),1033 sponsor_transfer_timeout(match mode {1034 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,1035 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1036 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1037 }) => ensure!(1038 new_limit <= MAX_SPONSOR_TIMEOUT,1039 <Error<T>>::CollectionLimitBoundsExceeded,1040 ),1041 sponsored_data_size => ensure!(1042 new_limit <= CUSTOM_DATA_LIMIT,1043 <Error<T>>::CollectionLimitBoundsExceeded,1044 ),1045 token_limit => ensure!(1046 old_limit >= new_limit && new_limit > 0,1047 <Error<T>>::CollectionTokenLimitExceeded1048 ),1049 owner_can_transfer => ensure!(1050 old_limit || !new_limit,1051 <Error<T>>::OwnerPermissionsCantBeReverted,1052 ),1053 owner_can_destroy => ensure!(1054 old_limit || !new_limit,1055 <Error<T>>::OwnerPermissionsCantBeReverted,1056 ),1057 sponsored_data_rate_limit => {},1058 transfers_enabled => {},1059 );1060 Ok(new_limit)1061 }1062}10631064#[macro_export]1065macro_rules! unsupported {1066 () => {1067 Err(<Error<T>>::UnsupportedOperation.into())1068 };1069}10701071/// Worst cases1072pub trait CommonWeightInfo<CrossAccountId> {1073 fn create_item() -> Weight;1074 fn create_multiple_items(amount: u32) -> Weight;1075 fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;1076 fn burn_item() -> Weight;1077 fn set_collection_properties(amount: u32) -> Weight;1078 fn delete_collection_properties(amount: u32) -> Weight;1079 fn set_token_properties(amount: u32) -> Weight;1080 fn delete_token_properties(amount: u32) -> Weight;1081 fn set_property_permissions(amount: u32) -> Weight;1082 fn transfer() -> Weight;1083 fn approve() -> Weight;1084 fn transfer_from() -> Weight;1085 fn burn_from() -> Weight;1086 fn set_variable_metadata(bytes: u32) -> Weight;1087}10881089pub trait CommonCollectionOperations<T: Config> {1090 fn create_item(1091 &self,1092 sender: T::CrossAccountId,1093 to: T::CrossAccountId,1094 data: CreateItemData,1095 nesting_budget: &dyn Budget,1096 ) -> DispatchResultWithPostInfo;1097 fn create_multiple_items(1098 &self,1099 sender: T::CrossAccountId,1100 to: T::CrossAccountId,1101 data: Vec<CreateItemData>,1102 nesting_budget: &dyn Budget,1103 ) -> DispatchResultWithPostInfo;1104 fn create_multiple_items_ex(1105 &self,1106 sender: T::CrossAccountId,1107 data: CreateItemExData<T::CrossAccountId>,1108 nesting_budget: &dyn Budget,1109 ) -> DispatchResultWithPostInfo;1110 fn burn_item(1111 &self,1112 sender: T::CrossAccountId,1113 token: TokenId,1114 amount: u128,1115 ) -> DispatchResultWithPostInfo;1116 fn set_collection_properties(1117 &self,1118 sender: T::CrossAccountId,1119 properties: Vec<Property>,1120 ) -> DispatchResultWithPostInfo;1121 fn delete_collection_properties(1122 &self,1123 sender: &T::CrossAccountId,1124 property_keys: Vec<PropertyKey>,1125 ) -> DispatchResultWithPostInfo;1126 fn set_token_properties(1127 &self,1128 sender: T::CrossAccountId,1129 token_id: TokenId,1130 property: Vec<Property>,1131 ) -> DispatchResultWithPostInfo;1132 fn delete_token_properties(1133 &self,1134 sender: T::CrossAccountId,1135 token_id: TokenId,1136 property_keys: Vec<PropertyKey>,1137 ) -> DispatchResultWithPostInfo;1138 fn set_property_permissions(1139 &self,1140 sender: &T::CrossAccountId,1141 property_permissions: Vec<PropertyKeyPermission>,1142 ) -> DispatchResultWithPostInfo;1143 fn transfer(1144 &self,1145 sender: T::CrossAccountId,1146 to: T::CrossAccountId,1147 token: TokenId,1148 amount: u128,1149 nesting_budget: &dyn Budget,1150 ) -> DispatchResultWithPostInfo;1151 fn approve(1152 &self,1153 sender: T::CrossAccountId,1154 spender: T::CrossAccountId,1155 token: TokenId,1156 amount: u128,1157 ) -> DispatchResultWithPostInfo;1158 fn transfer_from(1159 &self,1160 sender: T::CrossAccountId,1161 from: T::CrossAccountId,1162 to: T::CrossAccountId,1163 token: TokenId,1164 amount: u128,1165 nesting_budget: &dyn Budget,1166 ) -> DispatchResultWithPostInfo;1167 fn burn_from(1168 &self,1169 sender: T::CrossAccountId,1170 from: T::CrossAccountId,1171 token: TokenId,1172 amount: u128,1173 nesting_budget: &dyn Budget,1174 ) -> DispatchResultWithPostInfo;11751176 fn set_variable_metadata(1177 &self,1178 sender: T::CrossAccountId,1179 token: TokenId,1180 data: BoundedVec<u8, CustomDataLimit>,1181 ) -> DispatchResultWithPostInfo;11821183 fn check_nesting(1184 &self,1185 sender: T::CrossAccountId,1186 from: (CollectionId, TokenId),1187 under: TokenId,1188 budget: &dyn Budget,1189 ) -> DispatchResult;11901191 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;1192 fn collection_tokens(&self) -> Vec<TokenId>;1193 fn token_exists(&self, token: TokenId) -> bool;1194 fn last_token_id(&self) -> TokenId;11951196 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;1197 fn const_metadata(&self, token: TokenId) -> Vec<u8>;1198 fn variable_metadata(&self, token: TokenId) -> Vec<u8>;1199 fn token_properties(&self, token_id: TokenId, keys: Vec<PropertyKey>) -> Vec<Property>;1200 /// Amount of unique collection tokens1201 fn total_supply(&self) -> u32;1202 /// Amount of different tokens account has (Applicable to nonfungible/refungible)1203 fn account_balance(&self, account: T::CrossAccountId) -> u32;1204 /// Amount of specific token account have (Applicable to fungible/refungible)1205 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128;1206 fn allowance(1207 &self,1208 sender: T::CrossAccountId,1209 spender: T::CrossAccountId,1210 token: TokenId,1211 ) -> u128;1212}12131214// Flexible enough for implementing CommonCollectionOperations1215pub fn with_weight(res: DispatchResult, weight: Weight) -> DispatchResultWithPostInfo {1216 let post_info = PostDispatchInfo {1217 actual_weight: Some(weight),1218 pays_fee: Pays::Yes,1219 };1220 match res {1221 Ok(()) => Ok(post_info),1222 Err(error) => Err(DispatchErrorWithPostInfo { post_info, error }),1223 }1224}12251226impl<T: Config> From<PropertiesError> for Error<T> {1227 fn from(error: PropertiesError) -> Self {1228 match error {1229 PropertiesError::NoSpaceForProperty => Self::NoSpaceForProperty,1230 PropertiesError::PropertyLimitReached => Self::PropertyLimitReached,1231 PropertiesError::InvalidCharacterInPropertyKey => Self::InvalidCharacterInPropertyKey,1232 PropertiesError::EmptyPropertyKey => Self::EmptyPropertyKey,1233 }1234 }1235}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 core::ops::{Deref, DerefMut};20use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};21use sp_std::vec::Vec;22use pallet_evm::account::CrossAccountId;23use frame_support::{24 dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},25 ensure, fail,26 traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},27 BoundedVec,28 weights::Pays,29};30use pallet_evm::GasWeightMapping;31use up_data_structs::{32 COLLECTION_NUMBER_LIMIT, Collection, RpcCollection, CollectionId, CreateItemData,33 MAX_TOKEN_PREFIX_LENGTH, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, TokenId,34 CollectionStats, MAX_TOKEN_OWNERSHIP, CollectionMode, NFT_SPONSOR_TRANSFER_TIMEOUT,35 FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT,36 CUSTOM_DATA_LIMIT, CollectionLimits, CustomDataLimit, CreateCollectionData, SponsorshipState,37 CreateItemExData, SponsoringRateLimit, budget::Budget, COLLECTION_FIELD_LIMIT, CollectionField,38 PhantomType, Property, Properties, PropertiesPermissionMap, PropertyKey, PropertyPermission,39 PropertiesError, PropertyKeyPermission, TokenData, TrySet,40};41pub use pallet::*;42use sp_core::H160;43use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};44#[cfg(feature = "runtime-benchmarks")]45pub mod benchmarking;46pub mod dispatch;47pub mod erc;48pub mod eth;4950#[must_use = "Should call submit_logs or save, otherwise some data will be lost for evm side"]51pub struct CollectionHandle<T: Config> {52 pub id: CollectionId,53 collection: Collection<T::AccountId>,54 pub recorder: SubstrateRecorder<T>,55}56impl<T: Config> WithRecorder<T> for CollectionHandle<T> {57 fn recorder(&self) -> &SubstrateRecorder<T> {58 &self.recorder59 }60 fn into_recorder(self) -> SubstrateRecorder<T> {61 self.recorder62 }63}64impl<T: Config> CollectionHandle<T> {65 pub fn new_with_gas_limit(id: CollectionId, gas_limit: u64) -> Option<Self> {66 <CollectionById<T>>::get(id).map(|collection| Self {67 id,68 collection,69 recorder: SubstrateRecorder::new(gas_limit),70 })71 }72 pub fn new(id: CollectionId) -> Option<Self> {73 Self::new_with_gas_limit(id, u64::MAX)74 }75 pub fn try_get(id: CollectionId) -> Result<Self, DispatchError> {76 Ok(Self::new(id).ok_or(<Error<T>>::CollectionNotFound)?)77 }78 pub fn consume_store_reads(&self, reads: u64) -> evm_coder::execution::Result<()> {79 self.recorder80 .consume_gas(T::GasWeightMapping::weight_to_gas(81 <T as frame_system::Config>::DbWeight::get()82 .read83 .saturating_mul(reads),84 ))85 }86 pub fn consume_store_writes(&self, writes: u64) -> evm_coder::execution::Result<()> {87 self.recorder88 .consume_gas(T::GasWeightMapping::weight_to_gas(89 <T as frame_system::Config>::DbWeight::get()90 .write91 .saturating_mul(writes),92 ))93 }94 pub fn save(self) -> DispatchResult {95 <CollectionById<T>>::insert(self.id, self.collection);96 Ok(())97 }98}99impl<T: Config> Deref for CollectionHandle<T> {100 type Target = Collection<T::AccountId>;101102 fn deref(&self) -> &Self::Target {103 &self.collection104 }105}106107impl<T: Config> DerefMut for CollectionHandle<T> {108 fn deref_mut(&mut self) -> &mut Self::Target {109 &mut self.collection110 }111}112113impl<T: Config> CollectionHandle<T> {114 pub fn check_is_owner(&self, subject: &T::CrossAccountId) -> DispatchResult {115 ensure!(*subject.as_sub() == self.owner, <Error<T>>::NoPermission);116 Ok(())117 }118 pub fn is_owner_or_admin(&self, subject: &T::CrossAccountId) -> bool {119 *subject.as_sub() == self.owner || <IsAdmin<T>>::get((self.id, subject))120 }121 pub fn check_is_owner_or_admin(&self, subject: &T::CrossAccountId) -> DispatchResult {122 ensure!(self.is_owner_or_admin(subject), <Error<T>>::NoPermission);123 Ok(())124 }125 pub fn ignores_allowance(&self, user: &T::CrossAccountId) -> bool {126 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)127 }128 pub fn ignores_owned_amount(&self, user: &T::CrossAccountId) -> bool {129 self.limits.owner_can_transfer() && self.is_owner_or_admin(user)130 }131 pub fn check_allowlist(&self, user: &T::CrossAccountId) -> DispatchResult {132 ensure!(133 <Allowlist<T>>::get((self.id, user)),134 <Error<T>>::AddressNotInAllowlist135 );136 Ok(())137 }138139 pub fn check_can_update_meta(140 &self,141 subject: &T::CrossAccountId,142 item_owner: &T::CrossAccountId,143 ) -> DispatchResult {144 match self.meta_update_permission {145 MetaUpdatePermission::ItemOwner => {146 ensure!(subject == item_owner, <Error<T>>::NoPermission);147 Ok(())148 }149 MetaUpdatePermission::Admin => self.check_is_owner_or_admin(subject),150 MetaUpdatePermission::None => fail!(<Error<T>>::NoPermission),151 }152 }153}154155#[frame_support::pallet]156pub mod pallet {157 use super::*;158 use pallet_evm::account;159 use dispatch::CollectionDispatch;160 use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};161 use frame_system::pallet_prelude::*;162 use frame_support::traits::Currency;163 use up_data_structs::{TokenId, mapping::TokenAddressMapping};164 use scale_info::TypeInfo;165166 #[pallet::config]167 pub trait Config:168 frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config169 {170 type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;171172 type Currency: Currency<Self::AccountId>;173174 #[pallet::constant]175 type CollectionCreationPrice: Get<176 <<Self as Config>::Currency as Currency<Self::AccountId>>::Balance,177 >;178 type CollectionDispatch: CollectionDispatch<Self>;179180 type TreasuryAccountId: Get<Self::AccountId>;181182 type EvmTokenAddressMapping: TokenAddressMapping<H160>;183 type CrossTokenAddressMapping: TokenAddressMapping<Self::CrossAccountId>;184 }185186 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);187188 #[pallet::pallet]189 #[pallet::storage_version(STORAGE_VERSION)]190 #[pallet::generate_store(pub(super) trait Store)]191 pub struct Pallet<T>(_);192193 #[pallet::extra_constants]194 impl<T: Config> Pallet<T> {195 pub fn collection_admins_limit() -> u32 {196 COLLECTION_ADMINS_LIMIT197 }198 }199200 #[pallet::event]201 #[pallet::generate_deposit(pub fn deposit_event)]202 pub enum Event<T: Config> {203 /// New collection was created204 ///205 /// # Arguments206 ///207 /// * collection_id: Globally unique identifier of newly created collection.208 ///209 /// * mode: [CollectionMode] converted into u8.210 ///211 /// * account_id: Collection owner.212 CollectionCreated(CollectionId, u8, T::AccountId),213214 /// New collection was destroyed215 ///216 /// # Arguments217 ///218 /// * collection_id: Globally unique identifier of collection.219 CollectionDestroyed(CollectionId),220221 /// New item was created.222 ///223 /// # Arguments224 ///225 /// * collection_id: Id of the collection where item was created.226 ///227 /// * item_id: Id of an item. Unique within the collection.228 ///229 /// * recipient: Owner of newly created item230 ///231 /// * amount: Always 1 for NFT232 ItemCreated(CollectionId, TokenId, T::CrossAccountId, u128),233234 /// Collection item was burned.235 ///236 /// # Arguments237 ///238 /// * collection_id.239 ///240 /// * item_id: Identifier of burned NFT.241 ///242 /// * owner: which user has destroyed its tokens243 ///244 /// * amount: Always 1 for NFT245 ItemDestroyed(CollectionId, TokenId, T::CrossAccountId, u128),246247 /// Item was transferred248 ///249 /// * collection_id: Id of collection to which item is belong250 ///251 /// * item_id: Id of an item252 ///253 /// * sender: Original owner of item254 ///255 /// * recipient: New owner of item256 ///257 /// * amount: Always 1 for NFT258 Transfer(259 CollectionId,260 TokenId,261 T::CrossAccountId,262 T::CrossAccountId,263 u128,264 ),265266 /// * collection_id267 ///268 /// * item_id269 ///270 /// * sender271 ///272 /// * spender273 ///274 /// * amount275 Approved(276 CollectionId,277 TokenId,278 T::CrossAccountId,279 T::CrossAccountId,280 u128,281 ),282283 CollectionPropertySet(CollectionId, PropertyKey),284285 CollectionPropertyDeleted(CollectionId, PropertyKey),286287 TokenPropertySet(CollectionId, TokenId, PropertyKey),288289 TokenPropertyDeleted(CollectionId, TokenId, PropertyKey),290291 PropertyPermissionSet(CollectionId, PropertyKey),292 }293294 #[pallet::error]295 pub enum Error<T> {296 /// This collection does not exist.297 CollectionNotFound,298 /// Sender parameter and item owner must be equal.299 MustBeTokenOwner,300 /// No permission to perform action301 NoPermission,302 /// Collection is not in mint mode.303 PublicMintingNotAllowed,304 /// Address is not in allow list.305 AddressNotInAllowlist,306307 /// Collection name can not be longer than 63 char.308 CollectionNameLimitExceeded,309 /// Collection description can not be longer than 255 char.310 CollectionDescriptionLimitExceeded,311 /// Token prefix can not be longer than 15 char.312 CollectionTokenPrefixLimitExceeded,313 /// Total collections bound exceeded.314 TotalCollectionsLimitExceeded,315 /// variable_data exceeded data limit.316 TokenVariableDataLimitExceeded,317 /// Exceeded max admin count318 CollectionAdminCountExceeded,319 /// Collection limit bounds per collection exceeded320 CollectionLimitBoundsExceeded,321 /// Tried to enable permissions which are only permitted to be disabled322 OwnerPermissionsCantBeReverted,323 /// Collection settings not allowing items transferring324 TransferNotAllowed,325 /// Account token limit exceeded per collection326 AccountTokenLimitExceeded,327 /// Collection token limit exceeded328 CollectionTokenLimitExceeded,329 /// Metadata flag frozen330 MetadataFlagFrozen,331332 /// Item not exists.333 TokenNotFound,334 /// Item balance not enough.335 TokenValueTooLow,336 /// Requested value more than approved.337 ApprovedValueTooLow,338 /// Tried to approve more than owned339 CantApproveMoreThanOwned,340341 /// Can't transfer tokens to ethereum zero address342 AddressIsZero,343 /// Target collection doesn't supports this operation344 UnsupportedOperation,345346 /// Not sufficient founds to perform action347 NotSufficientFounds,348349 /// Collection has nesting disabled350 NestingIsDisabled,351 /// Only owner may nest tokens under this collection352 OnlyOwnerAllowedToNest,353 /// Only tokens from specific collections may nest tokens under this354 SourceCollectionIsNotAllowedToNest,355356 /// Tried to store more data than allowed in collection field357 CollectionFieldSizeExceeded,358359 /// Tried to store more property data than allowed360 NoSpaceForProperty,361362 /// Tried to store more property keys than allowed363 PropertyLimitReached,364365 /// Unable to read array of unbounded keys366 UnableToReadUnboundedKeys,367368 /// Only ASCII letters, digits, and '_', '-' are allowed369 InvalidCharacterInPropertyKey,370371 /// Empty property keys are forbidden372 EmptyPropertyKey,373 }374375 #[pallet::storage]376 pub type CreatedCollectionCount<T> = StorageValue<Value = CollectionId, QueryKind = ValueQuery>;377 #[pallet::storage]378 pub type DestroyedCollectionCount<T> =379 StorageValue<Value = CollectionId, QueryKind = ValueQuery>;380381 /// Collection info382 #[pallet::storage]383 pub type CollectionById<T> = StorageMap<384 Hasher = Blake2_128Concat,385 Key = CollectionId,386 Value = Collection<<T as frame_system::Config>::AccountId>,387 QueryKind = OptionQuery,388 >;389390 /// Collection properties391 #[pallet::storage]392 #[pallet::getter(fn collection_properties)]393 pub type CollectionProperties<T> = StorageMap<394 Hasher = Blake2_128Concat,395 Key = CollectionId,396 Value = Properties,397 QueryKind = ValueQuery,398 OnEmpty = up_data_structs::CollectionProperties,399 >;400401 #[pallet::storage]402 #[pallet::getter(fn property_permissions)]403 pub type CollectionPropertyPermissions<T> = StorageMap<404 Hasher = Blake2_128Concat,405 Key = CollectionId,406 Value = PropertiesPermissionMap,407 QueryKind = ValueQuery,408 >;409410 /// Large variable-size collection fields are extracted here411 #[pallet::storage]412 pub type CollectionData<T> = StorageNMap<413 Key = (414 Key<Twox64Concat, CollectionId>,415 Key<Twox64Concat, CollectionField>,416 ),417 Value = BoundedVec<u8, ConstU32<COLLECTION_FIELD_LIMIT>>,418 QueryKind = ValueQuery,419 >;420421 #[pallet::storage]422 pub type AdminAmount<T> = StorageMap<423 Hasher = Blake2_128Concat,424 Key = CollectionId,425 Value = u32,426 QueryKind = ValueQuery,427 >;428429 /// List of collection admins430 #[pallet::storage]431 pub type IsAdmin<T: Config> = StorageNMap<432 Key = (433 Key<Blake2_128Concat, CollectionId>,434 Key<Blake2_128Concat, T::CrossAccountId>,435 ),436 Value = bool,437 QueryKind = ValueQuery,438 >;439440 /// Allowlisted collection users441 #[pallet::storage]442 pub type Allowlist<T: Config> = StorageNMap<443 Key = (444 Key<Blake2_128Concat, CollectionId>,445 Key<Blake2_128Concat, T::CrossAccountId>,446 ),447 Value = bool,448 QueryKind = ValueQuery,449 >;450451 /// Not used by code, exists only to provide some types to metadata452 #[pallet::storage]453 pub type DummyStorageValue<T: Config> = StorageValue<454 Value = (455 CollectionStats,456 CollectionId,457 TokenId,458 PhantomType<TokenData<T::CrossAccountId>>,459 PhantomType<RpcCollection<T::AccountId>>,460 ),461 QueryKind = OptionQuery,462 >;463464 #[pallet::hooks]465 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {466 fn on_runtime_upgrade() -> Weight {467 if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {468 use up_data_structs::{CollectionVersion1, CollectionVersion2};469 <CollectionById<T>>::translate::<CollectionVersion1<T::AccountId>, _>(|id, v| {470 Self::set_field_raw(471 id,472 CollectionField::OffchainSchema,473 v.offchain_schema.clone().into_inner(),474 )475 .expect("data has lower bounds than field");476 Self::set_field_raw(477 id,478 CollectionField::ConstOnChainSchema,479 v.const_on_chain_schema.clone().into_inner(),480 )481 .expect("data has lower bounds than field");482483 Some(CollectionVersion2::from(v))484 });485 }486487 0488 }489 }490}491492impl<T: Config> Pallet<T> {493 /// Ethereum receiver 0x0000000000000000000000000000000000000000 is reserved, and shouldn't own tokens494 pub fn ensure_correct_receiver(receiver: &T::CrossAccountId) -> DispatchResult {495 ensure!(496 &T::CrossAccountId::from_eth(H160([0; 20])) != receiver,497 <Error<T>>::AddressIsZero498 );499 Ok(())500 }501 pub fn adminlist(collection: CollectionId) -> Vec<T::CrossAccountId> {502 <IsAdmin<T>>::iter_prefix((collection,))503 .map(|(a, _)| a)504 .collect()505 }506 pub fn allowlist(collection: CollectionId) -> Vec<T::CrossAccountId> {507 <Allowlist<T>>::iter_prefix((collection,))508 .map(|(a, _)| a)509 .collect()510 }511 pub fn allowed(collection: CollectionId, user: T::CrossAccountId) -> bool {512 <Allowlist<T>>::get((collection, user))513 }514 pub fn collection_stats() -> CollectionStats {515 let created = <CreatedCollectionCount<T>>::get();516 let destroyed = <DestroyedCollectionCount<T>>::get();517 CollectionStats {518 created: created.0,519 destroyed: destroyed.0,520 alive: created.0 - destroyed.0,521 }522 }523524 pub fn effective_collection_limits(collection: CollectionId) -> Option<CollectionLimits> {525 let collection = <CollectionById<T>>::get(collection);526 if collection.is_none() {527 return None;528 }529530 let collection = collection.unwrap();531 let limits = collection.limits;532 let effective_limits = CollectionLimits {533 account_token_ownership_limit: Some(limits.account_token_ownership_limit()),534 sponsored_data_size: Some(limits.sponsored_data_size()),535 sponsored_data_rate_limit: Some(536 limits537 .sponsored_data_rate_limit538 .unwrap_or(SponsoringRateLimit::SponsoringDisabled),539 ),540 token_limit: Some(limits.token_limit()),541 sponsor_transfer_timeout: Some(limits.sponsor_transfer_timeout(542 match collection.mode {543 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,544 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,545 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,546 },547 )),548 sponsor_approve_timeout: Some(limits.sponsor_approve_timeout()),549 owner_can_transfer: Some(limits.owner_can_transfer()),550 owner_can_destroy: Some(limits.owner_can_destroy()),551 transfers_enabled: Some(limits.transfers_enabled()),552 nesting_rule: Some(limits.nesting_rule().clone()),553 };554555 Some(effective_limits)556 }557558 pub fn rpc_collection(collection: CollectionId) -> Option<RpcCollection<T::AccountId>> {559 let Collection {560 name,561 description,562 owner,563 mode,564 access,565 token_prefix,566 mint_mode,567 schema_version,568 sponsorship,569 limits,570 meta_update_permission,571 } = <CollectionById<T>>::get(collection)?;572573 let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)574 .iter()575 .map(|(key, permission)| PropertyKeyPermission {576 key: key.clone(),577 permission: permission.clone(),578 })579 .collect();580581 let properties = <CollectionProperties<T>>::get(collection)582 .iter()583 .map(|(key, value)| Property {584 key: key.clone(),585 value: value.clone(),586 })587 .collect();588589 Some(RpcCollection {590 name: name.into_inner(),591 description: description.into_inner(),592 owner,593 mode,594 access,595 token_prefix: token_prefix.into_inner(),596 mint_mode,597 schema_version,598 sponsorship,599 limits,600 meta_update_permission,601 offchain_schema: <CollectionData<T>>::get((602 collection,603 CollectionField::OffchainSchema,604 ))605 .into_inner(),606 const_on_chain_schema: <CollectionData<T>>::get((607 collection,608 CollectionField::ConstOnChainSchema,609 ))610 .into_inner(),611 token_property_permissions,612 properties,613 })614 }615}616617impl<T: Config> Pallet<T> {618 pub fn init_collection(619 owner: T::AccountId,620 data: CreateCollectionData<T::AccountId>,621 ) -> Result<CollectionId, DispatchError> {622 {623 ensure!(624 data.token_prefix.len() <= MAX_TOKEN_PREFIX_LENGTH as usize,625 Error::<T>::CollectionTokenPrefixLimitExceeded626 );627 }628629 let created_count = <CreatedCollectionCount<T>>::get()630 .0631 .checked_add(1)632 .ok_or(ArithmeticError::Overflow)?;633 let destroyed_count = <DestroyedCollectionCount<T>>::get().0;634 let id = CollectionId(created_count);635636 // bound Total number of collections637 ensure!(638 created_count - destroyed_count <= COLLECTION_NUMBER_LIMIT,639 <Error<T>>::TotalCollectionsLimitExceeded640 );641642 // =========643644 let collection = Collection {645 owner: owner.clone(),646 name: data.name,647 mode: data.mode.clone(),648 mint_mode: false,649 access: data.access.unwrap_or_default(),650 description: data.description,651 token_prefix: data.token_prefix,652 schema_version: data.schema_version.unwrap_or_default(),653 sponsorship: data654 .pending_sponsor655 .map(SponsorshipState::Unconfirmed)656 .unwrap_or_default(),657 limits: data658 .limits659 .map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))660 .unwrap_or_else(|| Ok(CollectionLimits::default()))?,661 meta_update_permission: data.meta_update_permission.unwrap_or_default(),662 };663664 let mut collection_properties = up_data_structs::CollectionProperties::get();665 collection_properties666 .try_set_from_iter(data.properties.into_iter().map(|p| (p.key, p.value)))667 .map_err(<Error<T>>::from)?;668669 CollectionProperties::<T>::insert(id, collection_properties);670671 let mut token_props_permissions = PropertiesPermissionMap::new();672 token_props_permissions673 .try_set_from_iter(674 data.token_property_permissions675 .into_iter()676 .map(|property| (property.key, property.permission)),677 )678 .map_err(<Error<T>>::from)?;679680 CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);681682 // Take a (non-refundable) deposit of collection creation683 {684 let mut imbalance =685 <<<T as Config>::Currency as Currency<T::AccountId>>::PositiveImbalance>::zero();686 imbalance.subsume(687 <<T as Config>::Currency as Currency<T::AccountId>>::deposit_creating(688 &T::TreasuryAccountId::get(),689 T::CollectionCreationPrice::get(),690 ),691 );692 <T as Config>::Currency::settle(693 &owner,694 imbalance,695 WithdrawReasons::TRANSFER,696 ExistenceRequirement::KeepAlive,697 )698 .map_err(|_| Error::<T>::NotSufficientFounds)?;699 }700701 <CreatedCollectionCount<T>>::put(created_count);702 <Pallet<T>>::deposit_event(Event::CollectionCreated(id, data.mode.id(), owner.clone()));703 <CollectionById<T>>::insert(id, collection);704 Self::set_field_raw(705 id,706 CollectionField::OffchainSchema,707 data.offchain_schema.into_inner(),708 )709 .expect("data has lower bounds than field");710 Self::set_field_raw(711 id,712 CollectionField::ConstOnChainSchema,713 data.const_on_chain_schema.into_inner(),714 )715 .expect("data has lower bounds than field");716 Ok(id)717 }718719 pub fn destroy_collection(720 collection: CollectionHandle<T>,721 sender: &T::CrossAccountId,722 ) -> DispatchResult {723 ensure!(724 collection.limits.owner_can_destroy(),725 <Error<T>>::NoPermission,726 );727 collection.check_is_owner(sender)?;728729 let destroyed_collections = <DestroyedCollectionCount<T>>::get()730 .0731 .checked_add(1)732 .ok_or(ArithmeticError::Overflow)?;733734 // =========735736 <DestroyedCollectionCount<T>>::put(destroyed_collections);737 <CollectionById<T>>::remove(collection.id);738 <CollectionData<T>>::remove_prefix((collection.id,), None);739 <AdminAmount<T>>::remove(collection.id);740 <IsAdmin<T>>::remove_prefix((collection.id,), None);741 <Allowlist<T>>::remove_prefix((collection.id,), None);742743 <Pallet<T>>::deposit_event(Event::CollectionDestroyed(collection.id));744 Ok(())745 }746747 pub fn set_collection_property(748 collection: &CollectionHandle<T>,749 sender: &T::CrossAccountId,750 property: Property,751 ) -> DispatchResult {752 collection.check_is_owner_or_admin(sender)?;753754 CollectionProperties::<T>::try_mutate(collection.id, |properties| {755 let property = property.clone();756 properties.try_set(property.key, property.value)757 })758 .map_err(<Error<T>>::from)?;759760 Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));761762 Ok(())763 }764765 pub fn set_collection_properties(766 collection: &CollectionHandle<T>,767 sender: &T::CrossAccountId,768 properties: Vec<Property>,769 ) -> DispatchResult {770 for property in properties {771 Self::set_collection_property(collection, sender, property)?;772 }773774 Ok(())775 }776777 pub fn delete_collection_property(778 collection: &CollectionHandle<T>,779 sender: &T::CrossAccountId,780 property_key: PropertyKey,781 ) -> DispatchResult {782 collection.check_is_owner_or_admin(sender)?;783784 CollectionProperties::<T>::try_mutate(collection.id, |properties| {785 properties.remove(&property_key)786 })787 .map_err(<Error<T>>::from)?;788789 Self::deposit_event(Event::CollectionPropertyDeleted(790 collection.id,791 property_key,792 ));793794 Ok(())795 }796797 pub fn delete_collection_properties(798 collection: &CollectionHandle<T>,799 sender: &T::CrossAccountId,800 property_keys: Vec<PropertyKey>,801 ) -> DispatchResult {802 for key in property_keys {803 Self::delete_collection_property(collection, sender, key)?;804 }805806 Ok(())807 }808809 pub fn set_property_permission(810 collection: &CollectionHandle<T>,811 sender: &T::CrossAccountId,812 property_permission: PropertyKeyPermission,813 ) -> DispatchResult {814 collection.check_is_owner_or_admin(sender)?;815816 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);817 let current_permission = all_permissions.get(&property_permission.key);818 if matches![819 current_permission,820 Some(PropertyPermission { mutable: false, .. })821 ] {822 return Err(<Error<T>>::NoPermission.into());823 }824825 CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {826 let property_permission = property_permission.clone();827 permissions.try_set(property_permission.key, property_permission.permission)828 })829 .map_err(<Error<T>>::from)?;830831 Self::deposit_event(Event::PropertyPermissionSet(832 collection.id,833 property_permission.key,834 ));835836 Ok(())837 }838839 pub fn set_property_permissions(840 collection: &CollectionHandle<T>,841 sender: &T::CrossAccountId,842 property_permissions: Vec<PropertyKeyPermission>,843 ) -> DispatchResult {844 for prop_pemission in property_permissions {845 Self::set_property_permission(collection, sender, prop_pemission)?;846 }847848 Ok(())849 }850851 pub fn bytes_keys_to_property_keys(852 keys: Vec<Vec<u8>>,853 ) -> Result<Vec<PropertyKey>, DispatchError> {854 keys.into_iter()855 .map(|key| -> Result<PropertyKey, DispatchError> {856 key.try_into()857 .map_err(|_| <Error<T>>::UnableToReadUnboundedKeys.into())858 })859 .collect::<Result<Vec<PropertyKey>, DispatchError>>()860 }861862 pub fn check_property_key(key: &PropertyKey) -> Result<(), DispatchError> {863 let key_str = sp_std::str::from_utf8(key.as_slice())864 .map_err(|_| <Error<T>>::InvalidCharacterInPropertyKey)?;865866 for ch in key_str.chars() {867 if !ch.is_ascii_alphanumeric() && ch != '_' && ch != '-' {868 return Err(<Error<T>>::InvalidCharacterInPropertyKey.into());869 }870 }871872 Ok(())873 }874875 pub fn filter_collection_properties(876 collection_id: CollectionId,877 keys: Vec<PropertyKey>,878 ) -> Result<Vec<Property>, DispatchError> {879 let properties = Self::collection_properties(collection_id);880881 let properties = keys882 .into_iter()883 .filter_map(|key| {884 properties.get(&key).map(|value| Property {885 key,886 value: value.clone(),887 })888 })889 .collect();890891 Ok(properties)892 }893894 pub fn filter_property_permissions(895 collection_id: CollectionId,896 keys: Vec<PropertyKey>,897 ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {898 let permissions = Self::property_permissions(collection_id);899900 let key_permissions = keys901 .into_iter()902 .filter_map(|key| {903 permissions904 .get(&key)905 .map(|permission| PropertyKeyPermission {906 key,907 permission: permission.clone(),908 })909 })910 .collect();911912 Ok(key_permissions)913 }914915 fn set_field_raw(916 collection_id: CollectionId,917 field: CollectionField,918 value: Vec<u8>,919 ) -> DispatchResult {920 if !value.is_empty() {921 <CollectionData<T>>::insert(922 (collection_id, field),923 BoundedVec::try_from(value).map_err(|_| <Error<T>>::CollectionFieldSizeExceeded)?,924 )925 } else {926 <CollectionData<T>>::remove((collection_id, field));927 }928 Ok(())929 }930931 pub fn set_field(932 collection: &CollectionHandle<T>,933 sender: &T::CrossAccountId,934 field: CollectionField,935 value: Vec<u8>,936 ) -> DispatchResult {937 collection.check_is_owner_or_admin(sender)?;938939 // =========940941 Self::set_field_raw(collection.id, field, value)942 }943944 pub fn toggle_allowlist(945 collection: &CollectionHandle<T>,946 sender: &T::CrossAccountId,947 user: &T::CrossAccountId,948 allowed: bool,949 ) -> DispatchResult {950 collection.check_is_owner_or_admin(sender)?;951952 // =========953954 if allowed {955 <Allowlist<T>>::insert((collection.id, user), true);956 } else {957 <Allowlist<T>>::remove((collection.id, user));958 }959960 Ok(())961 }962963 pub fn toggle_admin(964 collection: &CollectionHandle<T>,965 sender: &T::CrossAccountId,966 user: &T::CrossAccountId,967 admin: bool,968 ) -> DispatchResult {969 collection.check_is_owner_or_admin(sender)?;970971 let was_admin = <IsAdmin<T>>::get((collection.id, user));972 if was_admin == admin {973 return Ok(());974 }975 let amount = <AdminAmount<T>>::get(collection.id);976977 if admin {978 let amount = amount979 .checked_add(1)980 .ok_or(<Error<T>>::CollectionAdminCountExceeded)?;981 ensure!(982 amount <= Self::collection_admins_limit(),983 <Error<T>>::CollectionAdminCountExceeded,984 );985986 // =========987988 <AdminAmount<T>>::insert(collection.id, amount);989 <IsAdmin<T>>::insert((collection.id, user), true);990 } else {991 <AdminAmount<T>>::insert(collection.id, amount.saturating_sub(1));992 <IsAdmin<T>>::remove((collection.id, user));993 }994995 Ok(())996 }997998 pub fn clamp_limits(999 mode: CollectionMode,1000 old_limit: &CollectionLimits,1001 mut new_limit: CollectionLimits,1002 ) -> Result<CollectionLimits, DispatchError> {1003 macro_rules! limit_default {1004 ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{1005 $(1006 if let Some($new) = $new.$field {1007 let $old = $old.$field($($arg)?);1008 let _ = $new;1009 let _ = $old;1010 $check1011 } else {1012 $new.$field = $old.$field1013 }1014 )*1015 }};1016 }10171018 limit_default!(old_limit, new_limit,1019 account_token_ownership_limit => ensure!(1020 new_limit <= MAX_TOKEN_OWNERSHIP,1021 <Error<T>>::CollectionLimitBoundsExceeded,1022 ),1023 sponsor_transfer_timeout(match mode {1024 CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,1025 CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1026 CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,1027 }) => ensure!(1028 new_limit <= MAX_SPONSOR_TIMEOUT,1029 <Error<T>>::CollectionLimitBoundsExceeded,1030 ),1031 sponsored_data_size => ensure!(1032 new_limit <= CUSTOM_DATA_LIMIT,1033 <Error<T>>::CollectionLimitBoundsExceeded,1034 ),1035 token_limit => ensure!(1036 old_limit >= new_limit && new_limit > 0,1037 <Error<T>>::CollectionTokenLimitExceeded1038 ),1039 owner_can_transfer => ensure!(1040 old_limit || !new_limit,1041 <Error<T>>::OwnerPermissionsCantBeReverted,1042 ),1043 owner_can_destroy => ensure!(1044 old_limit || !new_limit,1045 <Error<T>>::OwnerPermissionsCantBeReverted,1046 ),1047 sponsored_data_rate_limit => {},1048 transfers_enabled => {},1049 );1050 Ok(new_limit)1051 }1052}10531054#[macro_export]1055macro_rules! unsupported {1056 () => {1057 Err(<Error<T>>::UnsupportedOperation.into())1058 };1059}10601061/// Worst cases1062pub trait CommonWeightInfo<CrossAccountId> {1063 fn create_item() -> Weight;1064 fn create_multiple_items(amount: u32) -> Weight;1065 fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;1066 fn burn_item() -> Weight;1067 fn set_collection_properties(amount: u32) -> Weight;1068 fn delete_collection_properties(amount: u32) -> Weight;1069 fn set_token_properties(amount: u32) -> Weight;1070 fn delete_token_properties(amount: u32) -> Weight;1071 fn set_property_permissions(amount: u32) -> Weight;1072 fn transfer() -> Weight;1073 fn approve() -> Weight;1074 fn transfer_from() -> Weight;1075 fn burn_from() -> Weight;1076 fn set_variable_metadata(bytes: u32) -> Weight;1077}10781079pub trait CommonCollectionOperations<T: Config> {1080 fn create_item(1081 &self,1082 sender: T::CrossAccountId,1083 to: T::CrossAccountId,1084 data: CreateItemData,1085 nesting_budget: &dyn Budget,1086 ) -> DispatchResultWithPostInfo;1087 fn create_multiple_items(1088 &self,1089 sender: T::CrossAccountId,1090 to: T::CrossAccountId,1091 data: Vec<CreateItemData>,1092 nesting_budget: &dyn Budget,1093 ) -> DispatchResultWithPostInfo;1094 fn create_multiple_items_ex(1095 &self,1096 sender: T::CrossAccountId,1097 data: CreateItemExData<T::CrossAccountId>,1098 nesting_budget: &dyn Budget,1099 ) -> DispatchResultWithPostInfo;1100 fn burn_item(1101 &self,1102 sender: T::CrossAccountId,1103 token: TokenId,1104 amount: u128,1105 ) -> DispatchResultWithPostInfo;1106 fn set_collection_properties(1107 &self,1108 sender: T::CrossAccountId,1109 properties: Vec<Property>,1110 ) -> DispatchResultWithPostInfo;1111 fn delete_collection_properties(1112 &self,1113 sender: &T::CrossAccountId,1114 property_keys: Vec<PropertyKey>,1115 ) -> DispatchResultWithPostInfo;1116 fn set_token_properties(1117 &self,1118 sender: T::CrossAccountId,1119 token_id: TokenId,1120 property: Vec<Property>,1121 ) -> DispatchResultWithPostInfo;1122 fn delete_token_properties(1123 &self,1124 sender: T::CrossAccountId,1125 token_id: TokenId,1126 property_keys: Vec<PropertyKey>,1127 ) -> DispatchResultWithPostInfo;1128 fn set_property_permissions(1129 &self,1130 sender: &T::CrossAccountId,1131 property_permissions: Vec<PropertyKeyPermission>,1132 ) -> DispatchResultWithPostInfo;1133 fn transfer(1134 &self,1135 sender: T::CrossAccountId,1136 to: T::CrossAccountId,1137 token: TokenId,1138 amount: u128,1139 nesting_budget: &dyn Budget,1140 ) -> DispatchResultWithPostInfo;1141 fn approve(1142 &self,1143 sender: T::CrossAccountId,1144 spender: T::CrossAccountId,1145 token: TokenId,1146 amount: u128,1147 ) -> DispatchResultWithPostInfo;1148 fn transfer_from(1149 &self,1150 sender: T::CrossAccountId,1151 from: T::CrossAccountId,1152 to: T::CrossAccountId,1153 token: TokenId,1154 amount: u128,1155 nesting_budget: &dyn Budget,1156 ) -> DispatchResultWithPostInfo;1157 fn burn_from(1158 &self,1159 sender: T::CrossAccountId,1160 from: T::CrossAccountId,1161 token: TokenId,1162 amount: u128,1163 nesting_budget: &dyn Budget,1164 ) -> DispatchResultWithPostInfo;11651166 fn set_variable_metadata(1167 &self,1168 sender: T::CrossAccountId,1169 token: TokenId,1170 data: BoundedVec<u8, CustomDataLimit>,1171 ) -> DispatchResultWithPostInfo;11721173 fn check_nesting(1174 &self,1175 sender: T::CrossAccountId,1176 from: (CollectionId, TokenId),1177 under: TokenId,1178 budget: &dyn Budget,1179 ) -> DispatchResult;11801181 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;1182 fn collection_tokens(&self) -> Vec<TokenId>;1183 fn token_exists(&self, token: TokenId) -> bool;1184 fn last_token_id(&self) -> TokenId;11851186 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId>;1187 fn const_metadata(&self, token: TokenId) -> Vec<u8>;1188 fn variable_metadata(&self, token: TokenId) -> Vec<u8>;1189 fn token_properties(&self, token_id: TokenId, keys: Vec<PropertyKey>) -> Vec<Property>;1190 /// Amount of unique collection tokens1191 fn total_supply(&self) -> u32;1192 /// Amount of different tokens account has (Applicable to nonfungible/refungible)1193 fn account_balance(&self, account: T::CrossAccountId) -> u32;1194 /// Amount of specific token account have (Applicable to fungible/refungible)1195 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128;1196 fn allowance(1197 &self,1198 sender: T::CrossAccountId,1199 spender: T::CrossAccountId,1200 token: TokenId,1201 ) -> u128;1202}12031204// Flexible enough for implementing CommonCollectionOperations1205pub fn with_weight(res: DispatchResult, weight: Weight) -> DispatchResultWithPostInfo {1206 let post_info = PostDispatchInfo {1207 actual_weight: Some(weight),1208 pays_fee: Pays::Yes,1209 };1210 match res {1211 Ok(()) => Ok(post_info),1212 Err(error) => Err(DispatchErrorWithPostInfo { post_info, error }),1213 }1214}12151216impl<T: Config> From<PropertiesError> for Error<T> {1217 fn from(error: PropertiesError) -> Self {1218 match error {1219 PropertiesError::NoSpaceForProperty => Self::NoSpaceForProperty,1220 PropertiesError::PropertyLimitReached => Self::PropertyLimitReached,1221 PropertiesError::InvalidCharacterInPropertyKey => Self::InvalidCharacterInPropertyKey,1222 PropertiesError::EmptyPropertyKey => Self::EmptyPropertyKey,1223 }1224 }1225}pallets/evm-coder-substrate/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-coder-substrate/Cargo.toml
+++ b/pallets/evm-coder-substrate/Cargo.toml
@@ -12,8 +12,8 @@
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
ethereum = { version = "0.12.0", default-features = false }
evm-coder = { default-features = false, path = "../../crates/evm-coder" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
pallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -24,7 +24,6 @@
use core::marker::PhantomData;
use sp_std::cell::RefCell;
-use sp_std::vec::Vec;
use codec::Decode;
use frame_support::pallet_prelude::DispatchError;
@@ -33,15 +32,13 @@
use up_data_structs::budget;
use pallet_evm::{
ExitError, ExitRevert, ExitSucceed, GasWeightMapping, PrecompileFailure, PrecompileOutput,
- PrecompileResult, runner::stack::MaybeMirroredLog,
+ PrecompileResult,
};
use sp_core::H160;
-use pallet_ethereum::EthereumTransactionSender;
// #[cfg(feature = "runtime-benchmarks")]
// pub mod benchmarking;
use evm_coder::{
- ToLog,
abi::{AbiReader, AbiWrite, AbiWriter},
execution::{self, Result},
types::{Msg, value},
@@ -70,7 +67,6 @@
#[pallet::config]
pub trait Config: frame_system::Config {
- type EthereumTransactionSender: pallet_ethereum::EthereumTransactionSender;
type GasWeightMapping: pallet_evm::GasWeightMapping;
}
@@ -107,43 +103,20 @@
#[derive(Default)]
pub struct SubstrateRecorder<T: Config> {
- contract: H160,
- logs: RefCell<Vec<MaybeMirroredLog>>,
initial_gas: u64,
gas_limit: RefCell<u64>,
_phantom: PhantomData<*const T>,
}
impl<T: Config> SubstrateRecorder<T> {
- pub fn new(contract: H160, gas_limit: u64) -> Self {
+ pub fn new(gas_limit: u64) -> Self {
Self {
- contract,
- logs: RefCell::new(Vec::new()),
initial_gas: gas_limit,
gas_limit: RefCell::new(gas_limit),
_phantom: PhantomData,
}
}
- pub fn is_empty(&self) -> bool {
- self.logs.borrow().is_empty()
- }
- // Logs emitted with log_direct appear as substrate evm.Log event
- pub fn log_direct(&self, log: impl ToLog) {
- self.logs
- .borrow_mut()
- .push(MaybeMirroredLog::direct(log.to_log(self.contract)))
- }
- /// If log already has substrate equivalent - then we don't need to emit evm.Log
- pub fn log_mirrored(&self, log: impl ToLog) {
- self.logs
- .borrow_mut()
- .push(MaybeMirroredLog::mirrored(log.to_log(self.contract)))
- }
- pub fn retrieve_logs(self) -> Vec<MaybeMirroredLog> {
- self.logs.into_inner()
- }
-
pub fn gas_left(&self) -> u64 {
*self.gas_limit.borrow()
}
@@ -207,8 +180,8 @@
Ok(Some(v)) => Ok(PrecompileOutput {
exit_status: ExitSucceed::Returned,
cost: self.initial_gas - self.gas_left(),
- // TODO: preserve mirroring status
- logs: self.retrieve_logs().into_iter().map(|l| l.log).collect(),
+ // We don't use this interface
+ logs: sp_std::vec![],
output: v.finish(),
}),
Ok(None) => return None,
@@ -225,14 +198,6 @@
Err(Error::Fatal(f)) => Err(f.into()),
Err(Error::Error(e)) => Err(e.into()),
})
- }
-
- pub fn submit_logs(self) {
- let logs = self.retrieve_logs();
- if logs.is_empty() {
- return;
- }
- T::EthereumTransactionSender::submit_logs_transaction(Default::default(), logs)
}
}
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -15,8 +15,8 @@
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.21" }
log = "0.4.14"
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -162,7 +162,7 @@
return None;
}
- let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(*target, gas_left));
+ let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(gas_left));
pallet_evm_coder_substrate::call(*source, helpers, value, input)
}
pallets/evm-migration/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-migration/Cargo.toml
+++ b/pallets/evm-migration/Cargo.toml
@@ -15,8 +15,8 @@
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
[dependencies.codec]
default-features = false
pallets/evm-migration/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-migration/src/lib.rs
+++ b/pallets/evm-migration/src/lib.rs
@@ -28,6 +28,7 @@
use sp_core::{H160, H256};
use sp_std::vec::Vec;
use super::weights::WeightInfo;
+ use pallet_evm::Pallet as PalletEvm;
#[pallet::config]
pub trait Config: frame_system::Config + pallet_evm::Config {
@@ -56,8 +57,7 @@
pub fn begin(origin: OriginFor<T>, address: H160) -> DispatchResult {
ensure_root(origin)?;
ensure!(
- <pallet_evm::Pallet<T>>::is_account_empty(&address)
- && !<MigrationPending<T>>::get(&address),
+ <PalletEvm<T>>::is_account_empty(&address) && !<MigrationPending<T>>::get(&address),
<Error<T>>::AccountNotEmpty,
);
pallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-transaction-payment/Cargo.toml
+++ b/pallets/evm-transaction-payment/Cargo.toml
@@ -14,11 +14,11 @@
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.21" }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
[dependencies.codec]
default-features = false
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -23,7 +23,7 @@
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", branch = "polkadot-v0.9.21" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -17,6 +17,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
use core::ops::Deref;
+use evm_coder::ToLog;
use frame_support::{ensure};
use pallet_evm::account::CrossAccountId;
use up_data_structs::{
@@ -25,8 +26,9 @@
};
use pallet_common::{
Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, CollectionHandle,
- dispatch::CollectionDispatch,
+ dispatch::CollectionDispatch, eth::collection_id_to_address,
};
+use pallet_evm::Pallet as PalletEvm;
use pallet_structure::Pallet as PalletStructure;
use pallet_evm_coder_substrate::WithRecorder;
use sp_core::H160;
@@ -67,7 +69,7 @@
#[pallet::config]
pub trait Config:
- frame_system::Config + pallet_common::Config + pallet_structure::Config
+ frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config
{
type WeightInfo: WeightInfo;
}
@@ -179,11 +181,14 @@
}
<TotalSupply<T>>::insert(collection.id, total_supply);
- collection.log_mirrored(ERC20Events::Transfer {
- from: *owner.as_eth(),
- to: H160::default(),
- value: amount.into(),
- });
+ <PalletEvm<T>>::deposit_log(
+ ERC20Events::Transfer {
+ from: *owner.as_eth(),
+ to: H160::default(),
+ value: amount.into(),
+ }
+ .to_log(collection_id_to_address(collection.id)),
+ );
<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(
collection.id,
TokenId::default(),
@@ -249,11 +254,14 @@
<Balance<T>>::insert((collection.id, to), balance_to);
}
- collection.log_mirrored(ERC20Events::Transfer {
- from: *from.as_eth(),
- to: *to.as_eth(),
- value: amount.into(),
- });
+ <PalletEvm<T>>::deposit_log(
+ ERC20Events::Transfer {
+ from: *from.as_eth(),
+ to: *to.as_eth(),
+ value: amount.into(),
+ }
+ .to_log(collection_id_to_address(collection.id)),
+ );
<PalletCommon<T>>::deposit_event(CommonEvent::Transfer(
collection.id,
TokenId::default(),
@@ -318,11 +326,14 @@
for (user, amount) in balances {
<Balance<T>>::insert((collection.id, &user), amount);
- collection.log_mirrored(ERC20Events::Transfer {
- from: H160::default(),
- to: *user.as_eth(),
- value: amount.into(),
- });
+ <PalletEvm<T>>::deposit_log(
+ ERC20Events::Transfer {
+ from: H160::default(),
+ to: *user.as_eth(),
+ value: amount.into(),
+ }
+ .to_log(collection_id_to_address(collection.id)),
+ );
<PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(
collection.id,
TokenId::default(),
@@ -346,11 +357,14 @@
<Allowance<T>>::insert((collection.id, owner, spender), amount);
}
- collection.log_mirrored(ERC20Events::Approval {
- owner: *owner.as_eth(),
- spender: *spender.as_eth(),
- value: amount.into(),
- });
+ <PalletEvm<T>>::deposit_log(
+ ERC20Events::Approval {
+ owner: *owner.as_eth(),
+ spender: *spender.as_eth(),
+ value: amount.into(),
+ }
+ .to_log(collection_id_to_address(collection.id)),
+ );
<PalletCommon<T>>::deposit_event(CommonEvent::Approved(
collection.id,
TokenId(0),
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -8,13 +8,8 @@
uint8 dummy;
string stub_error = "this contract is implemented in native";
}
-
contract ERC165 is Dummy {
- function supportsInterface(bytes4 interfaceID)
- external
- view
- returns (bool)
- {
+ function supportsInterface(bytes4 interfaceID) external view returns (bool) {
require(false, stub_error);
interfaceID;
return true;
@@ -24,11 +19,36 @@
// Inline
contract ERC20Events {
event Transfer(address indexed from, address indexed to, uint256 value);
- event Approval(
- address indexed owner,
- address indexed spender,
- uint256 value
- );
+ event Approval(address indexed owner, address indexed spender, uint256 value);
+}
+
+// Selector: 56fd500b
+contract CollectionProperties is Dummy, ERC165 {
+ // Selector: setProperty(string,string) 62d9491f
+ function setProperty(string memory key, string memory value) public {
+ require(false, stub_error);
+ key;
+ value;
+ dummy = 0;
+ }
+ // Selector: deleteProperty(string) 34241914
+ function deleteProperty(string memory key) public {
+ require(false, stub_error);
+ key;
+ dummy = 0;
+ }
+}
+
+// Selector: 79cc6790
+contract ERC20UniqueExtensions is Dummy, ERC165 {
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ from;
+ amount;
+ dummy = 0;
+ return false;
+ }
}
// Selector: 942e8b22
@@ -39,28 +59,24 @@
dummy;
return "";
}
-
// Selector: symbol() 95d89b41
function symbol() public view returns (string memory) {
require(false, stub_error);
dummy;
return "";
}
-
// Selector: totalSupply() 18160ddd
function totalSupply() public view returns (uint256) {
require(false, stub_error);
dummy;
return 0;
}
-
// Selector: decimals() 313ce567
function decimals() public view returns (uint8) {
require(false, stub_error);
dummy;
return 0;
}
-
// Selector: balanceOf(address) 70a08231
function balanceOf(address owner) public view returns (uint256) {
require(false, stub_error);
@@ -68,7 +84,6 @@
dummy;
return 0;
}
-
// Selector: transfer(address,uint256) a9059cbb
function transfer(address to, uint256 amount) public returns (bool) {
require(false, stub_error);
@@ -77,13 +92,8 @@
dummy = 0;
return false;
}
-
// Selector: transferFrom(address,address,uint256) 23b872dd
- function transferFrom(
- address from,
- address to,
- uint256 amount
- ) public returns (bool) {
+ function transferFrom(address from, address to, uint256 amount) public returns (bool) {
require(false, stub_error);
from;
to;
@@ -91,7 +101,6 @@
dummy = 0;
return false;
}
-
// Selector: approve(address,uint256) 095ea7b3
function approve(address spender, uint256 amount) public returns (bool) {
require(false, stub_error);
@@ -100,13 +109,8 @@
dummy = 0;
return false;
}
-
// Selector: allowance(address,address) dd62ed3e
- function allowance(address owner, address spender)
- public
- view
- returns (uint256)
- {
+ function allowance(address owner, address spender) public view returns (uint256) {
require(false, stub_error);
owner;
spender;
@@ -115,4 +119,6 @@
}
}
-contract UniqueFungible is Dummy, ERC165, ERC20 {}
+contract UniqueFungible is Dummy, ERC165, ERC20, ERC20UniqueExtensions, CollectionProperties {
+}
+
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -16,7 +16,7 @@
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
pallet-common = { default-features = false, path = '../common' }
pallet-structure = { default-features = false, path = '../structure' }
up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -17,16 +17,17 @@
#![cfg_attr(not(feature = "std"), no_std)]
use erc::ERC721Events;
+use evm_coder::ToLog;
use frame_support::{BoundedVec, ensure, fail};
use up_data_structs::{
AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
mapping::TokenAddressMapping, NestingRule, budget::Budget, Property, PropertyPermission,
PropertyKey, PropertyKeyPermission, Properties, TrySet,
};
-use pallet_evm::account::CrossAccountId;
+use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
use pallet_common::{
Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,
- dispatch::CollectionDispatch,
+ dispatch::CollectionDispatch, eth::collection_id_to_address,
};
use pallet_structure::Pallet as PalletStructure;
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
@@ -72,7 +73,7 @@
#[pallet::config]
pub trait Config:
- frame_system::Config + pallet_common::Config + pallet_structure::Config
+ frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config
{
type WeightInfo: WeightInfo;
}
@@ -245,11 +246,14 @@
));
}
- collection.log_mirrored(ERC721Events::Transfer {
- from: *token_data.owner.as_eth(),
- to: H160::default(),
- token_id: token.into(),
- });
+ <PalletEvm<T>>::deposit_log(
+ ERC721Events::Transfer {
+ from: *token_data.owner.as_eth(),
+ to: H160::default(),
+ token_id: token.into(),
+ }
+ .to_log(collection_id_to_address(collection.id)),
+ );
<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(
collection.id,
token,
@@ -357,7 +361,7 @@
}
if token_owner {
- check_result.or(check_token_owner())
+ check_result.and_then(|()| check_token_owner())
} else {
check_result
}
@@ -483,11 +487,14 @@
}
Self::set_allowance_unchecked(collection, from, token, None, true);
- collection.log_mirrored(ERC721Events::Transfer {
- from: *from.as_eth(),
- to: *to.as_eth(),
- token_id: token.into(),
- });
+ <PalletEvm<T>>::deposit_log(
+ ERC721Events::Transfer {
+ from: *from.as_eth(),
+ to: *to.as_eth(),
+ token_id: token.into(),
+ }
+ .to_log(collection_id_to_address(collection.id)),
+ );
<PalletCommon<T>>::deposit_event(CommonEvent::Transfer(
collection.id,
token,
@@ -583,11 +590,14 @@
data.properties.into_inner(),
)?;
- collection.log_mirrored(ERC721Events::Transfer {
- from: H160::default(),
- to: *data.owner.as_eth(),
- token_id: token.into(),
- });
+ <PalletEvm<T>>::deposit_log(
+ ERC721Events::Transfer {
+ from: H160::default(),
+ to: *data.owner.as_eth(),
+ token_id: token.into(),
+ }
+ .to_log(collection_id_to_address(collection.id)),
+ );
<PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(
collection.id,
TokenId(token),
@@ -610,11 +620,14 @@
<Allowance<T>>::insert((collection.id, token), spender);
// In ERC721 there is only one possible approved user of token, so we set
// approved user to spender
- collection.log_mirrored(ERC721Events::Approval {
- owner: *sender.as_eth(),
- approved: *spender.as_eth(),
- token_id: token.into(),
- });
+ <PalletEvm<T>>::deposit_log(
+ ERC721Events::Approval {
+ owner: *sender.as_eth(),
+ approved: *spender.as_eth(),
+ token_id: token.into(),
+ }
+ .to_log(collection_id_to_address(collection.id)),
+ );
// In Unique chain, any token can have any amount of approved users, so we need to
// set allowance of old owner to 0, and allowance of new owner to 1
if old_spender.as_ref() != Some(spender) {
@@ -640,11 +653,14 @@
if !assume_implicit_eth {
// In ERC721 there is only one possible approved user of token, so we set
// approved user to zero address
- collection.log_mirrored(ERC721Events::Approval {
- owner: *sender.as_eth(),
- approved: H160::default(),
- token_id: token.into(),
- });
+ <PalletEvm<T>>::deposit_log(
+ ERC721Events::Approval {
+ owner: *sender.as_eth(),
+ approved: H160::default(),
+ token_id: token.into(),
+ }
+ .to_log(collection_id_to_address(collection.id)),
+ );
}
// In Unique chain, any token can have any amount of approved users, so we need to
// set allowance of old owner to 0
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -16,7 +16,7 @@
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
pallet-common = { default-features = false, path = '../common' }
pallet-structure = { default-features = false, path = '../structure' }
up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
pallets/unique/Cargo.tomldiffbeforeafterboth--- a/pallets/unique/Cargo.toml
+++ b/pallets/unique/Cargo.toml
@@ -83,5 +83,5 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
pallet-common = { default-features = false, path = "../common" }
primitives/data-structs/Cargo.tomldiffbeforeafterboth--- a/primitives/data-structs/Cargo.toml
+++ b/primitives/data-structs/Cargo.toml
@@ -23,9 +23,9 @@
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-derivative = "2.2.0"
+derivative = { version = "2.2.0", features = ["use_core"] }
struct-versioning = { path = "../../crates/struct-versioning" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
[features]
default = ["std"]
primitives/rpc/Cargo.tomldiffbeforeafterboth--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -14,7 +14,7 @@
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
[features]
default = ["std"]
runtime/common/Cargo.tomldiffbeforeafterboth--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -101,9 +101,9 @@
[dependencies.fp-rpc]
default-features = false
git = "https://github.com/uniquenetwork/frontier"
-branch = "unique-polkadot-v0.9.21"
+branch = "unique-polkadot-v0.9.21-logs"
[dependencies]
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.21' }
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -397,7 +397,7 @@
derivative = "2.2.0"
pallet-unique = { path = '../../pallets/unique', default-features = false }
up-rpc = { path = "../../primitives/rpc", default-features = false }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
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" }
@@ -412,11 +412,11 @@
pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }
pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
################################################################################
# Build Dependencies
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -821,7 +821,6 @@
);
impl pallet_evm_coder_substrate::Config for Runtime {
- type EthereumTransactionSender = pallet_ethereum::Pallet<Self>;
type GasWeightMapping = FixedGasWeightMapping;
}
@@ -1070,6 +1069,7 @@
frame_system::CheckWeight<Runtime>,
pallet_charge_transaction::ChargeTransactionPayment<Runtime>,
//pallet_contract_helpers::ContractHelpersExtension<Runtime>,
+ pallet_ethereum::FakeTransactionFinalizer<Runtime>,
);
/// Unchecked extrinsic type as expected by this runtime.
pub type UncheckedExtrinsic =
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -397,7 +397,7 @@
derivative = "2.2.0"
pallet-unique = { path = '../../pallets/unique', default-features = false }
up-rpc = { path = "../../primitives/rpc", default-features = false }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
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" }
@@ -412,11 +412,11 @@
pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }
pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
################################################################################
# Build Dependencies
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -793,7 +793,6 @@
);
impl pallet_evm_coder_substrate::Config for Runtime {
- type EthereumTransactionSender = pallet_ethereum::Pallet<Self>;
type GasWeightMapping = FixedGasWeightMapping;
}
@@ -1048,6 +1047,7 @@
frame_system::CheckWeight<Runtime>,
pallet_charge_transaction::ChargeTransactionPayment<Runtime>,
//pallet_contract_helpers::ContractHelpersExtension<Runtime>,
+ pallet_ethereum::FakeTransactionFinalizer<Runtime>,
);
/// Unchecked extrinsic type as expected by this runtime.
pub type UncheckedExtrinsic =
runtime/tests/Cargo.tomldiffbeforeafterboth--- a/runtime/tests/Cargo.toml
+++ b/runtime/tests/Cargo.toml
@@ -12,7 +12,7 @@
sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.21' }
sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.21' }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.21' }
frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.21' }
@@ -21,8 +21,8 @@
pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.21' }
pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.21' }
-pallet-evm = { default-features = false, git = 'https://github.com/uniquenetwork/frontier', branch = 'unique-polkadot-v0.9.21' }
-pallet-ethereum = { default-features = false, git = 'https://github.com/uniquenetwork/frontier', branch = 'unique-polkadot-v0.9.21' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
pallet-common = { path = '../../pallets/common' }
pallet-structure = { path = '../../pallets/structure' }
runtime/tests/src/lib.rsdiffbeforeafterboth--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -16,10 +16,10 @@
#![allow(clippy::from_over_into)]
-use sp_core::{H160, H256};
+use sp_core::{H256, U256};
use frame_support::{
parameter_types,
- traits::{Everything, ConstU32},
+ traits::{Everything, ConstU32, ConstU64},
weights::IdentityFee,
};
use sp_runtime::{
@@ -28,7 +28,9 @@
};
use pallet_transaction_payment::{CurrencyAdapter};
use frame_system as system;
-use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog, account::CrossAccountId};
+use pallet_evm::{
+ AddressMapping, account::CrossAccountId, EnsureAddressNever, SubstrateBlockHashMapping,
+};
use fp_evm_mapping::EvmBackwardsAddressMapping;
use parity_scale_codec::{Encode, Decode, MaxEncodedLen};
use scale_info::TypeInfo;
@@ -181,13 +183,31 @@
}
}
-pub struct TestEtheremTransactionSender;
-impl pallet_ethereum::EthereumTransactionSender for TestEtheremTransactionSender {
- fn submit_logs_transaction(_source: H160, _logs: Vec<MaybeMirroredLog>) {}
+parameter_types! {
+ pub BlockGasLimit: U256 = 0u32.into();
}
+impl pallet_evm::Config for Test {
+ type Event = ();
+ type FeeCalculator = ();
+ type GasWeightMapping = ();
+ type CallOrigin = EnsureAddressNever<Self::CrossAccountId>;
+ type WithdrawOrigin = EnsureAddressNever<Self::CrossAccountId>;
+ type AddressMapping = TestEvmAddressMapping;
+ type Currency = Balances;
+ type PrecompilesType = ();
+ type PrecompilesValue = ();
+ type Runner = pallet_evm::runner::stack::Runner<Self>;
+ type ChainId = ConstU64<0>;
+ type BlockGasLimit = BlockGasLimit;
+ type OnMethodCall = ();
+ type OnCreate = ();
+ type OnChargeTransaction = ();
+ type FindAuthor = ();
+ type BlockHashMapping = SubstrateBlockHashMapping<Self>;
+ type TransactionValidityHack = ();
+}
impl pallet_evm_coder_substrate::Config for Test {
- type EthereumTransactionSender = TestEtheremTransactionSender;
type GasWeightMapping = ();
}
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -411,12 +411,12 @@
pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }
pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
################################################################################
# Build Dependencies
runtime/unique/src/lib.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -792,7 +792,6 @@
);
impl pallet_evm_coder_substrate::Config for Runtime {
- type EthereumTransactionSender = pallet_ethereum::Pallet<Self>;
type GasWeightMapping = FixedGasWeightMapping;
}
@@ -1046,6 +1045,7 @@
frame_system::CheckWeight<Runtime>,
pallet_charge_transaction::ChargeTransactionPayment<Runtime>,
//pallet_contract_helpers::ContractHelpersExtension<Runtime>,
+ pallet_ethereum::FakeTransactionFinalizer<Runtime>,
);
/// Unchecked extrinsic type as expected by this runtime.
pub type UncheckedExtrinsic =
tests/src/substrate/substrate-api.tsdiffbeforeafterboth--- a/tests/src/substrate/substrate-api.ts
+++ b/tests/src/substrate/substrate-api.ts
@@ -34,6 +34,10 @@
extrinsic: {},
payload: {},
},
+ FakeTransactionFinalizer: {
+ extrinsic: {},
+ payload: {},
+ },
},
rpc: {
unique: defs.unique.rpc,