difftreelog
refactor evm type names
in: master
30 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -35,8 +35,7 @@
use crate::{
Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
eth::{
- Property as PropertyStruct, EthCrossAccount, CollectionPermissions as EvmPermissions,
- CollectionLimitField as EvmCollectionLimits, self,
+ CollectionPermissions as EvmPermissions, CollectionLimitField as EvmCollectionLimits, self,
},
weights::WeightInfo,
};
@@ -122,13 +121,13 @@
fn set_collection_properties(
&mut self,
caller: caller,
- properties: Vec<PropertyStruct>,
+ properties: Vec<eth::Property>,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
let properties = properties
.into_iter()
- .map(|PropertyStruct { key, value }| {
+ .map(|eth::Property { key, value }| {
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
@@ -196,7 +195,7 @@
///
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {
+ fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -218,7 +217,7 @@
let key =
string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok(PropertyStruct { key, value })
+ Ok(eth::Property { key, value })
})
.collect::<Result<Vec<_>>>()?;
Ok(properties)
@@ -248,7 +247,7 @@
fn set_collection_sponsor_cross(
&mut self,
caller: caller,
- sponsor: EthCrossAccount,
+ sponsor: eth::CrossAccount,
) -> Result<void> {
self.consume_store_reads_and_writes(1, 1)?;
@@ -288,13 +287,13 @@
/// Get current sponsor.
///
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
- fn collection_sponsor(&self) -> Result<EthCrossAccount> {
+ fn collection_sponsor(&self) -> Result<eth::CrossAccount> {
let sponsor = match self.collection.sponsorship.sponsor() {
Some(sponsor) => sponsor,
None => return Ok(Default::default()),
};
- Ok(EthCrossAccount::from_sub::<T>(&sponsor))
+ Ok(eth::CrossAccount::from_sub::<T>(&sponsor))
}
/// Get current collection limits.
@@ -377,7 +376,7 @@
fn add_collection_admin_cross(
&mut self,
caller: caller,
- new_admin: EthCrossAccount,
+ new_admin: eth::CrossAccount,
) -> Result<void> {
self.consume_store_reads_and_writes(2, 2)?;
@@ -392,7 +391,7 @@
fn remove_collection_admin_cross(
&mut self,
caller: caller,
- admin: EthCrossAccount,
+ admin: eth::CrossAccount,
) -> Result<void> {
self.consume_store_reads_and_writes(2, 2)?;
@@ -534,7 +533,7 @@
/// Checks that user allowed to operate with collection.
///
/// @param user User address to check.
- fn allowlisted_cross(&self, user: EthCrossAccount) -> Result<bool> {
+ fn allowlisted_cross(&self, user: eth::CrossAccount) -> Result<bool> {
let user = user.into_sub_cross_account::<T>()?;
Ok(Pallet::<T>::allowed(self.id, user))
}
@@ -558,7 +557,7 @@
fn add_to_collection_allow_list_cross(
&mut self,
caller: caller,
- user: EthCrossAccount,
+ user: eth::CrossAccount,
) -> Result<void> {
self.consume_store_writes(1)?;
@@ -587,7 +586,7 @@
fn remove_from_collection_allow_list_cross(
&mut self,
caller: caller,
- user: EthCrossAccount,
+ user: eth::CrossAccount,
) -> Result<void> {
self.consume_store_writes(1)?;
@@ -625,7 +624,7 @@
///
/// @param user User cross account to verify
/// @return "true" if account is the owner or admin
- fn is_owner_or_admin_cross(&self, user: EthCrossAccount) -> Result<bool> {
+ fn is_owner_or_admin_cross(&self, user: eth::CrossAccount) -> Result<bool> {
let user = user.into_sub_cross_account::<T>()?;
Ok(self.is_owner_or_admin(&user))
}
@@ -646,8 +645,8 @@
///
/// @return Tuble with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
- fn collection_owner(&self) -> Result<EthCrossAccount> {
- Ok(EthCrossAccount::from_sub_cross_account::<T>(
+ fn collection_owner(&self) -> Result<eth::CrossAccount> {
+ Ok(eth::CrossAccount::from_sub_cross_account::<T>(
&T::CrossAccountId::from_sub(self.owner.clone()),
))
}
@@ -670,9 +669,9 @@
///
/// @return Vector of tuples with admins address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
- fn collection_admins(&self) -> Result<Vec<EthCrossAccount>> {
+ fn collection_admins(&self) -> Result<Vec<eth::CrossAccount>> {
let result = crate::IsAdmin::<T>::iter_prefix((self.id,))
- .map(|(admin, _)| EthCrossAccount::from_sub_cross_account::<T>(&admin))
+ .map(|(admin, _)| eth::CrossAccount::from_sub_cross_account::<T>(&admin))
.collect();
Ok(result)
}
@@ -684,7 +683,7 @@
fn change_collection_owner_cross(
&mut self,
caller: caller,
- new_owner: EthCrossAccount,
+ new_owner: eth::CrossAccount,
) -> Result<void> {
self.consume_store_writes(1)?;
@@ -693,29 +692,6 @@
self.change_owner(caller, new_owner)
.map_err(dispatch_to_evm::<T>)
}
-}
-
-/// ### Note
-/// Do not forget to add: `self.consume_store_reads(1)?;`
-fn check_is_owner_or_admin<T: Config>(
- caller: caller,
- collection: &CollectionHandle<T>,
-) -> Result<T::CrossAccountId> {
- let caller = T::CrossAccountId::from_eth(caller);
- collection
- .check_is_owner_or_admin(&caller)
- .map_err(dispatch_to_evm::<T>)?;
- Ok(caller)
-}
-
-/// ### Note
-/// Do not forget to add: `self.consume_store_writes(1)?;`
-fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {
- collection
- .check_is_internal()
- .map_err(dispatch_to_evm::<T>)?;
- collection.save().map_err(dispatch_to_evm::<T>)?;
- Ok(())
}
/// Contains static property keys and values.
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -68,13 +68,13 @@
/// Cross account struct
#[derive(Debug, Default, AbiCoder)]
-pub struct EthCrossAccount {
+pub struct CrossAccount {
pub(crate) eth: address,
pub(crate) sub: uint256,
}
-impl EthCrossAccount {
- /// Converts `CrossAccountId` to `EthCrossAccountId`
+impl CrossAccount {
+ /// Converts `CrossAccountId` to [`CrossAccount`]
pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self
where
T: pallet_evm::Config,
@@ -89,7 +89,7 @@
}
}
}
- /// Creates `EthCrossAccount` from substrate account
+ /// Creates [`CrossAccount`] from substrate account
pub fn from_sub<T>(account_id: &T::AccountId) -> Self
where
T: pallet_evm::Config,
@@ -100,7 +100,7 @@
sub: uint256::from_big_endian(account_id.as_ref()),
}
}
- /// Converts `EthCrossAccount` to `CrossAccountId`
+ /// Converts [`CrossAccount`] to `CrossAccountId`
pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>
where
T: pallet_evm::Config,
@@ -127,7 +127,7 @@
pub value: evm_coder::types::bytes,
}
-/// [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
#[derive(Debug, Default, Clone, Copy, AbiCoder)]
#[repr(u8)]
pub enum CollectionLimitField {
@@ -160,6 +160,7 @@
TransferEnabled,
}
+/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
#[derive(Debug, Default, AbiCoder)]
pub struct CollectionLimit {
field: CollectionLimitField,
@@ -168,6 +169,7 @@
}
impl CollectionLimit {
+ /// Make [`CollectionLimit`] from [`CollectionLimitField`] and int value.
pub fn from_int(field: CollectionLimitField, value: u32) -> Self {
Self {
field,
@@ -176,6 +178,7 @@
}
}
+ /// Make [`CollectionLimit`] from [`CollectionLimitField`] and optional int value.
pub fn from_opt_int(field: CollectionLimitField, value: Option<u32>) -> Self {
value
.map(|v| Self {
@@ -190,6 +193,7 @@
})
}
+ /// Make [`CollectionLimit`] from [`CollectionLimitField`] and bool value.
pub fn from_opt_bool(field: CollectionLimitField, value: Option<bool>) -> Self {
value
.map(|v| Self {
@@ -306,6 +310,7 @@
}
impl PropertyPermission {
+ /// Make vector of [`PropertyPermission`] from [`up_data_structs::PropertyPermission`].
pub fn into_vec(pp: up_data_structs::PropertyPermission) -> Vec<Self> {
vec![
PropertyPermission {
@@ -323,6 +328,7 @@
]
}
+ /// Make [`up_data_structs::PropertyPermission`] from vector of [`PropertyPermission`].
pub fn from_vec(permission: Vec<Self>) -> up_data_structs::PropertyPermission {
let mut token_permission = up_data_structs::PropertyPermission::default();
@@ -367,6 +373,7 @@
}
impl TokenPropertyPermission {
+ /// Convert vector of [`TokenPropertyPermission`] into vector of [`up_data_structs::PropertyKeyPermission`].
pub fn into_property_key_permissions(
permissions: Vec<TokenPropertyPermission>,
) -> evm_coder::execution::Result<Vec<up_data_structs::PropertyKeyPermission>> {
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -25,7 +25,6 @@
types::*,
ToLog,
};
-use pallet_common::eth::EthCrossAccount;
use pallet_evm::{
ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,
account::CrossAccountId,
@@ -175,10 +174,12 @@
///
/// @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<EthCrossAccount> {
- Ok(EthCrossAccount::from_sub_cross_account::<T>(
- &Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
- ))
+ fn sponsor(&self, contract_address: address) -> Result<pallet_common::eth::CrossAccount> {
+ Ok(
+ pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(
+ &Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
+ ),
+ )
}
/// Check tat contract has confirmed sponsor.
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -96,11 +96,11 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x766c4f37,
/// or in textual repr: sponsor(address)
- function sponsor(address contractAddress) public view returns (EthCrossAccount memory) {
+ function sponsor(address contractAddress) public view returns (CrossAccount memory) {
require(false, stub_error);
contractAddress;
dummy;
- return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Check tat contract has confirmed sponsor.
@@ -266,7 +266,7 @@
}
/// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
address eth;
uint256 sub;
}
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -27,7 +27,6 @@
use pallet_common::{
CollectionHandle,
erc::{CommonEvmHandler, PrecompileResult, CollectionCall},
- eth::EthCrossAccount,
};
use sp_std::vec::Vec;
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
@@ -175,7 +174,12 @@
}
#[weight(<SelfWeightOf<T>>::create_item())]
- fn mint_cross(&mut self, caller: caller, to: EthCrossAccount, amount: uint256) -> Result<bool> {
+ fn mint_cross(
+ &mut self,
+ caller: caller,
+ to: pallet_common::eth::CrossAccount,
+ amount: uint256,
+ ) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -191,7 +195,7 @@
fn approve_cross(
&mut self,
caller: caller,
- spender: EthCrossAccount,
+ spender: pallet_common::eth::CrossAccount,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -232,7 +236,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: EthCrossAccount,
+ from: pallet_common::eth::CrossAccount,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -274,7 +278,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: EthCrossAccount,
+ to: pallet_common::eth::CrossAccount,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -292,8 +296,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: EthCrossAccount,
- to: EthCrossAccount,
+ from: pallet_common::eth::CrossAccount,
+ to: pallet_common::eth::CrossAccount,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -114,7 +114,7 @@
/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
/// @dev EVM selector for this function is: 0x84a1d5a8,
/// or in textual repr: setCollectionSponsorCross((address,uint256))
- function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+ function setCollectionSponsorCross(CrossAccount memory sponsor) public {
require(false, stub_error);
sponsor;
dummy = 0;
@@ -152,10 +152,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (EthCrossAccount memory) {
+ function collectionSponsor() public view returns (CrossAccount memory) {
require(false, stub_error);
dummy;
- return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -193,7 +193,7 @@
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
/// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+ function addCollectionAdminCross(CrossAccount memory newAdmin) public {
require(false, stub_error);
newAdmin;
dummy = 0;
@@ -203,7 +203,7 @@
/// @param admin Cross account administrator address.
/// @dev EVM selector for this function is: 0x6c0cd173,
/// or in textual repr: removeCollectionAdminCross((address,uint256))
- function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+ function removeCollectionAdminCross(CrossAccount memory admin) public {
require(false, stub_error);
admin;
dummy = 0;
@@ -289,7 +289,7 @@
/// @param user User address to check.
/// @dev EVM selector for this function is: 0x91b6df49,
/// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {
+ function allowlistedCross(CrossAccount memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -312,7 +312,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+ function addToCollectionAllowListCross(CrossAccount memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -334,7 +334,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+ function removeFromCollectionAllowListCross(CrossAccount memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -370,7 +370,7 @@
/// @return "true" if account is the owner or admin
/// @dev EVM selector for this function is: 0x3e75a905,
/// or in textual repr: isOwnerOrAdminCross((address,uint256))
- function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+ function isOwnerOrAdminCross(CrossAccount memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -394,10 +394,10 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
- function collectionOwner() public view returns (EthCrossAccount memory) {
+ function collectionOwner() public view returns (CrossAccount memory) {
require(false, stub_error);
dummy;
- return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAccount(0x0000000000000000000000000000000000000000, 0);
}
// /// Changes collection owner to another account
@@ -418,10 +418,10 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0x5813216b,
/// or in textual repr: collectionAdmins()
- function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+ function collectionAdmins() public view returns (CrossAccount[] memory) {
require(false, stub_error);
dummy;
- return new EthCrossAccount[](0);
+ return new CrossAccount[](0);
}
/// Changes collection owner to another account
@@ -430,7 +430,7 @@
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0x6496c497,
/// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
+ function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
require(false, stub_error);
newOwner;
dummy = 0;
@@ -438,7 +438,7 @@
}
/// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
address eth;
uint256 sub;
}
@@ -463,13 +463,14 @@
uint256[] field_1;
}
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
bool status;
uint256 value;
}
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
enum CollectionLimitField {
/// @dev How many tokens can a user have on one account.
AccountTokenOwnership,
@@ -512,7 +513,7 @@
/// @dev EVM selector for this function is: 0x269e6158,
/// or in textual repr: mintCross((address,uint256),uint256)
- function mintCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+ function mintCross(CrossAccount memory to, uint256 amount) public returns (bool) {
require(false, stub_error);
to;
amount;
@@ -522,7 +523,7 @@
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
- function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {
+ function approveCross(CrossAccount memory spender, uint256 amount) public returns (bool) {
require(false, stub_error);
spender;
amount;
@@ -552,7 +553,7 @@
/// @param amount The amount that will be burnt.
/// @dev EVM selector for this function is: 0xbb2f5a58,
/// or in textual repr: burnFromCross((address,uint256),uint256)
- function burnFromCross(EthCrossAccount memory from, uint256 amount) public returns (bool) {
+ function burnFromCross(CrossAccount memory from, uint256 amount) public returns (bool) {
require(false, stub_error);
from;
amount;
@@ -573,7 +574,7 @@
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+ function transferCross(CrossAccount memory to, uint256 amount) public returns (bool) {
require(false, stub_error);
to;
amount;
@@ -584,8 +585,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- EthCrossAccount memory from,
- EthCrossAccount memory to,
+ CrossAccount memory from,
+ CrossAccount memory to,
uint256 amount
) public returns (bool) {
require(false, stub_error);
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -38,7 +38,6 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
- eth::{Property as PropertyStruct, EthCrossAccount},
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::call;
@@ -160,7 +159,7 @@
&mut self,
caller: caller,
token_id: uint256,
- properties: Vec<PropertyStruct>,
+ properties: Vec<pallet_common::eth::Property>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -171,7 +170,7 @@
let properties = properties
.into_iter()
- .map(|PropertyStruct { key, value }| {
+ .map(|pallet_common::eth::Property { key, value }| {
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
@@ -762,9 +761,9 @@
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
- fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {
+ fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAccount> {
Self::token_owner(&self, token_id.try_into()?)
- .map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))
+ .map(|o| pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
}
@@ -773,7 +772,11 @@
/// @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<PropertyStruct>> {
+ fn properties(
+ &self,
+ token_id: uint256,
+ keys: Vec<string>,
+ ) -> Result<Vec<pallet_common::eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -793,7 +796,7 @@
let key = string::from_utf8(p.key.to_vec())
.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok(PropertyStruct { key, value })
+ Ok(pallet_common::eth::Property { key, value })
})
.collect::<Result<Vec<_>>>()
}
@@ -808,7 +811,7 @@
fn approve_cross(
&mut self,
caller: caller,
- approved: EthCrossAccount,
+ approved: pallet_common::eth::CrossAccount,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -847,7 +850,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: EthCrossAccount,
+ to: pallet_common::eth::CrossAccount,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -871,8 +874,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: EthCrossAccount,
- to: EthCrossAccount,
+ from: pallet_common::eth::CrossAccount,
+ to: pallet_common::eth::CrossAccount,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -918,7 +921,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: EthCrossAccount,
+ from: pallet_common::eth::CrossAccount,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -1040,8 +1043,8 @@
fn mint_cross(
&mut self,
caller: caller,
- to: EthCrossAccount,
- properties: Vec<PropertyStruct>,
+ to: pallet_common::eth::CrossAccount,
+ properties: Vec<pallet_common::eth::Property>,
) -> Result<uint256> {
let token_id = <TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -1051,7 +1054,7 @@
let properties = properties
.into_iter()
- .map(|PropertyStruct { key, value }| {
+ .map(|pallet_common::eth::Property { key, value }| {
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -258,7 +258,7 @@
/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
/// @dev EVM selector for this function is: 0x84a1d5a8,
/// or in textual repr: setCollectionSponsorCross((address,uint256))
- function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+ function setCollectionSponsorCross(CrossAccount memory sponsor) public {
require(false, stub_error);
sponsor;
dummy = 0;
@@ -296,10 +296,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (EthCrossAccount memory) {
+ function collectionSponsor() public view returns (CrossAccount memory) {
require(false, stub_error);
dummy;
- return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -337,7 +337,7 @@
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
/// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+ function addCollectionAdminCross(CrossAccount memory newAdmin) public {
require(false, stub_error);
newAdmin;
dummy = 0;
@@ -347,7 +347,7 @@
/// @param admin Cross account administrator address.
/// @dev EVM selector for this function is: 0x6c0cd173,
/// or in textual repr: removeCollectionAdminCross((address,uint256))
- function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+ function removeCollectionAdminCross(CrossAccount memory admin) public {
require(false, stub_error);
admin;
dummy = 0;
@@ -433,7 +433,7 @@
/// @param user User address to check.
/// @dev EVM selector for this function is: 0x91b6df49,
/// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {
+ function allowlistedCross(CrossAccount memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -456,7 +456,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+ function addToCollectionAllowListCross(CrossAccount memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -478,7 +478,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+ function removeFromCollectionAllowListCross(CrossAccount memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -514,7 +514,7 @@
/// @return "true" if account is the owner or admin
/// @dev EVM selector for this function is: 0x3e75a905,
/// or in textual repr: isOwnerOrAdminCross((address,uint256))
- function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+ function isOwnerOrAdminCross(CrossAccount memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -538,10 +538,10 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
- function collectionOwner() public view returns (EthCrossAccount memory) {
+ function collectionOwner() public view returns (CrossAccount memory) {
require(false, stub_error);
dummy;
- return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAccount(0x0000000000000000000000000000000000000000, 0);
}
// /// Changes collection owner to another account
@@ -562,10 +562,10 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0x5813216b,
/// or in textual repr: collectionAdmins()
- function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+ function collectionAdmins() public view returns (CrossAccount[] memory) {
require(false, stub_error);
dummy;
- return new EthCrossAccount[](0);
+ return new CrossAccount[](0);
}
/// Changes collection owner to another account
@@ -574,7 +574,7 @@
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0x6496c497,
/// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
+ function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
require(false, stub_error);
newOwner;
dummy = 0;
@@ -582,7 +582,7 @@
}
/// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
address eth;
uint256 sub;
}
@@ -607,13 +607,14 @@
uint256[] field_1;
}
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
bool status;
uint256 value;
}
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
enum CollectionLimitField {
/// @dev How many tokens can a user have on one account.
AccountTokenOwnership,
@@ -813,11 +814,11 @@
/// @param tokenId Id for the token.
/// @dev EVM selector for this function is: 0x2b29dace,
/// or in textual repr: crossOwnerOf(uint256)
- function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+ function crossOwnerOf(uint256 tokenId) public view returns (CrossAccount memory) {
require(false, stub_error);
tokenId;
dummy;
- return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Returns the token properties.
@@ -843,7 +844,7 @@
/// @param tokenId The NFT to approve
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
- function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {
+ function approveCross(CrossAccount memory approved, uint256 tokenId) public {
require(false, stub_error);
approved;
tokenId;
@@ -871,7 +872,7 @@
/// @param tokenId The NFT to transfer
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(EthCrossAccount memory to, uint256 tokenId) public {
+ function transferCross(CrossAccount memory to, uint256 tokenId) public {
require(false, stub_error);
to;
tokenId;
@@ -887,8 +888,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- EthCrossAccount memory from,
- EthCrossAccount memory to,
+ CrossAccount memory from,
+ CrossAccount memory to,
uint256 tokenId
) public {
require(false, stub_error);
@@ -921,7 +922,7 @@
/// @param tokenId The NFT to transfer
/// @dev EVM selector for this function is: 0xbb2f5a58,
/// or in textual repr: burnFromCross((address,uint256),uint256)
- function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {
+ function burnFromCross(CrossAccount memory from, uint256 tokenId) public {
require(false, stub_error);
from;
tokenId;
@@ -973,7 +974,7 @@
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0xb904db03,
/// or in textual repr: mintCross((address,uint256),(string,bytes)[])
- function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ function mintCross(CrossAccount memory to, Property[] memory properties) public returns (uint256) {
require(false, stub_error);
to;
properties;
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -33,7 +33,6 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
erc::{CommonEvmHandler, CollectionCall, static_property::key},
- eth::{Property as PropertyStruct, EthCrossAccount},
Error as CommonError,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
@@ -163,7 +162,7 @@
&mut self,
caller: caller,
token_id: uint256,
- properties: Vec<PropertyStruct>,
+ properties: Vec<pallet_common::eth::Property>,
) -> Result<()> {
let caller = T::CrossAccountId::from_eth(caller);
let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -174,7 +173,7 @@
let properties = properties
.into_iter()
- .map(|PropertyStruct { key, value }| {
+ .map(|pallet_common::eth::Property { key, value }| {
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
@@ -797,9 +796,9 @@
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
- fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {
+ fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAccount> {
Self::token_owner(&self, token_id.try_into()?)
- .map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))
+ .map(|o| pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
}
@@ -808,7 +807,11 @@
/// @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<PropertyStruct>> {
+ fn properties(
+ &self,
+ token_id: uint256,
+ keys: Vec<string>,
+ ) -> Result<Vec<pallet_common::eth::Property>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -828,7 +831,7 @@
let key = string::from_utf8(p.key.to_vec())
.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok(PropertyStruct { key, value })
+ Ok(pallet_common::eth::Property { key, value })
})
.collect::<Result<Vec<_>>>()
}
@@ -865,7 +868,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: EthCrossAccount,
+ to: pallet_common::eth::CrossAccount,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -893,8 +896,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: EthCrossAccount,
- to: EthCrossAccount,
+ from: pallet_common::eth::CrossAccount,
+ to: pallet_common::eth::CrossAccount,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -949,7 +952,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: EthCrossAccount,
+ from: pallet_common::eth::CrossAccount,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -1086,8 +1089,8 @@
fn mint_cross(
&mut self,
caller: caller,
- to: EthCrossAccount,
- properties: Vec<PropertyStruct>,
+ to: pallet_common::eth::CrossAccount,
+ properties: Vec<pallet_common::eth::Property>,
) -> Result<uint256> {
let token_id = <TokensMinted<T>>::get(self.id)
.checked_add(1)
@@ -1097,7 +1100,7 @@
let properties = properties
.into_iter()
- .map(|PropertyStruct { key, value }| {
+ .map(|pallet_common::eth::Property { key, value }| {
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -30,7 +30,7 @@
use pallet_common::{
CommonWeightInfo,
erc::{CommonEvmHandler, PrecompileResult},
- eth::{collection_id_to_address, EthCrossAccount},
+ eth::collection_id_to_address,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm, WithRecorder};
@@ -224,7 +224,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: EthCrossAccount,
+ from: pallet_common::eth::CrossAccount,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -250,7 +250,7 @@
fn approve_cross(
&mut self,
caller: caller,
- spender: EthCrossAccount,
+ spender: pallet_common::eth::CrossAccount,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -280,7 +280,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: EthCrossAccount,
+ to: pallet_common::eth::CrossAccount,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -303,8 +303,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: EthCrossAccount,
- to: EthCrossAccount,
+ from: pallet_common::eth::CrossAccount,
+ to: pallet_common::eth::CrossAccount,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -92,12 +92,8 @@
use codec::{Encode, Decode, MaxEncodedLen};
use core::ops::Deref;
-use derivative::Derivative;
use evm_coder::ToLog;
-use frame_support::{
- BoundedBTreeMap, BoundedVec, ensure, fail, storage::with_transaction, transactional,
- pallet_prelude::ConstU32,
-};
+use frame_support::{BoundedVec, ensure, fail, storage::with_transaction, transactional};
use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
use pallet_evm_coder_substrate::WithRecorder;
use pallet_common::{
@@ -110,11 +106,10 @@
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
use up_data_structs::{
- AccessMode, budget::Budget, CollectionId, CollectionFlags, CollectionPropertiesVec,
- CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,
- MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,
- PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,
- CreateRefungibleExMultipleOwners,
+ AccessMode, budget::Budget, CollectionId, CollectionFlags, CreateCollectionData,
+ CustomDataLimit, mapping::TokenAddressMapping, MAX_REFUNGIBLE_PIECES, Property, PropertyKey,
+ PropertyKeyPermission, PropertyPermission, PropertyScope, PropertyValue, TokenId,
+ TrySetProperty, PropertiesPermissionMap, CreateRefungibleExMultipleOwners,
};
pub use pallet::*;
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -258,7 +258,7 @@
/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
/// @dev EVM selector for this function is: 0x84a1d5a8,
/// or in textual repr: setCollectionSponsorCross((address,uint256))
- function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+ function setCollectionSponsorCross(CrossAccount memory sponsor) public {
require(false, stub_error);
sponsor;
dummy = 0;
@@ -296,10 +296,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (EthCrossAccount memory) {
+ function collectionSponsor() public view returns (CrossAccount memory) {
require(false, stub_error);
dummy;
- return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -337,7 +337,7 @@
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
/// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+ function addCollectionAdminCross(CrossAccount memory newAdmin) public {
require(false, stub_error);
newAdmin;
dummy = 0;
@@ -347,7 +347,7 @@
/// @param admin Cross account administrator address.
/// @dev EVM selector for this function is: 0x6c0cd173,
/// or in textual repr: removeCollectionAdminCross((address,uint256))
- function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+ function removeCollectionAdminCross(CrossAccount memory admin) public {
require(false, stub_error);
admin;
dummy = 0;
@@ -433,7 +433,7 @@
/// @param user User address to check.
/// @dev EVM selector for this function is: 0x91b6df49,
/// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {
+ function allowlistedCross(CrossAccount memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -456,7 +456,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+ function addToCollectionAllowListCross(CrossAccount memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -478,7 +478,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+ function removeFromCollectionAllowListCross(CrossAccount memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -514,7 +514,7 @@
/// @return "true" if account is the owner or admin
/// @dev EVM selector for this function is: 0x3e75a905,
/// or in textual repr: isOwnerOrAdminCross((address,uint256))
- function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+ function isOwnerOrAdminCross(CrossAccount memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -538,10 +538,10 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
- function collectionOwner() public view returns (EthCrossAccount memory) {
+ function collectionOwner() public view returns (CrossAccount memory) {
require(false, stub_error);
dummy;
- return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAccount(0x0000000000000000000000000000000000000000, 0);
}
// /// Changes collection owner to another account
@@ -562,10 +562,10 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0x5813216b,
/// or in textual repr: collectionAdmins()
- function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+ function collectionAdmins() public view returns (CrossAccount[] memory) {
require(false, stub_error);
dummy;
- return new EthCrossAccount[](0);
+ return new CrossAccount[](0);
}
/// Changes collection owner to another account
@@ -574,7 +574,7 @@
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0x6496c497,
/// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
+ function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
require(false, stub_error);
newOwner;
dummy = 0;
@@ -582,7 +582,7 @@
}
/// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
address eth;
uint256 sub;
}
@@ -607,13 +607,14 @@
uint256[] field_1;
}
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
bool status;
uint256 value;
}
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
enum CollectionLimitField {
/// @dev How many tokens can a user have on one account.
AccountTokenOwnership,
@@ -811,11 +812,11 @@
/// @param tokenId Id for the token.
/// @dev EVM selector for this function is: 0x2b29dace,
/// or in textual repr: crossOwnerOf(uint256)
- function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+ function crossOwnerOf(uint256 tokenId) public view returns (CrossAccount memory) {
require(false, stub_error);
tokenId;
dummy;
- return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Returns the token properties.
@@ -856,7 +857,7 @@
/// @param tokenId The RFT to transfer
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(EthCrossAccount memory to, uint256 tokenId) public {
+ function transferCross(CrossAccount memory to, uint256 tokenId) public {
require(false, stub_error);
to;
tokenId;
@@ -872,8 +873,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- EthCrossAccount memory from,
- EthCrossAccount memory to,
+ CrossAccount memory from,
+ CrossAccount memory to,
uint256 tokenId
) public {
require(false, stub_error);
@@ -908,7 +909,7 @@
/// @param tokenId The RFT to transfer
/// @dev EVM selector for this function is: 0xbb2f5a58,
/// or in textual repr: burnFromCross((address,uint256),uint256)
- function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {
+ function burnFromCross(CrossAccount memory from, uint256 tokenId) public {
require(false, stub_error);
from;
tokenId;
@@ -960,7 +961,7 @@
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0xb904db03,
/// or in textual repr: mintCross((address,uint256),(string,bytes)[])
- function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ function mintCross(CrossAccount memory to, Property[] memory properties) public returns (uint256) {
require(false, stub_error);
to;
properties;
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungibleToken.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
@@ -58,7 +58,7 @@
/// @param amount The amount that will be burnt.
/// @dev EVM selector for this function is: 0xbb2f5a58,
/// or in textual repr: burnFromCross((address,uint256),uint256)
- function burnFromCross(EthCrossAccount memory from, uint256 amount) public returns (bool) {
+ function burnFromCross(CrossAccount memory from, uint256 amount) public returns (bool) {
require(false, stub_error);
from;
amount;
@@ -75,7 +75,7 @@
/// @param amount The amount of tokens to be spent.
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
- function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {
+ function approveCross(CrossAccount memory spender, uint256 amount) public returns (bool) {
require(false, stub_error);
spender;
amount;
@@ -100,7 +100,7 @@
/// @param amount The amount to be transferred.
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+ function transferCross(CrossAccount memory to, uint256 amount) public returns (bool) {
require(false, stub_error);
to;
amount;
@@ -115,8 +115,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- EthCrossAccount memory from,
- EthCrossAccount memory to,
+ CrossAccount memory from,
+ CrossAccount memory to,
uint256 amount
) public returns (bool) {
require(false, stub_error);
@@ -129,7 +129,7 @@
}
/// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
address eth;
uint256 sub;
}
tests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -226,7 +226,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "",
"type": "tuple"
}
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -56,7 +56,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "newAdmin",
"type": "tuple"
}
@@ -73,7 +73,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -100,7 +100,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -127,7 +127,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "spender",
"type": "tuple"
},
@@ -154,7 +154,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "from",
"type": "tuple"
},
@@ -172,7 +172,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "newOwner",
"type": "tuple"
}
@@ -191,7 +191,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount[]",
+ "internalType": "struct CrossAccount[]",
"name": "",
"type": "tuple[]"
}
@@ -279,7 +279,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "",
"type": "tuple"
}
@@ -322,7 +322,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "",
"type": "tuple"
}
@@ -381,7 +381,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -425,7 +425,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
@@ -450,7 +450,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "admin",
"type": "tuple"
}
@@ -474,7 +474,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -565,7 +565,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "sponsor",
"type": "tuple"
}
@@ -615,7 +615,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
@@ -644,7 +644,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "from",
"type": "tuple"
},
@@ -653,7 +653,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -87,7 +87,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "newAdmin",
"type": "tuple"
}
@@ -104,7 +104,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -121,7 +121,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -148,7 +148,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "approved",
"type": "tuple"
},
@@ -184,7 +184,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "from",
"type": "tuple"
},
@@ -202,7 +202,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "newOwner",
"type": "tuple"
}
@@ -221,7 +221,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount[]",
+ "internalType": "struct CrossAccount[]",
"name": "",
"type": "tuple[]"
}
@@ -309,7 +309,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "",
"type": "tuple"
}
@@ -352,7 +352,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "",
"type": "tuple"
}
@@ -385,7 +385,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "",
"type": "tuple"
}
@@ -459,7 +459,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -483,7 +483,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
@@ -579,7 +579,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "admin",
"type": "tuple"
}
@@ -603,7 +603,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -727,7 +727,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "sponsor",
"type": "tuple"
}
@@ -881,7 +881,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
@@ -910,7 +910,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "from",
"type": "tuple"
},
@@ -919,7 +919,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -87,7 +87,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "newAdmin",
"type": "tuple"
}
@@ -104,7 +104,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -121,7 +121,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -166,7 +166,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "from",
"type": "tuple"
},
@@ -184,7 +184,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "newOwner",
"type": "tuple"
}
@@ -203,7 +203,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount[]",
+ "internalType": "struct CrossAccount[]",
"name": "",
"type": "tuple[]"
}
@@ -291,7 +291,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "",
"type": "tuple"
}
@@ -334,7 +334,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "",
"type": "tuple"
}
@@ -367,7 +367,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "",
"type": "tuple"
}
@@ -441,7 +441,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -465,7 +465,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
@@ -561,7 +561,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "admin",
"type": "tuple"
}
@@ -585,7 +585,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "user",
"type": "tuple"
}
@@ -709,7 +709,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "sponsor",
"type": "tuple"
}
@@ -872,7 +872,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
@@ -901,7 +901,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "from",
"type": "tuple"
},
@@ -910,7 +910,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
tests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -76,7 +76,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "spender",
"type": "tuple"
},
@@ -113,7 +113,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "from",
"type": "tuple"
},
@@ -201,7 +201,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
@@ -230,7 +230,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "from",
"type": "tuple"
},
@@ -239,7 +239,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct EthCrossAccount",
+ "internalType": "struct CrossAccount",
"name": "to",
"type": "tuple"
},
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -69,7 +69,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x766c4f37,
/// or in textual repr: sponsor(address)
- function sponsor(address contractAddress) external view returns (EthCrossAccount memory);
+ function sponsor(address contractAddress) external view returns (CrossAccount memory);
/// Check tat contract has confirmed sponsor.
///
@@ -172,7 +172,7 @@
}
/// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
address eth;
uint256 sub;
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -78,7 +78,7 @@
/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
/// @dev EVM selector for this function is: 0x84a1d5a8,
/// or in textual repr: setCollectionSponsorCross((address,uint256))
- function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;
+ function setCollectionSponsorCross(CrossAccount memory sponsor) external;
/// Whether there is a pending sponsor.
/// @dev EVM selector for this function is: 0x058ac185,
@@ -102,7 +102,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (EthCrossAccount memory);
+ function collectionSponsor() external view returns (CrossAccount memory);
/// Get current collection limits.
///
@@ -127,13 +127,13 @@
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
/// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;
+ function addCollectionAdminCross(CrossAccount memory newAdmin) external;
/// Remove collection admin.
/// @param admin Cross account administrator address.
/// @dev EVM selector for this function is: 0x6c0cd173,
/// or in textual repr: removeCollectionAdminCross((address,uint256))
- function removeCollectionAdminCross(EthCrossAccount memory admin) external;
+ function removeCollectionAdminCross(CrossAccount memory admin) external;
// /// Add collection admin.
// /// @param newAdmin Address of the added administrator.
@@ -186,7 +186,7 @@
/// @param user User address to check.
/// @dev EVM selector for this function is: 0x91b6df49,
/// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(EthCrossAccount memory user) external view returns (bool);
+ function allowlistedCross(CrossAccount memory user) external view returns (bool);
// /// Add the user to the allowed list.
// ///
@@ -200,7 +200,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(EthCrossAccount memory user) external;
+ function addToCollectionAllowListCross(CrossAccount memory user) external;
// /// Remove the user from the allowed list.
// ///
@@ -214,7 +214,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;
+ function removeFromCollectionAllowListCross(CrossAccount memory user) external;
/// Switch permission for minting.
///
@@ -237,7 +237,7 @@
/// @return "true" if account is the owner or admin
/// @dev EVM selector for this function is: 0x3e75a905,
/// or in textual repr: isOwnerOrAdminCross((address,uint256))
- function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);
+ function isOwnerOrAdminCross(CrossAccount memory user) external view returns (bool);
/// Returns collection type
///
@@ -252,7 +252,7 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
- function collectionOwner() external view returns (EthCrossAccount memory);
+ function collectionOwner() external view returns (CrossAccount memory);
// /// Changes collection owner to another account
// ///
@@ -268,7 +268,7 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0x5813216b,
/// or in textual repr: collectionAdmins()
- function collectionAdmins() external view returns (EthCrossAccount[] memory);
+ function collectionAdmins() external view returns (CrossAccount[] memory);
/// Changes collection owner to another account
///
@@ -276,11 +276,11 @@
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0x6496c497,
/// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;
+ function changeCollectionOwnerCross(CrossAccount memory newOwner) external;
}
/// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
address eth;
uint256 sub;
}
@@ -305,13 +305,14 @@
uint256[] field_1;
}
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
bool status;
uint256 value;
}
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
enum CollectionLimitField {
/// @dev How many tokens can a user have on one account.
AccountTokenOwnership,
@@ -350,11 +351,11 @@
/// @dev EVM selector for this function is: 0x269e6158,
/// or in textual repr: mintCross((address,uint256),uint256)
- function mintCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+ function mintCross(CrossAccount memory to, uint256 amount) external returns (bool);
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
- function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);
+ function approveCross(CrossAccount memory spender, uint256 amount) external returns (bool);
// /// Burn tokens from account
// /// @dev Function that burns an `amount` of the tokens of a given account,
@@ -372,7 +373,7 @@
/// @param amount The amount that will be burnt.
/// @dev EVM selector for this function is: 0xbb2f5a58,
/// or in textual repr: burnFromCross((address,uint256),uint256)
- function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);
+ function burnFromCross(CrossAccount memory from, uint256 amount) external returns (bool);
/// Mint tokens for multiple accounts.
/// @param amounts array of pairs of account address and amount
@@ -382,13 +383,13 @@
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+ function transferCross(CrossAccount memory to, uint256 amount) external returns (bool);
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- EthCrossAccount memory from,
- EthCrossAccount memory to,
+ CrossAccount memory from,
+ CrossAccount memory to,
uint256 amount
) external returns (bool);
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -180,7 +180,7 @@
/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
/// @dev EVM selector for this function is: 0x84a1d5a8,
/// or in textual repr: setCollectionSponsorCross((address,uint256))
- function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;
+ function setCollectionSponsorCross(CrossAccount memory sponsor) external;
/// Whether there is a pending sponsor.
/// @dev EVM selector for this function is: 0x058ac185,
@@ -204,7 +204,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (EthCrossAccount memory);
+ function collectionSponsor() external view returns (CrossAccount memory);
/// Get current collection limits.
///
@@ -229,13 +229,13 @@
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
/// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;
+ function addCollectionAdminCross(CrossAccount memory newAdmin) external;
/// Remove collection admin.
/// @param admin Cross account administrator address.
/// @dev EVM selector for this function is: 0x6c0cd173,
/// or in textual repr: removeCollectionAdminCross((address,uint256))
- function removeCollectionAdminCross(EthCrossAccount memory admin) external;
+ function removeCollectionAdminCross(CrossAccount memory admin) external;
// /// Add collection admin.
// /// @param newAdmin Address of the added administrator.
@@ -288,7 +288,7 @@
/// @param user User address to check.
/// @dev EVM selector for this function is: 0x91b6df49,
/// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(EthCrossAccount memory user) external view returns (bool);
+ function allowlistedCross(CrossAccount memory user) external view returns (bool);
// /// Add the user to the allowed list.
// ///
@@ -302,7 +302,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(EthCrossAccount memory user) external;
+ function addToCollectionAllowListCross(CrossAccount memory user) external;
// /// Remove the user from the allowed list.
// ///
@@ -316,7 +316,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;
+ function removeFromCollectionAllowListCross(CrossAccount memory user) external;
/// Switch permission for minting.
///
@@ -339,7 +339,7 @@
/// @return "true" if account is the owner or admin
/// @dev EVM selector for this function is: 0x3e75a905,
/// or in textual repr: isOwnerOrAdminCross((address,uint256))
- function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);
+ function isOwnerOrAdminCross(CrossAccount memory user) external view returns (bool);
/// Returns collection type
///
@@ -354,7 +354,7 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
- function collectionOwner() external view returns (EthCrossAccount memory);
+ function collectionOwner() external view returns (CrossAccount memory);
// /// Changes collection owner to another account
// ///
@@ -370,7 +370,7 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0x5813216b,
/// or in textual repr: collectionAdmins()
- function collectionAdmins() external view returns (EthCrossAccount[] memory);
+ function collectionAdmins() external view returns (CrossAccount[] memory);
/// Changes collection owner to another account
///
@@ -378,11 +378,11 @@
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0x6496c497,
/// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;
+ function changeCollectionOwnerCross(CrossAccount memory newOwner) external;
}
/// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
address eth;
uint256 sub;
}
@@ -407,13 +407,14 @@
uint256[] field_1;
}
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
bool status;
uint256 value;
}
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
enum CollectionLimitField {
/// @dev How many tokens can a user have on one account.
AccountTokenOwnership,
@@ -552,7 +553,7 @@
/// @param tokenId Id for the token.
/// @dev EVM selector for this function is: 0x2b29dace,
/// or in textual repr: crossOwnerOf(uint256)
- function crossOwnerOf(uint256 tokenId) external view returns (EthCrossAccount memory);
+ function crossOwnerOf(uint256 tokenId) external view returns (CrossAccount memory);
/// Returns the token properties.
///
@@ -571,7 +572,7 @@
/// @param tokenId The NFT to approve
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
- function approveCross(EthCrossAccount memory approved, uint256 tokenId) external;
+ function approveCross(CrossAccount memory approved, uint256 tokenId) external;
/// @notice Transfer ownership of an NFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -589,7 +590,7 @@
/// @param tokenId The NFT to transfer
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(EthCrossAccount memory to, uint256 tokenId) external;
+ function transferCross(CrossAccount memory to, uint256 tokenId) external;
/// @notice Transfer ownership of an NFT from cross account address to cross account address
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -600,8 +601,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- EthCrossAccount memory from,
- EthCrossAccount memory to,
+ CrossAccount memory from,
+ CrossAccount memory to,
uint256 tokenId
) external;
@@ -623,7 +624,7 @@
/// @param tokenId The NFT to transfer
/// @dev EVM selector for this function is: 0xbb2f5a58,
/// or in textual repr: burnFromCross((address,uint256),uint256)
- function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;
+ function burnFromCross(CrossAccount memory from, uint256 tokenId) external;
/// @notice Returns next free NFT ID.
/// @dev EVM selector for this function is: 0x75794a3c,
@@ -654,7 +655,7 @@
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0xb904db03,
/// or in textual repr: mintCross((address,uint256),(string,bytes)[])
- function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
+ function mintCross(CrossAccount memory to, Property[] memory properties) external returns (uint256);
}
/// @dev anonymous struct
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows to set and delete token properties and change token property permissions.16/// @dev the ERC-165 identifier for this interface is 0xde0695c217interface TokenProperties is Dummy, ERC165 {18 // /// @notice Set permissions for token property.19 // /// @dev Throws error if `msg.sender` is not admin or owner of the collection.20 // /// @param key Property key.21 // /// @param isMutable Permission to mutate property.22 // /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.23 // /// @param tokenOwner Permission to mutate property by token owner if property is mutable.24 // /// @dev EVM selector for this function is: 0x222d97fa,25 // /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)26 // function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) external;2728 /// @notice Set permissions for token property.29 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.30 /// @param permissions Permissions for keys.31 /// @dev EVM selector for this function is: 0xbd92983a,32 /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])33 function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) external;3435 /// @notice Get permissions for token properties.36 /// @dev EVM selector for this function is: 0xf23d7790,37 /// or in textual repr: tokenPropertyPermissions()38 function tokenPropertyPermissions() external view returns (TokenPropertyPermission[] memory);3940 // /// @notice Set token property value.41 // /// @dev Throws error if `msg.sender` has no permission to edit the property.42 // /// @param tokenId ID of the token.43 // /// @param key Property key.44 // /// @param value Property value.45 // /// @dev EVM selector for this function is: 0x1752d67b,46 // /// or in textual repr: setProperty(uint256,string,bytes)47 // function setProperty(uint256 tokenId, string memory key, bytes memory value) external;4849 /// @notice Set token properties value.50 /// @dev Throws error if `msg.sender` has no permission to edit the property.51 /// @param tokenId ID of the token.52 /// @param properties settable properties53 /// @dev EVM selector for this function is: 0x14ed3a6e,54 /// or in textual repr: setProperties(uint256,(string,bytes)[])55 function setProperties(uint256 tokenId, Property[] memory properties) external;5657 // /// @notice Delete token property value.58 // /// @dev Throws error if `msg.sender` has no permission to edit the property.59 // /// @param tokenId ID of the token.60 // /// @param key Property key.61 // /// @dev EVM selector for this function is: 0x066111d1,62 // /// or in textual repr: deleteProperty(uint256,string)63 // function deleteProperty(uint256 tokenId, string memory key) external;6465 /// @notice Delete token properties value.66 /// @dev Throws error if `msg.sender` has no permission to edit the property.67 /// @param tokenId ID of the token.68 /// @param keys Properties key.69 /// @dev EVM selector for this function is: 0xc472d371,70 /// or in textual repr: deleteProperties(uint256,string[])71 function deleteProperties(uint256 tokenId, string[] memory keys) external;7273 /// @notice Get token property value.74 /// @dev Throws error if key not found75 /// @param tokenId ID of the token.76 /// @param key Property key.77 /// @return Property value bytes78 /// @dev EVM selector for this function is: 0x7228c327,79 /// or in textual repr: property(uint256,string)80 function property(uint256 tokenId, string memory key) external view returns (bytes memory);81}8283/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).84struct Property {85 /// @dev Property key.86 string key;87 /// @dev Property value.88 bytes value;89}9091/// @dev Ethereum representation of Token Property Permissions.92struct TokenPropertyPermission {93 /// @dev Token property key.94 string key;95 /// @dev Token property permissions.96 PropertyPermission[] permissions;97}9899/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.100struct PropertyPermission {101 /// @dev TokenPermission field.102 TokenPermissionField code;103 /// @dev TokenPermission value.104 bool value;105}106107/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.108enum TokenPermissionField {109 /// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]110 Mutable,111 /// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]112 TokenOwner,113 /// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]114 CollectionAdmin115}116117/// @title A contract that allows you to work with collections.118/// @dev the ERC-165 identifier for this interface is 0x23201442119interface Collection is Dummy, ERC165 {120 // /// Set collection property.121 // ///122 // /// @param key Property key.123 // /// @param value Propery value.124 // /// @dev EVM selector for this function is: 0x2f073f66,125 // /// or in textual repr: setCollectionProperty(string,bytes)126 // function setCollectionProperty(string memory key, bytes memory value) external;127128 /// Set collection properties.129 ///130 /// @param properties Vector of properties key/value pair.131 /// @dev EVM selector for this function is: 0x50b26b2a,132 /// or in textual repr: setCollectionProperties((string,bytes)[])133 function setCollectionProperties(Property[] memory properties) external;134135 // /// Delete collection property.136 // ///137 // /// @param key Property key.138 // /// @dev EVM selector for this function is: 0x7b7debce,139 // /// or in textual repr: deleteCollectionProperty(string)140 // function deleteCollectionProperty(string memory key) external;141142 /// Delete collection properties.143 ///144 /// @param keys Properties keys.145 /// @dev EVM selector for this function is: 0xee206ee3,146 /// or in textual repr: deleteCollectionProperties(string[])147 function deleteCollectionProperties(string[] memory keys) external;148149 /// Get collection property.150 ///151 /// @dev Throws error if key not found.152 ///153 /// @param key Property key.154 /// @return bytes The property corresponding to the key.155 /// @dev EVM selector for this function is: 0xcf24fd6d,156 /// or in textual repr: collectionProperty(string)157 function collectionProperty(string memory key) external view returns (bytes memory);158159 /// Get collection properties.160 ///161 /// @param keys Properties keys. Empty keys for all propertyes.162 /// @return Vector of properties key/value pairs.163 /// @dev EVM selector for this function is: 0x285fb8e6,164 /// or in textual repr: collectionProperties(string[])165 function collectionProperties(string[] memory keys) external view returns (Property[] memory);166167 // /// Set the sponsor of the collection.168 // ///169 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.170 // ///171 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.172 // /// @dev EVM selector for this function is: 0x7623402e,173 // /// or in textual repr: setCollectionSponsor(address)174 // function setCollectionSponsor(address sponsor) external;175176 /// Set the sponsor of the collection.177 ///178 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.179 ///180 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.181 /// @dev EVM selector for this function is: 0x84a1d5a8,182 /// or in textual repr: setCollectionSponsorCross((address,uint256))183 function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;184185 /// Whether there is a pending sponsor.186 /// @dev EVM selector for this function is: 0x058ac185,187 /// or in textual repr: hasCollectionPendingSponsor()188 function hasCollectionPendingSponsor() external view returns (bool);189190 /// Collection sponsorship confirmation.191 ///192 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.193 /// @dev EVM selector for this function is: 0x3c50e97a,194 /// or in textual repr: confirmCollectionSponsorship()195 function confirmCollectionSponsorship() external;196197 /// Remove collection sponsor.198 /// @dev EVM selector for this function is: 0x6e0326a3,199 /// or in textual repr: removeCollectionSponsor()200 function removeCollectionSponsor() external;201202 /// Get current sponsor.203 ///204 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.205 /// @dev EVM selector for this function is: 0x6ec0a9f1,206 /// or in textual repr: collectionSponsor()207 function collectionSponsor() external view returns (EthCrossAccount memory);208209 /// Get current collection limits.210 ///211 /// @return Array of collection limits212 /// @dev EVM selector for this function is: 0xf63bc572,213 /// or in textual repr: collectionLimits()214 function collectionLimits() external view returns (CollectionLimit[] memory);215216 /// Set limits for the collection.217 /// @dev Throws error if limit not found.218 /// @param limit Some limit.219 /// @dev EVM selector for this function is: 0x2a2235e7,220 /// or in textual repr: setCollectionLimit((uint8,bool,uint256))221 function setCollectionLimit(CollectionLimit memory limit) external;222223 /// Get contract address.224 /// @dev EVM selector for this function is: 0xf6b4dfb4,225 /// or in textual repr: contractAddress()226 function contractAddress() external view returns (address);227228 /// Add collection admin.229 /// @param newAdmin Cross account administrator address.230 /// @dev EVM selector for this function is: 0x859aa7d6,231 /// or in textual repr: addCollectionAdminCross((address,uint256))232 function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;233234 /// Remove collection admin.235 /// @param admin Cross account administrator address.236 /// @dev EVM selector for this function is: 0x6c0cd173,237 /// or in textual repr: removeCollectionAdminCross((address,uint256))238 function removeCollectionAdminCross(EthCrossAccount memory admin) external;239240 // /// Add collection admin.241 // /// @param newAdmin Address of the added administrator.242 // /// @dev EVM selector for this function is: 0x92e462c7,243 // /// or in textual repr: addCollectionAdmin(address)244 // function addCollectionAdmin(address newAdmin) external;245246 // /// Remove collection admin.247 // ///248 // /// @param admin Address of the removed administrator.249 // /// @dev EVM selector for this function is: 0xfafd7b42,250 // /// or in textual repr: removeCollectionAdmin(address)251 // function removeCollectionAdmin(address admin) external;252253 /// Toggle accessibility of collection nesting.254 ///255 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'256 /// @dev EVM selector for this function is: 0x112d4586,257 /// or in textual repr: setCollectionNesting(bool)258 function setCollectionNesting(bool enable) external;259260 /// Toggle accessibility of collection nesting.261 ///262 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'263 /// @param collections Addresses of collections that will be available for nesting.264 /// @dev EVM selector for this function is: 0x64872396,265 /// or in textual repr: setCollectionNesting(bool,address[])266 function setCollectionNesting(bool enable, address[] memory collections) external;267268 /// Returns nesting for a collection269 /// @dev EVM selector for this function is: 0x22d25bfe,270 /// or in textual repr: collectionNestingRestrictedCollectionIds()271 function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);272273 /// Returns permissions for a collection274 /// @dev EVM selector for this function is: 0x5b2eaf4b,275 /// or in textual repr: collectionNestingPermissions()276 function collectionNestingPermissions() external view returns (Tuple38[] memory);277278 /// Set the collection access method.279 /// @param mode Access mode280 /// 0 for Normal281 /// 1 for AllowList282 /// @dev EVM selector for this function is: 0x41835d4c,283 /// or in textual repr: setCollectionAccess(uint8)284 function setCollectionAccess(uint8 mode) external;285286 /// Checks that user allowed to operate with collection.287 ///288 /// @param user User address to check.289 /// @dev EVM selector for this function is: 0x91b6df49,290 /// or in textual repr: allowlistedCross((address,uint256))291 function allowlistedCross(EthCrossAccount memory user) external view returns (bool);292293 // /// Add the user to the allowed list.294 // ///295 // /// @param user Address of a trusted user.296 // /// @dev EVM selector for this function is: 0x67844fe6,297 // /// or in textual repr: addToCollectionAllowList(address)298 // function addToCollectionAllowList(address user) external;299300 /// Add user to allowed list.301 ///302 /// @param user User cross account address.303 /// @dev EVM selector for this function is: 0xa0184a3a,304 /// or in textual repr: addToCollectionAllowListCross((address,uint256))305 function addToCollectionAllowListCross(EthCrossAccount memory user) external;306307 // /// Remove the user from the allowed list.308 // ///309 // /// @param user Address of a removed user.310 // /// @dev EVM selector for this function is: 0x85c51acb,311 // /// or in textual repr: removeFromCollectionAllowList(address)312 // function removeFromCollectionAllowList(address user) external;313314 /// Remove user from allowed list.315 ///316 /// @param user User cross account address.317 /// @dev EVM selector for this function is: 0x09ba452a,318 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))319 function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;320321 /// Switch permission for minting.322 ///323 /// @param mode Enable if "true".324 /// @dev EVM selector for this function is: 0x00018e84,325 /// or in textual repr: setCollectionMintMode(bool)326 function setCollectionMintMode(bool mode) external;327328 // /// Check that account is the owner or admin of the collection329 // ///330 // /// @param user account to verify331 // /// @return "true" if account is the owner or admin332 // /// @dev EVM selector for this function is: 0x9811b0c7,333 // /// or in textual repr: isOwnerOrAdmin(address)334 // function isOwnerOrAdmin(address user) external view returns (bool);335336 /// Check that account is the owner or admin of the collection337 ///338 /// @param user User cross account to verify339 /// @return "true" if account is the owner or admin340 /// @dev EVM selector for this function is: 0x3e75a905,341 /// or in textual repr: isOwnerOrAdminCross((address,uint256))342 function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);343344 /// Returns collection type345 ///346 /// @return `Fungible` or `NFT` or `ReFungible`347 /// @dev EVM selector for this function is: 0xd34b55b8,348 /// or in textual repr: uniqueCollectionType()349 function uniqueCollectionType() external view returns (string memory);350351 /// Get collection owner.352 ///353 /// @return Tuble with sponsor address and his substrate mirror.354 /// If address is canonical then substrate mirror is zero and vice versa.355 /// @dev EVM selector for this function is: 0xdf727d3b,356 /// or in textual repr: collectionOwner()357 function collectionOwner() external view returns (EthCrossAccount memory);358359 // /// Changes collection owner to another account360 // ///361 // /// @dev Owner can be changed only by current owner362 // /// @param newOwner new owner account363 // /// @dev EVM selector for this function is: 0x4f53e226,364 // /// or in textual repr: changeCollectionOwner(address)365 // function changeCollectionOwner(address newOwner) external;366367 /// Get collection administrators368 ///369 /// @return Vector of tuples with admins address and his substrate mirror.370 /// If address is canonical then substrate mirror is zero and vice versa.371 /// @dev EVM selector for this function is: 0x5813216b,372 /// or in textual repr: collectionAdmins()373 function collectionAdmins() external view returns (EthCrossAccount[] memory);374375 /// Changes collection owner to another account376 ///377 /// @dev Owner can be changed only by current owner378 /// @param newOwner new owner cross account379 /// @dev EVM selector for this function is: 0x6496c497,380 /// or in textual repr: changeCollectionOwnerCross((address,uint256))381 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;382}383384/// @dev Cross account struct385struct EthCrossAccount {386 address eth;387 uint256 sub;388}389390/// @dev anonymous struct391struct Tuple38 {392 CollectionPermissions field_0;393 bool field_1;394}395396/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.397enum CollectionPermissions {398 /// @dev Owner of token can nest tokens under it.399 TokenOwner,400 /// @dev Admin of token collection can nest tokens under token.401 CollectionAdmin402}403404/// @dev anonymous struct405struct Tuple35 {406 bool field_0;407 uint256[] field_1;408}409410struct CollectionLimit {411 CollectionLimitField field;412 bool status;413 uint256 value;414}415416/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.417enum CollectionLimitField {418 /// @dev How many tokens can a user have on one account.419 AccountTokenOwnership,420 /// @dev How many bytes of data are available for sponsorship.421 SponsoredDataSize,422 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]423 SponsoredDataRateLimit,424 /// @dev How many tokens can be mined into this collection.425 TokenLimit,426 /// @dev Timeouts for transfer sponsoring.427 SponsorTransferTimeout,428 /// @dev Timeout for sponsoring an approval in passed blocks.429 SponsorApproveTimeout,430 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).431 OwnerCanTransfer,432 /// @dev Can the collection owner burn other people's tokens.433 OwnerCanDestroy,434 /// @dev Is it possible to send tokens from this collection between users.435 TransferEnabled436}437438/// @dev the ERC-165 identifier for this interface is 0x5b5e139f439interface ERC721Metadata is Dummy, ERC165 {440 // /// @notice A descriptive name for a collection of NFTs in this contract441 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`442 // /// @dev EVM selector for this function is: 0x06fdde03,443 // /// or in textual repr: name()444 // function name() external view returns (string memory);445446 // /// @notice An abbreviated name for NFTs in this contract447 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`448 // /// @dev EVM selector for this function is: 0x95d89b41,449 // /// or in textual repr: symbol()450 // function symbol() external view returns (string memory);451452 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.453 ///454 /// @dev If the token has a `url` property and it is not empty, it is returned.455 /// 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`.456 /// If the collection property `baseURI` is empty or absent, return "" (empty string)457 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix458 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).459 ///460 /// @return token's const_metadata461 /// @dev EVM selector for this function is: 0xc87b56dd,462 /// or in textual repr: tokenURI(uint256)463 function tokenURI(uint256 tokenId) external view returns (string memory);464}465466/// @title ERC721 Token that can be irreversibly burned (destroyed).467/// @dev the ERC-165 identifier for this interface is 0x42966c68468interface ERC721Burnable is Dummy, ERC165 {469 /// @notice Burns a specific ERC721 token.470 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized471 /// operator of the current owner.472 /// @param tokenId The RFT to approve473 /// @dev EVM selector for this function is: 0x42966c68,474 /// or in textual repr: burn(uint256)475 function burn(uint256 tokenId) external;476}477478/// @dev inlined interface479interface ERC721UniqueMintableEvents {480 event MintingFinished();481}482483/// @title ERC721 minting logic.484/// @dev the ERC-165 identifier for this interface is 0x476ff149485interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {486 /// @dev EVM selector for this function is: 0x05d2035b,487 /// or in textual repr: mintingFinished()488 function mintingFinished() external view returns (bool);489490 /// @notice Function to mint a token.491 /// @param to The new owner492 /// @return uint256 The id of the newly minted token493 /// @dev EVM selector for this function is: 0x6a627842,494 /// or in textual repr: mint(address)495 function mint(address to) external returns (uint256);496497 // /// @notice Function to mint a token.498 // /// @dev `tokenId` should be obtained with `nextTokenId` method,499 // /// unlike standard, you can't specify it manually500 // /// @param to The new owner501 // /// @param tokenId ID of the minted RFT502 // /// @dev EVM selector for this function is: 0x40c10f19,503 // /// or in textual repr: mint(address,uint256)504 // function mint(address to, uint256 tokenId) external returns (bool);505506 /// @notice Function to mint token with the given tokenUri.507 /// @param to The new owner508 /// @param tokenUri Token URI that would be stored in the NFT properties509 /// @return uint256 The id of the newly minted token510 /// @dev EVM selector for this function is: 0x45c17782,511 /// or in textual repr: mintWithTokenURI(address,string)512 function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);513514 // /// @notice Function to mint token with the given tokenUri.515 // /// @dev `tokenId` should be obtained with `nextTokenId` method,516 // /// unlike standard, you can't specify it manually517 // /// @param to The new owner518 // /// @param tokenId ID of the minted RFT519 // /// @param tokenUri Token URI that would be stored in the RFT properties520 // /// @dev EVM selector for this function is: 0x50bb4e7f,521 // /// or in textual repr: mintWithTokenURI(address,uint256,string)522 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);523524 /// @dev Not implemented525 /// @dev EVM selector for this function is: 0x7d64bcb4,526 /// or in textual repr: finishMinting()527 function finishMinting() external returns (bool);528}529530/// @title Unique extensions for ERC721.531/// @dev the ERC-165 identifier for this interface is 0xabf30dc2532interface ERC721UniqueExtensions is Dummy, ERC165 {533 /// @notice A descriptive name for a collection of NFTs in this contract534 /// @dev EVM selector for this function is: 0x06fdde03,535 /// or in textual repr: name()536 function name() external view returns (string memory);537538 /// @notice An abbreviated name for NFTs in this contract539 /// @dev EVM selector for this function is: 0x95d89b41,540 /// or in textual repr: symbol()541 function symbol() external view returns (string memory);542543 /// @notice A description for the collection.544 /// @dev EVM selector for this function is: 0x7284e416,545 /// or in textual repr: description()546 function description() external view returns (string memory);547548 /// Returns the owner (in cross format) of the token.549 ///550 /// @param tokenId Id for the token.551 /// @dev EVM selector for this function is: 0x2b29dace,552 /// or in textual repr: crossOwnerOf(uint256)553 function crossOwnerOf(uint256 tokenId) external view returns (EthCrossAccount memory);554555 /// Returns the token properties.556 ///557 /// @param tokenId Id for the token.558 /// @param keys Properties keys. Empty keys for all propertyes.559 /// @return Vector of properties key/value pairs.560 /// @dev EVM selector for this function is: 0xe07ede7e,561 /// or in textual repr: properties(uint256,string[])562 function properties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);563564 /// @notice Transfer ownership of an RFT565 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`566 /// is the zero address. Throws if `tokenId` is not a valid RFT.567 /// Throws if RFT pieces have multiple owners.568 /// @param to The new owner569 /// @param tokenId The RFT to transfer570 /// @dev EVM selector for this function is: 0xa9059cbb,571 /// or in textual repr: transfer(address,uint256)572 function transfer(address to, uint256 tokenId) external;573574 /// @notice Transfer ownership of an RFT575 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`576 /// is the zero address. Throws if `tokenId` is not a valid RFT.577 /// Throws if RFT pieces have multiple owners.578 /// @param to The new owner579 /// @param tokenId The RFT to transfer580 /// @dev EVM selector for this function is: 0x2ada85ff,581 /// or in textual repr: transferCross((address,uint256),uint256)582 function transferCross(EthCrossAccount memory to, uint256 tokenId) external;583584 /// @notice Transfer ownership of an RFT585 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`586 /// is the zero address. Throws if `tokenId` is not a valid RFT.587 /// Throws if RFT pieces have multiple owners.588 /// @param to The new owner589 /// @param tokenId The RFT to transfer590 /// @dev EVM selector for this function is: 0xd5cf430b,591 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)592 function transferFromCross(593 EthCrossAccount memory from,594 EthCrossAccount memory to,595 uint256 tokenId596 ) external;597598 // /// @notice Burns a specific ERC721 token.599 // /// @dev Throws unless `msg.sender` is the current owner or an authorized600 // /// operator for this RFT. Throws if `from` is not the current owner. Throws601 // /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.602 // /// Throws if RFT pieces have multiple owners.603 // /// @param from The current owner of the RFT604 // /// @param tokenId The RFT to transfer605 // /// @dev EVM selector for this function is: 0x79cc6790,606 // /// or in textual repr: burnFrom(address,uint256)607 // function burnFrom(address from, uint256 tokenId) external;608609 /// @notice Burns a specific ERC721 token.610 /// @dev Throws unless `msg.sender` is the current owner or an authorized611 /// operator for this RFT. Throws if `from` is not the current owner. Throws612 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.613 /// Throws if RFT pieces have multiple owners.614 /// @param from The current owner of the RFT615 /// @param tokenId The RFT to transfer616 /// @dev EVM selector for this function is: 0xbb2f5a58,617 /// or in textual repr: burnFromCross((address,uint256),uint256)618 function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;619620 /// @notice Returns next free RFT ID.621 /// @dev EVM selector for this function is: 0x75794a3c,622 /// or in textual repr: nextTokenId()623 function nextTokenId() external view returns (uint256);624625 // /// @notice Function to mint multiple tokens.626 // /// @dev `tokenIds` should be an array of consecutive numbers and first number627 // /// should be obtained with `nextTokenId` method628 // /// @param to The new owner629 // /// @param tokenIds IDs of the minted RFTs630 // /// @dev EVM selector for this function is: 0x44a9945e,631 // /// or in textual repr: mintBulk(address,uint256[])632 // function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);633634 // /// @notice Function to mint multiple tokens with the given tokenUris.635 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive636 // /// numbers and first number should be obtained with `nextTokenId` method637 // /// @param to The new owner638 // /// @param tokens array of pairs of token ID and token URI for minted tokens639 // /// @dev EVM selector for this function is: 0x36543006,640 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])641 // function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);642643 /// @notice Function to mint a token.644 /// @param to The new owner crossAccountId645 /// @param properties Properties of minted token646 /// @return uint256 The id of the newly minted token647 /// @dev EVM selector for this function is: 0xb904db03,648 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])649 function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);650651 /// Returns EVM address for refungible token652 ///653 /// @param token ID of the token654 /// @dev EVM selector for this function is: 0xab76fac6,655 /// or in textual repr: tokenContractAddress(uint256)656 function tokenContractAddress(uint256 token) external view returns (address);657}658659/// @dev anonymous struct660struct Tuple12 {661 uint256 field_0;662 string field_1;663}664665/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension666/// @dev See https://eips.ethereum.org/EIPS/eip-721667/// @dev the ERC-165 identifier for this interface is 0x780e9d63668interface ERC721Enumerable is Dummy, ERC165 {669 /// @notice Enumerate valid RFTs670 /// @param index A counter less than `totalSupply()`671 /// @return The token identifier for the `index`th NFT,672 /// (sort order not specified)673 /// @dev EVM selector for this function is: 0x4f6ccce7,674 /// or in textual repr: tokenByIndex(uint256)675 function tokenByIndex(uint256 index) external view returns (uint256);676677 /// Not implemented678 /// @dev EVM selector for this function is: 0x2f745c59,679 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)680 function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);681682 /// @notice Count RFTs tracked by this contract683 /// @return A count of valid RFTs tracked by this contract, where each one of684 /// them has an assigned and queryable owner not equal to the zero address685 /// @dev EVM selector for this function is: 0x18160ddd,686 /// or in textual repr: totalSupply()687 function totalSupply() external view returns (uint256);688}689690/// @dev inlined interface691interface ERC721Events {692 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);693 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);694 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);695}696697/// @title ERC-721 Non-Fungible Token Standard698/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md699/// @dev the ERC-165 identifier for this interface is 0x4016cd87700interface ERC721 is Dummy, ERC165, ERC721Events {701 /// @notice Count all RFTs assigned to an owner702 /// @dev RFTs assigned to the zero address are considered invalid, and this703 /// function throws for queries about the zero address.704 /// @param owner An address for whom to query the balance705 /// @return The number of RFTs owned by `owner`, possibly zero706 /// @dev EVM selector for this function is: 0x70a08231,707 /// or in textual repr: balanceOf(address)708 function balanceOf(address owner) external view returns (uint256);709710 /// @notice Find the owner of an RFT711 /// @dev RFTs assigned to zero address are considered invalid, and queries712 /// about them do throw.713 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for714 /// the tokens that are partially owned.715 /// @param tokenId The identifier for an RFT716 /// @return The address of the owner of the RFT717 /// @dev EVM selector for this function is: 0x6352211e,718 /// or in textual repr: ownerOf(uint256)719 function ownerOf(uint256 tokenId) external view returns (address);720721 /// @dev Not implemented722 /// @dev EVM selector for this function is: 0x60a11672,723 /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)724 function safeTransferFromWithData(725 address from,726 address to,727 uint256 tokenId,728 bytes memory data729 ) external;730731 /// @dev Not implemented732 /// @dev EVM selector for this function is: 0x42842e0e,733 /// or in textual repr: safeTransferFrom(address,address,uint256)734 function safeTransferFrom(735 address from,736 address to,737 uint256 tokenId738 ) external;739740 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE741 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE742 /// THEY MAY BE PERMANENTLY LOST743 /// @dev Throws unless `msg.sender` is the current owner or an authorized744 /// operator for this RFT. Throws if `from` is not the current owner. Throws745 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.746 /// Throws if RFT pieces have multiple owners.747 /// @param from The current owner of the NFT748 /// @param to The new owner749 /// @param tokenId The NFT to transfer750 /// @dev EVM selector for this function is: 0x23b872dd,751 /// or in textual repr: transferFrom(address,address,uint256)752 function transferFrom(753 address from,754 address to,755 uint256 tokenId756 ) external;757758 /// @dev Not implemented759 /// @dev EVM selector for this function is: 0x095ea7b3,760 /// or in textual repr: approve(address,uint256)761 function approve(address approved, uint256 tokenId) external;762763 /// @notice Sets or unsets the approval of a given operator.764 /// The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.765 /// @param operator Operator766 /// @param approved Should operator status be granted or revoked?767 /// @dev EVM selector for this function is: 0xa22cb465,768 /// or in textual repr: setApprovalForAll(address,bool)769 function setApprovalForAll(address operator, bool approved) external;770771 /// @dev Not implemented772 /// @dev EVM selector for this function is: 0x081812fc,773 /// or in textual repr: getApproved(uint256)774 function getApproved(uint256 tokenId) external view returns (address);775776 /// @notice Tells whether the given `owner` approves the `operator`.777 /// @dev EVM selector for this function is: 0xe985e9c5,778 /// or in textual repr: isApprovedForAll(address,address)779 function isApprovedForAll(address owner, address operator) external view returns (bool);780781 /// @notice Returns collection helper contract address782 /// @dev EVM selector for this function is: 0x1896cce6,783 /// or in textual repr: collectionHelperAddress()784 function collectionHelperAddress() external view returns (address);785}786787interface UniqueRefungible is788 Dummy,789 ERC165,790 ERC721,791 ERC721Enumerable,792 ERC721UniqueExtensions,793 ERC721UniqueMintable,794 ERC721Burnable,795 ERC721Metadata,796 Collection,797 TokenProperties798{}1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows to set and delete token properties and change token property permissions.16/// @dev the ERC-165 identifier for this interface is 0xde0695c217interface TokenProperties is Dummy, ERC165 {18 // /// @notice Set permissions for token property.19 // /// @dev Throws error if `msg.sender` is not admin or owner of the collection.20 // /// @param key Property key.21 // /// @param isMutable Permission to mutate property.22 // /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.23 // /// @param tokenOwner Permission to mutate property by token owner if property is mutable.24 // /// @dev EVM selector for this function is: 0x222d97fa,25 // /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)26 // function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) external;2728 /// @notice Set permissions for token property.29 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.30 /// @param permissions Permissions for keys.31 /// @dev EVM selector for this function is: 0xbd92983a,32 /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])33 function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) external;3435 /// @notice Get permissions for token properties.36 /// @dev EVM selector for this function is: 0xf23d7790,37 /// or in textual repr: tokenPropertyPermissions()38 function tokenPropertyPermissions() external view returns (TokenPropertyPermission[] memory);3940 // /// @notice Set token property value.41 // /// @dev Throws error if `msg.sender` has no permission to edit the property.42 // /// @param tokenId ID of the token.43 // /// @param key Property key.44 // /// @param value Property value.45 // /// @dev EVM selector for this function is: 0x1752d67b,46 // /// or in textual repr: setProperty(uint256,string,bytes)47 // function setProperty(uint256 tokenId, string memory key, bytes memory value) external;4849 /// @notice Set token properties value.50 /// @dev Throws error if `msg.sender` has no permission to edit the property.51 /// @param tokenId ID of the token.52 /// @param properties settable properties53 /// @dev EVM selector for this function is: 0x14ed3a6e,54 /// or in textual repr: setProperties(uint256,(string,bytes)[])55 function setProperties(uint256 tokenId, Property[] memory properties) external;5657 // /// @notice Delete token property value.58 // /// @dev Throws error if `msg.sender` has no permission to edit the property.59 // /// @param tokenId ID of the token.60 // /// @param key Property key.61 // /// @dev EVM selector for this function is: 0x066111d1,62 // /// or in textual repr: deleteProperty(uint256,string)63 // function deleteProperty(uint256 tokenId, string memory key) external;6465 /// @notice Delete token properties value.66 /// @dev Throws error if `msg.sender` has no permission to edit the property.67 /// @param tokenId ID of the token.68 /// @param keys Properties key.69 /// @dev EVM selector for this function is: 0xc472d371,70 /// or in textual repr: deleteProperties(uint256,string[])71 function deleteProperties(uint256 tokenId, string[] memory keys) external;7273 /// @notice Get token property value.74 /// @dev Throws error if key not found75 /// @param tokenId ID of the token.76 /// @param key Property key.77 /// @return Property value bytes78 /// @dev EVM selector for this function is: 0x7228c327,79 /// or in textual repr: property(uint256,string)80 function property(uint256 tokenId, string memory key) external view returns (bytes memory);81}8283/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).84struct Property {85 /// @dev Property key.86 string key;87 /// @dev Property value.88 bytes value;89}9091/// @dev Ethereum representation of Token Property Permissions.92struct TokenPropertyPermission {93 /// @dev Token property key.94 string key;95 /// @dev Token property permissions.96 PropertyPermission[] permissions;97}9899/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.100struct PropertyPermission {101 /// @dev TokenPermission field.102 TokenPermissionField code;103 /// @dev TokenPermission value.104 bool value;105}106107/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.108enum TokenPermissionField {109 /// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]110 Mutable,111 /// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]112 TokenOwner,113 /// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]114 CollectionAdmin115}116117/// @title A contract that allows you to work with collections.118/// @dev the ERC-165 identifier for this interface is 0x23201442119interface Collection is Dummy, ERC165 {120 // /// Set collection property.121 // ///122 // /// @param key Property key.123 // /// @param value Propery value.124 // /// @dev EVM selector for this function is: 0x2f073f66,125 // /// or in textual repr: setCollectionProperty(string,bytes)126 // function setCollectionProperty(string memory key, bytes memory value) external;127128 /// Set collection properties.129 ///130 /// @param properties Vector of properties key/value pair.131 /// @dev EVM selector for this function is: 0x50b26b2a,132 /// or in textual repr: setCollectionProperties((string,bytes)[])133 function setCollectionProperties(Property[] memory properties) external;134135 // /// Delete collection property.136 // ///137 // /// @param key Property key.138 // /// @dev EVM selector for this function is: 0x7b7debce,139 // /// or in textual repr: deleteCollectionProperty(string)140 // function deleteCollectionProperty(string memory key) external;141142 /// Delete collection properties.143 ///144 /// @param keys Properties keys.145 /// @dev EVM selector for this function is: 0xee206ee3,146 /// or in textual repr: deleteCollectionProperties(string[])147 function deleteCollectionProperties(string[] memory keys) external;148149 /// Get collection property.150 ///151 /// @dev Throws error if key not found.152 ///153 /// @param key Property key.154 /// @return bytes The property corresponding to the key.155 /// @dev EVM selector for this function is: 0xcf24fd6d,156 /// or in textual repr: collectionProperty(string)157 function collectionProperty(string memory key) external view returns (bytes memory);158159 /// Get collection properties.160 ///161 /// @param keys Properties keys. Empty keys for all propertyes.162 /// @return Vector of properties key/value pairs.163 /// @dev EVM selector for this function is: 0x285fb8e6,164 /// or in textual repr: collectionProperties(string[])165 function collectionProperties(string[] memory keys) external view returns (Property[] memory);166167 // /// Set the sponsor of the collection.168 // ///169 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.170 // ///171 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.172 // /// @dev EVM selector for this function is: 0x7623402e,173 // /// or in textual repr: setCollectionSponsor(address)174 // function setCollectionSponsor(address sponsor) external;175176 /// Set the sponsor of the collection.177 ///178 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.179 ///180 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.181 /// @dev EVM selector for this function is: 0x84a1d5a8,182 /// or in textual repr: setCollectionSponsorCross((address,uint256))183 function setCollectionSponsorCross(CrossAccount memory sponsor) external;184185 /// Whether there is a pending sponsor.186 /// @dev EVM selector for this function is: 0x058ac185,187 /// or in textual repr: hasCollectionPendingSponsor()188 function hasCollectionPendingSponsor() external view returns (bool);189190 /// Collection sponsorship confirmation.191 ///192 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.193 /// @dev EVM selector for this function is: 0x3c50e97a,194 /// or in textual repr: confirmCollectionSponsorship()195 function confirmCollectionSponsorship() external;196197 /// Remove collection sponsor.198 /// @dev EVM selector for this function is: 0x6e0326a3,199 /// or in textual repr: removeCollectionSponsor()200 function removeCollectionSponsor() external;201202 /// Get current sponsor.203 ///204 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.205 /// @dev EVM selector for this function is: 0x6ec0a9f1,206 /// or in textual repr: collectionSponsor()207 function collectionSponsor() external view returns (CrossAccount memory);208209 /// Get current collection limits.210 ///211 /// @return Array of collection limits212 /// @dev EVM selector for this function is: 0xf63bc572,213 /// or in textual repr: collectionLimits()214 function collectionLimits() external view returns (CollectionLimit[] memory);215216 /// Set limits for the collection.217 /// @dev Throws error if limit not found.218 /// @param limit Some limit.219 /// @dev EVM selector for this function is: 0x2a2235e7,220 /// or in textual repr: setCollectionLimit((uint8,bool,uint256))221 function setCollectionLimit(CollectionLimit memory limit) external;222223 /// Get contract address.224 /// @dev EVM selector for this function is: 0xf6b4dfb4,225 /// or in textual repr: contractAddress()226 function contractAddress() external view returns (address);227228 /// Add collection admin.229 /// @param newAdmin Cross account administrator address.230 /// @dev EVM selector for this function is: 0x859aa7d6,231 /// or in textual repr: addCollectionAdminCross((address,uint256))232 function addCollectionAdminCross(CrossAccount memory newAdmin) external;233234 /// Remove collection admin.235 /// @param admin Cross account administrator address.236 /// @dev EVM selector for this function is: 0x6c0cd173,237 /// or in textual repr: removeCollectionAdminCross((address,uint256))238 function removeCollectionAdminCross(CrossAccount memory admin) external;239240 // /// Add collection admin.241 // /// @param newAdmin Address of the added administrator.242 // /// @dev EVM selector for this function is: 0x92e462c7,243 // /// or in textual repr: addCollectionAdmin(address)244 // function addCollectionAdmin(address newAdmin) external;245246 // /// Remove collection admin.247 // ///248 // /// @param admin Address of the removed administrator.249 // /// @dev EVM selector for this function is: 0xfafd7b42,250 // /// or in textual repr: removeCollectionAdmin(address)251 // function removeCollectionAdmin(address admin) external;252253 /// Toggle accessibility of collection nesting.254 ///255 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'256 /// @dev EVM selector for this function is: 0x112d4586,257 /// or in textual repr: setCollectionNesting(bool)258 function setCollectionNesting(bool enable) external;259260 /// Toggle accessibility of collection nesting.261 ///262 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'263 /// @param collections Addresses of collections that will be available for nesting.264 /// @dev EVM selector for this function is: 0x64872396,265 /// or in textual repr: setCollectionNesting(bool,address[])266 function setCollectionNesting(bool enable, address[] memory collections) external;267268 /// Returns nesting for a collection269 /// @dev EVM selector for this function is: 0x22d25bfe,270 /// or in textual repr: collectionNestingRestrictedCollectionIds()271 function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);272273 /// Returns permissions for a collection274 /// @dev EVM selector for this function is: 0x5b2eaf4b,275 /// or in textual repr: collectionNestingPermissions()276 function collectionNestingPermissions() external view returns (Tuple38[] memory);277278 /// Set the collection access method.279 /// @param mode Access mode280 /// 0 for Normal281 /// 1 for AllowList282 /// @dev EVM selector for this function is: 0x41835d4c,283 /// or in textual repr: setCollectionAccess(uint8)284 function setCollectionAccess(uint8 mode) external;285286 /// Checks that user allowed to operate with collection.287 ///288 /// @param user User address to check.289 /// @dev EVM selector for this function is: 0x91b6df49,290 /// or in textual repr: allowlistedCross((address,uint256))291 function allowlistedCross(CrossAccount memory user) external view returns (bool);292293 // /// Add the user to the allowed list.294 // ///295 // /// @param user Address of a trusted user.296 // /// @dev EVM selector for this function is: 0x67844fe6,297 // /// or in textual repr: addToCollectionAllowList(address)298 // function addToCollectionAllowList(address user) external;299300 /// Add user to allowed list.301 ///302 /// @param user User cross account address.303 /// @dev EVM selector for this function is: 0xa0184a3a,304 /// or in textual repr: addToCollectionAllowListCross((address,uint256))305 function addToCollectionAllowListCross(CrossAccount memory user) external;306307 // /// Remove the user from the allowed list.308 // ///309 // /// @param user Address of a removed user.310 // /// @dev EVM selector for this function is: 0x85c51acb,311 // /// or in textual repr: removeFromCollectionAllowList(address)312 // function removeFromCollectionAllowList(address user) external;313314 /// Remove user from allowed list.315 ///316 /// @param user User cross account address.317 /// @dev EVM selector for this function is: 0x09ba452a,318 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))319 function removeFromCollectionAllowListCross(CrossAccount memory user) external;320321 /// Switch permission for minting.322 ///323 /// @param mode Enable if "true".324 /// @dev EVM selector for this function is: 0x00018e84,325 /// or in textual repr: setCollectionMintMode(bool)326 function setCollectionMintMode(bool mode) external;327328 // /// Check that account is the owner or admin of the collection329 // ///330 // /// @param user account to verify331 // /// @return "true" if account is the owner or admin332 // /// @dev EVM selector for this function is: 0x9811b0c7,333 // /// or in textual repr: isOwnerOrAdmin(address)334 // function isOwnerOrAdmin(address user) external view returns (bool);335336 /// Check that account is the owner or admin of the collection337 ///338 /// @param user User cross account to verify339 /// @return "true" if account is the owner or admin340 /// @dev EVM selector for this function is: 0x3e75a905,341 /// or in textual repr: isOwnerOrAdminCross((address,uint256))342 function isOwnerOrAdminCross(CrossAccount memory user) external view returns (bool);343344 /// Returns collection type345 ///346 /// @return `Fungible` or `NFT` or `ReFungible`347 /// @dev EVM selector for this function is: 0xd34b55b8,348 /// or in textual repr: uniqueCollectionType()349 function uniqueCollectionType() external view returns (string memory);350351 /// Get collection owner.352 ///353 /// @return Tuble with sponsor address and his substrate mirror.354 /// If address is canonical then substrate mirror is zero and vice versa.355 /// @dev EVM selector for this function is: 0xdf727d3b,356 /// or in textual repr: collectionOwner()357 function collectionOwner() external view returns (CrossAccount memory);358359 // /// Changes collection owner to another account360 // ///361 // /// @dev Owner can be changed only by current owner362 // /// @param newOwner new owner account363 // /// @dev EVM selector for this function is: 0x4f53e226,364 // /// or in textual repr: changeCollectionOwner(address)365 // function changeCollectionOwner(address newOwner) external;366367 /// Get collection administrators368 ///369 /// @return Vector of tuples with admins address and his substrate mirror.370 /// If address is canonical then substrate mirror is zero and vice versa.371 /// @dev EVM selector for this function is: 0x5813216b,372 /// or in textual repr: collectionAdmins()373 function collectionAdmins() external view returns (CrossAccount[] memory);374375 /// Changes collection owner to another account376 ///377 /// @dev Owner can be changed only by current owner378 /// @param newOwner new owner cross account379 /// @dev EVM selector for this function is: 0x6496c497,380 /// or in textual repr: changeCollectionOwnerCross((address,uint256))381 function changeCollectionOwnerCross(CrossAccount memory newOwner) external;382}383384/// @dev Cross account struct385struct CrossAccount {386 address eth;387 uint256 sub;388}389390/// @dev anonymous struct391struct Tuple38 {392 CollectionPermissions field_0;393 bool field_1;394}395396/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.397enum CollectionPermissions {398 /// @dev Owner of token can nest tokens under it.399 TokenOwner,400 /// @dev Admin of token collection can nest tokens under token.401 CollectionAdmin402}403404/// @dev anonymous struct405struct Tuple35 {406 bool field_0;407 uint256[] field_1;408}409410/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.411struct CollectionLimit {412 CollectionLimitField field;413 bool status;414 uint256 value;415}416417/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.418enum CollectionLimitField {419 /// @dev How many tokens can a user have on one account.420 AccountTokenOwnership,421 /// @dev How many bytes of data are available for sponsorship.422 SponsoredDataSize,423 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]424 SponsoredDataRateLimit,425 /// @dev How many tokens can be mined into this collection.426 TokenLimit,427 /// @dev Timeouts for transfer sponsoring.428 SponsorTransferTimeout,429 /// @dev Timeout for sponsoring an approval in passed blocks.430 SponsorApproveTimeout,431 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).432 OwnerCanTransfer,433 /// @dev Can the collection owner burn other people's tokens.434 OwnerCanDestroy,435 /// @dev Is it possible to send tokens from this collection between users.436 TransferEnabled437}438439/// @dev the ERC-165 identifier for this interface is 0x5b5e139f440interface ERC721Metadata is Dummy, ERC165 {441 // /// @notice A descriptive name for a collection of NFTs in this contract442 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`443 // /// @dev EVM selector for this function is: 0x06fdde03,444 // /// or in textual repr: name()445 // function name() external view returns (string memory);446447 // /// @notice An abbreviated name for NFTs in this contract448 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`449 // /// @dev EVM selector for this function is: 0x95d89b41,450 // /// or in textual repr: symbol()451 // function symbol() external view returns (string memory);452453 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.454 ///455 /// @dev If the token has a `url` property and it is not empty, it is returned.456 /// 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`.457 /// If the collection property `baseURI` is empty or absent, return "" (empty string)458 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix459 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).460 ///461 /// @return token's const_metadata462 /// @dev EVM selector for this function is: 0xc87b56dd,463 /// or in textual repr: tokenURI(uint256)464 function tokenURI(uint256 tokenId) external view returns (string memory);465}466467/// @title ERC721 Token that can be irreversibly burned (destroyed).468/// @dev the ERC-165 identifier for this interface is 0x42966c68469interface ERC721Burnable is Dummy, ERC165 {470 /// @notice Burns a specific ERC721 token.471 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized472 /// operator of the current owner.473 /// @param tokenId The RFT to approve474 /// @dev EVM selector for this function is: 0x42966c68,475 /// or in textual repr: burn(uint256)476 function burn(uint256 tokenId) external;477}478479/// @dev inlined interface480interface ERC721UniqueMintableEvents {481 event MintingFinished();482}483484/// @title ERC721 minting logic.485/// @dev the ERC-165 identifier for this interface is 0x476ff149486interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {487 /// @dev EVM selector for this function is: 0x05d2035b,488 /// or in textual repr: mintingFinished()489 function mintingFinished() external view returns (bool);490491 /// @notice Function to mint a token.492 /// @param to The new owner493 /// @return uint256 The id of the newly minted token494 /// @dev EVM selector for this function is: 0x6a627842,495 /// or in textual repr: mint(address)496 function mint(address to) external returns (uint256);497498 // /// @notice Function to mint a token.499 // /// @dev `tokenId` should be obtained with `nextTokenId` method,500 // /// unlike standard, you can't specify it manually501 // /// @param to The new owner502 // /// @param tokenId ID of the minted RFT503 // /// @dev EVM selector for this function is: 0x40c10f19,504 // /// or in textual repr: mint(address,uint256)505 // function mint(address to, uint256 tokenId) external returns (bool);506507 /// @notice Function to mint token with the given tokenUri.508 /// @param to The new owner509 /// @param tokenUri Token URI that would be stored in the NFT properties510 /// @return uint256 The id of the newly minted token511 /// @dev EVM selector for this function is: 0x45c17782,512 /// or in textual repr: mintWithTokenURI(address,string)513 function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);514515 // /// @notice Function to mint token with the given tokenUri.516 // /// @dev `tokenId` should be obtained with `nextTokenId` method,517 // /// unlike standard, you can't specify it manually518 // /// @param to The new owner519 // /// @param tokenId ID of the minted RFT520 // /// @param tokenUri Token URI that would be stored in the RFT properties521 // /// @dev EVM selector for this function is: 0x50bb4e7f,522 // /// or in textual repr: mintWithTokenURI(address,uint256,string)523 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);524525 /// @dev Not implemented526 /// @dev EVM selector for this function is: 0x7d64bcb4,527 /// or in textual repr: finishMinting()528 function finishMinting() external returns (bool);529}530531/// @title Unique extensions for ERC721.532/// @dev the ERC-165 identifier for this interface is 0xabf30dc2533interface ERC721UniqueExtensions is Dummy, ERC165 {534 /// @notice A descriptive name for a collection of NFTs in this contract535 /// @dev EVM selector for this function is: 0x06fdde03,536 /// or in textual repr: name()537 function name() external view returns (string memory);538539 /// @notice An abbreviated name for NFTs in this contract540 /// @dev EVM selector for this function is: 0x95d89b41,541 /// or in textual repr: symbol()542 function symbol() external view returns (string memory);543544 /// @notice A description for the collection.545 /// @dev EVM selector for this function is: 0x7284e416,546 /// or in textual repr: description()547 function description() external view returns (string memory);548549 /// Returns the owner (in cross format) of the token.550 ///551 /// @param tokenId Id for the token.552 /// @dev EVM selector for this function is: 0x2b29dace,553 /// or in textual repr: crossOwnerOf(uint256)554 function crossOwnerOf(uint256 tokenId) external view returns (CrossAccount memory);555556 /// Returns the token properties.557 ///558 /// @param tokenId Id for the token.559 /// @param keys Properties keys. Empty keys for all propertyes.560 /// @return Vector of properties key/value pairs.561 /// @dev EVM selector for this function is: 0xe07ede7e,562 /// or in textual repr: properties(uint256,string[])563 function properties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);564565 /// @notice Transfer ownership of an RFT566 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`567 /// is the zero address. Throws if `tokenId` is not a valid RFT.568 /// Throws if RFT pieces have multiple owners.569 /// @param to The new owner570 /// @param tokenId The RFT to transfer571 /// @dev EVM selector for this function is: 0xa9059cbb,572 /// or in textual repr: transfer(address,uint256)573 function transfer(address to, uint256 tokenId) external;574575 /// @notice Transfer ownership of an RFT576 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`577 /// is the zero address. Throws if `tokenId` is not a valid RFT.578 /// Throws if RFT pieces have multiple owners.579 /// @param to The new owner580 /// @param tokenId The RFT to transfer581 /// @dev EVM selector for this function is: 0x2ada85ff,582 /// or in textual repr: transferCross((address,uint256),uint256)583 function transferCross(CrossAccount memory to, uint256 tokenId) external;584585 /// @notice Transfer ownership of an RFT586 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`587 /// is the zero address. Throws if `tokenId` is not a valid RFT.588 /// Throws if RFT pieces have multiple owners.589 /// @param to The new owner590 /// @param tokenId The RFT to transfer591 /// @dev EVM selector for this function is: 0xd5cf430b,592 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)593 function transferFromCross(594 CrossAccount memory from,595 CrossAccount memory to,596 uint256 tokenId597 ) external;598599 // /// @notice Burns a specific ERC721 token.600 // /// @dev Throws unless `msg.sender` is the current owner or an authorized601 // /// operator for this RFT. Throws if `from` is not the current owner. Throws602 // /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.603 // /// Throws if RFT pieces have multiple owners.604 // /// @param from The current owner of the RFT605 // /// @param tokenId The RFT to transfer606 // /// @dev EVM selector for this function is: 0x79cc6790,607 // /// or in textual repr: burnFrom(address,uint256)608 // function burnFrom(address from, uint256 tokenId) external;609610 /// @notice Burns a specific ERC721 token.611 /// @dev Throws unless `msg.sender` is the current owner or an authorized612 /// operator for this RFT. Throws if `from` is not the current owner. Throws613 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.614 /// Throws if RFT pieces have multiple owners.615 /// @param from The current owner of the RFT616 /// @param tokenId The RFT to transfer617 /// @dev EVM selector for this function is: 0xbb2f5a58,618 /// or in textual repr: burnFromCross((address,uint256),uint256)619 function burnFromCross(CrossAccount memory from, uint256 tokenId) external;620621 /// @notice Returns next free RFT ID.622 /// @dev EVM selector for this function is: 0x75794a3c,623 /// or in textual repr: nextTokenId()624 function nextTokenId() external view returns (uint256);625626 // /// @notice Function to mint multiple tokens.627 // /// @dev `tokenIds` should be an array of consecutive numbers and first number628 // /// should be obtained with `nextTokenId` method629 // /// @param to The new owner630 // /// @param tokenIds IDs of the minted RFTs631 // /// @dev EVM selector for this function is: 0x44a9945e,632 // /// or in textual repr: mintBulk(address,uint256[])633 // function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);634635 // /// @notice Function to mint multiple tokens with the given tokenUris.636 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive637 // /// numbers and first number should be obtained with `nextTokenId` method638 // /// @param to The new owner639 // /// @param tokens array of pairs of token ID and token URI for minted tokens640 // /// @dev EVM selector for this function is: 0x36543006,641 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])642 // function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);643644 /// @notice Function to mint a token.645 /// @param to The new owner crossAccountId646 /// @param properties Properties of minted token647 /// @return uint256 The id of the newly minted token648 /// @dev EVM selector for this function is: 0xb904db03,649 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])650 function mintCross(CrossAccount memory to, Property[] memory properties) external returns (uint256);651652 /// Returns EVM address for refungible token653 ///654 /// @param token ID of the token655 /// @dev EVM selector for this function is: 0xab76fac6,656 /// or in textual repr: tokenContractAddress(uint256)657 function tokenContractAddress(uint256 token) external view returns (address);658}659660/// @dev anonymous struct661struct Tuple12 {662 uint256 field_0;663 string field_1;664}665666/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension667/// @dev See https://eips.ethereum.org/EIPS/eip-721668/// @dev the ERC-165 identifier for this interface is 0x780e9d63669interface ERC721Enumerable is Dummy, ERC165 {670 /// @notice Enumerate valid RFTs671 /// @param index A counter less than `totalSupply()`672 /// @return The token identifier for the `index`th NFT,673 /// (sort order not specified)674 /// @dev EVM selector for this function is: 0x4f6ccce7,675 /// or in textual repr: tokenByIndex(uint256)676 function tokenByIndex(uint256 index) external view returns (uint256);677678 /// Not implemented679 /// @dev EVM selector for this function is: 0x2f745c59,680 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)681 function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);682683 /// @notice Count RFTs tracked by this contract684 /// @return A count of valid RFTs tracked by this contract, where each one of685 /// them has an assigned and queryable owner not equal to the zero address686 /// @dev EVM selector for this function is: 0x18160ddd,687 /// or in textual repr: totalSupply()688 function totalSupply() external view returns (uint256);689}690691/// @dev inlined interface692interface ERC721Events {693 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);694 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);695 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);696}697698/// @title ERC-721 Non-Fungible Token Standard699/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md700/// @dev the ERC-165 identifier for this interface is 0x4016cd87701interface ERC721 is Dummy, ERC165, ERC721Events {702 /// @notice Count all RFTs assigned to an owner703 /// @dev RFTs assigned to the zero address are considered invalid, and this704 /// function throws for queries about the zero address.705 /// @param owner An address for whom to query the balance706 /// @return The number of RFTs owned by `owner`, possibly zero707 /// @dev EVM selector for this function is: 0x70a08231,708 /// or in textual repr: balanceOf(address)709 function balanceOf(address owner) external view returns (uint256);710711 /// @notice Find the owner of an RFT712 /// @dev RFTs assigned to zero address are considered invalid, and queries713 /// about them do throw.714 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for715 /// the tokens that are partially owned.716 /// @param tokenId The identifier for an RFT717 /// @return The address of the owner of the RFT718 /// @dev EVM selector for this function is: 0x6352211e,719 /// or in textual repr: ownerOf(uint256)720 function ownerOf(uint256 tokenId) external view returns (address);721722 /// @dev Not implemented723 /// @dev EVM selector for this function is: 0x60a11672,724 /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)725 function safeTransferFromWithData(726 address from,727 address to,728 uint256 tokenId,729 bytes memory data730 ) external;731732 /// @dev Not implemented733 /// @dev EVM selector for this function is: 0x42842e0e,734 /// or in textual repr: safeTransferFrom(address,address,uint256)735 function safeTransferFrom(736 address from,737 address to,738 uint256 tokenId739 ) external;740741 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE742 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE743 /// THEY MAY BE PERMANENTLY LOST744 /// @dev Throws unless `msg.sender` is the current owner or an authorized745 /// operator for this RFT. Throws if `from` is not the current owner. Throws746 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.747 /// Throws if RFT pieces have multiple owners.748 /// @param from The current owner of the NFT749 /// @param to The new owner750 /// @param tokenId The NFT to transfer751 /// @dev EVM selector for this function is: 0x23b872dd,752 /// or in textual repr: transferFrom(address,address,uint256)753 function transferFrom(754 address from,755 address to,756 uint256 tokenId757 ) external;758759 /// @dev Not implemented760 /// @dev EVM selector for this function is: 0x095ea7b3,761 /// or in textual repr: approve(address,uint256)762 function approve(address approved, uint256 tokenId) external;763764 /// @notice Sets or unsets the approval of a given operator.765 /// The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.766 /// @param operator Operator767 /// @param approved Should operator status be granted or revoked?768 /// @dev EVM selector for this function is: 0xa22cb465,769 /// or in textual repr: setApprovalForAll(address,bool)770 function setApprovalForAll(address operator, bool approved) external;771772 /// @dev Not implemented773 /// @dev EVM selector for this function is: 0x081812fc,774 /// or in textual repr: getApproved(uint256)775 function getApproved(uint256 tokenId) external view returns (address);776777 /// @notice Tells whether the given `owner` approves the `operator`.778 /// @dev EVM selector for this function is: 0xe985e9c5,779 /// or in textual repr: isApprovedForAll(address,address)780 function isApprovedForAll(address owner, address operator) external view returns (bool);781782 /// @notice Returns collection helper contract address783 /// @dev EVM selector for this function is: 0x1896cce6,784 /// or in textual repr: collectionHelperAddress()785 function collectionHelperAddress() external view returns (address);786}787788interface UniqueRefungible is789 Dummy,790 ERC165,791 ERC721,792 ERC721Enumerable,793 ERC721UniqueExtensions,794 ERC721UniqueMintable,795 ERC721Burnable,796 ERC721Metadata,797 Collection,798 TokenProperties799{}tests/src/eth/api/UniqueRefungibleToken.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungibleToken.sol
+++ b/tests/src/eth/api/UniqueRefungibleToken.sol
@@ -39,7 +39,7 @@
/// @param amount The amount that will be burnt.
/// @dev EVM selector for this function is: 0xbb2f5a58,
/// or in textual repr: burnFromCross((address,uint256),uint256)
- function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);
+ function burnFromCross(CrossAccount memory from, uint256 amount) external returns (bool);
/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.
/// Beware that changing an allowance with this method brings the risk that someone may use both the old
@@ -50,7 +50,7 @@
/// @param amount The amount of tokens to be spent.
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
- function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);
+ function approveCross(CrossAccount memory spender, uint256 amount) external returns (bool);
/// @dev Function that changes total amount of the tokens.
/// Throws if `msg.sender` doesn't owns all of the tokens.
@@ -64,7 +64,7 @@
/// @param amount The amount to be transferred.
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+ function transferCross(CrossAccount memory to, uint256 amount) external returns (bool);
/// @dev Transfer tokens from one address to another
/// @param from The address which you want to send tokens from
@@ -73,14 +73,14 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- EthCrossAccount memory from,
- EthCrossAccount memory to,
+ CrossAccount memory from,
+ CrossAccount memory to,
uint256 amount
) external returns (bool);
}
/// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
address eth;
uint256 sub;
}
tests/src/eth/fractionalizer/Fractionalizer.soldiffbeforeafterboth--- a/tests/src/eth/fractionalizer/Fractionalizer.sol
+++ b/tests/src/eth/fractionalizer/Fractionalizer.sol
@@ -3,7 +3,7 @@
import {CollectionHelpers} from "../api/CollectionHelpers.sol";
import {ContractHelpers} from "../api/ContractHelpers.sol";
import {UniqueRefungibleToken} from "../api/UniqueRefungibleToken.sol";
-import {UniqueRefungible, EthCrossAccount} from "../api/UniqueRefungible.sol";
+import {UniqueRefungible, CrossAccount} from "../api/UniqueRefungible.sol";
import {UniqueNFT} from "../api/UniqueNFT.sol";
/// @dev Fractionalization contract. It stores mappings between NFT and RFT tokens,
@@ -63,7 +63,7 @@
"Wrong collection type. Collection is not refungible."
);
require(
- refungibleContract.isOwnerOrAdminCross(EthCrossAccount({eth: address(this), sub: uint256(0)})),
+ refungibleContract.isOwnerOrAdminCross(CrossAccount({eth: address(this), sub: uint256(0)})),
"Fractionalizer contract should be an admin of the collection"
);
rftCollection = _collection;
@@ -128,7 +128,7 @@
address rftTokenAddress;
UniqueRefungibleToken rftTokenContract;
if (nft2rftMapping[_collection][_token] == 0) {
- rftTokenId = rftCollectionContract.mint(address(this));
+ rftTokenId = rftCollectionContract.mint(address(this));
rftTokenAddress = rftCollectionContract.tokenContractAddress(rftTokenId);
nft2rftMapping[_collection][_token] = rftTokenId;
rft2nftMapping[rftTokenAddress] = Token(_collection, _token);
tests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/types.ts
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -25,6 +25,7 @@
TokenOwner,
CollectionAdmin
}
+
export enum CollectionLimitField {
AccountTokenOwnership,
SponsoredDataSize,
@@ -37,8 +38,8 @@
TransferEnabled
}
-export interface EthCollectionLimit {
+export interface CollectionLimit {
field: CollectionLimitField,
status: boolean,
- value: bigint,
+ value: bigint | number,
}