difftreelog
CORE-300 Move CrossAccountId to frontier
in: master
27 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2554,7 +2554,7 @@
"fc-db",
"fc-rpc-core",
"fp-consensus",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"fp-rpc",
"fp-storage",
"futures 0.3.21",
@@ -2565,7 +2565,7 @@
"log",
"lru 0.6.6",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"parking_lot 0.11.2",
"rand 0.7.3",
@@ -2757,7 +2757,7 @@
dependencies = [
"ethereum",
"ethereum-types",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-api",
@@ -2853,6 +2853,21 @@
]
[[package]]
+name = "frame-common"
+version = "0.1.0"
+source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
+dependencies = [
+ "frame-system",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=feature/300)",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-std",
+ "up-evm-mapping",
+]
+
+[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65"
@@ -5835,7 +5850,7 @@
dependencies = [
"frame-support",
"frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"serde",
@@ -5984,9 +5999,10 @@
version = "0.1.0"
dependencies = [
"evm-coder",
+ "frame-common",
"frame-support",
"frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6064,7 +6080,7 @@
"ethereum-types",
"evm",
"fp-consensus",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"fp-rpc",
"fp-self-contained",
"fp-storage",
@@ -6072,7 +6088,7 @@
"frame-system",
"log",
"pallet-balances",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-timestamp",
"parity-scale-codec",
"rlp",
@@ -6093,7 +6109,7 @@
"evm",
"evm-gasometer",
"evm-runtime",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -6124,7 +6140,7 @@
"frame-support",
"frame-system",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6139,7 +6155,7 @@
"frame-support",
"frame-system",
"log",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"parity-scale-codec",
"scale-info",
@@ -6154,11 +6170,11 @@
name = "pallet-evm-migration"
version = "0.1.0"
dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-benchmarking",
"frame-support",
"frame-system",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6171,11 +6187,11 @@
name = "pallet-evm-transaction-payment"
version = "0.1.0"
dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-support",
"frame-system",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6193,6 +6209,7 @@
"ethereum",
"evm-coder",
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"pallet-common",
@@ -6419,6 +6436,7 @@
"ethereum",
"evm-coder",
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"pallet-common",
@@ -6535,6 +6553,7 @@
version = "0.1.0"
dependencies = [
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"pallet-common",
@@ -6795,15 +6814,16 @@
dependencies = [
"ethereum",
"evm-coder",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"frame-benchmarking",
+ "frame-common",
"frame-support",
"frame-system",
"hex-literal",
"pallet-balances",
"pallet-common",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"pallet-fungible",
"pallet-nonfungible",
@@ -12186,7 +12206,7 @@
"chrono",
"lazy_static",
"matchers",
- "parking_lot 0.11.2",
+ "parking_lot 0.10.2",
"regex",
"serde",
"serde_json",
@@ -12333,6 +12353,7 @@
name = "uc-rpc"
version = "0.1.0"
dependencies = [
+ "frame-common",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -12549,6 +12570,7 @@
"fp-rpc",
"fp-self-contained",
"frame-benchmarking",
+ "frame-common",
"frame-executive",
"frame-support",
"frame-system",
@@ -12561,7 +12583,7 @@
"pallet-base-fee",
"pallet-common",
"pallet-ethereum",
- "pallet-evm",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
"pallet-evm-coder-substrate",
"pallet-evm-contract-helpers",
"pallet-evm-migration",
@@ -12688,6 +12710,7 @@
[[package]]
name = "up-evm-mapping"
version = "0.1.0"
+source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
dependencies = [
"frame-support",
"sp-core",
@@ -12697,6 +12720,7 @@
name = "up-rpc"
version = "0.1.0"
dependencies = [
+ "frame-common",
"pallet-common",
"parity-scale-codec",
"sp-api",
client/rpc/Cargo.tomldiffbeforeafterboth--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -18,3 +18,4 @@
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -201,7 +201,7 @@
AccountId: Decode,
C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,
- CrossAccountId: pallet_common::account::CrossAccountId<AccountId>,
+ CrossAccountId: frame_common::account::CrossAccountId<AccountId>,
{
pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);
pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -16,11 +16,12 @@
sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = '../../primitives/evm-mapping' }
up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
serde = { version = "1.0.130", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
pallets/common/src/account.rsdiffbeforeafterboth--- a/pallets/common/src/account.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use crate::Config;
-use codec::{Encode, EncodeLike, Decode, MaxEncodedLen};
-use sp_core::H160;
-use scale_info::{Type, TypeInfo};
-use core::cmp::Ordering;
-use serde::{Serialize, Deserialize};
-use pallet_evm::AddressMapping;
-use sp_std::vec::Vec;
-use sp_std::clone::Clone;
-
-pub use up_evm_mapping::EvmBackwardsAddressMapping;
-
-pub trait CrossAccountId<AccountId>:
- Encode + EncodeLike + Decode + TypeInfo + MaxEncodedLen + Clone + PartialEq + Ord + core::fmt::Debug
-// +
-// Serialize + Deserialize<'static>
-{
- fn as_sub(&self) -> &AccountId;
- fn as_eth(&self) -> &H160;
-
- fn from_sub(account: AccountId) -> Self;
- fn from_eth(account: H160) -> Self;
-
- fn conv_eq(&self, other: &Self) -> bool;
-}
-
-#[derive(Encode, Decode, Serialize, Deserialize, TypeInfo, MaxEncodedLen)]
-#[serde(rename_all = "camelCase")]
-enum BasicCrossAccountIdRepr<AccountId> {
- Substrate(AccountId),
- Ethereum(H160),
-}
-
-#[derive(PartialEq, Eq)]
-pub struct BasicCrossAccountId<T: Config> {
- /// If true - then ethereum is canonical encoding
- from_ethereum: bool,
- substrate: T::AccountId,
- ethereum: H160,
-}
-
-impl<T: Config> MaxEncodedLen for BasicCrossAccountId<T> {
- fn max_encoded_len() -> usize {
- <BasicCrossAccountIdRepr<T::AccountId>>::max_encoded_len()
- }
-}
-
-impl<T: Config> TypeInfo for BasicCrossAccountId<T> {
- type Identity = Self;
-
- fn type_info() -> Type {
- <BasicCrossAccountIdRepr<T::AccountId>>::type_info()
- }
-}
-
-impl<T: Config> core::fmt::Debug for BasicCrossAccountId<T> {
- fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
- if self.from_ethereum {
- fmt.debug_tuple("CrossAccountId::Ethereum")
- .field(&self.ethereum)
- .finish()
- } else {
- fmt.debug_tuple("CrossAccountId::Substrate")
- .field(&self.substrate)
- .finish()
- }
- }
-}
-
-impl<T: Config> PartialOrd for BasicCrossAccountId<T> {
- fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
- Some(self.substrate.cmp(&other.substrate))
- }
-}
-
-impl<T: Config> Ord for BasicCrossAccountId<T> {
- fn cmp(&self, other: &Self) -> Ordering {
- self.partial_cmp(other)
- .expect("substrate account is total ordered")
- }
-}
-
-impl<T: Config> Clone for BasicCrossAccountId<T> {
- fn clone(&self) -> Self {
- Self {
- from_ethereum: self.from_ethereum,
- substrate: self.substrate.clone(),
- ethereum: self.ethereum,
- }
- }
-}
-impl<T: Config> Encode for BasicCrossAccountId<T> {
- fn encode(&self) -> Vec<u8> {
- BasicCrossAccountIdRepr::from(self.clone()).encode()
- }
-}
-impl<T: Config> EncodeLike for BasicCrossAccountId<T> {}
-impl<T: Config> Decode for BasicCrossAccountId<T> {
- fn decode<I>(input: &mut I) -> Result<Self, codec::Error>
- where
- I: codec::Input,
- {
- Ok(BasicCrossAccountIdRepr::decode(input)?.into())
- }
-}
-impl<T> Serialize for BasicCrossAccountId<T>
-where
- T: Config,
- T::AccountId: Serialize,
-{
- fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
- where
- S: serde::Serializer,
- {
- let repr = BasicCrossAccountIdRepr::from(self.clone());
- (&repr).serialize(serializer)
- }
-}
-impl<'de, T> Deserialize<'de> for BasicCrossAccountId<T>
-where
- T: Config,
- T::AccountId: Deserialize<'de>,
-{
- fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
- where
- D: serde::Deserializer<'de>,
- {
- Ok(BasicCrossAccountIdRepr::deserialize(deserializer)?.into())
- }
-}
-impl<T: Config> CrossAccountId<T::AccountId> for BasicCrossAccountId<T> {
- fn as_sub(&self) -> &T::AccountId {
- &self.substrate
- }
- fn as_eth(&self) -> &H160 {
- &self.ethereum
- }
- fn from_sub(substrate: T::AccountId) -> Self {
- Self {
- ethereum: T::EvmBackwardsAddressMapping::from_account_id(substrate.clone()),
- substrate,
- from_ethereum: false,
- }
- }
- fn from_eth(ethereum: H160) -> Self {
- Self {
- ethereum,
- substrate: T::EvmAddressMapping::into_account_id(ethereum),
- from_ethereum: true,
- }
- }
- fn conv_eq(&self, other: &Self) -> bool {
- if self.from_ethereum == other.from_ethereum {
- self.substrate == other.substrate && self.ethereum == other.ethereum
- } else if self.from_ethereum {
- // ethereum is canonical encoding, but we need to compare derived address
- self.substrate == other.substrate
- } else {
- self.ethereum == other.ethereum
- }
- }
-}
-impl<T: Config> From<BasicCrossAccountIdRepr<T::AccountId>> for BasicCrossAccountId<T> {
- fn from(repr: BasicCrossAccountIdRepr<T::AccountId>) -> Self {
- match repr {
- BasicCrossAccountIdRepr::Substrate(s) => Self::from_sub(s),
- BasicCrossAccountIdRepr::Ethereum(e) => Self::from_eth(e),
- }
- }
-}
-impl<T: Config> From<BasicCrossAccountId<T>> for BasicCrossAccountIdRepr<T::AccountId> {
- fn from(v: BasicCrossAccountId<T>) -> Self {
- if v.from_ethereum {
- BasicCrossAccountIdRepr::Ethereum(*v.as_eth())
- } else {
- BasicCrossAccountIdRepr::Substrate(v.as_sub().clone())
- }
- }
-}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -19,7 +19,7 @@
use core::ops::{Deref, DerefMut};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use sp_std::vec::Vec;
-use account::CrossAccountId;
+use frame_common::account::CrossAccountId;
use frame_support::{
dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo},
ensure, fail,
@@ -38,7 +38,6 @@
pub use pallet::*;
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
-pub mod account;
#[cfg(feature = "runtime-benchmarks")]
pub mod benchmarking;
pub mod erc;
@@ -163,7 +162,7 @@
pub mod pallet {
use super::*;
use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key};
- use account::CrossAccountId;
+ use frame_common::account::CrossAccountId;
use frame_support::traits::Currency;
use up_data_structs::TokenId;
use scale_info::TypeInfo;
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -17,7 +17,7 @@
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
log = "0.4.14"
[dependencies.codec]
pallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-transaction-payment/Cargo.toml
+++ b/pallets/evm-transaction-payment/Cargo.toml
@@ -18,7 +18,7 @@
fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
+up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[dependencies.codec]
default-features = false
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -25,6 +25,7 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -21,7 +21,7 @@
use pallet_common::erc::{CommonEvmHandler, PrecompileResult};
use sp_core::{H160, U256};
use sp_std::vec::Vec;
-use pallet_common::account::CrossAccountId;
+use frame_common::account::CrossAccountId;
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
use crate::{
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -20,8 +20,9 @@
use frame_support::{ensure};
use up_data_structs::{AccessMode, CollectionId, TokenId, CreateCollectionData};
use pallet_common::{
- Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,
+ Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
};
+use frame_common::account::CrossAccountId;
use pallet_evm_coder_substrate::WithRecorder;
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -25,6 +25,7 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
+frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
[features]
default = ["std"]
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -25,9 +25,9 @@
use sp_core::{H160, U256};
use sp_std::{vec::Vec, vec};
use pallet_common::{
- account::CrossAccountId,
erc::{CommonEvmHandler, PrecompileResult},
};
+use frame_common::account::CrossAccountId;
use pallet_evm_coder_substrate::call;
use crate::{
pallets/nonfungible/src/lib.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.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 frame_support::{ensure, BoundedVec};20use up_data_structs::{21 AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId,22 CreateCollectionData, CreateRefungibleExData,23};24use pallet_common::{25 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,26};27use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};28use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};29use core::ops::Deref;30use codec::{Encode, Decode, MaxEncodedLen};31use scale_info::TypeInfo;3233pub use pallet::*;34#[cfg(feature = "runtime-benchmarks")]35pub mod benchmarking;36pub mod common;37pub mod erc;38pub mod weights;39pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;4041#[derive(Encode, Decode, Default, TypeInfo, MaxEncodedLen)]42pub struct ItemData {43 pub const_data: BoundedVec<u8, CustomDataLimit>,44 pub variable_data: BoundedVec<u8, CustomDataLimit>,45}4647#[frame_support::pallet]48pub mod pallet {49 use super::*;50 use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};51 use up_data_structs::{CollectionId, TokenId};52 use super::weights::WeightInfo;5354 #[pallet::error]55 pub enum Error<T> {56 /// Not Refungible item data used to mint in Refungible collection.57 NotRefungibleDataUsedToMintFungibleCollectionToken,58 /// Maximum refungibility exceeded59 WrongRefungiblePieces,60 }6162 #[pallet::config]63 pub trait Config: frame_system::Config + pallet_common::Config {64 type WeightInfo: WeightInfo;65 }6667 #[pallet::pallet]68 #[pallet::generate_store(pub(super) trait Store)]69 pub struct Pallet<T>(_);7071 #[pallet::storage]72 pub type TokensMinted<T: Config> =73 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;74 #[pallet::storage]75 pub type TokensBurnt<T: Config> =76 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;7778 #[pallet::storage]79 pub type TokenData<T: Config> = StorageNMap<80 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),81 Value = ItemData,82 QueryKind = ValueQuery,83 >;8485 #[pallet::storage]86 pub type TotalSupply<T: Config> = StorageNMap<87 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),88 Value = u128,89 QueryKind = ValueQuery,90 >;9192 /// Used to enumerate tokens owned by account93 #[pallet::storage]94 pub type Owned<T: Config> = StorageNMap<95 Key = (96 Key<Twox64Concat, CollectionId>,97 Key<Blake2_128Concat, T::CrossAccountId>,98 Key<Twox64Concat, TokenId>,99 ),100 Value = bool,101 QueryKind = ValueQuery,102 >;103104 #[pallet::storage]105 pub type AccountBalance<T: Config> = StorageNMap<106 Key = (107 Key<Twox64Concat, CollectionId>,108 // Owner109 Key<Blake2_128Concat, T::CrossAccountId>,110 ),111 Value = u32,112 QueryKind = ValueQuery,113 >;114115 #[pallet::storage]116 pub type Balance<T: Config> = StorageNMap<117 Key = (118 Key<Twox64Concat, CollectionId>,119 Key<Twox64Concat, TokenId>,120 // Owner121 Key<Blake2_128Concat, T::CrossAccountId>,122 ),123 Value = u128,124 QueryKind = ValueQuery,125 >;126127 #[pallet::storage]128 pub type Allowance<T: Config> = StorageNMap<129 Key = (130 Key<Twox64Concat, CollectionId>,131 Key<Twox64Concat, TokenId>,132 // Owner133 Key<Blake2_128, T::CrossAccountId>,134 // Spender135 Key<Blake2_128Concat, T::CrossAccountId>,136 ),137 Value = u128,138 QueryKind = ValueQuery,139 >;140}141142pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);143impl<T: Config> RefungibleHandle<T> {144 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {145 Self(inner)146 }147 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {148 self.0149 }150}151impl<T: Config> Deref for RefungibleHandle<T> {152 type Target = pallet_common::CollectionHandle<T>;153154 fn deref(&self) -> &Self::Target {155 &self.0156 }157}158159impl<T: Config> Pallet<T> {160 pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {161 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)162 }163 pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {164 <TotalSupply<T>>::contains_key((collection.id, token))165 }166}167168// unchecked calls skips any permission checks169impl<T: Config> Pallet<T> {170 pub fn init_collection(171 owner: T::AccountId,172 data: CreateCollectionData<T::AccountId>,173 ) -> Result<CollectionId, DispatchError> {174 <PalletCommon<T>>::init_collection(owner, data)175 }176 pub fn destroy_collection(177 collection: RefungibleHandle<T>,178 sender: &T::CrossAccountId,179 ) -> DispatchResult {180 let id = collection.id;181182 // =========183184 PalletCommon::destroy_collection(collection.0, sender)?;185186 <TokensMinted<T>>::remove(id);187 <TokensBurnt<T>>::remove(id);188 <TokenData<T>>::remove_prefix((id,), None);189 <TotalSupply<T>>::remove_prefix((id,), None);190 <Balance<T>>::remove_prefix((id,), None);191 <Allowance<T>>::remove_prefix((id,), None);192 <Owned<T>>::remove_prefix((id,), None);193 <AccountBalance<T>>::remove_prefix((id,), None);194 Ok(())195 }196197 pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {198 let burnt = <TokensBurnt<T>>::get(collection.id)199 .checked_add(1)200 .ok_or(ArithmeticError::Overflow)?;201202 <TokensBurnt<T>>::insert(collection.id, burnt);203 <TokenData<T>>::remove((collection.id, token_id));204 <TotalSupply<T>>::remove((collection.id, token_id));205 <Balance<T>>::remove_prefix((collection.id, token_id), None);206 <Allowance<T>>::remove_prefix((collection.id, token_id), None);207 // TODO: ERC721 transfer event208 Ok(())209 }210211 pub fn burn(212 collection: &RefungibleHandle<T>,213 owner: &T::CrossAccountId,214 token: TokenId,215 amount: u128,216 ) -> DispatchResult {217 let total_supply = <TotalSupply<T>>::get((collection.id, token))218 .checked_sub(amount)219 .ok_or(<CommonError<T>>::TokenValueTooLow)?;220221 // This was probally last owner of this token?222 if total_supply == 0 {223 // Ensure user actually owns this amount224 ensure!(225 <Balance<T>>::get((collection.id, token, owner)) == amount,226 <CommonError<T>>::TokenValueTooLow227 );228 let account_balance = <AccountBalance<T>>::get((collection.id, owner))229 .checked_sub(1)230 // Should not occur231 .ok_or(ArithmeticError::Underflow)?;232233 // =========234235 <Owned<T>>::remove((collection.id, owner, token));236 <AccountBalance<T>>::insert((collection.id, owner), account_balance);237 Self::burn_token(collection, token)?;238 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(239 collection.id,240 token,241 owner.clone(),242 amount,243 ));244 return Ok(());245 }246247 let balance = <Balance<T>>::get((collection.id, token, owner))248 .checked_sub(amount)249 .ok_or(<CommonError<T>>::TokenValueTooLow)?;250 let account_balance = if balance == 0 {251 <AccountBalance<T>>::get((collection.id, owner))252 .checked_sub(1)253 // Should not occur254 .ok_or(ArithmeticError::Underflow)?255 } else {256 0257 };258259 // =========260261 if balance == 0 {262 <Owned<T>>::remove((collection.id, owner, token));263 <Balance<T>>::remove((collection.id, token, owner));264 <AccountBalance<T>>::insert((collection.id, owner), account_balance);265 } else {266 <Balance<T>>::insert((collection.id, token, owner), balance);267 }268 <TotalSupply<T>>::insert((collection.id, token), total_supply);269 // TODO: ERC20 transfer event270 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(271 collection.id,272 token,273 owner.clone(),274 amount,275 ));276 Ok(())277 }278279 pub fn transfer(280 collection: &RefungibleHandle<T>,281 from: &T::CrossAccountId,282 to: &T::CrossAccountId,283 token: TokenId,284 amount: u128,285 ) -> DispatchResult {286 ensure!(287 collection.limits.transfers_enabled(),288 <CommonError<T>>::TransferNotAllowed289 );290291 if collection.access == AccessMode::AllowList {292 collection.check_allowlist(from)?;293 collection.check_allowlist(to)?;294 }295 <PalletCommon<T>>::ensure_correct_receiver(to)?;296297 let balance_from = <Balance<T>>::get((collection.id, token, from))298 .checked_sub(amount)299 .ok_or(<CommonError<T>>::TokenValueTooLow)?;300 let mut create_target = false;301 let from_to_differ = from != to;302 let balance_to = if from != to {303 let old_balance = <Balance<T>>::get((collection.id, token, to));304 if old_balance == 0 {305 create_target = true;306 }307 Some(308 old_balance309 .checked_add(amount)310 .ok_or(ArithmeticError::Overflow)?,311 )312 } else {313 None314 };315316 let account_balance_from = if balance_from == 0 {317 Some(318 <AccountBalance<T>>::get((collection.id, from))319 .checked_sub(1)320 // Should not occur321 .ok_or(ArithmeticError::Underflow)?,322 )323 } else {324 None325 };326 // Account data is created in token, AccountBalance should be increased327 // But only if from != to as we shouldn't check overflow in this case328 let account_balance_to = if create_target && from_to_differ {329 let account_balance_to = <AccountBalance<T>>::get((collection.id, to))330 .checked_add(1)331 .ok_or(ArithmeticError::Overflow)?;332 ensure!(333 account_balance_to < collection.limits.account_token_ownership_limit(),334 <CommonError<T>>::AccountTokenLimitExceeded,335 );336337 Some(account_balance_to)338 } else {339 None340 };341342 // =========343344 if let Some(balance_to) = balance_to {345 // from != to346 if balance_from == 0 {347 <Balance<T>>::remove((collection.id, token, from));348 } else {349 <Balance<T>>::insert((collection.id, token, from), balance_from);350 }351 <Balance<T>>::insert((collection.id, token, to), balance_to);352 if let Some(account_balance_from) = account_balance_from {353 <AccountBalance<T>>::insert((collection.id, from), account_balance_from);354 <Owned<T>>::remove((collection.id, from, token));355 }356 if let Some(account_balance_to) = account_balance_to {357 <AccountBalance<T>>::insert((collection.id, to), account_balance_to);358 <Owned<T>>::insert((collection.id, to, token), true);359 }360 }361362 // TODO: ERC20 transfer event363 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(364 collection.id,365 token,366 from.clone(),367 to.clone(),368 amount,369 ));370 Ok(())371 }372373 pub fn create_multiple_items(374 collection: &RefungibleHandle<T>,375 sender: &T::CrossAccountId,376 data: Vec<CreateRefungibleExData<T::CrossAccountId>>,377 ) -> DispatchResult {378 if !collection.is_owner_or_admin(sender) {379 ensure!(380 collection.mint_mode,381 <CommonError<T>>::PublicMintingNotAllowed382 );383 collection.check_allowlist(sender)?;384385 for item in data.iter() {386 for user in item.users.keys() {387 collection.check_allowlist(user)?;388 }389 }390 }391392 for item in data.iter() {393 for (owner, _) in item.users.iter() {394 <PalletCommon<T>>::ensure_correct_receiver(owner)?;395 }396 }397398 // Total pieces per tokens399 let totals = data400 .iter()401 .map(|data| {402 Ok(data403 .users404 .iter()405 .map(|u| u.1)406 .try_fold(0u128, |acc, v| acc.checked_add(*v))407 .ok_or(ArithmeticError::Overflow)?)408 })409 .collect::<Result<Vec<_>, DispatchError>>()?;410 for total in &totals {411 ensure!(412 *total <= MAX_REFUNGIBLE_PIECES,413 <Error<T>>::WrongRefungiblePieces414 );415 }416417 let first_token_id = <TokensMinted<T>>::get(collection.id);418 let tokens_minted = first_token_id419 .checked_add(data.len() as u32)420 .ok_or(ArithmeticError::Overflow)?;421 ensure!(422 tokens_minted < collection.limits.token_limit(),423 <CommonError<T>>::CollectionTokenLimitExceeded424 );425426 let mut balances = BTreeMap::new();427 for data in &data {428 for owner in data.users.keys() {429 let balance = balances430 .entry(owner)431 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner)));432 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;433434 ensure!(435 *balance <= collection.limits.account_token_ownership_limit(),436 <CommonError<T>>::AccountTokenLimitExceeded,437 );438 }439 }440441 // =========442443 <TokensMinted<T>>::insert(collection.id, tokens_minted);444 for (account, balance) in balances {445 <AccountBalance<T>>::insert((collection.id, account), balance);446 }447 for (i, token) in data.into_iter().enumerate() {448 let token_id = first_token_id + i as u32 + 1;449 <TotalSupply<T>>::insert((collection.id, token_id), totals[i]);450451 <TokenData<T>>::insert(452 (collection.id, token_id),453 ItemData {454 const_data: token.const_data,455 variable_data: token.variable_data,456 },457 );458 for (user, amount) in token.users.into_iter() {459 if amount == 0 {460 continue;461 }462 <Balance<T>>::insert((collection.id, token_id, &user), amount);463 <Owned<T>>::insert((collection.id, &user, TokenId(token_id)), true);464 // TODO: ERC20 transfer event465 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(466 collection.id,467 TokenId(token_id),468 user,469 amount,470 ));471 }472 }473 Ok(())474 }475476 pub fn set_allowance_unchecked(477 collection: &RefungibleHandle<T>,478 sender: &T::CrossAccountId,479 spender: &T::CrossAccountId,480 token: TokenId,481 amount: u128,482 ) {483 if amount == 0 {484 <Allowance<T>>::remove((collection.id, token, sender, spender));485 } else {486 <Allowance<T>>::insert((collection.id, token, sender, spender), amount);487 }488 // TODO: ERC20 approval event489 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(490 collection.id,491 token,492 sender.clone(),493 spender.clone(),494 amount,495 ))496 }497498 pub fn set_allowance(499 collection: &RefungibleHandle<T>,500 sender: &T::CrossAccountId,501 spender: &T::CrossAccountId,502 token: TokenId,503 amount: u128,504 ) -> DispatchResult {505 if collection.access == AccessMode::AllowList {506 collection.check_allowlist(sender)?;507 collection.check_allowlist(spender)?;508 }509510 <PalletCommon<T>>::ensure_correct_receiver(spender)?;511512 if <Balance<T>>::get((collection.id, token, sender)) < amount {513 ensure!(514 collection.ignores_owned_amount(sender) && Self::token_exists(collection, token),515 <CommonError<T>>::CantApproveMoreThanOwned516 );517 }518519 // =========520521 Self::set_allowance_unchecked(collection, sender, spender, token, amount);522 Ok(())523 }524525 pub fn transfer_from(526 collection: &RefungibleHandle<T>,527 spender: &T::CrossAccountId,528 from: &T::CrossAccountId,529 to: &T::CrossAccountId,530 token: TokenId,531 amount: u128,532 ) -> DispatchResult {533 if spender.conv_eq(from) {534 return Self::transfer(collection, from, to, token, amount);535 }536 if collection.access == AccessMode::AllowList {537 // `from`, `to` checked in [`transfer`]538 collection.check_allowlist(spender)?;539 }540541 let allowance =542 <Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);543 if allowance.is_none() {544 ensure!(545 collection.ignores_allowance(spender),546 <CommonError<T>>::ApprovedValueTooLow547 );548 }549550 // =========551552 Self::transfer(collection, from, to, token, amount)?;553 if let Some(allowance) = allowance {554 Self::set_allowance_unchecked(collection, from, spender, token, allowance);555 }556 Ok(())557 }558559 pub fn burn_from(560 collection: &RefungibleHandle<T>,561 spender: &T::CrossAccountId,562 from: &T::CrossAccountId,563 token: TokenId,564 amount: u128,565 ) -> DispatchResult {566 if spender.conv_eq(from) {567 return Self::burn(collection, from, token, amount);568 }569 if collection.access == AccessMode::AllowList {570 // `from` checked in [`burn`]571 collection.check_allowlist(spender)?;572 }573574 let allowance =575 <Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);576 if allowance.is_none() {577 ensure!(578 collection.ignores_allowance(spender),579 <CommonError<T>>::ApprovedValueTooLow580 );581 }582583 // =========584585 Self::burn(collection, from, token, amount)?;586 if let Some(allowance) = allowance {587 Self::set_allowance_unchecked(collection, from, spender, token, allowance);588 }589 Ok(())590 }591592 pub fn set_variable_metadata(593 collection: &RefungibleHandle<T>,594 sender: &T::CrossAccountId,595 token: TokenId,596 data: BoundedVec<u8, CustomDataLimit>,597 ) -> DispatchResult {598 collection.check_can_update_meta(599 sender,600 &T::CrossAccountId::from_sub(collection.owner.clone()),601 )?;602603 let token_data = <TokenData<T>>::get((collection.id, token));604605 // =========606607 <TokenData<T>>::insert(608 (collection.id, token),609 ItemData {610 variable_data: data,611 ..token_data612 },613 );614 Ok(())615 }616617 /// Delegated to `create_multiple_items`618 pub fn create_item(619 collection: &RefungibleHandle<T>,620 sender: &T::CrossAccountId,621 data: CreateRefungibleExData<T::CrossAccountId>,622 ) -> DispatchResult {623 Self::create_multiple_items(collection, sender, vec![data])624 }625}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 frame_support::{ensure, BoundedVec};20use up_data_structs::{21 AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId,22 CreateCollectionData, CreateRefungibleExData,23};24use pallet_common::{25 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,26};27use frame_common::account::CrossAccountId;28use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};29use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};30use core::ops::Deref;31use codec::{Encode, Decode, MaxEncodedLen};32use scale_info::TypeInfo;3334pub use pallet::*;35#[cfg(feature = "runtime-benchmarks")]36pub mod benchmarking;37pub mod common;38pub mod erc;39pub mod weights;40pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;4142#[derive(Encode, Decode, Default, TypeInfo, MaxEncodedLen)]43pub struct ItemData {44 pub const_data: BoundedVec<u8, CustomDataLimit>,45 pub variable_data: BoundedVec<u8, CustomDataLimit>,46}4748#[frame_support::pallet]49pub mod pallet {50 use super::*;51 use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};52 use up_data_structs::{CollectionId, TokenId};53 use super::weights::WeightInfo;5455 #[pallet::error]56 pub enum Error<T> {57 /// Not Refungible item data used to mint in Refungible collection.58 NotRefungibleDataUsedToMintFungibleCollectionToken,59 /// Maximum refungibility exceeded60 WrongRefungiblePieces,61 }6263 #[pallet::config]64 pub trait Config: frame_system::Config + pallet_common::Config {65 type WeightInfo: WeightInfo;66 }6768 #[pallet::pallet]69 #[pallet::generate_store(pub(super) trait Store)]70 pub struct Pallet<T>(_);7172 #[pallet::storage]73 pub type TokensMinted<T: Config> =74 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;75 #[pallet::storage]76 pub type TokensBurnt<T: Config> =77 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;7879 #[pallet::storage]80 pub type TokenData<T: Config> = StorageNMap<81 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),82 Value = ItemData,83 QueryKind = ValueQuery,84 >;8586 #[pallet::storage]87 pub type TotalSupply<T: Config> = StorageNMap<88 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),89 Value = u128,90 QueryKind = ValueQuery,91 >;9293 /// Used to enumerate tokens owned by account94 #[pallet::storage]95 pub type Owned<T: Config> = StorageNMap<96 Key = (97 Key<Twox64Concat, CollectionId>,98 Key<Blake2_128Concat, T::CrossAccountId>,99 Key<Twox64Concat, TokenId>,100 ),101 Value = bool,102 QueryKind = ValueQuery,103 >;104105 #[pallet::storage]106 pub type AccountBalance<T: Config> = StorageNMap<107 Key = (108 Key<Twox64Concat, CollectionId>,109 // Owner110 Key<Blake2_128Concat, T::CrossAccountId>,111 ),112 Value = u32,113 QueryKind = ValueQuery,114 >;115116 #[pallet::storage]117 pub type Balance<T: Config> = StorageNMap<118 Key = (119 Key<Twox64Concat, CollectionId>,120 Key<Twox64Concat, TokenId>,121 // Owner122 Key<Blake2_128Concat, T::CrossAccountId>,123 ),124 Value = u128,125 QueryKind = ValueQuery,126 >;127128 #[pallet::storage]129 pub type Allowance<T: Config> = StorageNMap<130 Key = (131 Key<Twox64Concat, CollectionId>,132 Key<Twox64Concat, TokenId>,133 // Owner134 Key<Blake2_128, T::CrossAccountId>,135 // Spender136 Key<Blake2_128Concat, T::CrossAccountId>,137 ),138 Value = u128,139 QueryKind = ValueQuery,140 >;141}142143pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);144impl<T: Config> RefungibleHandle<T> {145 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {146 Self(inner)147 }148 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {149 self.0150 }151}152impl<T: Config> Deref for RefungibleHandle<T> {153 type Target = pallet_common::CollectionHandle<T>;154155 fn deref(&self) -> &Self::Target {156 &self.0157 }158}159160impl<T: Config> Pallet<T> {161 pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {162 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)163 }164 pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {165 <TotalSupply<T>>::contains_key((collection.id, token))166 }167}168169// unchecked calls skips any permission checks170impl<T: Config> Pallet<T> {171 pub fn init_collection(172 owner: T::AccountId,173 data: CreateCollectionData<T::AccountId>,174 ) -> Result<CollectionId, DispatchError> {175 <PalletCommon<T>>::init_collection(owner, data)176 }177 pub fn destroy_collection(178 collection: RefungibleHandle<T>,179 sender: &T::CrossAccountId,180 ) -> DispatchResult {181 let id = collection.id;182183 // =========184185 PalletCommon::destroy_collection(collection.0, sender)?;186187 <TokensMinted<T>>::remove(id);188 <TokensBurnt<T>>::remove(id);189 <TokenData<T>>::remove_prefix((id,), None);190 <TotalSupply<T>>::remove_prefix((id,), None);191 <Balance<T>>::remove_prefix((id,), None);192 <Allowance<T>>::remove_prefix((id,), None);193 <Owned<T>>::remove_prefix((id,), None);194 <AccountBalance<T>>::remove_prefix((id,), None);195 Ok(())196 }197198 pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {199 let burnt = <TokensBurnt<T>>::get(collection.id)200 .checked_add(1)201 .ok_or(ArithmeticError::Overflow)?;202203 <TokensBurnt<T>>::insert(collection.id, burnt);204 <TokenData<T>>::remove((collection.id, token_id));205 <TotalSupply<T>>::remove((collection.id, token_id));206 <Balance<T>>::remove_prefix((collection.id, token_id), None);207 <Allowance<T>>::remove_prefix((collection.id, token_id), None);208 // TODO: ERC721 transfer event209 Ok(())210 }211212 pub fn burn(213 collection: &RefungibleHandle<T>,214 owner: &T::CrossAccountId,215 token: TokenId,216 amount: u128,217 ) -> DispatchResult {218 let total_supply = <TotalSupply<T>>::get((collection.id, token))219 .checked_sub(amount)220 .ok_or(<CommonError<T>>::TokenValueTooLow)?;221222 // This was probally last owner of this token?223 if total_supply == 0 {224 // Ensure user actually owns this amount225 ensure!(226 <Balance<T>>::get((collection.id, token, owner)) == amount,227 <CommonError<T>>::TokenValueTooLow228 );229 let account_balance = <AccountBalance<T>>::get((collection.id, owner))230 .checked_sub(1)231 // Should not occur232 .ok_or(ArithmeticError::Underflow)?;233234 // =========235236 <Owned<T>>::remove((collection.id, owner, token));237 <AccountBalance<T>>::insert((collection.id, owner), account_balance);238 Self::burn_token(collection, token)?;239 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(240 collection.id,241 token,242 owner.clone(),243 amount,244 ));245 return Ok(());246 }247248 let balance = <Balance<T>>::get((collection.id, token, owner))249 .checked_sub(amount)250 .ok_or(<CommonError<T>>::TokenValueTooLow)?;251 let account_balance = if balance == 0 {252 <AccountBalance<T>>::get((collection.id, owner))253 .checked_sub(1)254 // Should not occur255 .ok_or(ArithmeticError::Underflow)?256 } else {257 0258 };259260 // =========261262 if balance == 0 {263 <Owned<T>>::remove((collection.id, owner, token));264 <Balance<T>>::remove((collection.id, token, owner));265 <AccountBalance<T>>::insert((collection.id, owner), account_balance);266 } else {267 <Balance<T>>::insert((collection.id, token, owner), balance);268 }269 <TotalSupply<T>>::insert((collection.id, token), total_supply);270 // TODO: ERC20 transfer event271 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(272 collection.id,273 token,274 owner.clone(),275 amount,276 ));277 Ok(())278 }279280 pub fn transfer(281 collection: &RefungibleHandle<T>,282 from: &T::CrossAccountId,283 to: &T::CrossAccountId,284 token: TokenId,285 amount: u128,286 ) -> DispatchResult {287 ensure!(288 collection.limits.transfers_enabled(),289 <CommonError<T>>::TransferNotAllowed290 );291292 if collection.access == AccessMode::AllowList {293 collection.check_allowlist(from)?;294 collection.check_allowlist(to)?;295 }296 <PalletCommon<T>>::ensure_correct_receiver(to)?;297298 let balance_from = <Balance<T>>::get((collection.id, token, from))299 .checked_sub(amount)300 .ok_or(<CommonError<T>>::TokenValueTooLow)?;301 let mut create_target = false;302 let from_to_differ = from != to;303 let balance_to = if from != to {304 let old_balance = <Balance<T>>::get((collection.id, token, to));305 if old_balance == 0 {306 create_target = true;307 }308 Some(309 old_balance310 .checked_add(amount)311 .ok_or(ArithmeticError::Overflow)?,312 )313 } else {314 None315 };316317 let account_balance_from = if balance_from == 0 {318 Some(319 <AccountBalance<T>>::get((collection.id, from))320 .checked_sub(1)321 // Should not occur322 .ok_or(ArithmeticError::Underflow)?,323 )324 } else {325 None326 };327 // Account data is created in token, AccountBalance should be increased328 // But only if from != to as we shouldn't check overflow in this case329 let account_balance_to = if create_target && from_to_differ {330 let account_balance_to = <AccountBalance<T>>::get((collection.id, to))331 .checked_add(1)332 .ok_or(ArithmeticError::Overflow)?;333 ensure!(334 account_balance_to < collection.limits.account_token_ownership_limit(),335 <CommonError<T>>::AccountTokenLimitExceeded,336 );337338 Some(account_balance_to)339 } else {340 None341 };342343 // =========344345 if let Some(balance_to) = balance_to {346 // from != to347 if balance_from == 0 {348 <Balance<T>>::remove((collection.id, token, from));349 } else {350 <Balance<T>>::insert((collection.id, token, from), balance_from);351 }352 <Balance<T>>::insert((collection.id, token, to), balance_to);353 if let Some(account_balance_from) = account_balance_from {354 <AccountBalance<T>>::insert((collection.id, from), account_balance_from);355 <Owned<T>>::remove((collection.id, from, token));356 }357 if let Some(account_balance_to) = account_balance_to {358 <AccountBalance<T>>::insert((collection.id, to), account_balance_to);359 <Owned<T>>::insert((collection.id, to, token), true);360 }361 }362363 // TODO: ERC20 transfer event364 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(365 collection.id,366 token,367 from.clone(),368 to.clone(),369 amount,370 ));371 Ok(())372 }373374 pub fn create_multiple_items(375 collection: &RefungibleHandle<T>,376 sender: &T::CrossAccountId,377 data: Vec<CreateRefungibleExData<T::CrossAccountId>>,378 ) -> DispatchResult {379 if !collection.is_owner_or_admin(sender) {380 ensure!(381 collection.mint_mode,382 <CommonError<T>>::PublicMintingNotAllowed383 );384 collection.check_allowlist(sender)?;385386 for item in data.iter() {387 for user in item.users.keys() {388 collection.check_allowlist(user)?;389 }390 }391 }392393 for item in data.iter() {394 for (owner, _) in item.users.iter() {395 <PalletCommon<T>>::ensure_correct_receiver(owner)?;396 }397 }398399 // Total pieces per tokens400 let totals = data401 .iter()402 .map(|data| {403 Ok(data404 .users405 .iter()406 .map(|u| u.1)407 .try_fold(0u128, |acc, v| acc.checked_add(*v))408 .ok_or(ArithmeticError::Overflow)?)409 })410 .collect::<Result<Vec<_>, DispatchError>>()?;411 for total in &totals {412 ensure!(413 *total <= MAX_REFUNGIBLE_PIECES,414 <Error<T>>::WrongRefungiblePieces415 );416 }417418 let first_token_id = <TokensMinted<T>>::get(collection.id);419 let tokens_minted = first_token_id420 .checked_add(data.len() as u32)421 .ok_or(ArithmeticError::Overflow)?;422 ensure!(423 tokens_minted < collection.limits.token_limit(),424 <CommonError<T>>::CollectionTokenLimitExceeded425 );426427 let mut balances = BTreeMap::new();428 for data in &data {429 for owner in data.users.keys() {430 let balance = balances431 .entry(owner)432 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner)));433 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;434435 ensure!(436 *balance <= collection.limits.account_token_ownership_limit(),437 <CommonError<T>>::AccountTokenLimitExceeded,438 );439 }440 }441442 // =========443444 <TokensMinted<T>>::insert(collection.id, tokens_minted);445 for (account, balance) in balances {446 <AccountBalance<T>>::insert((collection.id, account), balance);447 }448 for (i, token) in data.into_iter().enumerate() {449 let token_id = first_token_id + i as u32 + 1;450 <TotalSupply<T>>::insert((collection.id, token_id), totals[i]);451452 <TokenData<T>>::insert(453 (collection.id, token_id),454 ItemData {455 const_data: token.const_data,456 variable_data: token.variable_data,457 },458 );459 for (user, amount) in token.users.into_iter() {460 if amount == 0 {461 continue;462 }463 <Balance<T>>::insert((collection.id, token_id, &user), amount);464 <Owned<T>>::insert((collection.id, &user, TokenId(token_id)), true);465 // TODO: ERC20 transfer event466 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(467 collection.id,468 TokenId(token_id),469 user,470 amount,471 ));472 }473 }474 Ok(())475 }476477 pub fn set_allowance_unchecked(478 collection: &RefungibleHandle<T>,479 sender: &T::CrossAccountId,480 spender: &T::CrossAccountId,481 token: TokenId,482 amount: u128,483 ) {484 if amount == 0 {485 <Allowance<T>>::remove((collection.id, token, sender, spender));486 } else {487 <Allowance<T>>::insert((collection.id, token, sender, spender), amount);488 }489 // TODO: ERC20 approval event490 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(491 collection.id,492 token,493 sender.clone(),494 spender.clone(),495 amount,496 ))497 }498499 pub fn set_allowance(500 collection: &RefungibleHandle<T>,501 sender: &T::CrossAccountId,502 spender: &T::CrossAccountId,503 token: TokenId,504 amount: u128,505 ) -> DispatchResult {506 if collection.access == AccessMode::AllowList {507 collection.check_allowlist(sender)?;508 collection.check_allowlist(spender)?;509 }510511 <PalletCommon<T>>::ensure_correct_receiver(spender)?;512513 if <Balance<T>>::get((collection.id, token, sender)) < amount {514 ensure!(515 collection.ignores_owned_amount(sender) && Self::token_exists(collection, token),516 <CommonError<T>>::CantApproveMoreThanOwned517 );518 }519520 // =========521522 Self::set_allowance_unchecked(collection, sender, spender, token, amount);523 Ok(())524 }525526 pub fn transfer_from(527 collection: &RefungibleHandle<T>,528 spender: &T::CrossAccountId,529 from: &T::CrossAccountId,530 to: &T::CrossAccountId,531 token: TokenId,532 amount: u128,533 ) -> DispatchResult {534 if spender.conv_eq(from) {535 return Self::transfer(collection, from, to, token, amount);536 }537 if collection.access == AccessMode::AllowList {538 // `from`, `to` checked in [`transfer`]539 collection.check_allowlist(spender)?;540 }541542 let allowance =543 <Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);544 if allowance.is_none() {545 ensure!(546 collection.ignores_allowance(spender),547 <CommonError<T>>::ApprovedValueTooLow548 );549 }550551 // =========552553 Self::transfer(collection, from, to, token, amount)?;554 if let Some(allowance) = allowance {555 Self::set_allowance_unchecked(collection, from, spender, token, allowance);556 }557 Ok(())558 }559560 pub fn burn_from(561 collection: &RefungibleHandle<T>,562 spender: &T::CrossAccountId,563 from: &T::CrossAccountId,564 token: TokenId,565 amount: u128,566 ) -> DispatchResult {567 if spender.conv_eq(from) {568 return Self::burn(collection, from, token, amount);569 }570 if collection.access == AccessMode::AllowList {571 // `from` checked in [`burn`]572 collection.check_allowlist(spender)?;573 }574575 let allowance =576 <Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);577 if allowance.is_none() {578 ensure!(579 collection.ignores_allowance(spender),580 <CommonError<T>>::ApprovedValueTooLow581 );582 }583584 // =========585586 Self::burn(collection, from, token, amount)?;587 if let Some(allowance) = allowance {588 Self::set_allowance_unchecked(collection, from, spender, token, allowance);589 }590 Ok(())591 }592593 pub fn set_variable_metadata(594 collection: &RefungibleHandle<T>,595 sender: &T::CrossAccountId,596 token: TokenId,597 data: BoundedVec<u8, CustomDataLimit>,598 ) -> DispatchResult {599 collection.check_can_update_meta(600 sender,601 &T::CrossAccountId::from_sub(collection.owner.clone()),602 )?;603604 let token_data = <TokenData<T>>::get((collection.id, token));605606 // =========607608 <TokenData<T>>::insert(609 (collection.id, token),610 ItemData {611 variable_data: data,612 ..token_data613 },614 );615 Ok(())616 }617618 /// Delegated to `create_multiple_items`619 pub fn create_item(620 collection: &RefungibleHandle<T>,621 sender: &T::CrossAccountId,622 data: CreateRefungibleExData<T::CrossAccountId>,623 ) -> DispatchResult {624 Self::create_multiple_items(collection, sender, vec![data])625 }626}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