From 314a48de54b90dfaa9a2852cfdd111afe37c37cc Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Tue, 17 Jan 2023 15:47:36 +0000 Subject: [PATCH] refac: rename address -> Address --- --- a/crates/evm-coder/procedural/src/to_log.rs +++ b/crates/evm-coder/procedural/src/to_log.rs @@ -231,7 +231,7 @@ #[automatically_derived] impl ::evm_coder::events::ToLog for #name { - fn to_log(&self, contract: address) -> ::ethereum::Log { + fn to_log(&self, contract: Address) -> ::ethereum::Log { use ::evm_coder::events::ToTopic; use ::evm_coder::abi::AbiWrite; let mut writer = ::evm_coder::abi::AbiWriter::new(); --- a/crates/evm-coder/src/abi/test.rs +++ b/crates/evm-coder/src/abi/test.rs @@ -101,7 +101,7 @@ #[test] fn encode_decode_vec_tuple_address_uint256() { - test_impl::>( + test_impl::>( 0x1ACF2D55, vec![ ( --- a/crates/evm-coder/src/events.rs +++ b/crates/evm-coder/src/events.rs @@ -53,7 +53,7 @@ } } -impl ToTopic for address { +impl ToTopic for Address { fn to_topic(&self) -> H256 { let mut out = [0u8; 32]; out[12..32].copy_from_slice(&self.0); --- a/crates/evm-coder/src/lib.rs +++ b/crates/evm-coder/src/lib.rs @@ -131,7 +131,7 @@ use alloc::{vec::Vec}; use primitive_types::{U256, H160, H256}; - pub type address = H160; + pub type Address = H160; pub type bytes4 = [u8; 4]; pub type topic = H256; @@ -147,7 +147,7 @@ /// Makes function payable pub type value = U256; /// Makes function caller-sensitive - pub type caller = address; + pub type caller = Address; //#endregion /// Ethereum typed call message, similar to solidity --- a/crates/evm-coder/tests/log.rs +++ b/crates/evm-coder/tests/log.rs @@ -23,14 +23,14 @@ enum ERC721Log { Transfer { #[indexed] - from: address, + from: Address, #[indexed] - to: address, + to: Address, value: U256, }, Eee { #[indexed] - aaa: address, + aaa: Address, bbb: U256, }, } --- a/crates/evm-coder/tests/solidity_generation.rs +++ b/crates/evm-coder/tests/solidity_generation.rs @@ -25,25 +25,25 @@ unreachable!() } /// Get balance of specified owner - fn balance_of(&self, _owner: address) -> Result { + fn balance_of(&self, _owner: Address) -> Result { unreachable!() } - fn transfer(&mut self, _caller: caller, _to: address, _value: U256) -> Result { + fn transfer(&mut self, _caller: caller, _to: Address, _value: U256) -> Result { unreachable!() } fn transfer_from( &mut self, _caller: caller, - _from: address, - _to: address, + _from: Address, + _to: Address, _value: U256, ) -> Result { unreachable!() } - fn approve(&mut self, _caller: caller, _spender: address, _value: U256) -> Result { + fn approve(&mut self, _caller: caller, _spender: Address, _value: U256) -> Result { unreachable!() } - fn allowance(&self, _owner: address, _spender: address) -> Result { + fn allowance(&self, _owner: Address, _spender: Address) -> Result { unreachable!() } } --- a/pallets/common/src/erc.rs +++ b/pallets/common/src/erc.rs @@ -43,30 +43,30 @@ CollectionCreated { /// Collection owner. #[indexed] - owner: address, + owner: Address, /// Collection ID. #[indexed] - collection_id: address, + collection_id: Address, }, /// The collection has been destroyed. CollectionDestroyed { /// Collection ID. #[indexed] - collection_id: address, + collection_id: Address, }, /// The collection has been changed. CollectionChanged { /// Collection ID. #[indexed] - collection_id: address, + collection_id: Address, }, /// The token has been changed. TokenChanged { /// Collection ID. #[indexed] - collection_id: address, + collection_id: Address, /// Token ID. token_id: U256, }, @@ -208,7 +208,7 @@ /// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract. #[solidity(hide)] - fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<()> { + fn set_collection_sponsor(&mut self, caller: caller, sponsor: Address) -> Result<()> { self.consume_store_reads_and_writes(1, 1)?; let caller = T::CrossAccountId::from_eth(caller); @@ -351,7 +351,7 @@ } /// Get contract address. - fn contract_address(&self) -> Result
{ + fn contract_address(&self) -> Result
{ Ok(crate::eth::collection_id_to_address(self.id)) } @@ -388,7 +388,7 @@ /// Add collection admin. /// @param newAdmin Address of the added administrator. #[solidity(hide)] - fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<()> { + fn add_collection_admin(&mut self, caller: caller, new_admin: Address) -> Result<()> { self.consume_store_reads_and_writes(2, 2)?; let caller = T::CrossAccountId::from_eth(caller); @@ -401,7 +401,7 @@ /// /// @param admin Address of the removed administrator. #[solidity(hide)] - fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<()> { + fn remove_collection_admin(&mut self, caller: caller, admin: Address) -> Result<()> { self.consume_store_reads_and_writes(2, 2)?; let caller = T::CrossAccountId::from_eth(caller); @@ -437,7 +437,7 @@ &mut self, caller: caller, enable: bool, - collections: Vec
, + collections: Vec
, ) -> Result<()> { self.consume_store_reads_and_writes(1, 1)?; @@ -526,7 +526,7 @@ /// /// @param user Address of a trusted user. #[solidity(hide)] - fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> { + fn add_to_collection_allow_list(&mut self, caller: caller, user: Address) -> Result<()> { self.consume_store_writes(1)?; let caller = T::CrossAccountId::from_eth(caller); @@ -555,7 +555,7 @@ /// /// @param user Address of a removed user. #[solidity(hide)] - fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<()> { + fn remove_from_collection_allow_list(&mut self, caller: caller, user: Address) -> Result<()> { self.consume_store_writes(1)?; let caller = T::CrossAccountId::from_eth(caller); @@ -599,7 +599,7 @@ /// @param user account to verify /// @return "true" if account is the owner or admin #[solidity(hide, rename_selector = "isOwnerOrAdmin")] - fn is_owner_or_admin_eth(&self, user: address) -> Result { + fn is_owner_or_admin_eth(&self, user: Address) -> Result { let user = T::CrossAccountId::from_eth(user); Ok(self.is_owner_or_admin(&user)) } @@ -640,7 +640,7 @@ /// @dev Owner can be changed only by current owner /// @param newOwner new owner account #[solidity(hide, rename_selector = "changeCollectionOwner")] - fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<()> { + fn set_owner(&mut self, caller: caller, new_owner: Address) -> Result<()> { self.consume_store_writes(1)?; let caller = T::CrossAccountId::from_eth(caller); --- a/pallets/common/src/eth.rs +++ b/pallets/common/src/eth.rs @@ -18,7 +18,7 @@ use alloc::format; use sp_std::{vec, vec::Vec}; -use evm_coder::{AbiCoder, types::address}; +use evm_coder::{AbiCoder, types::Address}; pub use pallet_evm::{Config, account::CrossAccountId}; use sp_core::{H160, U256}; use up_data_structs::CollectionId; @@ -30,7 +30,7 @@ ]; /// Maps the ethereum address of the collection in substrate. -pub fn map_eth_to_id(eth: &H160) -> Option { +pub fn map_eth_to_id(eth: &Address) -> Option { if eth[0..16] != ETH_COLLECTION_PREFIX { return None; } @@ -40,7 +40,7 @@ } /// Maps the substrate collection id in ethereum. -pub fn collection_id_to_address(id: CollectionId) -> H160 { +pub fn collection_id_to_address(id: CollectionId) -> Address { let mut out = [0; 20]; out[0..16].copy_from_slice(Ð_COLLECTION_PREFIX); out[16..20].copy_from_slice(&u32::to_be_bytes(id.0)); @@ -48,7 +48,7 @@ } /// Check if the ethereum address is a collection. -pub fn is_collection(address: &H160) -> bool { +pub fn is_collection(address: &Address) -> bool { address[0..16] == ETH_COLLECTION_PREFIX } @@ -66,7 +66,7 @@ /// Cross account struct #[derive(Debug, Default, AbiCoder)] pub struct CrossAddress { - pub(crate) eth: address, + pub(crate) eth: Address, pub(crate) sub: U256, } --- a/pallets/evm-contract-helpers/src/eth.rs +++ b/pallets/evm-contract-helpers/src/eth.rs @@ -49,25 +49,25 @@ ContractSponsorSet { /// Contract address of the affected collection. #[indexed] - contract_address: address, + contract_address: Address, /// New sponsor address. - sponsor: address, + sponsor: Address, }, /// New sponsor was confirm. ContractSponsorshipConfirmed { /// Contract address of the affected collection. #[indexed] - contract_address: address, + contract_address: Address, /// New sponsor address. - sponsor: address, + sponsor: Address, }, /// Collection sponsor was removed. ContractSponsorRemoved { /// Contract address of the affected collection. #[indexed] - contract_address: address, + contract_address: Address, }, } @@ -96,7 +96,7 @@ /// @dev Returns zero address if contract does not exists /// @param contractAddress Contract to get owner of /// @return address Owner of contract - fn contract_owner(&self, contract_address: address) -> Result
{ + fn contract_owner(&self, contract_address: Address) -> Result
{ Ok(>::get(contract_address)) } @@ -106,8 +106,8 @@ fn set_sponsor( &mut self, caller: caller, - contract_address: address, - sponsor: address, + contract_address: Address, + sponsor: Address, ) -> Result<()> { self.recorder().consume_sload()?; self.recorder().consume_sstore()?; @@ -125,7 +125,7 @@ /// Set contract as self sponsored. /// /// @param contractAddress Contract for which a self sponsoring is being enabled. - fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<()> { + fn self_sponsored_enable(&mut self, caller: caller, contract_address: Address) -> Result<()> { self.recorder().consume_sload()?; self.recorder().consume_sstore()?; @@ -146,7 +146,7 @@ /// Remove sponsor. /// /// @param contractAddress Contract for which a sponsorship is being removed. - fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<()> { + fn remove_sponsor(&mut self, caller: caller, contract_address: Address) -> Result<()> { self.recorder().consume_sload()?; self.recorder().consume_sstore()?; @@ -161,7 +161,7 @@ /// @dev Caller must be same that set via [`setSponsor`]. /// /// @param contractAddress Сontract for which need to confirm sponsorship. - fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<()> { + fn confirm_sponsorship(&mut self, caller: caller, contract_address: Address) -> Result<()> { self.recorder().consume_sload()?; self.recorder().consume_sstore()?; @@ -175,7 +175,7 @@ /// /// @param contractAddress The contract for which a sponsor is requested. /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw. - fn sponsor(&self, contract_address: address) -> Result> { + fn sponsor(&self, contract_address: Address) -> Result> { Ok(match Pallet::::get_sponsor(contract_address) { Some(ref value) => Some(eth::CrossAddress::from_sub_cross_account::(value)), None => None, @@ -186,7 +186,7 @@ /// /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked. /// @return **true** if contract has confirmed sponsor. - fn has_sponsor(&self, contract_address: address) -> Result { + fn has_sponsor(&self, contract_address: Address) -> Result { Ok(Pallet::::get_sponsor(contract_address).is_some()) } @@ -194,21 +194,21 @@ /// /// @param contractAddress The contract for which the presence of a pending sponsor is checked. /// @return **true** if contract has pending sponsor. - fn has_pending_sponsor(&self, contract_address: address) -> Result { + fn has_pending_sponsor(&self, contract_address: Address) -> Result { Ok(match Sponsoring::::get(contract_address) { SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false, SponsorshipState::Unconfirmed(_) => true, }) } - fn sponsoring_enabled(&self, contract_address: address) -> Result { + fn sponsoring_enabled(&self, contract_address: Address) -> Result { Ok(>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled) } fn set_sponsoring_mode( &mut self, caller: caller, - contract_address: address, + contract_address: Address, mode: SponsoringModeT, ) -> Result<()> { self.recorder().consume_sload()?; @@ -223,7 +223,7 @@ /// Get current contract sponsoring rate limit /// @param contractAddress Contract to get sponsoring rate limit of /// @return uint32 Amount of blocks between two sponsored transactions - fn sponsoring_rate_limit(&self, contract_address: address) -> Result { + fn sponsoring_rate_limit(&self, contract_address: Address) -> Result { self.recorder().consume_sload()?; Ok(>::get(contract_address) @@ -240,7 +240,7 @@ fn set_sponsoring_rate_limit( &mut self, caller: caller, - contract_address: address, + contract_address: Address, rate_limit: u32, ) -> Result<()> { self.recorder().consume_sload()?; @@ -260,7 +260,7 @@ fn set_sponsoring_fee_limit( &mut self, caller: caller, - contract_address: address, + contract_address: Address, fee_limit: U256, ) -> Result<()> { self.recorder().consume_sload()?; @@ -276,7 +276,7 @@ /// @param contractAddress Contract to get sponsoring fee limit of /// @return uint256 Maximum amount of fee that could be spent by single /// transaction - fn sponsoring_fee_limit(&self, contract_address: address) -> Result { + fn sponsoring_fee_limit(&self, contract_address: Address) -> Result { self.recorder().consume_sload()?; Ok(get_sponsoring_fee_limit::(contract_address)) @@ -287,7 +287,7 @@ /// @param contractAddress Contract to check allowlist of /// @param user User to check /// @return bool Is specified users exists in contract allowlist - fn allowed(&self, contract_address: address, user: address) -> Result { + fn allowed(&self, contract_address: Address, user: Address) -> Result { self.0.consume_sload()?; Ok(>::allowed(contract_address, user)) } @@ -301,8 +301,8 @@ fn toggle_allowed( &mut self, caller: caller, - contract_address: address, - user: address, + contract_address: Address, + user: Address, is_allowed: bool, ) -> Result<()> { self.recorder().consume_sload()?; @@ -320,7 +320,7 @@ /// in case of allowlist access enabled, only users from allowlist may call this contract /// @param contractAddress Contract to get allowlist access of /// @return bool Is specified contract has allowlist access enabled - fn allowlist_enabled(&self, contract_address: address) -> Result { + fn allowlist_enabled(&self, contract_address: Address) -> Result { Ok(>::get(contract_address)) } @@ -330,7 +330,7 @@ fn toggle_allowlist( &mut self, caller: caller, - contract_address: address, + contract_address: Address, enabled: bool, ) -> Result<()> { self.recorder().consume_sload()?; @@ -441,7 +441,7 @@ } } -fn get_sponsoring_fee_limit(contract_address: address) -> U256 { +fn get_sponsoring_fee_limit(contract_address: Address) -> U256 { >::get(contract_address) .get(&0xffffffff) .cloned() --- a/pallets/fungible/src/erc.rs +++ b/pallets/fungible/src/erc.rs @@ -43,16 +43,16 @@ pub enum ERC20Events { Transfer { #[indexed] - from: address, + from: Address, #[indexed] - to: address, + to: Address, value: U256, }, Approval { #[indexed] - owner: address, + owner: Address, #[indexed] - spender: address, + spender: Address, value: U256, }, } @@ -79,14 +79,14 @@ unreachable!() }) } - fn balance_of(&self, owner: address) -> Result { + fn balance_of(&self, owner: Address) -> Result { self.consume_store_reads(1)?; let owner = T::CrossAccountId::from_eth(owner); let balance = >::get((self.id, owner)); Ok(balance.into()) } #[weight(>::transfer())] - fn transfer(&mut self, caller: caller, to: address, amount: U256) -> Result { + fn transfer(&mut self, caller: caller, to: Address, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = T::CrossAccountId::from_eth(to); let amount = amount.try_into().map_err(|_| "amount overflow")?; @@ -102,8 +102,8 @@ fn transfer_from( &mut self, caller: caller, - from: address, - to: address, + from: Address, + to: Address, amount: U256, ) -> Result { let caller = T::CrossAccountId::from_eth(caller); @@ -119,7 +119,7 @@ Ok(true) } #[weight(>::approve())] - fn approve(&mut self, caller: caller, spender: address, amount: U256) -> Result { + fn approve(&mut self, caller: caller, spender: Address, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let spender = T::CrossAccountId::from_eth(spender); let amount = amount.try_into().map_err(|_| "amount overflow")?; @@ -128,7 +128,7 @@ .map_err(dispatch_to_evm::)?; Ok(true) } - fn allowance(&self, owner: address, spender: address) -> Result { + fn allowance(&self, owner: Address, spender: Address) -> Result { self.consume_store_reads(1)?; let owner = T::CrossAccountId::from_eth(owner); let spender = T::CrossAccountId::from_eth(spender); @@ -137,7 +137,7 @@ } /// @notice Returns collection helper contract address - fn collection_helper_address(&self) -> Result
{ + fn collection_helper_address(&self) -> Result
{ Ok(T::ContractAddress::get()) } } @@ -148,7 +148,7 @@ /// @param to account that will receive minted tokens /// @param amount amount of tokens to mint #[weight(>::create_item())] - fn mint(&mut self, caller: caller, to: address, amount: U256) -> Result { + fn mint(&mut self, caller: caller, to: Address, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = T::CrossAccountId::from_eth(to); let amount = amount.try_into().map_err(|_| "amount overflow")?; @@ -214,7 +214,7 @@ /// @param amount The amount that will be burnt. #[solidity(hide)] #[weight(>::burn_from())] - fn burn_from(&mut self, caller: caller, from: address, amount: U256) -> Result { + fn burn_from(&mut self, caller: caller, from: Address, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let from = T::CrossAccountId::from_eth(from); let amount = amount.try_into().map_err(|_| "amount overflow")?; @@ -254,7 +254,7 @@ /// Mint tokens for multiple accounts. /// @param amounts array of pairs of account address and amount #[weight(>::create_multiple_items_ex(amounts.len() as u32))] - fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, U256)>) -> Result { + fn mint_bulk(&mut self, caller: caller, amounts: Vec<(Address, U256)>) -> Result { let caller = T::CrossAccountId::from_eth(caller); let budget = self .recorder --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -261,9 +261,9 @@ /// any transfer, the approved address for that NFT (if any) is reset to none. Transfer { #[indexed] - from: address, + from: Address, #[indexed] - to: address, + to: Address, #[indexed] token_id: U256, }, @@ -273,9 +273,9 @@ /// address for that NFT (if any) is reset to none. Approval { #[indexed] - owner: address, + owner: Address, #[indexed] - approved: address, + approved: Address, #[indexed] token_id: U256, }, @@ -284,9 +284,9 @@ #[allow(dead_code)] ApprovalForAll { #[indexed] - owner: address, + owner: Address, #[indexed] - operator: address, + operator: Address, approved: bool, }, } @@ -373,7 +373,7 @@ } /// @dev Not implemented - fn token_of_owner_by_index(&self, _owner: address, _index: U256) -> Result { + fn token_of_owner_by_index(&self, _owner: Address, _index: U256) -> Result { // TODO: Not implemetable Err("not implemented".into()) } @@ -396,7 +396,7 @@ /// function throws for queries about the zero address. /// @param owner An address for whom to query the balance /// @return The number of NFTs owned by `owner`, possibly zero - fn balance_of(&self, owner: address) -> Result { + fn balance_of(&self, owner: Address) -> Result { self.consume_store_reads(1)?; let owner = T::CrossAccountId::from_eth(owner); let balance = >::get((self.id, owner)); @@ -407,7 +407,7 @@ /// about them do throw. /// @param tokenId The identifier for an NFT /// @return The address of the owner of the NFT - fn owner_of(&self, token_id: U256) -> Result
{ + fn owner_of(&self, token_id: U256) -> Result
{ self.consume_store_reads(1)?; let token: TokenId = token_id.try_into()?; Ok(*>::get((self.id, token)) @@ -419,8 +419,8 @@ #[solidity(rename_selector = "safeTransferFrom")] fn safe_transfer_from_with_data( &mut self, - _from: address, - _to: address, + _from: Address, + _to: Address, _token_id: U256, _data: bytes, ) -> Result<()> { @@ -428,7 +428,7 @@ Err("not implemented".into()) } /// @dev Not implemented - fn safe_transfer_from(&mut self, _from: address, _to: address, _token_id: U256) -> Result<()> { + fn safe_transfer_from(&mut self, _from: Address, _to: Address, _token_id: U256) -> Result<()> { // TODO: Not implemetable Err("not implemented".into()) } @@ -446,8 +446,8 @@ fn transfer_from( &mut self, caller: caller, - from: address, - to: address, + from: Address, + to: Address, token_id: U256, ) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); @@ -470,7 +470,7 @@ /// @param approved The new approved NFT controller /// @param tokenId The NFT to approve #[weight(>::approve())] - fn approve(&mut self, caller: caller, approved: address, token_id: U256) -> Result<()> { + fn approve(&mut self, caller: caller, approved: Address, token_id: U256) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); let approved = T::CrossAccountId::from_eth(approved); let token = token_id.try_into()?; @@ -488,7 +488,7 @@ fn set_approval_for_all( &mut self, caller: caller, - operator: address, + operator: Address, approved: bool, ) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); @@ -500,14 +500,14 @@ } /// @dev Not implemented - fn get_approved(&self, _token_id: U256) -> Result
{ + fn get_approved(&self, _token_id: U256) -> Result
{ // TODO: Not implemetable Err("not implemented".into()) } /// @notice Tells whether the given `owner` approves the `operator`. #[weight(>::allowance_for_all())] - fn is_approved_for_all(&self, owner: address, operator: address) -> Result { + fn is_approved_for_all(&self, owner: Address, operator: Address) -> Result { let owner = T::CrossAccountId::from_eth(owner); let operator = T::CrossAccountId::from_eth(operator); @@ -539,7 +539,7 @@ /// @param to The new owner /// @return uint256 The id of the newly minted token #[weight(>::create_item())] - fn mint(&mut self, caller: caller, to: address) -> Result { + fn mint(&mut self, caller: caller, to: Address) -> Result { let token_id: U256 = >::get(self.id) .checked_add(1) .ok_or("item id overflow")? @@ -555,7 +555,7 @@ /// @param tokenId ID of the minted NFT #[solidity(hide, rename_selector = "mint")] #[weight(>::create_item())] - fn mint_check_id(&mut self, caller: caller, to: address, token_id: U256) -> Result { + fn mint_check_id(&mut self, caller: caller, to: Address, token_id: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = T::CrossAccountId::from_eth(to); let token_id: u32 = token_id.try_into()?; @@ -594,7 +594,7 @@ fn mint_with_token_uri( &mut self, caller: caller, - to: address, + to: Address, token_uri: string, ) -> Result { let token_id: U256 = >::get(self.id) @@ -616,7 +616,7 @@ fn mint_with_token_uri_check_id( &mut self, caller: caller, - to: address, + to: Address, token_id: U256, token_uri: string, ) -> Result { @@ -784,7 +784,7 @@ /// @param to The new owner /// @param tokenId The NFT to transfer #[weight(>::transfer())] - fn transfer(&mut self, caller: caller, to: address, token_id: U256) -> Result<()> { + fn transfer(&mut self, caller: caller, to: Address, token_id: U256) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); let to = T::CrossAccountId::from_eth(to); let token = token_id.try_into()?; @@ -853,7 +853,7 @@ /// @param tokenId The NFT to transfer #[solidity(hide)] #[weight(>::burn_from())] - fn burn_from(&mut self, caller: caller, from: address, token_id: U256) -> Result<()> { + fn burn_from(&mut self, caller: caller, from: Address, token_id: U256) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); let from = T::CrossAccountId::from_eth(from); let token = token_id.try_into()?; @@ -907,7 +907,7 @@ /// @param tokenIds IDs of the minted NFTs #[solidity(hide)] #[weight(>::create_multiple_items(token_ids.len() as u32))] - fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec) -> Result { + fn mint_bulk(&mut self, caller: caller, to: Address, token_ids: Vec) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = T::CrossAccountId::from_eth(to); let mut expected_index = >::get(self.id) @@ -947,7 +947,7 @@ fn mint_bulk_with_token_uri( &mut self, caller: caller, - to: address, + to: Address, tokens: Vec<(U256, string)>, ) -> Result { let key = key::url(); @@ -1035,7 +1035,7 @@ } /// @notice Returns collection helper contract address - fn collection_helper_address(&self) -> Result
{ + fn collection_helper_address(&self) -> Result
{ Ok(T::ContractAddress::get()) } } --- a/pallets/refungible/src/erc.rs +++ b/pallets/refungible/src/erc.rs @@ -262,18 +262,18 @@ /// may be created and assigned without emitting Transfer. Transfer { #[indexed] - from: address, + from: Address, #[indexed] - to: address, + to: Address, #[indexed] token_id: U256, }, /// @dev Not supported Approval { #[indexed] - owner: address, + owner: Address, #[indexed] - approved: address, + approved: Address, #[indexed] token_id: U256, }, @@ -281,9 +281,9 @@ #[allow(dead_code)] ApprovalForAll { #[indexed] - owner: address, + owner: Address, #[indexed] - operator: address, + operator: Address, approved: bool, }, } @@ -370,7 +370,7 @@ } /// Not implemented - fn token_of_owner_by_index(&self, _owner: address, _index: U256) -> Result { + fn token_of_owner_by_index(&self, _owner: Address, _index: U256) -> Result { // TODO: Not implemetable Err("not implemented".into()) } @@ -393,7 +393,7 @@ /// function throws for queries about the zero address. /// @param owner An address for whom to query the balance /// @return The number of RFTs owned by `owner`, possibly zero - fn balance_of(&self, owner: address) -> Result { + fn balance_of(&self, owner: Address) -> Result { self.consume_store_reads(1)?; let owner = T::CrossAccountId::from_eth(owner); let balance = >::get((self.id, owner)); @@ -407,7 +407,7 @@ /// the tokens that are partially owned. /// @param tokenId The identifier for an RFT /// @return The address of the owner of the RFT - fn owner_of(&self, token_id: U256) -> Result
{ + fn owner_of(&self, token_id: U256) -> Result
{ self.consume_store_reads(2)?; let token = token_id.try_into()?; let owner = >::token_owner(self.id, token); @@ -420,8 +420,8 @@ #[solidity(rename_selector = "safeTransferFrom")] fn safe_transfer_from_with_data( &mut self, - _from: address, - _to: address, + _from: Address, + _to: Address, _token_id: U256, _data: bytes, ) -> Result<()> { @@ -431,7 +431,7 @@ /// @dev Not implemented #[solidity(rename_selector = "safeTransferFrom")] - fn safe_transfer_from(&mut self, _from: address, _to: address, _token_id: U256) -> Result<()> { + fn safe_transfer_from(&mut self, _from: Address, _to: Address, _token_id: U256) -> Result<()> { // TODO: Not implemetable Err("not implemented".into()) } @@ -450,8 +450,8 @@ fn transfer_from( &mut self, caller: caller, - from: address, - to: address, + from: Address, + to: Address, token_id: U256, ) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); @@ -472,7 +472,7 @@ } /// @dev Not implemented - fn approve(&mut self, _caller: caller, _approved: address, _token_id: U256) -> Result<()> { + fn approve(&mut self, _caller: caller, _approved: Address, _token_id: U256) -> Result<()> { Err("not implemented".into()) } @@ -484,7 +484,7 @@ fn set_approval_for_all( &mut self, caller: caller, - operator: address, + operator: Address, approved: bool, ) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); @@ -496,14 +496,14 @@ } /// @dev Not implemented - fn get_approved(&self, _token_id: U256) -> Result
{ + fn get_approved(&self, _token_id: U256) -> Result
{ // TODO: Not implemetable Err("not implemented".into()) } /// @notice Tells whether the given `owner` approves the `operator`. #[weight(>::allowance_for_all())] - fn is_approved_for_all(&self, owner: address, operator: address) -> Result { + fn is_approved_for_all(&self, owner: Address, operator: Address) -> Result { let owner = T::CrossAccountId::from_eth(owner); let operator = T::CrossAccountId::from_eth(operator); @@ -570,7 +570,7 @@ /// @param to The new owner /// @return uint256 The id of the newly minted token #[weight(>::create_item())] - fn mint(&mut self, caller: caller, to: address) -> Result { + fn mint(&mut self, caller: caller, to: Address) -> Result { let token_id: U256 = >::get(self.id) .checked_add(1) .ok_or("item id overflow")? @@ -586,7 +586,7 @@ /// @param tokenId ID of the minted RFT #[solidity(hide, rename_selector = "mint")] #[weight(>::create_item())] - fn mint_check_id(&mut self, caller: caller, to: address, token_id: U256) -> Result { + fn mint_check_id(&mut self, caller: caller, to: Address, token_id: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = T::CrossAccountId::from_eth(to); let token_id: u32 = token_id.try_into()?; @@ -630,7 +630,7 @@ fn mint_with_token_uri( &mut self, caller: caller, - to: address, + to: Address, token_uri: string, ) -> Result { let token_id: U256 = >::get(self.id) @@ -652,7 +652,7 @@ fn mint_with_token_uri_check_id( &mut self, caller: caller, - to: address, + to: Address, token_id: U256, token_uri: string, ) -> Result { @@ -800,7 +800,7 @@ /// @param to The new owner /// @param tokenId The RFT to transfer #[weight(>::transfer_creating_removing())] - fn transfer(&mut self, caller: caller, to: address, token_id: U256) -> Result<()> { + fn transfer(&mut self, caller: caller, to: Address, token_id: U256) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); let to = T::CrossAccountId::from_eth(to); let token = token_id.try_into()?; @@ -883,7 +883,7 @@ /// @param tokenId The RFT to transfer #[solidity(hide)] #[weight(>::burn_from())] - fn burn_from(&mut self, caller: caller, from: address, token_id: U256) -> Result<()> { + fn burn_from(&mut self, caller: caller, from: Address, token_id: U256) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); let from = T::CrossAccountId::from_eth(from); let token = token_id.try_into()?; @@ -944,7 +944,7 @@ /// @param tokenIds IDs of the minted RFTs #[solidity(hide)] #[weight(>::create_multiple_items(token_ids.len() as u32))] - fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec) -> Result { + fn mint_bulk(&mut self, caller: caller, to: Address, token_ids: Vec) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = T::CrossAccountId::from_eth(to); let mut expected_index = >::get(self.id) @@ -990,7 +990,7 @@ fn mint_bulk_with_token_uri( &mut self, caller: caller, - to: address, + to: Address, tokens: Vec<(U256, string)>, ) -> Result { let key = key::url(); @@ -1088,7 +1088,7 @@ /// Returns EVM address for refungible token /// /// @param token ID of the token - fn token_contract_address(&self, token: U256) -> Result
{ + fn token_contract_address(&self, token: U256) -> Result
{ Ok(T::EvmTokenAddressMapping::token_to_address( self.id, token.try_into().map_err(|_| "token id overflow")?, @@ -1096,7 +1096,7 @@ } /// @notice Returns collection helper contract address - fn collection_helper_address(&self) -> Result
{ + fn collection_helper_address(&self) -> Result
{ Ok(T::ContractAddress::get()) } } --- a/pallets/refungible/src/erc_token.rs +++ b/pallets/refungible/src/erc_token.rs @@ -52,7 +52,7 @@ #[solidity_interface(name = ERC1633)] impl RefungibleTokenHandle { - fn parent_token(&self) -> Result
{ + fn parent_token(&self) -> Result
{ Ok(collection_id_to_address(self.id)) } @@ -69,18 +69,18 @@ /// of burning tokens the transfer is to 0. Transfer { #[indexed] - from: address, + from: Address, #[indexed] - to: address, + to: Address, value: U256, }, /// @dev This event is emitted when the amount of tokens (value) is approved /// by the owner to be used by the spender. Approval { #[indexed] - owner: address, + owner: Address, #[indexed] - spender: address, + spender: Address, value: U256, }, } @@ -118,7 +118,7 @@ /// @dev Gets the balance of the specified address. /// @param owner The address to query the balance of. /// @return An uint256 representing the amount owned by the passed address. - fn balance_of(&self, owner: address) -> Result { + fn balance_of(&self, owner: Address) -> Result { self.consume_store_reads(1)?; let owner = T::CrossAccountId::from_eth(owner); let balance = >::get((self.id, self.1, owner)); @@ -129,7 +129,7 @@ /// @param to The address to transfer to. /// @param amount The amount to be transferred. #[weight(>::transfer())] - fn transfer(&mut self, caller: caller, to: address, amount: U256) -> Result { + fn transfer(&mut self, caller: caller, to: Address, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let to = T::CrossAccountId::from_eth(to); let amount = amount.try_into().map_err(|_| "amount overflow")?; @@ -150,8 +150,8 @@ fn transfer_from( &mut self, caller: caller, - from: address, - to: address, + from: Address, + to: Address, amount: U256, ) -> Result { let caller = T::CrossAccountId::from_eth(caller); @@ -175,7 +175,7 @@ /// @param spender The address which will spend the funds. /// @param amount The amount of tokens to be spent. #[weight(>::approve())] - fn approve(&mut self, caller: caller, spender: address, amount: U256) -> Result { + fn approve(&mut self, caller: caller, spender: Address, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let spender = T::CrossAccountId::from_eth(spender); let amount = amount.try_into().map_err(|_| "amount overflow")?; @@ -189,7 +189,7 @@ /// @param owner address The address which owns the funds. /// @param spender address The address which will spend the funds. /// @return A uint256 specifying the amount of tokens still available for the spender. - fn allowance(&self, owner: address, spender: address) -> Result { + fn allowance(&self, owner: Address, spender: Address) -> Result { self.consume_store_reads(1)?; let owner = T::CrossAccountId::from_eth(owner); let spender = T::CrossAccountId::from_eth(spender); @@ -209,7 +209,7 @@ /// @param amount The amount that will be burnt. #[weight(>::burn_from())] #[solidity(hide)] - fn burn_from(&mut self, caller: caller, from: address, amount: U256) -> Result { + fn burn_from(&mut self, caller: caller, from: Address, amount: U256) -> Result { let caller = T::CrossAccountId::from_eth(caller); let from = T::CrossAccountId::from_eth(from); let amount = amount.try_into().map_err(|_| "amount overflow")?; --- a/pallets/unique/src/eth/mod.rs +++ b/pallets/unique/src/eth/mod.rs @@ -93,7 +93,7 @@ collection_mode: CollectionMode, description: string, token_prefix: string, -) -> Result
{ +) -> Result
{ let (caller, name, description, token_prefix) = convert_data::(caller, name, description, token_prefix)?; let data = CreateCollectionData { @@ -154,7 +154,7 @@ name: string, description: string, token_prefix: string, - ) -> Result
{ + ) -> Result
{ let (caller, name, description, token_prefix) = convert_data::(caller, name, description, token_prefix)?; let data = CreateCollectionData { @@ -193,7 +193,7 @@ name: string, description: string, token_prefix: string, - ) -> Result
{ + ) -> Result
{ create_collection_internal::( caller, value, @@ -213,7 +213,7 @@ name: string, description: string, token_prefix: string, - ) -> Result
{ + ) -> Result
{ create_collection_internal::( caller, value, @@ -234,7 +234,7 @@ decimals: u8, description: string, token_prefix: string, - ) -> Result
{ + ) -> Result
{ create_collection_internal::( caller, value, @@ -249,7 +249,7 @@ fn make_collection_metadata_compatible( &mut self, caller: caller, - collection: address, + collection: Address, base_uri: string, ) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); @@ -334,7 +334,7 @@ } #[weight(>::destroy_collection())] - fn destroy_collection(&mut self, caller: caller, collection_address: address) -> Result<()> { + fn destroy_collection(&mut self, caller: caller, collection_address: Address) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); let collection_id = pallet_common::eth::map_eth_to_id(&collection_address) @@ -346,7 +346,7 @@ /// Check if a collection exists /// @param collectionAddress Address of the collection in question /// @return bool Does the collection exist? - fn is_collection_exist(&self, _caller: caller, collection_address: address) -> Result { + fn is_collection_exist(&self, _caller: caller, collection_address: Address) -> Result { if let Some(id) = pallet_common::eth::map_eth_to_id(&collection_address) { let collection_id = id; return Ok(>::contains_key(collection_id)); @@ -366,14 +366,14 @@ /// Returns address of a collection. /// @param collectionId - CollectionId of the collection /// @return eth mirror address of the collection - fn collection_address(&self, collection_id: u32) -> Result
{ + fn collection_address(&self, collection_id: u32) -> Result
{ Ok(collection_id_to_address(collection_id.into())) } /// Returns collectionId of a collection. /// @param collectionAddress - Eth address of the collection /// @return collectionId of the collection - fn collection_id(&self, collection_address: address) -> Result { + fn collection_id(&self, collection_address: Address) -> Result { map_eth_to_id(&collection_address) .map(|id| id.0) .ok_or(Error::Revert(format!( -- gitstuff