git.delta.rocks / unique-network / refs/commits / 22251a0f47f9

difftreelog

CORE-300 Move CrossAccountId to frontier

Trubnikov Sergey2022-03-14parent: #3ab9e10.patch.diff
in: master

27 files changed

modifiedCargo.lockdiffbeforeafterboth
2554 "fc-db",2554 "fc-db",
2555 "fc-rpc-core",2555 "fc-rpc-core",
2556 "fp-consensus",2556 "fp-consensus",
2557 "fp-evm",2557 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
2558 "fp-rpc",2558 "fp-rpc",
2559 "fp-storage",2559 "fp-storage",
2560 "futures 0.3.21",2560 "futures 0.3.21",
2565 "log",2565 "log",
2566 "lru 0.6.6",2566 "lru 0.6.6",
2567 "pallet-ethereum",2567 "pallet-ethereum",
2568 "pallet-evm",2568 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
2569 "parity-scale-codec",2569 "parity-scale-codec",
2570 "parking_lot 0.11.2",2570 "parking_lot 0.11.2",
2571 "rand 0.7.3",2571 "rand 0.7.3",
2757dependencies = [2757dependencies = [
2758 "ethereum",2758 "ethereum",
2759 "ethereum-types",2759 "ethereum-types",
2760 "fp-evm",2760 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
2761 "parity-scale-codec",2761 "parity-scale-codec",
2762 "scale-info",2762 "scale-info",
2763 "sp-api",2763 "sp-api",
2852 "sp-trie",2852 "sp-trie",
2853]2853]
2854
2855[[package]]
2856name = "frame-common"
2857version = "0.1.0"
2858source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
2859dependencies = [
2860 "frame-system",
2861 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=feature/300)",
2862 "parity-scale-codec",
2863 "scale-info",
2864 "serde",
2865 "sp-core",
2866 "sp-std",
2867 "up-evm-mapping",
2868]
28542869
2855[[package]]2870[[package]]
2856name = "frame-election-provider-support"2871name = "frame-election-provider-support"
5835dependencies = [5850dependencies = [
5836 "frame-support",5851 "frame-support",
5837 "frame-system",5852 "frame-system",
5838 "pallet-evm",5853 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
5839 "parity-scale-codec",5854 "parity-scale-codec",
5840 "scale-info",5855 "scale-info",
5841 "serde",5856 "serde",
5984version = "0.1.0"5999version = "0.1.0"
5985dependencies = [6000dependencies = [
5986 "evm-coder",6001 "evm-coder",
6002 "frame-common",
5987 "frame-support",6003 "frame-support",
5988 "frame-system",6004 "frame-system",
5989 "pallet-evm",6005 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
5990 "pallet-evm-coder-substrate",6006 "pallet-evm-coder-substrate",
5991 "parity-scale-codec",6007 "parity-scale-codec",
5992 "scale-info",6008 "scale-info",
6064 "ethereum-types",6080 "ethereum-types",
6065 "evm",6081 "evm",
6066 "fp-consensus",6082 "fp-consensus",
6067 "fp-evm",6083 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6068 "fp-rpc",6084 "fp-rpc",
6069 "fp-self-contained",6085 "fp-self-contained",
6070 "fp-storage",6086 "fp-storage",
6071 "frame-support",6087 "frame-support",
6072 "frame-system",6088 "frame-system",
6073 "log",6089 "log",
6074 "pallet-balances",6090 "pallet-balances",
6075 "pallet-evm",6091 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6076 "pallet-timestamp",6092 "pallet-timestamp",
6077 "parity-scale-codec",6093 "parity-scale-codec",
6078 "rlp",6094 "rlp",
6093 "evm",6109 "evm",
6094 "evm-gasometer",6110 "evm-gasometer",
6095 "evm-runtime",6111 "evm-runtime",
6096 "fp-evm",6112 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6097 "frame-benchmarking",6113 "frame-benchmarking",
6098 "frame-support",6114 "frame-support",
6099 "frame-system",6115 "frame-system",
6124 "frame-support",6140 "frame-support",
6125 "frame-system",6141 "frame-system",
6126 "pallet-ethereum",6142 "pallet-ethereum",
6127 "pallet-evm",6143 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6128 "parity-scale-codec",6144 "parity-scale-codec",
6129 "scale-info",6145 "scale-info",
6130 "sp-core",6146 "sp-core",
6139 "frame-support",6155 "frame-support",
6140 "frame-system",6156 "frame-system",
6141 "log",6157 "log",
6142 "pallet-evm",6158 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6143 "pallet-evm-coder-substrate",6159 "pallet-evm-coder-substrate",
6144 "parity-scale-codec",6160 "parity-scale-codec",
6145 "scale-info",6161 "scale-info",
6154name = "pallet-evm-migration"6170name = "pallet-evm-migration"
6155version = "0.1.0"6171version = "0.1.0"
6156dependencies = [6172dependencies = [
6157 "fp-evm",6173 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6158 "frame-benchmarking",6174 "frame-benchmarking",
6159 "frame-support",6175 "frame-support",
6160 "frame-system",6176 "frame-system",
6161 "pallet-evm",6177 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6162 "parity-scale-codec",6178 "parity-scale-codec",
6163 "scale-info",6179 "scale-info",
6164 "sp-core",6180 "sp-core",
6171name = "pallet-evm-transaction-payment"6187name = "pallet-evm-transaction-payment"
6172version = "0.1.0"6188version = "0.1.0"
6173dependencies = [6189dependencies = [
6174 "fp-evm",6190 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6175 "frame-support",6191 "frame-support",
6176 "frame-system",6192 "frame-system",
6177 "pallet-ethereum",6193 "pallet-ethereum",
6178 "pallet-evm",6194 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6179 "parity-scale-codec",6195 "parity-scale-codec",
6180 "scale-info",6196 "scale-info",
6181 "sp-core",6197 "sp-core",
6193 "ethereum",6209 "ethereum",
6194 "evm-coder",6210 "evm-coder",
6195 "frame-benchmarking",6211 "frame-benchmarking",
6212 "frame-common",
6196 "frame-support",6213 "frame-support",
6197 "frame-system",6214 "frame-system",
6198 "pallet-common",6215 "pallet-common",
6419 "ethereum",6436 "ethereum",
6420 "evm-coder",6437 "evm-coder",
6421 "frame-benchmarking",6438 "frame-benchmarking",
6439 "frame-common",
6422 "frame-support",6440 "frame-support",
6423 "frame-system",6441 "frame-system",
6424 "pallet-common",6442 "pallet-common",
6535version = "0.1.0"6553version = "0.1.0"
6536dependencies = [6554dependencies = [
6537 "frame-benchmarking",6555 "frame-benchmarking",
6556 "frame-common",
6538 "frame-support",6557 "frame-support",
6539 "frame-system",6558 "frame-system",
6540 "pallet-common",6559 "pallet-common",
6795dependencies = [6814dependencies = [
6796 "ethereum",6815 "ethereum",
6797 "evm-coder",6816 "evm-coder",
6798 "fp-evm",6817 "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6799 "frame-benchmarking",6818 "frame-benchmarking",
6819 "frame-common",
6800 "frame-support",6820 "frame-support",
6801 "frame-system",6821 "frame-system",
6802 "hex-literal",6822 "hex-literal",
6803 "pallet-balances",6823 "pallet-balances",
6804 "pallet-common",6824 "pallet-common",
6805 "pallet-ethereum",6825 "pallet-ethereum",
6806 "pallet-evm",6826 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
6807 "pallet-evm-coder-substrate",6827 "pallet-evm-coder-substrate",
6808 "pallet-fungible",6828 "pallet-fungible",
6809 "pallet-nonfungible",6829 "pallet-nonfungible",
12186 "chrono",12206 "chrono",
12187 "lazy_static",12207 "lazy_static",
12188 "matchers",12208 "matchers",
12189 "parking_lot 0.11.2",12209 "parking_lot 0.10.2",
12190 "regex",12210 "regex",
12191 "serde",12211 "serde",
12192 "serde_json",12212 "serde_json",
12333name = "uc-rpc"12353name = "uc-rpc"
12334version = "0.1.0"12354version = "0.1.0"
12335dependencies = [12355dependencies = [
12356 "frame-common",
12336 "jsonrpc-core",12357 "jsonrpc-core",
12337 "jsonrpc-core-client",12358 "jsonrpc-core-client",
12338 "jsonrpc-derive",12359 "jsonrpc-derive",
12549 "fp-rpc",12570 "fp-rpc",
12550 "fp-self-contained",12571 "fp-self-contained",
12551 "frame-benchmarking",12572 "frame-benchmarking",
12573 "frame-common",
12552 "frame-executive",12574 "frame-executive",
12553 "frame-support",12575 "frame-support",
12554 "frame-system",12576 "frame-system",
12561 "pallet-base-fee",12583 "pallet-base-fee",
12562 "pallet-common",12584 "pallet-common",
12563 "pallet-ethereum",12585 "pallet-ethereum",
12564 "pallet-evm",12586 "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier.git?branch=unique-polkadot-v0.9.17)",
12565 "pallet-evm-coder-substrate",12587 "pallet-evm-coder-substrate",
12566 "pallet-evm-contract-helpers",12588 "pallet-evm-contract-helpers",
12567 "pallet-evm-migration",12589 "pallet-evm-migration",
12688[[package]]12710[[package]]
12689name = "up-evm-mapping"12711name = "up-evm-mapping"
12690version = "0.1.0"12712version = "0.1.0"
12713source = "git+https://github.com/uniquenetwork/frontier.git?branch=feature/300#0a1dc4086cbe971ddf57edf82a61cfce52c8c20b"
12691dependencies = [12714dependencies = [
12692 "frame-support",12715 "frame-support",
12693 "sp-core",12716 "sp-core",
12697name = "up-rpc"12720name = "up-rpc"
12698version = "0.1.0"12721version = "0.1.0"
12699dependencies = [12722dependencies = [
12723 "frame-common",
12700 "pallet-common",12724 "pallet-common",
12701 "parity-scale-codec",12725 "parity-scale-codec",
12702 "sp-api",12726 "sp-api",
modifiedclient/rpc/Cargo.tomldiffbeforeafterboth
18sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }18sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
19sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }19sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
20sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }20sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
21frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
2122
modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
201 AccountId: Decode,201 AccountId: Decode,
202 C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,202 C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
203 C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,203 C::Api: UniqueRuntimeApi<Block, CrossAccountId, AccountId>,
204 CrossAccountId: pallet_common::account::CrossAccountId<AccountId>,204 CrossAccountId: frame_common::account::CrossAccountId<AccountId>,
205{205{
206 pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);206 pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);
207 pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);207 pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);
modifiedpallets/common/Cargo.tomldiffbeforeafterboth
16sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }16sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
17sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }17sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
18sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }18sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
19up-evm-mapping = { default-features = false, path = '../../primitives/evm-mapping' }
20up-data-structs = { default-features = false, path = '../../primitives/data-structs' }19up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
21pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }20pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
22evm-coder = { default-features = false, path = '../../crates/evm-coder' }21evm-coder = { default-features = false, path = '../../crates/evm-coder' }
23pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }22pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
23frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
24up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
24serde = { version = "1.0.130", default-features = false }25serde = { version = "1.0.130", default-features = false }
25scale-info = { version = "2.0.1", default-features = false, features = [26scale-info = { version = "2.0.1", default-features = false, features = [
26 "derive",27 "derive",
deletedpallets/common/src/account.rsdiffbeforeafterboth

no changes

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
19use core::ops::{Deref, DerefMut};19use core::ops::{Deref, DerefMut};
20use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};20use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
21use sp_std::vec::Vec;21use sp_std::vec::Vec;
22use account::CrossAccountId;22use frame_common::account::CrossAccountId;
23use frame_support::{23use frame_support::{
24 dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo},24 dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo},
25 ensure, fail,25 ensure, fail,
38pub use pallet::*;38pub use pallet::*;
39use sp_core::H160;39use sp_core::H160;
40use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};40use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
41pub mod account;
42#[cfg(feature = "runtime-benchmarks")]41#[cfg(feature = "runtime-benchmarks")]
43pub mod benchmarking;42pub mod benchmarking;
44pub mod erc;43pub mod erc;
163pub mod pallet {162pub mod pallet {
164 use super::*;163 use super::*;
165 use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key};164 use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key};
166 use account::CrossAccountId;165 use frame_common::account::CrossAccountId;
167 use frame_support::traits::Currency;166 use frame_support::traits::Currency;
168 use up_data_structs::TokenId;167 use up_data_structs::TokenId;
169 use scale_info::TypeInfo;168 use scale_info::TypeInfo;
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
17pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }17pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
18pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }18pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
19up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }19up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
20up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }20up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
21log = "0.4.14"21log = "0.4.14"
2222
23[dependencies.codec]23[dependencies.codec]
modifiedpallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth
18fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }18fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
19pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }19pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
20up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }20up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
21up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }21up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
2222
23[dependencies.codec]23[dependencies.codec]
24default-features = false24default-features = false
modifiedpallets/fungible/Cargo.tomldiffbeforeafterboth
25scale-info = { version = "2.0.1", default-features = false, features = [25scale-info = { version = "2.0.1", default-features = false, features = [
26 "derive",26 "derive",
27] }27] }
28frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
2829
29[features]30[features]
30default = ["std"]31default = ["std"]
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
21use pallet_common::erc::{CommonEvmHandler, PrecompileResult};21use pallet_common::erc::{CommonEvmHandler, PrecompileResult};
22use sp_core::{H160, U256};22use sp_core::{H160, U256};
23use sp_std::vec::Vec;23use sp_std::vec::Vec;
24use pallet_common::account::CrossAccountId;24use frame_common::account::CrossAccountId;
25use pallet_evm_coder_substrate::{call, dispatch_to_evm};25use pallet_evm_coder_substrate::{call, dispatch_to_evm};
2626
27use crate::{27use crate::{
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
20use frame_support::{ensure};20use frame_support::{ensure};
21use up_data_structs::{AccessMode, CollectionId, TokenId, CreateCollectionData};21use up_data_structs::{AccessMode, CollectionId, TokenId, CreateCollectionData};
22use pallet_common::{22use pallet_common::{
23 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,23 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
24};24};
25use frame_common::account::CrossAccountId;
25use pallet_evm_coder_substrate::WithRecorder;26use pallet_evm_coder_substrate::WithRecorder;
26use sp_core::H160;27use sp_core::H160;
27use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};28use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
modifiedpallets/nonfungible/Cargo.tomldiffbeforeafterboth
25scale-info = { version = "2.0.1", default-features = false, features = [25scale-info = { version = "2.0.1", default-features = false, features = [
26 "derive",26 "derive",
27] }27] }
28frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
2829
29[features]30[features]
30default = ["std"]31default = ["std"]
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
25use sp_core::{H160, U256};25use sp_core::{H160, U256};
26use sp_std::{vec::Vec, vec};26use sp_std::{vec::Vec, vec};
27use pallet_common::{27use pallet_common::{
28 account::CrossAccountId,
29 erc::{CommonEvmHandler, PrecompileResult},28 erc::{CommonEvmHandler, PrecompileResult},
30};29};
30use frame_common::account::CrossAccountId;
31use pallet_evm_coder_substrate::call;31use pallet_evm_coder_substrate::call;
3232
33use crate::{33use crate::{
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
22 AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,22 AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
23};23};
24use pallet_common::{24use pallet_common::{
25 Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, account::CrossAccountId,25 Error as CommonError, Pallet as PalletCommon, Event as CommonEvent,
26};26};
27use frame_common::account::CrossAccountId;
27use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};28use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
28use sp_core::H160;29use sp_core::H160;
29use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};30use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
modifiedpallets/refungible/Cargo.tomldiffbeforeafterboth
22scale-info = { version = "2.0.1", default-features = false, features = [22scale-info = { version = "2.0.1", default-features = false, features = [
23 "derive",23 "derive",
24] }24] }
25frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
2526
26[features]27[features]
27default = ["std"]28default = ["std"]
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
22 CreateCollectionData, CreateRefungibleExData,22 CreateCollectionData, CreateRefungibleExData,
23};23};
24use pallet_common::{24use pallet_common::{
25 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,25 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
26};26};
27use frame_common::account::CrossAccountId;
27use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};28use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
28use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};29use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
29use core::ops::Deref;30use core::ops::Deref;
modifiedpallets/unique/Cargo.tomldiffbeforeafterboth
132sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }132sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
133133
134up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }134up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
135up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }135up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
136frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
136evm-coder = { default-features = false, path = "../../crates/evm-coder" }137evm-coder = { default-features = false, path = "../../crates/evm-coder" }
137pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }138pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
138primitive-types = { version = "0.11.1", default-features = false, features = [139primitive-types = { version = "0.11.1", default-features = false, features = [
modifiedpallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth
25use core::marker::PhantomData;25use core::marker::PhantomData;
26use core::convert::TryInto;26use core::convert::TryInto;
27use up_data_structs::TokenId;27use up_data_structs::TokenId;
28use up_evm_mapping::EvmBackwardsAddressMapping;
29use pallet_common::account::CrossAccountId;28use frame_common::account::CrossAccountId;
3029
31use pallet_nonfungible::erc::{UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721Call};30use pallet_nonfungible::erc::{UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721Call};
32use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};31use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
54 CreateCollectionData, CustomDataLimit, CreateItemExData,54 CreateCollectionData, CustomDataLimit, CreateItemExData,
55};55};
56use pallet_common::{56use pallet_common::{
57 account::CrossAccountId, CollectionHandle, Pallet as PalletCommon, Error as CommonError,57 CollectionHandle, Pallet as PalletCommon, Error as CommonError,
58 CommonWeightInfo,58 CommonWeightInfo,
59};59};
60use frame_common::account::CrossAccountId;
60use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle};61use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle};
61use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};62use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};
62use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle};63use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle};
modifiedpallets/unique/src/mock.rsdiffbeforeafterboth
26use pallet_transaction_payment::{CurrencyAdapter};26use pallet_transaction_payment::{CurrencyAdapter};
27use frame_system as system;27use frame_system as system;
28use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};28use pallet_evm::{AddressMapping, runner::stack::MaybeMirroredLog};
29use up_evm_mapping::EvmBackwardsAddressMapping;
29use pallet_common::account::{EvmBackwardsAddressMapping, CrossAccountId};30use frame_common::account::CrossAccountId;
30use codec::{Encode, Decode, MaxEncodedLen};31use codec::{Encode, Decode, MaxEncodedLen};
31use scale_info::TypeInfo;32use scale_info::TypeInfo;
32use up_data_structs::ConstU32;33use up_data_structs::ConstU32;
modifiedpallets/unique/src/sponsorship.rsdiffbeforeafterboth
30 NFT_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, TokenId,30 NFT_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, TokenId,
31};31};
32use pallet_common::{CollectionHandle};32use pallet_common::{CollectionHandle};
33use pallet_common::account::CrossAccountId;33use frame_common::account::CrossAccountId;
3434
35pub fn withdraw_transfer<T: Config>(35pub fn withdraw_transfer<T: Config>(
36 collection: &CollectionHandle<T>,36 collection: &CollectionHandle<T>,
deletedprimitives/evm-mapping/Cargo.tomldiffbeforeafterboth

no changes

deletedprimitives/evm-mapping/src/lib.rsdiffbeforeafterboth

no changes

modifiedprimitives/rpc/Cargo.tomldiffbeforeafterboth
14sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }14sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
15sp-api = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }15sp-api = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
16sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }16sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
17frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
1718
18[features]19[features]
19default = ["std"]20default = ["std"]
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
28 #[api_version(2)]28 #[api_version(2)]
29 pub trait UniqueApi<CrossAccountId, AccountId> where29 pub trait UniqueApi<CrossAccountId, AccountId> where
30 AccountId: Decode,30 AccountId: Decode,
31 CrossAccountId: pallet_common::account::CrossAccountId<AccountId>,31 CrossAccountId: frame_common::account::CrossAccountId<AccountId>,
32 {32 {
33 #[changed_in(2)]33 #[changed_in(2)]
34 fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;34 fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
116116
117pub const RUNTIME_NAME: &str = "Opal";117pub const RUNTIME_NAME: &str = "Opal";
118118
119type CrossAccountId = pallet_common::account::BasicCrossAccountId<Runtime>;119type CrossAccountId = frame_common::account::BasicCrossAccountId<Runtime>;
120120
121impl RuntimeInstance for Runtime {121impl RuntimeInstance for Runtime {
122 type CrossAccountId = self::CrossAccountId;122 type CrossAccountId = self::CrossAccountId;
286 type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;285 type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;
287}286}
287
288impl frame_common::account::Config for Runtime {
289 type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
290 type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
291}
288292
289pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);293pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);
290impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {294impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {
846 type Event = Event;850 type Event = Event;
847 type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;851 type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
848 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;852 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;
849 type CrossAccountId = pallet_common::account::BasicCrossAccountId<Self>;853 type CrossAccountId = frame_common::account::BasicCrossAccountId<Self>;
850854
851 type Currency = Balances;855 type Currency = Balances;
852 type CollectionCreationPrice = CollectionCreationPrice;856 type CollectionCreationPrice = CollectionCreationPrice;
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
382derivative = "2.2.0"382derivative = "2.2.0"
383pallet-unique = { path = '../../pallets/unique', default-features = false }383pallet-unique = { path = '../../pallets/unique', default-features = false }
384up-rpc = { path = "../../primitives/rpc", default-features = false }384up-rpc = { path = "../../primitives/rpc", default-features = false }
385up-evm-mapping = { path = "../../primitives/evm-mapping", default-features = false }
386pallet-inflation = { path = '../../pallets/inflation', default-features = false }385pallet-inflation = { path = '../../pallets/inflation', default-features = false }
387up-data-structs = { path = '../../primitives/data-structs', default-features = false }386up-data-structs = { path = '../../primitives/data-structs', default-features = false }
388pallet-common = { default-features = false, path = "../../pallets/common" }387pallet-common = { default-features = false, path = "../../pallets/common" }
401pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }400pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
402fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }401fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
403fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }402fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
403up-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
404frame-common = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "feature/300" }
404405
405################################################################################406################################################################################
406# Build Dependencies407# Build Dependencies