difftreelog
CORE-300 Move CrossAccountId to frontier
in: master
27 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2554,7 +2554,7 @@
"fc-db",
"fc-rpc-core",
"fp-consensus",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"fp-rpc",
"fp-storage",
"futures 0.3.21",
@@ -2565,7 +2565,7 @@
"log",
"lru 0.6.6",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"parking_lot 0.11.2",
"rand 0.7.3",
@@ -2757,7 +2757,7 @@
dependencies = [
"ethereum",
"ethereum-types",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-api",
@@ -2853,6 +2853,21 @@
]
[[package]]
+name = "frame-common"
+version = "0.1.0"
+source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
+dependencies = [
+ "frame-system",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=feature/300)",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-std",
+ "up-evm-mapping",
+]
+
+[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65"
@@ -5835,7 +5850,7 @@
dependencies = [
"frame-support",
"frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"serde",
@@ -5984,9 +5999,10 @@
version = "0.1.0"
dependencies = [
"evm-coder",
+ "frame-common",
"frame-support",
"frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6064,7 +6080,7 @@
"ethereum-types",
"evm",
"fp-consensus",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"fp-rpc",
"fp-self-contained",
"fp-storage",
@@ -6072,7 +6088,7 @@
"frame-system",
"log",
"pallet-balances",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-timestamp",
"parity-scale-codec",
"rlp",
@@ -6093,7 +6109,7 @@
"evm",
"evm-gasometer",
"evm-runtime",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -6124,7 +6140,7 @@
"frame-support",
"frame-system",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6139,7 +6155,7 @@
"frame-support",
"frame-system",
"log",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6154,11 +6170,11 @@
name = "pallet-evm-migration"
version = "0.1.0"
dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-benchmarking",
"frame-support",
"frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6171,11 +6187,11 @@
name = "pallet-evm-transaction-payment"
version = "0.1.0"
dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-support",
"frame-system",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6193,6 +6209,7 @@
"ethereum",
"evm-coder",
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"pallet-common",
@@ -6419,6 +6436,7 @@
"ethereum",
"evm-coder",
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"pallet-common",
@@ -6535,6 +6553,7 @@
version = "0.1.0"
dependencies = [
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"pallet-common",
@@ -6795,15 +6814,16 @@
dependencies = [
"ethereum",
"evm-coder",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"hex-literal",
"pallet-balances",
"pallet-common",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"pallet-fungible",
"pallet-nonfungible",
@@ -12186,7 +12206,7 @@
"chrono",
"lazy_static",
"matchers",
- "parking_lot 0.11.2",
+ "parking_lot 0.10.2",
"regex",
"serde",
"serde_json",
@@ -12333,6 +12353,7 @@
name = "uc-rpc"
version = "0.1.0"
dependencies = [
+ "frame-common",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -12549,6 +12570,7 @@
"fp-rpc",
"fp-self-contained",
"frame-benchmarking",
+ "frame-common",
"frame-executive",
"frame-support",
"frame-system",
@@ -12561,7 +12583,7 @@
"pallet-base-fee",
"pallet-common",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"pallet-evm-contract-helpers",
"pallet-evm-migration",
@@ -12688,6 +12710,7 @@
[[package]]
name = "up-evm-mapping"
version = "0.1.0"
+source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
dependencies = [
"frame-support",
"sp-core",
@@ -12697,6 +12720,7 @@
name = "up-rpc"
version = "0.1.0"
dependencies = [
+ "frame-common",
"pallet-common",
"parity-scale-codec",
"sp-api",
client/rpc/Cargo.tomldiffbeforeafterboth--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -18,3 +18,4 @@
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -201,7 +201,7 @@
AccountId: Decode,
C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,
- CrossAccountId: pallet_common::account::CrossAccountId<AccountId>,
+ CrossAccountId: frame_common::account::CrossAccountId<AccountId>,
{
pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);
pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -16,11 +16,12 @@
sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = '../../primitives/evm-mapping' }
up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
serde = { version = "1.0.130", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
pallets/common/src/account.rsdiffbeforeafterboth--- a/pallets/common/src/account.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use crate::Config;
-use codec::{Encode, EncodeLike, Decode, MaxEncodedLen};
-use sp_core::H160;
-use scale_info::{Type, TypeInfo};
-use core::cmp::Ordering;
-use serde::{Serialize, Deserialize};
-use pallet_evm::AddressMapping;
-use sp_std::vec::Vec;
-use sp_std::clone::Clone;
-
-pub use up_evm_mapping::EvmBackwardsAddressMapping;
-
-pub trait CrossAccountId<AccountId>:
- Encode + EncodeLike + Decode + TypeInfo + MaxEncodedLen + Clone + PartialEq + Ord + core::fmt::Debug
-// +
-// Serialize + Deserialize<'static>
-{
- fn as_sub(&self) -> &AccountId;
- fn as_eth(&self) -> &H160;
-
- fn from_sub(account: AccountId) -> Self;
- fn from_eth(account: H160) -> Self;
-
- fn conv_eq(&self, other: &Self) -> bool;
-}
-
-#[derive(Encode, Decode, Serialize, Deserialize, TypeInfo, MaxEncodedLen)]
-#[serde(rename_all = "camelCase")]
-enum BasicCrossAccountIdRepr<AccountId> {
- Substrate(AccountId),
- Ethereum(H160),
-}
-
-#[derive(PartialEq, Eq)]
-pub struct BasicCrossAccountId<T: Config> {
- /// If true - then ethereum is canonical encoding
- from_ethereum: bool,
- substrate: T::AccountId,
- ethereum: H160,
-}
-
-impl<T: Config> MaxEncodedLen for BasicCrossAccountId<T> {
- fn max_encoded_len() -> usize {
- <BasicCrossAccountIdRepr<T::AccountId>>::max_encoded_len()
- }
-}
-
-impl<T: Config> TypeInfo for BasicCrossAccountId<T> {
- type Identity = Self;
-
- fn type_info() -> Type {
- <BasicCrossAccountIdRepr<T::AccountId>>::type_info()
- }
-}
-
-impl<T: Config> core::fmt::Debug for BasicCrossAccountId<T> {
- fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
- if self.from_ethereum {
- fmt.debug_tuple("CrossAccountId::Ethereum")
- .field(&self.ethereum)
- .finish()
- } else {
- fmt.debug_tuple("CrossAccountId::Substrate")
- .field(&self.substrate)
- .finish()
- }
- }
-}
-
-impl<T: Config> PartialOrd for BasicCrossAccountId<T> {
- fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
- Some(self.substrate.cmp(&other.substrate))
- }
-}
-
-impl<T: Config> Ord for BasicCrossAccountId<T> {
- fn cmp(&self, other: &Self) -> Ordering {
- self.partial_cmp(other)
- .expect("substrate account is total ordered")
- }
-}
-
-impl<T: Config> Clone for BasicCrossAccountId<T> {
- fn clone(&self) -> Self {
- Self {
- from_ethereum: self.from_ethereum,
- substrate: self.substrate.clone(),
- ethereum: self.ethereum,
- }
- }
-}
-impl<T: Config> Encode for BasicCrossAccountId<T> {
- fn encode(&self) -> Vec<u8> {
- BasicCrossAccountIdRepr::from(self.clone()).encode()
- }
-}
-impl<T: Config> EncodeLike for BasicCrossAccountId<T> {}
-impl<T: Config> Decode for BasicCrossAccountId<T> {
- fn decode<I>(input: &mut I) -> Result<Self, codec::Error>
- where
- I: codec::Input,
- {
- Ok(BasicCrossAccountIdRepr::decode(input)?.into())
- }
-}
-impl<T> Serialize for BasicCrossAccountId<T>
-where
- T: Config,
- T::AccountId: Serialize,
-{
- fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
- where
- S: serde::Serializer,
- {
- let repr = BasicCrossAccountIdRepr::from(self.clone());
- (&repr).serialize(serializer)
- }
-}
-impl<'de, T> Deserialize<'de> for BasicCrossAccountId<T>
-where
- T: Config,
- T::AccountId: Deserialize<'de>,
-{
- fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
- where
- D: serde::Deserializer<'de>,
- {
- Ok(BasicCrossAccountIdRepr::deserialize(deserializer)?.into())
- }
-}
-impl<T: Config> CrossAccountId<T::AccountId> for BasicCrossAccountId<T> {
- fn as_sub(&self) -> &T::AccountId {
- &self.substrate
- }
- fn as_eth(&self) -> &H160 {
- &self.ethereum
- }
- fn from_sub(substrate: T::AccountId) -> Self {
- Self {
- ethereum: T::EvmBackwardsAddressMapping::from_account_id(substrate.clone()),
- substrate,
- from_ethereum: false,
- }
- }
- fn from_eth(ethereum: H160) -> Self {
- Self {
- ethereum,
- substrate: T::EvmAddressMapping::into_account_id(ethereum),
- from_ethereum: true,
- }
- }
- fn conv_eq(&self, other: &Self) -> bool {
- if self.from_ethereum == other.from_ethereum {
- self.substrate == other.substrate && self.ethereum == other.ethereum
- } else if self.from_ethereum {
- // ethereum is canonical encoding, but we need to compare derived address
- self.substrate == other.substrate
- } else {
- self.ethereum == other.ethereum
- }
- }
-}
-impl<T: Config> From<BasicCrossAccountIdRepr<T::AccountId>> for BasicCrossAccountId<T> {
- fn from(repr: BasicCrossAccountIdRepr<T::AccountId>) -> Self {
- match repr {
- BasicCrossAccountIdRepr::Substrate(s) => Self::from_sub(s),
- BasicCrossAccountIdRepr::Ethereum(e) => Self::from_eth(e),
- }
- }
-}
-impl<T: Config> From<BasicCrossAccountId<T>> for BasicCrossAccountIdRepr<T::AccountId> {
- fn from(v: BasicCrossAccountId<T>) -> Self {
- if v.from_ethereum {
- BasicCrossAccountIdRepr::Ethereum(*v.as_eth())
- } else {
- BasicCrossAccountIdRepr::Substrate(v.as_sub().clone())
- }
- }
-}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -19,7 +19,7 @@
use core::ops::{Deref, DerefMut};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use sp_std::vec::Vec;
-use account::CrossAccountId;
+use frame_common::account::CrossAccountId;
use frame_support::{
dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo},
ensure, fail,
@@ -38,7 +38,6 @@
pub use pallet::*;
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
-pub mod account;
#[cfg(feature = "runtime-benchmarks")]
pub mod benchmarking;
pub mod erc;
@@ -163,7 +162,7 @@
pub mod pallet {
use super::*;
use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key};
- use account::CrossAccountId;
+ use frame_common::account::CrossAccountId;
use frame_support::traits::Currency;
use up_data_structs::TokenId;
use scale_info::TypeInfo;
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -17,7 +17,7 @@
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
log = "0.4.14"
[dependencies.codec]
pallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-transaction-payment/Cargo.toml
+++ b/pallets/evm-transaction-payment/Cargo.toml
@@ -18,7 +18,7 @@
fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[dependencies.codec]
default-features = false
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -25,6 +25,7 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -21,7 +21,7 @@
use pallet_common::erc::{CommonEvmHandler, PrecompileResult};
use sp_core::{H160, U256};
use sp_std::vec::Vec;
-use pallet_common::account::CrossAccountId;
+use frame_common::account::CrossAccountId;
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
use crate::{
pallets/fungible/src/lib.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;20use frame_support::{ensure};21use up_data_structs::{AccessMode, CollectionId, TokenId, CreateCollectionData};22use pallet_common::{23 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,24};25use pallet_evm_coder_substrate::WithRecorder;26use sp_core::H160;27use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};28use sp_std::collections::btree_map::BTreeMap;2930pub use pallet::*;3132use crate::erc::ERC20Events;33#[cfg(feature = "runtime-benchmarks")]34pub mod benchmarking;35pub mod common;36pub mod erc;37pub mod weights;3839pub type CreateItemData<T> = (<T as pallet_common::Config>::CrossAccountId, u128);40pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;4142#[frame_support::pallet]43pub mod pallet {44 use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};45 use up_data_structs::CollectionId;46 use super::weights::WeightInfo;4748 #[pallet::error]49 pub enum Error<T> {50 /// Not Fungible item data used to mint in Fungible collection.51 NotFungibleDataUsedToMintFungibleCollectionToken,52 /// Not default id passed as TokenId argument53 FungibleItemsHaveNoId,54 /// Tried to set data for fungible item55 FungibleItemsDontHaveData,56 }5758 #[pallet::config]59 pub trait Config: frame_system::Config + pallet_common::Config {60 type WeightInfo: WeightInfo;61 }6263 #[pallet::pallet]64 #[pallet::generate_store(pub(super) trait Store)]65 pub struct Pallet<T>(_);6667 #[pallet::storage]68 pub type TotalSupply<T: Config> =69 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u128, QueryKind = ValueQuery>;7071 #[pallet::storage]72 pub type Balance<T: Config> = StorageNMap<73 Key = (74 Key<Twox64Concat, CollectionId>,75 Key<Blake2_128Concat, T::CrossAccountId>,76 ),77 Value = u128,78 QueryKind = ValueQuery,79 >;8081 #[pallet::storage]82 pub type Allowance<T: Config> = StorageNMap<83 Key = (84 Key<Twox64Concat, CollectionId>,85 Key<Blake2_128, T::CrossAccountId>,86 Key<Blake2_128Concat, T::CrossAccountId>,87 ),88 Value = u128,89 QueryKind = ValueQuery,90 >;91}9293pub struct FungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);94impl<T: Config> FungibleHandle<T> {95 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {96 Self(inner)97 }98 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {99 self.0100 }101}102impl<T: Config> WithRecorder<T> for FungibleHandle<T> {103 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {104 self.0.recorder()105 }106 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {107 self.0.into_recorder()108 }109}110impl<T: Config> Deref for FungibleHandle<T> {111 type Target = pallet_common::CollectionHandle<T>;112113 fn deref(&self) -> &Self::Target {114 &self.0115 }116}117118impl<T: Config> Pallet<T> {119 pub fn init_collection(120 owner: T::AccountId,121 data: CreateCollectionData<T::AccountId>,122 ) -> Result<CollectionId, DispatchError> {123 <PalletCommon<T>>::init_collection(owner, data)124 }125 pub fn destroy_collection(126 collection: FungibleHandle<T>,127 sender: &T::CrossAccountId,128 ) -> DispatchResult {129 let id = collection.id;130131 // =========132133 PalletCommon::destroy_collection(collection.0, sender)?;134135 <TotalSupply<T>>::remove(id);136 <Balance<T>>::remove_prefix((id,), None);137 <Allowance<T>>::remove_prefix((id,), None);138 Ok(())139 }140141 pub fn burn(142 collection: &FungibleHandle<T>,143 owner: &T::CrossAccountId,144 amount: u128,145 ) -> DispatchResult {146 let total_supply = <TotalSupply<T>>::get(collection.id)147 .checked_sub(amount)148 .ok_or(<CommonError<T>>::TokenValueTooLow)?;149150 let balance = <Balance<T>>::get((collection.id, owner))151 .checked_sub(amount)152 .ok_or(<CommonError<T>>::TokenValueTooLow)?;153154 if collection.access == AccessMode::AllowList {155 collection.check_allowlist(owner)?;156 }157158 // =========159160 if balance == 0 {161 <Balance<T>>::remove((collection.id, owner));162 } else {163 <Balance<T>>::insert((collection.id, owner), balance);164 }165 <TotalSupply<T>>::insert(collection.id, total_supply);166167 collection.log_mirrored(ERC20Events::Transfer {168 from: *owner.as_eth(),169 to: H160::default(),170 value: amount.into(),171 });172 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(173 collection.id,174 TokenId::default(),175 owner.clone(),176 amount,177 ));178 Ok(())179 }180181 pub fn transfer(182 collection: &FungibleHandle<T>,183 from: &T::CrossAccountId,184 to: &T::CrossAccountId,185 amount: u128,186 ) -> DispatchResult {187 ensure!(188 collection.limits.transfers_enabled(),189 <CommonError<T>>::TransferNotAllowed,190 );191192 if collection.access == AccessMode::AllowList {193 collection.check_allowlist(from)?;194 collection.check_allowlist(to)?;195 }196 <PalletCommon<T>>::ensure_correct_receiver(to)?;197198 let balance_from = <Balance<T>>::get((collection.id, from))199 .checked_sub(amount)200 .ok_or(<CommonError<T>>::TokenValueTooLow)?;201 let balance_to = if from != to {202 Some(203 <Balance<T>>::get((collection.id, to))204 .checked_add(amount)205 .ok_or(ArithmeticError::Overflow)?,206 )207 } else {208 None209 };210211 // =========212213 if let Some(balance_to) = balance_to {214 // from != to215 if balance_from == 0 {216 <Balance<T>>::remove((collection.id, from));217 } else {218 <Balance<T>>::insert((collection.id, from), balance_from);219 }220 <Balance<T>>::insert((collection.id, to), balance_to);221 }222223 collection.log_mirrored(ERC20Events::Transfer {224 from: *from.as_eth(),225 to: *to.as_eth(),226 value: amount.into(),227 });228 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(229 collection.id,230 TokenId::default(),231 from.clone(),232 to.clone(),233 amount,234 ));235 Ok(())236 }237238 pub fn create_multiple_items(239 collection: &FungibleHandle<T>,240 sender: &T::CrossAccountId,241 data: BTreeMap<T::CrossAccountId, u128>,242 ) -> DispatchResult {243 if !collection.is_owner_or_admin(sender) {244 ensure!(245 collection.mint_mode,246 <CommonError<T>>::PublicMintingNotAllowed247 );248 collection.check_allowlist(sender)?;249250 for (owner, _) in data.iter() {251 collection.check_allowlist(owner)?;252 }253 }254255 let total_supply = data256 .iter()257 .map(|(_, v)| *v)258 .try_fold(<TotalSupply<T>>::get(collection.id), |acc, v| {259 acc.checked_add(v)260 })261 .ok_or(ArithmeticError::Overflow)?;262263 let mut balances = data;264 for (k, v) in balances.iter_mut() {265 *v = <Balance<T>>::get((collection.id, &k))266 .checked_add(*v)267 .ok_or(ArithmeticError::Overflow)?;268 }269270 // =========271272 <TotalSupply<T>>::insert(collection.id, total_supply);273 for (user, amount) in balances {274 <Balance<T>>::insert((collection.id, &user), amount);275276 collection.log_mirrored(ERC20Events::Transfer {277 from: H160::default(),278 to: *user.as_eth(),279 value: amount.into(),280 });281 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(282 collection.id,283 TokenId::default(),284 user.clone(),285 amount,286 ));287 }288289 Ok(())290 }291292 fn set_allowance_unchecked(293 collection: &FungibleHandle<T>,294 owner: &T::CrossAccountId,295 spender: &T::CrossAccountId,296 amount: u128,297 ) {298 if amount == 0 {299 <Allowance<T>>::remove((collection.id, owner, spender));300 } else {301 <Allowance<T>>::insert((collection.id, owner, spender), amount);302 }303304 collection.log_mirrored(ERC20Events::Approval {305 owner: *owner.as_eth(),306 spender: *spender.as_eth(),307 value: amount.into(),308 });309 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(310 collection.id,311 TokenId(0),312 owner.clone(),313 spender.clone(),314 amount,315 ));316 }317318 pub fn set_allowance(319 collection: &FungibleHandle<T>,320 owner: &T::CrossAccountId,321 spender: &T::CrossAccountId,322 amount: u128,323 ) -> DispatchResult {324 if collection.access == AccessMode::AllowList {325 collection.check_allowlist(owner)?;326 collection.check_allowlist(spender)?;327 }328329 if <Balance<T>>::get((collection.id, owner)) < amount {330 ensure!(331 collection.ignores_owned_amount(owner),332 <CommonError<T>>::CantApproveMoreThanOwned333 );334 }335336 // =========337338 Self::set_allowance_unchecked(collection, owner, spender, amount);339 Ok(())340 }341342 pub fn transfer_from(343 collection: &FungibleHandle<T>,344 spender: &T::CrossAccountId,345 from: &T::CrossAccountId,346 to: &T::CrossAccountId,347 amount: u128,348 ) -> DispatchResult {349 if spender.conv_eq(from) {350 return Self::transfer(collection, from, to, amount);351 }352 if collection.access == AccessMode::AllowList {353 // `from`, `to` checked in [`transfer`]354 collection.check_allowlist(spender)?;355 }356357 let allowance = <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount);358 if allowance.is_none() {359 ensure!(360 collection.ignores_allowance(spender),361 <CommonError<T>>::ApprovedValueTooLow362 );363 }364365 // =========366367 Self::transfer(collection, from, to, amount)?;368 if let Some(allowance) = allowance {369 Self::set_allowance_unchecked(collection, from, spender, allowance);370 }371 Ok(())372 }373374 pub fn burn_from(375 collection: &FungibleHandle<T>,376 spender: &T::CrossAccountId,377 from: &T::CrossAccountId,378 amount: u128,379 ) -> DispatchResult {380 if spender.conv_eq(from) {381 return Self::burn(collection, from, amount);382 }383 if collection.access == AccessMode::AllowList {384 // `from` checked in [`burn`]385 collection.check_allowlist(spender)?;386 }387388 let allowance = <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount);389 if allowance.is_none() {390 ensure!(391 collection.ignores_allowance(spender),392 <CommonError<T>>::ApprovedValueTooLow393 );394 }395396 // =========397398 Self::burn(collection, from, amount)?;399 if let Some(allowance) = allowance {400 Self::set_allowance_unchecked(collection, from, spender, allowance);401 }402 Ok(())403 }404405 /// Delegated to `create_multiple_items`406 pub fn create_item(407 collection: &FungibleHandle<T>,408 sender: &T::CrossAccountId,409 data: CreateItemData<T>,410 ) -> DispatchResult {411 Self::create_multiple_items(collection, sender, [(data.0, data.1)].into_iter().collect())412 }413}pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -25,6 +25,7 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -25,9 +25,9 @@
use sp_core::{H160, U256};
use sp_std::{vec::Vec, vec};
use pallet_common::{
- account::CrossAccountId,
erc::{CommonEvmHandler, PrecompileResult},
};
+use frame_common::account::CrossAccountId;
use pallet_evm_coder_substrate::call;
use crate::{
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -22,8 +22,9 @@
AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
};
use pallet_common::{
- Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, account::CrossAccountId,
+ Error as CommonError, Pallet as PalletCommon, Event as CommonEvent,
};
+use frame_common::account::CrossAccountId;
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -22,6 +22,7 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -22,8 +22,9 @@
CreateCollectionData, CreateRefungibleExData,
};
use pallet_common::{
- Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,
+ Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
};
+use frame_common::account::CrossAccountId;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
use core::ops::Deref;
pallets/unique/Cargo.tomldiffbeforeafterboth--- a/pallets/unique/Cargo.toml
+++ b/pallets/unique/Cargo.toml
@@ -132,7 +132,8 @@
sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
evm-coder = { default-features = false, path = "../../crates/evm-coder" }
pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
primitive-types = { version = "0.11.1", default-features = false, features = [
pallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -25,8 +25,7 @@
use core::marker::PhantomData;
use core::convert::TryInto;
use up_data_structs::TokenId;
-use up_evm_mapping::EvmBackwardsAddressMapping;
-use pallet_common::account::CrossAccountId;
+use frame_common::account::CrossAccountId;
use pallet_nonfungible::erc::{UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721Call};
use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -54,9 +54,10 @@
CreateCollectionData, CustomDataLimit, CreateItemExData,
};
use pallet_common::{
- account::CrossAccountId, CollectionHandle, Pallet as PalletCommon, Error as CommonError,
+ CollectionHandle, Pallet as PalletCommon, Error as CommonError,
CommonWeightInfo,
};
+use frame_common::account::CrossAccountId;
use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle};
use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};
use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle};
pallets/unique/src/mock.rsdiffbeforeafterboth--- a/pallets/unique/src/mock.rs
+++ b/pallets/unique/src/mock.rs
@@ -26,7 +26,8 @@
use pallet_transaction_payment::{CurrencyAdapter};
use frame_system as system;
use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};
-use pallet_common::account::{EvmBackwardsAddressMapping, CrossAccountId};
+use up_evm_mapping::EvmBackwardsAddressMapping;
+use frame_common::account::CrossAccountId;
use codec::{Encode, Decode, MaxEncodedLen};
use scale_info::TypeInfo;
use up_data_structs::ConstU32;
pallets/unique/src/sponsorship.rsdiffbeforeafterboth--- a/pallets/unique/src/sponsorship.rs
+++ b/pallets/unique/src/sponsorship.rs
@@ -30,7 +30,7 @@
NFT_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, TokenId,
};
use pallet_common::{CollectionHandle};
-use pallet_common::account::CrossAccountId;
+use frame_common::account::CrossAccountId;
pub fn withdraw_transfer<T: Config>(
collection: &CollectionHandle<T>,
primitives/evm-mapping/Cargo.tomldiffbeforeafterboth--- a/primitives/evm-mapping/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "up-evm-mapping"
-version = "0.1.0"
-license = "GPLv3"
-edition = "2021"
-
-[dependencies]
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-
-[features]
-default = ["std"]
-std = ["sp-core/std", "frame-support/std"]
primitives/evm-mapping/src/lib.rsdiffbeforeafterboth--- a/primitives/evm-mapping/src/lib.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use frame_support::sp_runtime::AccountId32;
-use sp_core::H160;
-
-/// Transforms substrate addresses to ethereum (Reverse of `EvmAddressMapping`)
-/// pallet_evm doesn't have this, as it only checks if eth address
-/// is owned by substrate via `EnsureAddressOrigin` trait
-///
-/// This trait implementations shouldn't conflict with used `EnsureAddressOrigin`
-pub trait EvmBackwardsAddressMapping<AccountId> {
- fn from_account_id(account_id: AccountId) -> H160;
-}
-
-/// Should have same mapping as EnsureAddressTruncated
-pub struct MapBackwardsAddressTruncated;
-impl EvmBackwardsAddressMapping<AccountId32> for MapBackwardsAddressTruncated {
- fn from_account_id(account_id: AccountId32) -> H160 {
- let mut out = [0; 20];
- out.copy_from_slice(&(account_id.as_ref() as &[u8])[0..20]);
- H160(out)
- }
-}
primitives/rpc/Cargo.tomldiffbeforeafterboth--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -14,6 +14,7 @@
sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-api = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
primitives/rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -28,7 +28,7 @@
#[api_version(2)]
pub trait UniqueApi<CrossAccountId, AccountId> where
AccountId: Decode,
- CrossAccountId: pallet_common::account::CrossAccountId<AccountId>,
+ CrossAccountId: frame_common::account::CrossAccountId<AccountId>,
{
#[changed_in(2)]
fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -116,11 +116,10 @@
pub const RUNTIME_NAME: &str = "Opal";
-type CrossAccountId = pallet_common::account::BasicCrossAccountId<Runtime>;
+type CrossAccountId = frame_common::account::BasicCrossAccountId<Runtime>;
impl RuntimeInstance for Runtime {
type CrossAccountId = self::CrossAccountId;
-
type TransactionConverter = self::TransactionConverter;
fn get_transaction_converter() -> TransactionConverter {
@@ -286,6 +285,11 @@
type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;
}
+impl frame_common::account::Config for Runtime {
+ type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
+ type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
+}
+
pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);
impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {
fn find_author<'a, I>(digests: I) -> Option<H160>
@@ -846,7 +850,7 @@
type Event = Event;
type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
- type CrossAccountId = pallet_common::account::BasicCrossAccountId<Self>;
+ type CrossAccountId = frame_common::account::BasicCrossAccountId<Self>;
type Currency = Balances;
type CollectionCreationPrice = CollectionCreationPrice;
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -382,7 +382,6 @@
derivative = "2.2.0"
pallet-unique = { path = '../../pallets/unique', default-features = false }
up-rpc = { path = "../../primitives/rpc", default-features = false }
-up-evm-mapping = { path = "../../primitives/evm-mapping", default-features = false }
pallet-inflation = { path = '../../pallets/inflation', default-features = false }
up-data-structs = { path = '../../primitives/data-structs', default-features = false }
pallet-common = { default-features = false, path = "../../pallets/common" }
@@ -401,6 +400,8 @@
pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
################################################################################
# Build Dependencies