difftreelog
misc: change uint256 to U256
in: master
10 files changed
crates/evm-coder/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -132,7 +132,6 @@
use primitive_types::{U256, H160, H256};
pub type address = H160;
- pub type uint256 = U256;
pub type bytes4 = [u8; 4];
pub type topic = H256;
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -18,12 +18,9 @@
use alloc::format;
use sp_std::{vec, vec::Vec};
-use evm_coder::{
- AbiCoder,
- types::{uint256, address},
-};
+use evm_coder::{AbiCoder, types::address};
pub use pallet_evm::{Config, account::CrossAccountId};
-use sp_core::H160;
+use sp_core::{H160, U256};
use up_data_structs::CollectionId;
// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 1
@@ -55,8 +52,8 @@
address[0..16] == ETH_COLLECTION_PREFIX
}
-/// Convert `uint256` to `CrossAccountId`.
-pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId
+/// Convert `U256` to `CrossAccountId`.
+pub fn convert_uint256_to_cross_account<T: Config>(from: U256) -> T::CrossAccountId
where
T::AccountId: From<[u8; 32]>,
{
@@ -70,7 +67,7 @@
#[derive(Debug, Default, AbiCoder)]
pub struct CrossAddress {
pub(crate) eth: address,
- pub(crate) sub: uint256,
+ pub(crate) sub: U256,
}
impl CrossAddress {
@@ -97,7 +94,7 @@
{
Self {
eth: Default::default(),
- sub: uint256::from_big_endian(account_id.as_ref()),
+ sub: U256::from_big_endian(account_id.as_ref()),
}
}
/// Converts [`CrossAddress`] to `CrossAccountId`.
@@ -187,7 +184,7 @@
#[derive(Debug, Default, AbiCoder)]
pub struct CollectionLimit {
field: CollectionLimitField,
- value: Option<uint256>,
+ value: Option<U256>,
}
impl CollectionLimit {
@@ -393,12 +390,12 @@
#[derive(Debug, Default, AbiCoder)]
pub struct CollectionNesting {
token_owner: bool,
- ids: Vec<uint256>,
+ ids: Vec<U256>,
}
impl CollectionNesting {
/// Create [`CollectionNesting`].
- pub fn new(token_owner: bool, ids: Vec<uint256>) -> Self {
+ pub fn new(token_owner: bool, ids: Vec<U256>) -> Self {
Self { token_owner, ids }
}
}
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -261,7 +261,7 @@
&mut self,
caller: caller,
contract_address: address,
- fee_limit: uint256,
+ fee_limit: U256,
) -> Result<()> {
self.recorder().consume_sload()?;
self.recorder().consume_sstore()?;
@@ -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<uint256> {
+ fn sponsoring_fee_limit(&self, contract_address: address) -> Result<U256> {
self.recorder().consume_sload()?;
Ok(get_sponsoring_fee_limit::<T>(contract_address))
@@ -441,7 +441,7 @@
}
}
-fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {
+fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> U256 {
<SponsoringFeeLimit<T>>::get(contract_address)
.get(&0xffffffff)
.cloned()
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -32,7 +32,7 @@
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
-use sp_core::Get;
+use sp_core::{U256, Get};
use crate::{
Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,
@@ -46,14 +46,14 @@
from: address,
#[indexed]
to: address,
- value: uint256,
+ value: U256,
},
Approval {
#[indexed]
owner: address,
#[indexed]
spender: address,
- value: uint256,
+ value: U256,
},
}
@@ -67,7 +67,7 @@
fn symbol(&self) -> Result<string> {
Ok(string::from_utf8_lossy(&self.token_prefix).into())
}
- fn total_supply(&self) -> Result<uint256> {
+ fn total_supply(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<TotalSupply<T>>::get(self.id).into())
}
@@ -79,14 +79,14 @@
unreachable!()
})
}
- fn balance_of(&self, owner: address) -> Result<uint256> {
+ fn balance_of(&self, owner: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let balance = <Balance<T>>::get((self.id, owner));
Ok(balance.into())
}
#[weight(<SelfWeightOf<T>>::transfer())]
- fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {
+ fn transfer(&mut self, caller: caller, to: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -104,7 +104,7 @@
caller: caller,
from: address,
to: address,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
@@ -119,7 +119,7 @@
Ok(true)
}
#[weight(<SelfWeightOf<T>>::approve())]
- fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {
+ fn approve(&mut self, caller: caller, spender: address, amount: U256) -> Result<bool> {
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::<T>)?;
Ok(true)
}
- fn allowance(&self, owner: address, spender: address) -> Result<uint256> {
+ fn allowance(&self, owner: address, spender: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let spender = T::CrossAccountId::from_eth(spender);
@@ -148,7 +148,7 @@
/// @param to account that will receive minted tokens
/// @param amount amount of tokens to mint
#[weight(<SelfWeightOf<T>>::create_item())]
- fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {
+ fn mint(&mut self, caller: caller, to: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -178,7 +178,7 @@
&mut self,
caller: caller,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -196,7 +196,7 @@
&mut self,
caller: caller,
spender: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let spender = spender.into_sub_cross_account::<T>()?;
@@ -214,7 +214,7 @@
/// @param amount The amount that will be burnt.
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::burn_from())]
- fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {
+ fn burn_from(&mut self, caller: caller, from: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -237,7 +237,7 @@
&mut self,
caller: caller,
from: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -254,7 +254,7 @@
/// Mint tokens for multiple accounts.
/// @param amounts array of pairs of account address and amount
#[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]
- fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {
+ fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, U256)>) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let budget = self
.recorder
@@ -279,7 +279,7 @@
&mut self,
caller: caller,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -298,7 +298,7 @@
caller: caller,
from: pallet_common::eth::CrossAddress,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
pallets/nonfungible/src/erc.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//! # Nonfungible Pallet EVM API18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Nonfungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods.2122extern crate alloc;23use core::{24 char::{REPLACEMENT_CHARACTER, decode_utf16},25 convert::TryInto,26};27use evm_coder::{28 abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,29 weight,30};31use frame_support::BoundedVec;32use up_data_structs::{33 TokenId, PropertyPermission, PropertyKeyPermission, Property, CollectionId, PropertyKey,34 CollectionPropertiesVec,35};36use pallet_evm_coder_substrate::dispatch_to_evm;37use sp_std::{vec::Vec, vec};38use pallet_common::{39 CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,40 erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},41 eth,42};43use pallet_evm::{account::CrossAccountId, PrecompileHandle};44use pallet_evm_coder_substrate::call;45use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};46use sp_core::Get;4748use crate::{49 AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,50 SelfWeightOf, weights::WeightInfo, TokenProperties,51};5253/// @title A contract that allows to set and delete token properties and change token property permissions.54#[solidity_interface(name = TokenProperties)]55impl<T: Config> NonfungibleHandle<T> {56 /// @notice Set permissions for token property.57 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.58 /// @param key Property key.59 /// @param isMutable Permission to mutate property.60 /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.61 /// @param tokenOwner Permission to mutate property by token owner if property is mutable.62 #[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]63 #[solidity(hide)]64 fn set_token_property_permission(65 &mut self,66 caller: caller,67 key: string,68 is_mutable: bool,69 collection_admin: bool,70 token_owner: bool,71 ) -> Result<()> {72 let caller = T::CrossAccountId::from_eth(caller);73 <Pallet<T>>::set_token_property_permissions(74 self,75 &caller,76 vec![PropertyKeyPermission {77 key: <Vec<u8>>::from(key)78 .try_into()79 .map_err(|_| "too long key")?,80 permission: PropertyPermission {81 mutable: is_mutable,82 collection_admin,83 token_owner,84 },85 }],86 )87 .map_err(dispatch_to_evm::<T>)88 }8990 /// @notice Set permissions for token property.91 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.92 /// @param permissions Permissions for keys.93 #[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]94 fn set_token_property_permissions(95 &mut self,96 caller: caller,97 permissions: Vec<eth::TokenPropertyPermission>,98 ) -> Result<()> {99 let caller = T::CrossAccountId::from_eth(caller);100 let perms = eth::TokenPropertyPermission::into_property_key_permissions(permissions)?;101102 <Pallet<T>>::set_token_property_permissions(self, &caller, perms)103 .map_err(dispatch_to_evm::<T>)104 }105106 /// @notice Get permissions for token properties.107 fn token_property_permissions(&self) -> Result<Vec<eth::TokenPropertyPermission>> {108 let perms = <Pallet<T>>::token_property_permission(self.id);109 Ok(perms110 .into_iter()111 .map(eth::TokenPropertyPermission::from)112 .collect())113 }114115 /// @notice Set token property value.116 /// @dev Throws error if `msg.sender` has no permission to edit the property.117 /// @param tokenId ID of the token.118 /// @param key Property key.119 /// @param value Property value.120 #[solidity(hide)]121 #[weight(<SelfWeightOf<T>>::set_token_properties(1))]122 fn set_property(123 &mut self,124 caller: caller,125 token_id: uint256,126 key: string,127 value: bytes,128 ) -> Result<()> {129 let caller = T::CrossAccountId::from_eth(caller);130 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;131 let key = <Vec<u8>>::from(key)132 .try_into()133 .map_err(|_| "key too long")?;134 let value = value.0.try_into().map_err(|_| "value too long")?;135136 let nesting_budget = self137 .recorder138 .weight_calls_budget(<StructureWeight<T>>::find_parent());139140 <Pallet<T>>::set_token_property(141 self,142 &caller,143 TokenId(token_id),144 Property { key, value },145 &nesting_budget,146 )147 .map_err(dispatch_to_evm::<T>)148 }149150 /// @notice Set token properties value.151 /// @dev Throws error if `msg.sender` has no permission to edit the property.152 /// @param tokenId ID of the token.153 /// @param properties settable properties154 #[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]155 fn set_properties(156 &mut self,157 caller: caller,158 token_id: uint256,159 properties: Vec<eth::Property>,160 ) -> Result<()> {161 let caller = T::CrossAccountId::from_eth(caller);162 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;163164 let nesting_budget = self165 .recorder166 .weight_calls_budget(<StructureWeight<T>>::find_parent());167168 let properties = properties169 .into_iter()170 .map(eth::Property::try_into)171 .collect::<Result<Vec<_>>>()?;172173 <Pallet<T>>::set_token_properties(174 self,175 &caller,176 TokenId(token_id),177 properties.into_iter(),178 false,179 &nesting_budget,180 )181 .map_err(dispatch_to_evm::<T>)182 }183184 /// @notice Delete token property value.185 /// @dev Throws error if `msg.sender` has no permission to edit the property.186 /// @param tokenId ID of the token.187 /// @param key Property key.188 #[solidity(hide)]189 #[weight(<SelfWeightOf<T>>::delete_token_properties(1))]190 fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {191 let caller = T::CrossAccountId::from_eth(caller);192 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;193 let key = <Vec<u8>>::from(key)194 .try_into()195 .map_err(|_| "key too long")?;196197 let nesting_budget = self198 .recorder199 .weight_calls_budget(<StructureWeight<T>>::find_parent());200201 <Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)202 .map_err(dispatch_to_evm::<T>)203 }204205 /// @notice Delete token properties value.206 /// @dev Throws error if `msg.sender` has no permission to edit the property.207 /// @param tokenId ID of the token.208 /// @param keys Properties key.209 #[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]210 fn delete_properties(211 &mut self,212 token_id: uint256,213 caller: caller,214 keys: Vec<string>,215 ) -> Result<()> {216 let caller = T::CrossAccountId::from_eth(caller);217 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;218 let keys = keys219 .into_iter()220 .map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))221 .collect::<Result<Vec<_>>>()?;222223 let nesting_budget = self224 .recorder225 .weight_calls_budget(<StructureWeight<T>>::find_parent());226227 <Pallet<T>>::delete_token_properties(228 self,229 &caller,230 TokenId(token_id),231 keys.into_iter(),232 &nesting_budget,233 )234 .map_err(dispatch_to_evm::<T>)235 }236237 /// @notice Get token property value.238 /// @dev Throws error if key not found239 /// @param tokenId ID of the token.240 /// @param key Property key.241 /// @return Property value bytes242 fn property(&self, token_id: uint256, key: string) -> Result<bytes> {243 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;244 let key = <Vec<u8>>::from(key)245 .try_into()246 .map_err(|_| "key too long")?;247248 let props = <TokenProperties<T>>::get((self.id, token_id));249 let prop = props.get(&key).ok_or("key not found")?;250251 Ok(prop.to_vec().into())252 }253}254255#[derive(ToLog)]256pub enum ERC721Events {257 /// @dev This emits when ownership of any NFT changes by any mechanism.258 /// This event emits when NFTs are created (`from` == 0) and destroyed259 /// (`to` == 0). Exception: during contract creation, any number of NFTs260 /// may be created and assigned without emitting Transfer. At the time of261 /// any transfer, the approved address for that NFT (if any) is reset to none.262 Transfer {263 #[indexed]264 from: address,265 #[indexed]266 to: address,267 #[indexed]268 token_id: uint256,269 },270 /// @dev This emits when the approved address for an NFT is changed or271 /// reaffirmed. The zero address indicates there is no approved address.272 /// When a Transfer event emits, this also indicates that the approved273 /// address for that NFT (if any) is reset to none.274 Approval {275 #[indexed]276 owner: address,277 #[indexed]278 approved: address,279 #[indexed]280 token_id: uint256,281 },282 /// @dev This emits when an operator is enabled or disabled for an owner.283 /// The operator can manage all NFTs of the owner.284 #[allow(dead_code)]285 ApprovalForAll {286 #[indexed]287 owner: address,288 #[indexed]289 operator: address,290 approved: bool,291 },292}293294/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension295/// @dev See https://eips.ethereum.org/EIPS/eip-721296#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]297impl<T: Config> NonfungibleHandle<T>298where299 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,300{301 /// @notice A descriptive name for a collection of NFTs in this contract302 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`303 #[solidity(hide, rename_selector = "name")]304 fn name_proxy(&self) -> Result<string> {305 self.name()306 }307308 /// @notice An abbreviated name for NFTs in this contract309 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`310 #[solidity(hide, rename_selector = "symbol")]311 fn symbol_proxy(&self) -> Result<string> {312 self.symbol()313 }314315 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.316 ///317 /// @dev If the token has a `url` property and it is not empty, it is returned.318 /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.319 /// If the collection property `baseURI` is empty or absent, return "" (empty string)320 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix321 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).322 ///323 /// @return token's const_metadata324 #[solidity(rename_selector = "tokenURI")]325 fn token_uri(&self, token_id: uint256) -> Result<string> {326 let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;327328 match get_token_property(self, token_id_u32, &key::url()).as_deref() {329 Err(_) | Ok("") => (),330 Ok(url) => {331 return Ok(url.into());332 }333 };334335 let base_uri =336 pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())337 .map(BoundedVec::into_inner)338 .map(string::from_utf8)339 .transpose()340 .map_err(|e| {341 Error::Revert(alloc::format!(342 "Can not convert value \"baseURI\" to string with error \"{}\"",343 e344 ))345 })?;346347 let base_uri = match base_uri.as_deref() {348 None | Some("") => {349 return Ok("".into());350 }351 Some(base_uri) => base_uri.into(),352 };353354 Ok(355 match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {356 Err(_) | Ok("") => base_uri,357 Ok(suffix) => base_uri + suffix,358 },359 )360 }361}362363/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension364/// @dev See https://eips.ethereum.org/EIPS/eip-721365#[solidity_interface(name = ERC721Enumerable, expect_selector = 0x780e9d63)]366impl<T: Config> NonfungibleHandle<T> {367 /// @notice Enumerate valid NFTs368 /// @param index A counter less than `totalSupply()`369 /// @return The token identifier for the `index`th NFT,370 /// (sort order not specified)371 fn token_by_index(&self, index: uint256) -> Result<uint256> {372 Ok(index)373 }374375 /// @dev Not implemented376 fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {377 // TODO: Not implemetable378 Err("not implemented".into())379 }380381 /// @notice Count NFTs tracked by this contract382 /// @return A count of valid NFTs tracked by this contract, where each one of383 /// them has an assigned and queryable owner not equal to the zero address384 fn total_supply(&self) -> Result<uint256> {385 self.consume_store_reads(1)?;386 Ok(<Pallet<T>>::total_supply(self).into())387 }388}389390/// @title ERC-721 Non-Fungible Token Standard391/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md392#[solidity_interface(name = ERC721, events(ERC721Events), expect_selector = 0x80ac58cd)]393impl<T: Config> NonfungibleHandle<T> {394 /// @notice Count all NFTs assigned to an owner395 /// @dev NFTs assigned to the zero address are considered invalid, and this396 /// function throws for queries about the zero address.397 /// @param owner An address for whom to query the balance398 /// @return The number of NFTs owned by `owner`, possibly zero399 fn balance_of(&self, owner: address) -> Result<uint256> {400 self.consume_store_reads(1)?;401 let owner = T::CrossAccountId::from_eth(owner);402 let balance = <AccountBalance<T>>::get((self.id, owner));403 Ok(balance.into())404 }405 /// @notice Find the owner of an NFT406 /// @dev NFTs assigned to zero address are considered invalid, and queries407 /// about them do throw.408 /// @param tokenId The identifier for an NFT409 /// @return The address of the owner of the NFT410 fn owner_of(&self, token_id: uint256) -> Result<address> {411 self.consume_store_reads(1)?;412 let token: TokenId = token_id.try_into()?;413 Ok(*<TokenData<T>>::get((self.id, token))414 .ok_or("token not found")?415 .owner416 .as_eth())417 }418 /// @dev Not implemented419 #[solidity(rename_selector = "safeTransferFrom")]420 fn safe_transfer_from_with_data(421 &mut self,422 _from: address,423 _to: address,424 _token_id: uint256,425 _data: bytes,426 ) -> Result<()> {427 // TODO: Not implemetable428 Err("not implemented".into())429 }430 /// @dev Not implemented431 fn safe_transfer_from(432 &mut self,433 _from: address,434 _to: address,435 _token_id: uint256,436 ) -> Result<()> {437 // TODO: Not implemetable438 Err("not implemented".into())439 }440441 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE442 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE443 /// THEY MAY BE PERMANENTLY LOST444 /// @dev Throws unless `msg.sender` is the current owner or an authorized445 /// operator for this NFT. Throws if `from` is not the current owner. Throws446 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.447 /// @param from The current owner of the NFT448 /// @param to The new owner449 /// @param tokenId The NFT to transfer450 #[weight(<SelfWeightOf<T>>::transfer_from())]451 fn transfer_from(452 &mut self,453 caller: caller,454 from: address,455 to: address,456 token_id: uint256,457 ) -> Result<()> {458 let caller = T::CrossAccountId::from_eth(caller);459 let from = T::CrossAccountId::from_eth(from);460 let to = T::CrossAccountId::from_eth(to);461 let token = token_id.try_into()?;462 let budget = self463 .recorder464 .weight_calls_budget(<StructureWeight<T>>::find_parent());465466 <Pallet<T>>::transfer_from(self, &caller, &from, &to, token, &budget)467 .map_err(dispatch_to_evm::<T>)?;468 Ok(())469 }470471 /// @notice Set or reaffirm the approved address for an NFT472 /// @dev The zero address indicates there is no approved address.473 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized474 /// operator of the current owner.475 /// @param approved The new approved NFT controller476 /// @param tokenId The NFT to approve477 #[weight(<SelfWeightOf<T>>::approve())]478 fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<()> {479 let caller = T::CrossAccountId::from_eth(caller);480 let approved = T::CrossAccountId::from_eth(approved);481 let token = token_id.try_into()?;482483 <Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))484 .map_err(dispatch_to_evm::<T>)?;485 Ok(())486 }487488 /// @notice Sets or unsets the approval of a given operator.489 /// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.490 /// @param operator Operator491 /// @param approved Should operator status be granted or revoked?492 #[weight(<SelfWeightOf<T>>::set_allowance_for_all())]493 fn set_approval_for_all(494 &mut self,495 caller: caller,496 operator: address,497 approved: bool,498 ) -> Result<()> {499 let caller = T::CrossAccountId::from_eth(caller);500 let operator = T::CrossAccountId::from_eth(operator);501502 <Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)503 .map_err(dispatch_to_evm::<T>)?;504 Ok(())505 }506507 /// @dev Not implemented508 fn get_approved(&self, _token_id: uint256) -> Result<address> {509 // TODO: Not implemetable510 Err("not implemented".into())511 }512513 /// @notice Tells whether the given `owner` approves the `operator`.514 #[weight(<SelfWeightOf<T>>::allowance_for_all())]515 fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {516 let owner = T::CrossAccountId::from_eth(owner);517 let operator = T::CrossAccountId::from_eth(operator);518519 Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))520 }521}522523/// @title ERC721 Token that can be irreversibly burned (destroyed).524#[solidity_interface(name = ERC721Burnable)]525impl<T: Config> NonfungibleHandle<T> {526 /// @notice Burns a specific ERC721 token.527 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized528 /// operator of the current owner.529 /// @param tokenId The NFT to approve530 #[weight(<SelfWeightOf<T>>::burn_item())]531 fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {532 let caller = T::CrossAccountId::from_eth(caller);533 let token = token_id.try_into()?;534535 <Pallet<T>>::burn(self, &caller, token).map_err(dispatch_to_evm::<T>)?;536 Ok(())537 }538}539540/// @title ERC721 minting logic.541#[solidity_interface(name = ERC721UniqueMintable)]542impl<T: Config> NonfungibleHandle<T> {543 /// @notice Function to mint a token.544 /// @param to The new owner545 /// @return uint256 The id of the newly minted token546 #[weight(<SelfWeightOf<T>>::create_item())]547 fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {548 let token_id: uint256 = <TokensMinted<T>>::get(self.id)549 .checked_add(1)550 .ok_or("item id overflow")?551 .into();552 self.mint_check_id(caller, to, token_id)?;553 Ok(token_id)554 }555556 /// @notice Function to mint a token.557 /// @dev `tokenId` should be obtained with `nextTokenId` method,558 /// unlike standard, you can't specify it manually559 /// @param to The new owner560 /// @param tokenId ID of the minted NFT561 #[solidity(hide, rename_selector = "mint")]562 #[weight(<SelfWeightOf<T>>::create_item())]563 fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {564 let caller = T::CrossAccountId::from_eth(caller);565 let to = T::CrossAccountId::from_eth(to);566 let token_id: u32 = token_id.try_into()?;567 let budget = self568 .recorder569 .weight_calls_budget(<StructureWeight<T>>::find_parent());570571 if <TokensMinted<T>>::get(self.id)572 .checked_add(1)573 .ok_or("item id overflow")?574 != token_id575 {576 return Err("item id should be next".into());577 }578579 <Pallet<T>>::create_item(580 self,581 &caller,582 CreateItemData::<T> {583 properties: BoundedVec::default(),584 owner: to,585 },586 &budget,587 )588 .map_err(dispatch_to_evm::<T>)?;589590 Ok(true)591 }592593 /// @notice Function to mint token with the given tokenUri.594 /// @param to The new owner595 /// @param tokenUri Token URI that would be stored in the NFT properties596 /// @return uint256 The id of the newly minted token597 #[solidity(rename_selector = "mintWithTokenURI")]598 #[weight(<SelfWeightOf<T>>::create_item())]599 fn mint_with_token_uri(600 &mut self,601 caller: caller,602 to: address,603 token_uri: string,604 ) -> Result<uint256> {605 let token_id: uint256 = <TokensMinted<T>>::get(self.id)606 .checked_add(1)607 .ok_or("item id overflow")?608 .into();609 self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;610 Ok(token_id)611 }612613 /// @notice Function to mint token with the given tokenUri.614 /// @dev `tokenId` should be obtained with `nextTokenId` method,615 /// unlike standard, you can't specify it manually616 /// @param to The new owner617 /// @param tokenId ID of the minted NFT618 /// @param tokenUri Token URI that would be stored in the NFT properties619 #[solidity(hide, rename_selector = "mintWithTokenURI")]620 #[weight(<SelfWeightOf<T>>::create_item())]621 fn mint_with_token_uri_check_id(622 &mut self,623 caller: caller,624 to: address,625 token_id: uint256,626 token_uri: string,627 ) -> Result<bool> {628 let key = key::url();629 let permission = get_token_permission::<T>(self.id, &key)?;630 if !permission.collection_admin {631 return Err("Operation is not allowed".into());632 }633634 let caller = T::CrossAccountId::from_eth(caller);635 let to = T::CrossAccountId::from_eth(to);636 let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;637 let budget = self638 .recorder639 .weight_calls_budget(<StructureWeight<T>>::find_parent());640641 if <TokensMinted<T>>::get(self.id)642 .checked_add(1)643 .ok_or("item id overflow")?644 != token_id645 {646 return Err("item id should be next".into());647 }648649 let mut properties = CollectionPropertiesVec::default();650 properties651 .try_push(Property {652 key,653 value: token_uri654 .into_bytes()655 .try_into()656 .map_err(|_| "token uri is too long")?,657 })658 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;659660 <Pallet<T>>::create_item(661 self,662 &caller,663 CreateItemData::<T> {664 properties,665 owner: to,666 },667 &budget,668 )669 .map_err(dispatch_to_evm::<T>)?;670 Ok(true)671 }672}673674fn get_token_property<T: Config>(675 collection: &CollectionHandle<T>,676 token_id: u32,677 key: &up_data_structs::PropertyKey,678) -> Result<string> {679 collection.consume_store_reads(1)?;680 let properties = <TokenProperties<T>>::try_get((collection.id, token_id))681 .map_err(|_| Error::Revert("Token properties not found".into()))?;682 if let Some(property) = properties.get(key) {683 return Ok(string::from_utf8_lossy(property).into());684 }685686 Err("Property tokenURI not found".into())687}688689fn get_token_permission<T: Config>(690 collection_id: CollectionId,691 key: &PropertyKey,692) -> Result<PropertyPermission> {693 let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)694 .map_err(|_| Error::Revert("No permissions for collection".into()))?;695 let a = token_property_permissions696 .get(key)697 .map(Clone::clone)698 .ok_or_else(|| {699 let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();700 Error::Revert(alloc::format!("No permission for key {}", key))701 })?;702 Ok(a)703}704705/// @title Unique extensions for ERC721.706#[solidity_interface(name = ERC721UniqueExtensions)]707impl<T: Config> NonfungibleHandle<T>708where709 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,710{711 /// @notice A descriptive name for a collection of NFTs in this contract712 fn name(&self) -> Result<string> {713 Ok(decode_utf16(self.name.iter().copied())714 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))715 .collect::<string>())716 }717718 /// @notice An abbreviated name for NFTs in this contract719 fn symbol(&self) -> Result<string> {720 Ok(string::from_utf8_lossy(&self.token_prefix).into())721 }722723 /// @notice A description for the collection.724 fn description(&self) -> Result<string> {725 Ok(decode_utf16(self.description.iter().copied())726 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))727 .collect::<string>())728 }729730 /// Returns the owner (in cross format) of the token.731 ///732 /// @param tokenId Id for the token.733 fn cross_owner_of(&self, token_id: uint256) -> Result<eth::CrossAddress> {734 Self::token_owner(&self, token_id.try_into()?)735 .map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))736 .ok_or(Error::Revert("key too large".into()))737 }738739 /// Returns the token properties.740 ///741 /// @param tokenId Id for the token.742 /// @param keys Properties keys. Empty keys for all propertyes.743 /// @return Vector of properties key/value pairs.744 fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<eth::Property>> {745 let keys = keys746 .into_iter()747 .map(|key| {748 <Vec<u8>>::from(key)749 .try_into()750 .map_err(|_| Error::Revert("key too large".into()))751 })752 .collect::<Result<Vec<_>>>()?;753754 <Self as CommonCollectionOperations<T>>::token_properties(755 &self,756 token_id.try_into()?,757 if keys.is_empty() { None } else { Some(keys) },758 )759 .into_iter()760 .map(eth::Property::try_from)761 .collect::<Result<Vec<_>>>()762 }763764 /// @notice Set or reaffirm the approved address for an NFT765 /// @dev The zero address indicates there is no approved address.766 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized767 /// operator of the current owner.768 /// @param approved The new substrate address approved NFT controller769 /// @param tokenId The NFT to approve770 #[weight(<SelfWeightOf<T>>::approve())]771 fn approve_cross(772 &mut self,773 caller: caller,774 approved: eth::CrossAddress,775 token_id: uint256,776 ) -> Result<()> {777 let caller = T::CrossAccountId::from_eth(caller);778 let approved = approved.into_sub_cross_account::<T>()?;779 let token = token_id.try_into()?;780781 <Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))782 .map_err(dispatch_to_evm::<T>)?;783 Ok(())784 }785786 /// @notice Transfer ownership of an NFT787 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`788 /// is the zero address. Throws if `tokenId` is not a valid NFT.789 /// @param to The new owner790 /// @param tokenId The NFT to transfer791 #[weight(<SelfWeightOf<T>>::transfer())]792 fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<()> {793 let caller = T::CrossAccountId::from_eth(caller);794 let to = T::CrossAccountId::from_eth(to);795 let token = token_id.try_into()?;796 let budget = self797 .recorder798 .weight_calls_budget(<StructureWeight<T>>::find_parent());799800 <Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;801 Ok(())802 }803804 /// @notice Transfer ownership of an NFT805 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`806 /// is the zero address. Throws if `tokenId` is not a valid NFT.807 /// @param to The new owner808 /// @param tokenId The NFT to transfer809 #[weight(<SelfWeightOf<T>>::transfer())]810 fn transfer_cross(811 &mut self,812 caller: caller,813 to: eth::CrossAddress,814 token_id: uint256,815 ) -> Result<()> {816 let caller = T::CrossAccountId::from_eth(caller);817 let to = to.into_sub_cross_account::<T>()?;818 let token = token_id.try_into()?;819 let budget = self820 .recorder821 .weight_calls_budget(<StructureWeight<T>>::find_parent());822823 <Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;824 Ok(())825 }826827 /// @notice Transfer ownership of an NFT from cross account address to cross account address828 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`829 /// is the zero address. Throws if `tokenId` is not a valid NFT.830 /// @param from Cross acccount address of current owner831 /// @param to Cross acccount address of new owner832 /// @param tokenId The NFT to transfer833 #[weight(<SelfWeightOf<T>>::transfer())]834 fn transfer_from_cross(835 &mut self,836 caller: caller,837 from: eth::CrossAddress,838 to: eth::CrossAddress,839 token_id: uint256,840 ) -> Result<()> {841 let caller = T::CrossAccountId::from_eth(caller);842 let from = from.into_sub_cross_account::<T>()?;843 let to = to.into_sub_cross_account::<T>()?;844 let token_id = token_id.try_into()?;845 let budget = self846 .recorder847 .weight_calls_budget(<StructureWeight<T>>::find_parent());848 Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, &budget)849 .map_err(dispatch_to_evm::<T>)?;850 Ok(())851 }852853 /// @notice Burns a specific ERC721 token.854 /// @dev Throws unless `msg.sender` is the current owner or an authorized855 /// operator for this NFT. Throws if `from` is not the current owner. Throws856 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.857 /// @param from The current owner of the NFT858 /// @param tokenId The NFT to transfer859 #[solidity(hide)]860 #[weight(<SelfWeightOf<T>>::burn_from())]861 fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<()> {862 let caller = T::CrossAccountId::from_eth(caller);863 let from = T::CrossAccountId::from_eth(from);864 let token = token_id.try_into()?;865 let budget = self866 .recorder867 .weight_calls_budget(<StructureWeight<T>>::find_parent());868869 <Pallet<T>>::burn_from(self, &caller, &from, token, &budget)870 .map_err(dispatch_to_evm::<T>)?;871 Ok(())872 }873874 /// @notice Burns a specific ERC721 token.875 /// @dev Throws unless `msg.sender` is the current owner or an authorized876 /// operator for this NFT. Throws if `from` is not the current owner. Throws877 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.878 /// @param from The current owner of the NFT879 /// @param tokenId The NFT to transfer880 #[weight(<SelfWeightOf<T>>::burn_from())]881 fn burn_from_cross(882 &mut self,883 caller: caller,884 from: eth::CrossAddress,885 token_id: uint256,886 ) -> Result<()> {887 let caller = T::CrossAccountId::from_eth(caller);888 let from = from.into_sub_cross_account::<T>()?;889 let token = token_id.try_into()?;890 let budget = self891 .recorder892 .weight_calls_budget(<StructureWeight<T>>::find_parent());893894 <Pallet<T>>::burn_from(self, &caller, &from, token, &budget)895 .map_err(dispatch_to_evm::<T>)?;896 Ok(())897 }898899 /// @notice Returns next free NFT ID.900 fn next_token_id(&self) -> Result<uint256> {901 self.consume_store_reads(1)?;902 Ok(<TokensMinted<T>>::get(self.id)903 .checked_add(1)904 .ok_or("item id overflow")?905 .into())906 }907908 /// @notice Function to mint multiple tokens.909 /// @dev `tokenIds` should be an array of consecutive numbers and first number910 /// should be obtained with `nextTokenId` method911 /// @param to The new owner912 /// @param tokenIds IDs of the minted NFTs913 #[solidity(hide)]914 #[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]915 fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {916 let caller = T::CrossAccountId::from_eth(caller);917 let to = T::CrossAccountId::from_eth(to);918 let mut expected_index = <TokensMinted<T>>::get(self.id)919 .checked_add(1)920 .ok_or("item id overflow")?;921 let budget = self922 .recorder923 .weight_calls_budget(<StructureWeight<T>>::find_parent());924925 let total_tokens = token_ids.len();926 for id in token_ids.into_iter() {927 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;928 if id != expected_index {929 return Err("item id should be next".into());930 }931 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;932 }933 let data = (0..total_tokens)934 .map(|_| CreateItemData::<T> {935 properties: BoundedVec::default(),936 owner: to.clone(),937 })938 .collect();939940 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)941 .map_err(dispatch_to_evm::<T>)?;942 Ok(true)943 }944945 /// @notice Function to mint multiple tokens with the given tokenUris.946 /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive947 /// numbers and first number should be obtained with `nextTokenId` method948 /// @param to The new owner949 /// @param tokens array of pairs of token ID and token URI for minted tokens950 #[solidity(hide, rename_selector = "mintBulkWithTokenURI")]951 #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]952 fn mint_bulk_with_token_uri(953 &mut self,954 caller: caller,955 to: address,956 tokens: Vec<(uint256, string)>,957 ) -> Result<bool> {958 let key = key::url();959 let caller = T::CrossAccountId::from_eth(caller);960 let to = T::CrossAccountId::from_eth(to);961 let mut expected_index = <TokensMinted<T>>::get(self.id)962 .checked_add(1)963 .ok_or("item id overflow")?;964 let budget = self965 .recorder966 .weight_calls_budget(<StructureWeight<T>>::find_parent());967968 let mut data = Vec::with_capacity(tokens.len());969 for (id, token_uri) in tokens {970 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;971 if id != expected_index {972 return Err("item id should be next".into());973 }974 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;975976 let mut properties = CollectionPropertiesVec::default();977 properties978 .try_push(Property {979 key: key.clone(),980 value: token_uri981 .into_bytes()982 .try_into()983 .map_err(|_| "token uri is too long")?,984 })985 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;986987 data.push(CreateItemData::<T> {988 properties,989 owner: to.clone(),990 });991 }992993 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)994 .map_err(dispatch_to_evm::<T>)?;995 Ok(true)996 }997998 /// @notice Function to mint a token.999 /// @param to The new owner crossAccountId1000 /// @param properties Properties of minted token1001 /// @return uint256 The id of the newly minted token1002 #[weight(<SelfWeightOf<T>>::create_item())]1003 fn mint_cross(1004 &mut self,1005 caller: caller,1006 to: eth::CrossAddress,1007 properties: Vec<eth::Property>,1008 ) -> Result<uint256> {1009 let token_id = <TokensMinted<T>>::get(self.id)1010 .checked_add(1)1011 .ok_or("item id overflow")?;10121013 let to = to.into_sub_cross_account::<T>()?;10141015 let properties = properties1016 .into_iter()1017 .map(eth::Property::try_into)1018 .collect::<Result<Vec<_>>>()?1019 .try_into()1020 .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;10211022 let caller = T::CrossAccountId::from_eth(caller);10231024 let budget = self1025 .recorder1026 .weight_calls_budget(<StructureWeight<T>>::find_parent());10271028 <Pallet<T>>::create_item(1029 self,1030 &caller,1031 CreateItemData::<T> {1032 properties,1033 owner: to,1034 },1035 &budget,1036 )1037 .map_err(dispatch_to_evm::<T>)?;10381039 Ok(token_id.into())1040 }10411042 /// @notice Returns collection helper contract address1043 fn collection_helper_address(&self) -> Result<address> {1044 Ok(T::ContractAddress::get())1045 }1046}10471048#[solidity_interface(1049 name = UniqueNFT,1050 is(1051 ERC721,1052 ERC721Enumerable,1053 ERC721UniqueExtensions,1054 ERC721UniqueMintable,1055 ERC721Burnable,1056 ERC721Metadata(if(this.flags.erc721metadata)),1057 Collection(via(common_mut returns CollectionHandle<T>)),1058 TokenProperties,1059 )1060)]1061impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}10621063// Not a tests, but code generators1064generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);1065generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);10661067impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>1068where1069 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1070{1071 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");10721073 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {1074 call::<T, UniqueNFTCall<T>, _, _>(handle, self)1075 }1076}pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -39,7 +39,7 @@
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
-use sp_core::{H160, Get};
+use sp_core::{H160, U256, Get};
use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};
use up_data_structs::{
CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,
@@ -125,7 +125,7 @@
fn set_property(
&mut self,
caller: caller,
- token_id: uint256,
+ token_id: U256,
key: string,
value: bytes,
) -> Result<()> {
@@ -158,7 +158,7 @@
fn set_properties(
&mut self,
caller: caller,
- token_id: uint256,
+ token_id: U256,
properties: Vec<eth::Property>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -190,7 +190,7 @@
/// @param key Property key.
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]
- fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {
+ fn delete_property(&mut self, token_id: U256, caller: caller, key: string) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
@@ -212,7 +212,7 @@
#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]
fn delete_properties(
&mut self,
- token_id: uint256,
+ token_id: U256,
caller: caller,
keys: Vec<string>,
) -> Result<()> {
@@ -242,7 +242,7 @@
/// @param tokenId ID of the token.
/// @param key Property key.
/// @return Property value bytes
- fn property(&self, token_id: uint256, key: string) -> Result<bytes> {
+ fn property(&self, token_id: U256, key: string) -> Result<bytes> {
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
let key = <Vec<u8>>::from(key)
.try_into()
@@ -266,7 +266,7 @@
#[indexed]
to: address,
#[indexed]
- token_id: uint256,
+ token_id: U256,
},
/// @dev Not supported
Approval {
@@ -275,7 +275,7 @@
#[indexed]
approved: address,
#[indexed]
- token_id: uint256,
+ token_id: U256,
},
/// @dev Not supported
#[allow(dead_code)]
@@ -319,7 +319,7 @@
///
/// @return token's const_metadata
#[solidity(rename_selector = "tokenURI")]
- fn token_uri(&self, token_id: uint256) -> Result<string> {
+ fn token_uri(&self, token_id: U256) -> Result<string> {
let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
match get_token_property(self, token_id_u32, &key::url()).as_deref() {
@@ -365,12 +365,12 @@
/// @param index A counter less than `totalSupply()`
/// @return The token identifier for the `index`th NFT,
/// (sort order not specified)
- fn token_by_index(&self, index: uint256) -> Result<uint256> {
+ fn token_by_index(&self, index: U256) -> Result<U256> {
Ok(index)
}
/// Not implemented
- fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {
+ fn token_of_owner_by_index(&self, _owner: address, _index: U256) -> Result<U256> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -378,7 +378,7 @@
/// @notice Count RFTs tracked by this contract
/// @return A count of valid RFTs tracked by this contract, where each one of
/// them has an assigned and queryable owner not equal to the zero address
- fn total_supply(&self) -> Result<uint256> {
+ fn total_supply(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<Pallet<T>>::total_supply(self).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<uint256> {
+ fn balance_of(&self, owner: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let balance = <AccountBalance<T>>::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: uint256) -> Result<address> {
+ fn owner_of(&self, token_id: U256) -> Result<address> {
self.consume_store_reads(2)?;
let token = token_id.try_into()?;
let owner = <Pallet<T>>::token_owner(self.id, token);
@@ -422,7 +422,7 @@
&mut self,
_from: address,
_to: address,
- _token_id: uint256,
+ _token_id: U256,
_data: bytes,
) -> Result<()> {
// TODO: Not implemetable
@@ -431,12 +431,7 @@
/// @dev Not implemented
#[solidity(rename_selector = "safeTransferFrom")]
- fn safe_transfer_from(
- &mut self,
- _from: address,
- _to: address,
- _token_id: uint256,
- ) -> Result<()> {
+ fn safe_transfer_from(&mut self, _from: address, _to: address, _token_id: U256) -> Result<()> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -457,7 +452,7 @@
caller: caller,
from: address,
to: address,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
@@ -477,7 +472,7 @@
}
/// @dev Not implemented
- fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<()> {
+ fn approve(&mut self, _caller: caller, _approved: address, _token_id: U256) -> Result<()> {
Err("not implemented".into())
}
@@ -501,7 +496,7 @@
}
/// @dev Not implemented
- fn get_approved(&self, _token_id: uint256) -> Result<address> {
+ fn get_approved(&self, _token_id: U256) -> Result<address> {
// TODO: Not implemetable
Err("not implemented".into())
}
@@ -556,7 +551,7 @@
/// operator of the current owner.
/// @param tokenId The RFT to approve
#[weight(<SelfWeightOf<T>>::burn_item_fully())]
- fn burn(&mut self, caller: caller, token_id: uint256) -> Result<()> {
+ fn burn(&mut self, caller: caller, token_id: U256) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token = token_id.try_into()?;
@@ -575,8 +570,8 @@
/// @param to The new owner
/// @return uint256 The id of the newly minted token
#[weight(<SelfWeightOf<T>>::create_item())]
- fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {
- let token_id: uint256 = <TokensMinted<T>>::get(self.id)
+ fn mint(&mut self, caller: caller, to: address) -> Result<U256> {
+ let token_id: U256 = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?
.into();
@@ -591,7 +586,7 @@
/// @param tokenId ID of the minted RFT
#[solidity(hide, rename_selector = "mint")]
#[weight(<SelfWeightOf<T>>::create_item())]
- fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {
+ fn mint_check_id(&mut self, caller: caller, to: address, token_id: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let token_id: u32 = token_id.try_into()?;
@@ -637,8 +632,8 @@
caller: caller,
to: address,
token_uri: string,
- ) -> Result<uint256> {
- let token_id: uint256 = <TokensMinted<T>>::get(self.id)
+ ) -> Result<U256> {
+ let token_id: U256 = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?
.into();
@@ -658,7 +653,7 @@
&mut self,
caller: caller,
to: address,
- token_id: uint256,
+ token_id: U256,
token_uri: string,
) -> Result<bool> {
let key = key::url();
@@ -768,7 +763,7 @@
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
- fn cross_owner_of(&self, token_id: uint256) -> Result<eth::CrossAddress> {
+ fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
Self::token_owner(&self, token_id.try_into()?)
.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
@@ -779,7 +774,7 @@
/// @param tokenId Id for the token.
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
+ fn properties(&self, token_id: U256, keys: Vec<string>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -805,7 +800,7 @@
/// @param to The new owner
/// @param tokenId The RFT to transfer
#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]
- fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> 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()?;
@@ -832,7 +827,7 @@
&mut self,
caller: caller,
to: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -861,7 +856,7 @@
caller: caller,
from: eth::CrossAddress,
to: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -888,7 +883,7 @@
/// @param tokenId The RFT to transfer
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::burn_from())]
- fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> 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()?;
@@ -916,7 +911,7 @@
&mut self,
caller: caller,
from: eth::CrossAddress,
- token_id: uint256,
+ token_id: U256,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -934,7 +929,7 @@
}
/// @notice Returns next free RFT ID.
- fn next_token_id(&self) -> Result<uint256> {
+ fn next_token_id(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -949,7 +944,7 @@
/// @param tokenIds IDs of the minted RFTs
#[solidity(hide)]
#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]
- fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {
+ fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<U256>) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let mut expected_index = <TokensMinted<T>>::get(self.id)
@@ -996,7 +991,7 @@
&mut self,
caller: caller,
to: address,
- tokens: Vec<(uint256, string)>,
+ tokens: Vec<(U256, string)>,
) -> Result<bool> {
let key = key::url();
let caller = T::CrossAccountId::from_eth(caller);
@@ -1054,7 +1049,7 @@
caller: caller,
to: eth::CrossAddress,
properties: Vec<eth::Property>,
- ) -> Result<uint256> {
+ ) -> Result<U256> {
let token_id = <TokensMinted<T>>::get(self.id)
.checked_add(1)
.ok_or("item id overflow")?;
@@ -1093,7 +1088,7 @@
/// Returns EVM address for refungible token
///
/// @param token ID of the token
- fn token_contract_address(&self, token: uint256) -> Result<address> {
+ fn token_contract_address(&self, token: U256) -> Result<address> {
Ok(T::EvmTokenAddressMapping::token_to_address(
self.id,
token.try_into().map_err(|_| "token id overflow")?,
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -37,6 +37,7 @@
use pallet_evm_coder_substrate::{call, dispatch_to_evm, WithRecorder};
use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
use sp_std::vec::Vec;
+use sp_core::U256;
use up_data_structs::TokenId;
use crate::{
@@ -55,7 +56,7 @@
Ok(collection_id_to_address(self.id))
}
- fn parent_token_id(&self) -> Result<uint256> {
+ fn parent_token_id(&self) -> Result<U256> {
Ok(self.1.into())
}
}
@@ -71,7 +72,7 @@
from: address,
#[indexed]
to: address,
- value: uint256,
+ value: U256,
},
/// @dev This event is emitted when the amount of tokens (value) is approved
/// by the owner to be used by the spender.
@@ -80,7 +81,7 @@
owner: address,
#[indexed]
spender: address,
- value: uint256,
+ value: U256,
},
}
@@ -103,7 +104,7 @@
}
/// @dev Total number of tokens in existence
- fn total_supply(&self) -> Result<uint256> {
+ fn total_supply(&self) -> Result<U256> {
self.consume_store_reads(1)?;
Ok(<TotalSupply<T>>::get((self.id, self.1)).into())
}
@@ -117,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<uint256> {
+ fn balance_of(&self, owner: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let balance = <Balance<T>>::get((self.id, self.1, owner));
@@ -128,7 +129,7 @@
/// @param to The address to transfer to.
/// @param amount The amount to be transferred.
#[weight(<CommonWeights<T>>::transfer())]
- fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {
+ fn transfer(&mut self, caller: caller, to: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = T::CrossAccountId::from_eth(to);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -151,7 +152,7 @@
caller: caller,
from: address,
to: address,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
@@ -174,7 +175,7 @@
/// @param spender The address which will spend the funds.
/// @param amount The amount of tokens to be spent.
#[weight(<SelfWeightOf<T>>::approve())]
- fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {
+ fn approve(&mut self, caller: caller, spender: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let spender = T::CrossAccountId::from_eth(spender);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -188,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<uint256> {
+ fn allowance(&self, owner: address, spender: address) -> Result<U256> {
self.consume_store_reads(1)?;
let owner = T::CrossAccountId::from_eth(owner);
let spender = T::CrossAccountId::from_eth(spender);
@@ -208,7 +209,7 @@
/// @param amount The amount that will be burnt.
#[weight(<SelfWeightOf<T>>::burn_from())]
#[solidity(hide)]
- fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {
+ fn burn_from(&mut self, caller: caller, from: address, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = T::CrossAccountId::from_eth(from);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -230,7 +231,7 @@
&mut self,
caller: caller,
from: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
@@ -256,7 +257,7 @@
&mut self,
caller: caller,
spender: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let spender = spender.into_sub_cross_account::<T>()?;
@@ -270,7 +271,7 @@
/// Throws if `msg.sender` doesn't owns all of the tokens.
/// @param amount New total amount of the tokens.
#[weight(<SelfWeightOf<T>>::repartition_item())]
- fn repartition(&mut self, caller: caller, amount: uint256) -> Result<bool> {
+ fn repartition(&mut self, caller: caller, amount: U256) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -286,7 +287,7 @@
&mut self,
caller: caller,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
@@ -310,7 +311,7 @@
caller: caller,
from: pallet_common::eth::CrossAddress,
to: pallet_common::eth::CrossAddress,
- amount: uint256,
+ amount: U256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let from = from.into_sub_cross_account::<T>()?;
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -51,6 +51,12 @@
},
{
"anonymous": false,
+ "inputs": [],
+ "name": "MintingFinished",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -417,6 +423,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "finishMinting",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -504,6 +517,13 @@
},
{
"inputs": [],
+ "name": "mintingFinished",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -51,6 +51,12 @@
},
{
"anonymous": false,
+ "inputs": [],
+ "name": "MintingFinished",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -399,6 +405,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "finishMinting",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -486,6 +499,13 @@
},
{
"inputs": [],
+ "name": "mintingFinished",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
tests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -98,6 +98,16 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "from", "type": "address" },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
+ ],
+ "name": "burnFrom",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{
"components": [
{ "internalType": "address", "name": "eth", "type": "address" },