git.delta.rocks / unique-network / refs/commits / 35f0b49c19be

difftreelog

style reformat code

Yaroslav Bolyukin2021-06-02parent: #6bc566c.patch.diff
in: master

3 files changed

modifiedpallets/nft/Cargo.tomldiffbeforeafterboth
42rlp = { default-features = false, version = "0.5.0" }42rlp = { default-features = false, version = "0.5.0" }
4343
44evm-coder = { default-features = false, path = "../../crates/evm-coder" }44evm-coder = { default-features = false, path = "../../crates/evm-coder" }
45primitive-types = { version = "0.9.0", default-features = false }45primitive-types = { version = "0.9.0", default-features = false, features = ["serde_no_std"] }
4646
47hex-literal = "0.3.1"47hex-literal = "0.3.1"
4848
modifiedpallets/nft/src/eth/account.rsdiffbeforeafterboth
1use crate::Config;1use crate::Config;
2use codec::{Encode, EncodeLike, Decode};2use codec::{Encode, EncodeLike, Decode};
3use sp_core::{H160, H256, crypto::AccountId32};3use sp_core::crypto::AccountId32;
4use primitive_types::H160;
4use core::cmp::Ordering;5use core::cmp::Ordering;
5use serde::{Serialize, Deserialize};6use serde::{Serialize, Deserialize};
6use pallet_evm::AddressMapping;7use pallet_evm::AddressMapping;
modifiedpallets/nft/src/eth/mod.rsdiffbeforeafterboth
1pub mod account;1pub mod account;
2use account::CrossAccountId;2pub mod erc;
3mod erc_impl;
3pub mod abi;4pub mod log;
5pub mod sponsoring;
6
4use abi::{AbiReader, AbiWriter};7use evm_coder::abi::AbiWriter;
5pub mod log;
6
7use sp_std::borrow::ToOwned;8use evm_coder::abi::StringError;
8use sp_std::vec::Vec;9use sp_std::prelude::*;
9use sp_std::convert::TryInto;10use sp_std::borrow::ToOwned;
10
11use codec::{Decode, Encode};11use sp_std::vec::Vec;
12
12use pallet_evm::{AddressMapping, PrecompileLog, PrecompileOutput, ExitReason, ExitRevert, ExitSucceed};13use pallet_evm::{PrecompileOutput, ExitReason, ExitRevert, ExitSucceed};
13use sp_core::{H160, H256};14use sp_core::{H160, U256};
14use frame_support::storage::{StorageMap, StorageDoubleMap};15use frame_support::storage::StorageMap;
1516
16use crate::{Allowances, NftItemList, Module, Balance, Config, CollectionById, CollectionHandle, CollectionId, CollectionMode};17use crate::{Config, CollectionById, CollectionHandle, CollectionId, CollectionMode};
18
19use erc::{UniqueFungible, UniqueFungibleCall, UniqueNFT, UniqueNFTCall};
20use evm_coder::{types::*, abi::AbiReader};
1721
18pub struct NftErcSupport<T: Config>(core::marker::PhantomData<T>);22pub struct NftErcSupport<T: Config>(core::marker::PhantomData<T>);
1923
20// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection24// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection
21// TODO: Unhardcode prefix25// TODO: Unhardcode prefix
22const ETH_ACCOUNT_PREFIX: [u8; 16] = [0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e];26const ETH_ACCOUNT_PREFIX: [u8; 16] = [
27 0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,
28];
2329
24fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {30fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {