From ccafa37d8568dfd6b2711f435bbf7ae569356b7c Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Thu, 02 Feb 2023 10:48:09 +0000 Subject: [PATCH] fix: PR --- --- a/pallets/fungible/src/erc.rs +++ b/pallets/fungible/src/erc.rs @@ -6,7 +6,7 @@ // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Unique Network is disaddress: tod in the hope that it will be useful, +// 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. @@ -28,6 +28,7 @@ use pallet_common::{ CollectionHandle, erc::{CommonEvmHandler, PrecompileResult, CollectionCall}, + eth::CrossAddress, }; use sp_std::vec::Vec; use pallet_evm::{account::CrossAccountId, PrecompileHandle}; @@ -172,11 +173,7 @@ /// @param owner crossAddress The address which owns the funds. /// @param spender crossAddress The address which will spend the funds. /// @return A uint256 specifying the amount of tokens still available for the spender. - fn allowance_cross( - &self, - owner: pallet_common::eth::CrossAddress, - spender: pallet_common::eth::CrossAddress, - ) -> Result { + fn allowance_cross(&self, owner: CrossAddress, spender: CrossAddress) -> Result { let owner = owner.into_sub_cross_account::()?; let spender = spender.into_sub_cross_account::()?; @@ -191,12 +188,7 @@ } #[weight(>::create_item())] - fn mint_cross( - &mut self, - caller: Caller, - to: pallet_common::eth::CrossAddress, - amount: U256, - ) -> Result { + fn mint_cross(&mut self, caller: Caller, to: CrossAddress, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = to.into_sub_cross_account::()?; let amount = amount.try_into().map_err(|_| "amount overflow")?; @@ -212,7 +204,7 @@ fn approve_cross( &mut self, caller: Caller, - spender: pallet_common::eth::CrossAddress, + spender: CrossAddress, amount: U256, ) -> Result { let caller = T::CrossAccountId::from_eth(caller); @@ -253,7 +245,7 @@ fn burn_from_cross( &mut self, caller: Caller, - from: pallet_common::eth::CrossAddress, + from: CrossAddress, amount: U256, ) -> Result { let caller = T::CrossAccountId::from_eth(caller); @@ -292,12 +284,7 @@ } #[weight(>::transfer())] - fn transfer_cross( - &mut self, - caller: Caller, - to: pallet_common::eth::CrossAddress, - amount: U256, - ) -> Result { + fn transfer_cross(&mut self, caller: Caller, to: CrossAddress, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = to.into_sub_cross_account::()?; let amount = amount.try_into().map_err(|_| "amount overflow")?; @@ -313,8 +300,8 @@ fn transfer_from_cross( &mut self, caller: Caller, - from: pallet_common::eth::CrossAddress, - to: pallet_common::eth::CrossAddress, + from: CrossAddress, + to: CrossAddress, amount: U256, ) -> Result { let caller = T::CrossAccountId::from_eth(caller); --- a/pallets/fungible/src/lib.rs +++ b/pallets/fungible/src/lib.rs @@ -165,8 +165,8 @@ pub type Allowance = StorageNMap< Key = ( Key, - Key, - Key, + Key, // Owner + Key, // Spender ), Value = u128, QueryKind = ValueQuery, --- a/pallets/refungible/src/erc_token.rs +++ b/pallets/refungible/src/erc_token.rs @@ -31,7 +31,7 @@ use pallet_common::{ CommonWeightInfo, erc::{CommonEvmHandler, PrecompileResult}, - eth::collection_id_to_address, + eth::{collection_id_to_address, CrossAddress}, }; use pallet_evm::{account::CrossAccountId, PrecompileHandle}; use pallet_evm_coder_substrate::{call, dispatch_to_evm, WithRecorder}; @@ -207,11 +207,7 @@ /// @param owner crossAddress The address which owns the funds. /// @param spender crossAddress The address which will spend the funds. /// @return A uint256 specifying the amount of tokens still available for the spender. - fn allowance_cross( - &self, - owner: pallet_common::eth::CrossAddress, - spender: pallet_common::eth::CrossAddress, - ) -> Result { + fn allowance_cross(&self, owner: CrossAddress, spender: CrossAddress) -> Result { let owner = owner.into_sub_cross_account::()?; let spender = spender.into_sub_cross_account::()?; @@ -245,7 +241,7 @@ fn burn_from_cross( &mut self, caller: Caller, - from: pallet_common::eth::CrossAddress, + from: CrossAddress, amount: U256, ) -> Result { let caller = T::CrossAccountId::from_eth(caller); @@ -271,7 +267,7 @@ fn approve_cross( &mut self, caller: Caller, - spender: pallet_common::eth::CrossAddress, + spender: CrossAddress, amount: U256, ) -> Result { let caller = T::CrossAccountId::from_eth(caller); @@ -298,12 +294,7 @@ /// @param to The crossaccount to transfer to. /// @param amount The amount to be transferred. #[weight(>::transfer())] - fn transfer_cross( - &mut self, - caller: Caller, - to: pallet_common::eth::CrossAddress, - amount: U256, - ) -> Result { + fn transfer_cross(&mut self, caller: Caller, to: CrossAddress, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = to.into_sub_cross_account::()?; let amount = amount.try_into().map_err(|_| "amount overflow")?; @@ -324,8 +315,8 @@ fn transfer_from_cross( &mut self, caller: Caller, - from: pallet_common::eth::CrossAddress, - to: pallet_common::eth::CrossAddress, + from: CrossAddress, + to: CrossAddress, amount: U256, ) -> Result { let caller = T::CrossAccountId::from_eth(caller); --- a/pallets/refungible/src/lib.rs +++ b/pallets/refungible/src/lib.rs @@ -240,13 +240,13 @@ QueryKind = ValueQuery, >; - /// Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet. + /// Spender set by a wallet owner that could perform certain transactions on all tokens in the wallet. #[pallet::storage] pub type CollectionAllowance = StorageNMap< Key = ( Key, Key, // Owner - Key, // Operator + Key, // Spender ), Value = bool, QueryKind = ValueQuery, @@ -1403,18 +1403,18 @@ pub fn set_allowance_for_all( collection: &RefungibleHandle, owner: &T::CrossAccountId, - operator: &T::CrossAccountId, + spender: &T::CrossAccountId, approve: bool, ) -> DispatchResult { >::set_allowance_for_all( collection, owner, - operator, + spender, approve, - || >::insert((collection.id, owner, operator), approve), + || >::insert((collection.id, owner, spender), approve), ERC721Events::ApprovalForAll { owner: *owner.as_eth(), - operator: *operator.as_eth(), + operator: *spender.as_eth(), approved: approve, } .to_log(collection_id_to_address(collection.id)), @@ -1425,9 +1425,9 @@ pub fn allowance_for_all( collection: &RefungibleHandle, owner: &T::CrossAccountId, - operator: &T::CrossAccountId, + spender: &T::CrossAccountId, ) -> bool { - >::get((collection.id, owner, operator)) + >::get((collection.id, owner, spender)) } pub fn repair_item(collection: &RefungibleHandle, token: TokenId) -> DispatchResult { -- gitstuff