difftreelog
rename: CrossAccount -> CrossAddress
in: master
30 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -244,7 +244,7 @@
fn set_collection_sponsor_cross(
&mut self,
caller: caller,
- sponsor: eth::CrossAccount,
+ sponsor: eth::CrossAddress,
) -> Result<void> {
self.consume_store_reads_and_writes(1, 1)?;
@@ -284,13 +284,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<eth::CrossAccount> {
+ fn collection_sponsor(&self) -> Result<eth::CrossAddress> {
let sponsor = match self.collection.sponsorship.sponsor() {
Some(sponsor) => sponsor,
None => return Ok(Default::default()),
};
- Ok(eth::CrossAccount::from_sub::<T>(&sponsor))
+ Ok(eth::CrossAddress::from_sub::<T>(&sponsor))
}
/// Get current collection limits.
@@ -376,7 +376,7 @@
fn add_collection_admin_cross(
&mut self,
caller: caller,
- new_admin: eth::CrossAccount,
+ new_admin: eth::CrossAddress,
) -> Result<void> {
self.consume_store_reads_and_writes(2, 2)?;
@@ -391,7 +391,7 @@
fn remove_collection_admin_cross(
&mut self,
caller: caller,
- admin: eth::CrossAccount,
+ admin: eth::CrossAddress,
) -> Result<void> {
self.consume_store_reads_and_writes(2, 2)?;
@@ -539,7 +539,7 @@
/// Checks that user allowed to operate with collection.
///
/// @param user User address to check.
- fn allowlisted_cross(&self, user: eth::CrossAccount) -> Result<bool> {
+ fn allowlisted_cross(&self, user: eth::CrossAddress) -> Result<bool> {
let user = user.into_sub_cross_account::<T>()?;
Ok(Pallet::<T>::allowed(self.id, user))
}
@@ -563,7 +563,7 @@
fn add_to_collection_allow_list_cross(
&mut self,
caller: caller,
- user: eth::CrossAccount,
+ user: eth::CrossAddress,
) -> Result<void> {
self.consume_store_writes(1)?;
@@ -592,7 +592,7 @@
fn remove_from_collection_allow_list_cross(
&mut self,
caller: caller,
- user: eth::CrossAccount,
+ user: eth::CrossAddress,
) -> Result<void> {
self.consume_store_writes(1)?;
@@ -630,7 +630,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: eth::CrossAccount) -> Result<bool> {
+ fn is_owner_or_admin_cross(&self, user: eth::CrossAddress) -> Result<bool> {
let user = user.into_sub_cross_account::<T>()?;
Ok(self.is_owner_or_admin(&user))
}
@@ -651,8 +651,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<eth::CrossAccount> {
- Ok(eth::CrossAccount::from_sub_cross_account::<T>(
+ fn collection_owner(&self) -> Result<eth::CrossAddress> {
+ Ok(eth::CrossAddress::from_sub_cross_account::<T>(
&T::CrossAccountId::from_sub(self.owner.clone()),
))
}
@@ -675,9 +675,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<eth::CrossAccount>> {
+ fn collection_admins(&self) -> Result<Vec<eth::CrossAddress>> {
let result = crate::IsAdmin::<T>::iter_prefix((self.id,))
- .map(|(admin, _)| eth::CrossAccount::from_sub_cross_account::<T>(&admin))
+ .map(|(admin, _)| eth::CrossAddress::from_sub_cross_account::<T>(&admin))
.collect();
Ok(result)
}
@@ -689,7 +689,7 @@
fn change_collection_owner_cross(
&mut self,
caller: caller,
- new_owner: eth::CrossAccount,
+ new_owner: eth::CrossAddress,
) -> Result<void> {
self.consume_store_writes(1)?;
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -118,13 +118,13 @@
/// Cross account struct
#[derive(Debug, Default, AbiCoder)]
-pub struct CrossAccount {
+pub struct CrossAddress {
pub(crate) eth: address,
pub(crate) sub: uint256,
}
-impl CrossAccount {
- /// Converts `CrossAccountId` to [`CrossAccount`]
+impl CrossAddress {
+ /// Converts `CrossAccountId` to [`CrossAddress`]
pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self
where
T: pallet_evm::Config,
@@ -139,7 +139,7 @@
}
}
}
- /// Creates [`CrossAccount`] from substrate account
+ /// Creates [`CrossAddress`] from substrate account
pub fn from_sub<T>(account_id: &T::AccountId) -> Self
where
T: pallet_evm::Config,
@@ -150,7 +150,7 @@
sub: uint256::from_big_endian(account_id.as_ref()),
}
}
- /// Converts [`CrossAccount`] to `CrossAccountId`
+ /// Converts [`CrossAddress`] to `CrossAccountId`
pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>
where
T: pallet_evm::Config,
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -174,9 +174,9 @@
///
/// @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<pallet_common::eth::CrossAccount> {
+ fn sponsor(&self, contract_address: address) -> Result<pallet_common::eth::CrossAddress> {
Ok(
- pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(
+ pallet_common::eth::CrossAddress::from_sub_cross_account::<T>(
&Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no 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 (CrossAccount memory) {
+ function sponsor(address contractAddress) public view returns (CrossAddress memory) {
require(false, stub_error);
contractAddress;
dummy;
- return CrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAddress(0x0000000000000000000000000000000000000000, 0);
}
/// Check tat contract has confirmed sponsor.
@@ -266,7 +266,7 @@
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
address eth;
uint256 sub;
}
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -177,7 +177,7 @@
fn mint_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAccount,
+ to: pallet_common::eth::CrossAddress,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -195,7 +195,7 @@
fn approve_cross(
&mut self,
caller: caller,
- spender: pallet_common::eth::CrossAccount,
+ spender: pallet_common::eth::CrossAddress,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -236,7 +236,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAccount,
+ from: pallet_common::eth::CrossAddress,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -278,7 +278,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAccount,
+ to: pallet_common::eth::CrossAddress,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -296,8 +296,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAccount,
- to: pallet_common::eth::CrossAccount,
+ from: pallet_common::eth::CrossAddress,
+ to: pallet_common::eth::CrossAddress,
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(CrossAccount memory sponsor) public {
+ function setCollectionSponsorCross(CrossAddress 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 (CrossAccount memory) {
+ function collectionSponsor() public view returns (CrossAddress memory) {
require(false, stub_error);
dummy;
- return CrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAddress(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(CrossAccount memory newAdmin) public {
+ function addCollectionAdminCross(CrossAddress 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(CrossAccount memory admin) public {
+ function removeCollectionAdminCross(CrossAddress 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(CrossAccount memory user) public view returns (bool) {
+ function allowlistedCross(CrossAddress 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(CrossAccount memory user) public {
+ function addToCollectionAllowListCross(CrossAddress 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(CrossAccount memory user) public {
+ function removeFromCollectionAllowListCross(CrossAddress 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(CrossAccount memory user) public view returns (bool) {
+ function isOwnerOrAdminCross(CrossAddress 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 (CrossAccount memory) {
+ function collectionOwner() public view returns (CrossAddress memory) {
require(false, stub_error);
dummy;
- return CrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAddress(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 (CrossAccount[] memory) {
+ function collectionAdmins() public view returns (CrossAddress[] memory) {
require(false, stub_error);
dummy;
- return new CrossAccount[](0);
+ return new CrossAddress[](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(CrossAccount memory newOwner) public {
+ function changeCollectionOwnerCross(CrossAddress memory newOwner) public {
require(false, stub_error);
newOwner;
dummy = 0;
@@ -438,7 +438,7 @@
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
address eth;
uint256 sub;
}
@@ -516,7 +516,7 @@
/// @dev EVM selector for this function is: 0x269e6158,
/// or in textual repr: mintCross((address,uint256),uint256)
- function mintCross(CrossAccount memory to, uint256 amount) public returns (bool) {
+ function mintCross(CrossAddress memory to, uint256 amount) public returns (bool) {
require(false, stub_error);
to;
amount;
@@ -526,7 +526,7 @@
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
- function approveCross(CrossAccount memory spender, uint256 amount) public returns (bool) {
+ function approveCross(CrossAddress memory spender, uint256 amount) public returns (bool) {
require(false, stub_error);
spender;
amount;
@@ -556,7 +556,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(CrossAccount memory from, uint256 amount) public returns (bool) {
+ function burnFromCross(CrossAddress memory from, uint256 amount) public returns (bool) {
require(false, stub_error);
from;
amount;
@@ -577,7 +577,7 @@
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(CrossAccount memory to, uint256 amount) public returns (bool) {
+ function transferCross(CrossAddress memory to, uint256 amount) public returns (bool) {
require(false, stub_error);
to;
amount;
@@ -588,8 +588,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- CrossAccount memory from,
- CrossAccount memory to,
+ CrossAddress memory from,
+ CrossAddress 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
@@ -762,9 +762,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<pallet_common::eth::CrossAccount> {
+ fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAddress> {
Self::token_owner(&self, token_id.try_into()?)
- .map(|o| pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(&o))
+ .map(|o| pallet_common::eth::CrossAddress::from_sub_cross_account::<T>(&o))
.ok_or(Error::Revert("key too large".into()))
}
@@ -812,7 +812,7 @@
fn approve_cross(
&mut self,
caller: caller,
- approved: pallet_common::eth::CrossAccount,
+ approved: pallet_common::eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -851,7 +851,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAccount,
+ to: pallet_common::eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -875,8 +875,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAccount,
- to: pallet_common::eth::CrossAccount,
+ from: pallet_common::eth::CrossAddress,
+ to: pallet_common::eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -922,7 +922,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAccount,
+ from: pallet_common::eth::CrossAddress,
token_id: uint256,
) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -1044,7 +1044,7 @@
fn mint_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAccount,
+ to: pallet_common::eth::CrossAddress,
properties: Vec<pallet_common::eth::Property>,
) -> Result<uint256> {
let token_id = <TokensMinted<T>>::get(self.id)
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
@@ -256,7 +256,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(CrossAccount memory sponsor) public {
+ function setCollectionSponsorCross(CrossAddress memory sponsor) public {
require(false, stub_error);
sponsor;
dummy = 0;
@@ -294,10 +294,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 (CrossAccount memory) {
+ function collectionSponsor() public view returns (CrossAddress memory) {
require(false, stub_error);
dummy;
- return CrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAddress(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -335,7 +335,7 @@
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
/// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(CrossAccount memory newAdmin) public {
+ function addCollectionAdminCross(CrossAddress memory newAdmin) public {
require(false, stub_error);
newAdmin;
dummy = 0;
@@ -345,7 +345,7 @@
/// @param admin Cross account administrator address.
/// @dev EVM selector for this function is: 0x6c0cd173,
/// or in textual repr: removeCollectionAdminCross((address,uint256))
- function removeCollectionAdminCross(CrossAccount memory admin) public {
+ function removeCollectionAdminCross(CrossAddress memory admin) public {
require(false, stub_error);
admin;
dummy = 0;
@@ -431,7 +431,7 @@
/// @param user User address to check.
/// @dev EVM selector for this function is: 0x91b6df49,
/// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(CrossAccount memory user) public view returns (bool) {
+ function allowlistedCross(CrossAddress memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -454,7 +454,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(CrossAccount memory user) public {
+ function addToCollectionAllowListCross(CrossAddress memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -476,7 +476,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(CrossAccount memory user) public {
+ function removeFromCollectionAllowListCross(CrossAddress memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -512,7 +512,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(CrossAccount memory user) public view returns (bool) {
+ function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -536,10 +536,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 (CrossAccount memory) {
+ function collectionOwner() public view returns (CrossAddress memory) {
require(false, stub_error);
dummy;
- return CrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAddress(0x0000000000000000000000000000000000000000, 0);
}
// /// Changes collection owner to another account
@@ -560,10 +560,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 (CrossAccount[] memory) {
+ function collectionAdmins() public view returns (CrossAddress[] memory) {
require(false, stub_error);
dummy;
- return new CrossAccount[](0);
+ return new CrossAddress[](0);
}
/// Changes collection owner to another account
@@ -572,7 +572,7 @@
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0x6496c497,
/// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
+ function changeCollectionOwnerCross(CrossAddress memory newOwner) public {
require(false, stub_error);
newOwner;
dummy = 0;
@@ -580,7 +580,7 @@
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
address eth;
uint256 sub;
}
@@ -817,11 +817,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 (CrossAccount memory) {
+ function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {
require(false, stub_error);
tokenId;
dummy;
- return CrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAddress(0x0000000000000000000000000000000000000000, 0);
}
/// Returns the token properties.
@@ -847,7 +847,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(CrossAccount memory approved, uint256 tokenId) public {
+ function approveCross(CrossAddress memory approved, uint256 tokenId) public {
require(false, stub_error);
approved;
tokenId;
@@ -875,7 +875,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(CrossAccount memory to, uint256 tokenId) public {
+ function transferCross(CrossAddress memory to, uint256 tokenId) public {
require(false, stub_error);
to;
tokenId;
@@ -891,8 +891,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- CrossAccount memory from,
- CrossAccount memory to,
+ CrossAddress memory from,
+ CrossAddress memory to,
uint256 tokenId
) public {
require(false, stub_error);
@@ -925,7 +925,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(CrossAccount memory from, uint256 tokenId) public {
+ function burnFromCross(CrossAddress memory from, uint256 tokenId) public {
require(false, stub_error);
from;
tokenId;
@@ -977,7 +977,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(CrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ function mintCross(CrossAddress memory to, Property[] memory properties) public returns (uint256) {
require(false, stub_error);
to;
properties;
pallets/refungible/src/erc.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Refungible Pallet EVM API for tokens18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Refungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Refungible Pallet methods.2122extern crate alloc;2324use core::{25 char::{REPLACEMENT_CHARACTER, decode_utf16},26 convert::TryInto,27};28use evm_coder::{29 abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,30 weight,31};32use frame_support::{BoundedBTreeMap, BoundedVec};33use pallet_common::{34 CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,35 erc::{CommonEvmHandler, CollectionCall, static_property::key},36 Error as CommonError,37};38use pallet_evm::{account::CrossAccountId, PrecompileHandle};39use pallet_evm_coder_substrate::{call, dispatch_to_evm};40use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};41use sp_core::{H160, Get};42use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};43use up_data_structs::{44 CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,45 PropertyKeyPermission, PropertyPermission, TokenId,46};4748use crate::{49 AccountBalance, Balance, Config, CreateItemData, Pallet, RefungibleHandle, SelfWeightOf,50 TokenProperties, TokensMinted, TotalSupply, weights::WeightInfo,51};5253pub const ADDRESS_FOR_PARTIALLY_OWNED_TOKENS: H160 = H160::repeat_byte(0xff);5455/// @title A contract that allows to set and delete token properties and change token property permissions.56#[solidity_interface(name = TokenProperties)]57impl<T: Config> RefungibleHandle<T> {58 /// @notice Set permissions for token property.59 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.60 /// @param key Property key.61 /// @param isMutable Permission to mutate property.62 /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.63 /// @param tokenOwner Permission to mutate property by token owner if property is mutable.64 #[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]65 #[solidity(hide)]66 fn set_token_property_permission(67 &mut self,68 caller: caller,69 key: string,70 is_mutable: bool,71 collection_admin: bool,72 token_owner: bool,73 ) -> Result<()> {74 let caller = T::CrossAccountId::from_eth(caller);75 <Pallet<T>>::set_token_property_permissions(76 self,77 &caller,78 vec![PropertyKeyPermission {79 key: <Vec<u8>>::from(key)80 .try_into()81 .map_err(|_| "too long key")?,82 permission: PropertyPermission {83 mutable: is_mutable,84 collection_admin,85 token_owner,86 },87 }],88 )89 .map_err(dispatch_to_evm::<T>)90 }9192 /// @notice Set permissions for token property.93 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.94 /// @param permissions Permissions for keys.95 #[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]96 fn set_token_property_permissions(97 &mut self,98 caller: caller,99 permissions: Vec<pallet_common::eth::TokenPropertyPermission>,100 ) -> Result<()> {101 let caller = T::CrossAccountId::from_eth(caller);102 let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(103 permissions,104 )?;105106 <Pallet<T>>::set_token_property_permissions(self, &caller, perms)107 .map_err(dispatch_to_evm::<T>)108 }109110 /// @notice Get permissions for token properties.111 fn token_property_permissions(112 &self,113 ) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {114 let perms = <Pallet<T>>::token_property_permission(self.id);115 Ok(perms116 .into_iter()117 .map(pallet_common::eth::TokenPropertyPermission::from)118 .collect())119 }120121 /// @notice Set token property value.122 /// @dev Throws error if `msg.sender` has no permission to edit the property.123 /// @param tokenId ID of the token.124 /// @param key Property key.125 /// @param value Property value.126 #[solidity(hide)]127 #[weight(<SelfWeightOf<T>>::set_token_properties(1))]128 fn set_property(129 &mut self,130 caller: caller,131 token_id: uint256,132 key: string,133 value: bytes,134 ) -> Result<()> {135 let caller = T::CrossAccountId::from_eth(caller);136 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;137 let key = <Vec<u8>>::from(key)138 .try_into()139 .map_err(|_| "key too long")?;140 let value = value.0.try_into().map_err(|_| "value too long")?;141142 let nesting_budget = self143 .recorder144 .weight_calls_budget(<StructureWeight<T>>::find_parent());145146 <Pallet<T>>::set_token_property(147 self,148 &caller,149 TokenId(token_id),150 Property { key, value },151 &nesting_budget,152 )153 .map_err(dispatch_to_evm::<T>)154 }155156 /// @notice Set token properties value.157 /// @dev Throws error if `msg.sender` has no permission to edit the property.158 /// @param tokenId ID of the token.159 /// @param properties settable properties160 #[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]161 fn set_properties(162 &mut self,163 caller: caller,164 token_id: uint256,165 properties: Vec<pallet_common::eth::Property>,166 ) -> Result<()> {167 let caller = T::CrossAccountId::from_eth(caller);168 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;169170 let nesting_budget = self171 .recorder172 .weight_calls_budget(<StructureWeight<T>>::find_parent());173174 let properties = properties175 .into_iter()176 .map(|property| {177 let (key, value) = property.take_key_value();178 let key = <Vec<u8>>::from(key)179 .try_into()180 .map_err(|_| "key too large")?;181182 let value = value.0.try_into().map_err(|_| "value too large")?;183184 Ok(Property { key, value })185 })186 .collect::<Result<Vec<_>>>()?;187188 <Pallet<T>>::set_token_properties(189 self,190 &caller,191 TokenId(token_id),192 properties.into_iter(),193 false,194 &nesting_budget,195 )196 .map_err(dispatch_to_evm::<T>)197 }198199 /// @notice Delete token property value.200 /// @dev Throws error if `msg.sender` has no permission to edit the property.201 /// @param tokenId ID of the token.202 /// @param key Property key.203 #[solidity(hide)]204 #[weight(<SelfWeightOf<T>>::delete_token_properties(1))]205 fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {206 let caller = T::CrossAccountId::from_eth(caller);207 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;208 let key = <Vec<u8>>::from(key)209 .try_into()210 .map_err(|_| "key too long")?;211212 let nesting_budget = self213 .recorder214 .weight_calls_budget(<StructureWeight<T>>::find_parent());215216 <Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)217 .map_err(dispatch_to_evm::<T>)218 }219220 /// @notice Delete token properties value.221 /// @dev Throws error if `msg.sender` has no permission to edit the property.222 /// @param tokenId ID of the token.223 /// @param keys Properties key.224 #[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]225 fn delete_properties(226 &mut self,227 token_id: uint256,228 caller: caller,229 keys: Vec<string>,230 ) -> Result<()> {231 let caller = T::CrossAccountId::from_eth(caller);232 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;233 let keys = keys234 .into_iter()235 .map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))236 .collect::<Result<Vec<_>>>()?;237238 let nesting_budget = self239 .recorder240 .weight_calls_budget(<StructureWeight<T>>::find_parent());241242 <Pallet<T>>::delete_token_properties(243 self,244 &caller,245 TokenId(token_id),246 keys.into_iter(),247 &nesting_budget,248 )249 .map_err(dispatch_to_evm::<T>)250 }251252 /// @notice Get token property value.253 /// @dev Throws error if key not found254 /// @param tokenId ID of the token.255 /// @param key Property key.256 /// @return Property value bytes257 fn property(&self, token_id: uint256, key: string) -> Result<bytes> {258 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;259 let key = <Vec<u8>>::from(key)260 .try_into()261 .map_err(|_| "key too long")?;262263 let props = <TokenProperties<T>>::get((self.id, token_id));264 let prop = props.get(&key).ok_or("key not found")?;265266 Ok(prop.to_vec().into())267 }268}269270#[derive(ToLog)]271pub enum ERC721Events {272 /// @dev This event emits when NFTs are created (`from` == 0) and destroyed273 /// (`to` == 0). Exception: during contract creation, any number of RFTs274 /// may be created and assigned without emitting Transfer.275 Transfer {276 #[indexed]277 from: address,278 #[indexed]279 to: address,280 #[indexed]281 token_id: uint256,282 },283 /// @dev Not supported284 Approval {285 #[indexed]286 owner: address,287 #[indexed]288 approved: address,289 #[indexed]290 token_id: uint256,291 },292 /// @dev Not supported293 #[allow(dead_code)]294 ApprovalForAll {295 #[indexed]296 owner: address,297 #[indexed]298 operator: address,299 approved: bool,300 },301}302303#[derive(ToLog)]304pub enum ERC721UniqueMintableEvents {305 /// @dev Not supported306 #[allow(dead_code)]307 MintingFinished {},308}309310#[solidity_interface(name = ERC721Metadata)]311impl<T: Config> RefungibleHandle<T>312where313 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,314{315 /// @notice A descriptive name for a collection of NFTs in this contract316 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`317 #[solidity(hide, rename_selector = "name")]318 fn name_proxy(&self) -> Result<string> {319 self.name()320 }321322 /// @notice An abbreviated name for NFTs in this contract323 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`324 #[solidity(hide, rename_selector = "symbol")]325 fn symbol_proxy(&self) -> Result<string> {326 self.symbol()327 }328329 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.330 ///331 /// @dev If the token has a `url` property and it is not empty, it is returned.332 /// 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`.333 /// If the collection property `baseURI` is empty or absent, return "" (empty string)334 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix335 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).336 ///337 /// @return token's const_metadata338 #[solidity(rename_selector = "tokenURI")]339 fn token_uri(&self, token_id: uint256) -> Result<string> {340 let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;341342 match get_token_property(self, token_id_u32, &key::url()).as_deref() {343 Err(_) | Ok("") => (),344 Ok(url) => {345 return Ok(url.into());346 }347 };348349 let base_uri =350 pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())351 .map(BoundedVec::into_inner)352 .map(string::from_utf8)353 .transpose()354 .map_err(|e| {355 Error::Revert(alloc::format!(356 "Can not convert value \"baseURI\" to string with error \"{}\"",357 e358 ))359 })?;360361 let base_uri = match base_uri.as_deref() {362 None | Some("") => {363 return Ok("".into());364 }365 Some(base_uri) => base_uri.into(),366 };367368 Ok(369 match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {370 Err(_) | Ok("") => base_uri,371 Ok(suffix) => base_uri + suffix,372 },373 )374 }375}376377/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension378/// @dev See https://eips.ethereum.org/EIPS/eip-721379#[solidity_interface(name = ERC721Enumerable)]380impl<T: Config> RefungibleHandle<T> {381 /// @notice Enumerate valid RFTs382 /// @param index A counter less than `totalSupply()`383 /// @return The token identifier for the `index`th NFT,384 /// (sort order not specified)385 fn token_by_index(&self, index: uint256) -> Result<uint256> {386 Ok(index)387 }388389 /// Not implemented390 fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {391 // TODO: Not implemetable392 Err("not implemented".into())393 }394395 /// @notice Count RFTs tracked by this contract396 /// @return A count of valid RFTs tracked by this contract, where each one of397 /// them has an assigned and queryable owner not equal to the zero address398 fn total_supply(&self) -> Result<uint256> {399 self.consume_store_reads(1)?;400 Ok(<Pallet<T>>::total_supply(self).into())401 }402}403404/// @title ERC-721 Non-Fungible Token Standard405/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md406#[solidity_interface(name = ERC721, events(ERC721Events))]407impl<T: Config> RefungibleHandle<T> {408 /// @notice Count all RFTs assigned to an owner409 /// @dev RFTs assigned to the zero address are considered invalid, and this410 /// function throws for queries about the zero address.411 /// @param owner An address for whom to query the balance412 /// @return The number of RFTs owned by `owner`, possibly zero413 fn balance_of(&self, owner: address) -> Result<uint256> {414 self.consume_store_reads(1)?;415 let owner = T::CrossAccountId::from_eth(owner);416 let balance = <AccountBalance<T>>::get((self.id, owner));417 Ok(balance.into())418 }419420 /// @notice Find the owner of an RFT421 /// @dev RFTs assigned to zero address are considered invalid, and queries422 /// about them do throw.423 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for424 /// the tokens that are partially owned.425 /// @param tokenId The identifier for an RFT426 /// @return The address of the owner of the RFT427 fn owner_of(&self, token_id: uint256) -> Result<address> {428 self.consume_store_reads(2)?;429 let token = token_id.try_into()?;430 let owner = <Pallet<T>>::token_owner(self.id, token);431 Ok(owner432 .map(|address| *address.as_eth())433 .unwrap_or_else(|| ADDRESS_FOR_PARTIALLY_OWNED_TOKENS))434 }435436 /// @dev Not implemented437 fn safe_transfer_from_with_data(438 &mut self,439 _from: address,440 _to: address,441 _token_id: uint256,442 _data: bytes,443 ) -> Result<void> {444 // TODO: Not implemetable445 Err("not implemented".into())446 }447448 /// @dev Not implemented449 fn safe_transfer_from(450 &mut self,451 _from: address,452 _to: address,453 _token_id: uint256,454 ) -> Result<void> {455 // TODO: Not implemetable456 Err("not implemented".into())457 }458459 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE460 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE461 /// THEY MAY BE PERMANENTLY LOST462 /// @dev Throws unless `msg.sender` is the current owner or an authorized463 /// operator for this RFT. Throws if `from` is not the current owner. Throws464 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.465 /// Throws if RFT pieces have multiple owners.466 /// @param from The current owner of the NFT467 /// @param to The new owner468 /// @param tokenId The NFT to transfer469 #[weight(<SelfWeightOf<T>>::transfer_from_creating_removing())]470 fn transfer_from(471 &mut self,472 caller: caller,473 from: address,474 to: address,475 token_id: uint256,476 ) -> Result<void> {477 let caller = T::CrossAccountId::from_eth(caller);478 let from = T::CrossAccountId::from_eth(from);479 let to = T::CrossAccountId::from_eth(to);480 let token = token_id.try_into()?;481 let budget = self482 .recorder483 .weight_calls_budget(<StructureWeight<T>>::find_parent());484485 let balance = balance(&self, token, &from)?;486 ensure_single_owner(&self, token, balance)?;487488 <Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)489 .map_err(dispatch_to_evm::<T>)?;490491 Ok(())492 }493494 /// @dev Not implemented495 fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<void> {496 Err("not implemented".into())497 }498499 /// @notice Sets or unsets the approval of a given operator.500 /// The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.501 /// @param operator Operator502 /// @param approved Should operator status be granted or revoked?503 #[weight(<SelfWeightOf<T>>::set_allowance_for_all())]504 fn set_approval_for_all(505 &mut self,506 caller: caller,507 operator: address,508 approved: bool,509 ) -> Result<void> {510 let caller = T::CrossAccountId::from_eth(caller);511 let operator = T::CrossAccountId::from_eth(operator);512513 <Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)514 .map_err(dispatch_to_evm::<T>)?;515 Ok(())516 }517518 /// @dev Not implemented519 fn get_approved(&self, _token_id: uint256) -> Result<address> {520 // TODO: Not implemetable521 Err("not implemented".into())522 }523524 /// @notice Tells whether the given `owner` approves the `operator`.525 #[weight(<SelfWeightOf<T>>::allowance_for_all())]526 fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {527 let owner = T::CrossAccountId::from_eth(owner);528 let operator = T::CrossAccountId::from_eth(operator);529530 Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))531 }532533 /// @notice Returns collection helper contract address534 fn collection_helper_address(&self) -> Result<address> {535 Ok(T::ContractAddress::get())536 }537}538539/// Returns amount of pieces of `token` that `owner` have540pub fn balance<T: Config>(541 collection: &RefungibleHandle<T>,542 token: TokenId,543 owner: &T::CrossAccountId,544) -> Result<u128> {545 collection.consume_store_reads(1)?;546 let balance = <Balance<T>>::get((collection.id, token, &owner));547 Ok(balance)548}549550/// Throws if `owner_balance` is lower than total amount of `token` pieces551pub fn ensure_single_owner<T: Config>(552 collection: &RefungibleHandle<T>,553 token: TokenId,554 owner_balance: u128,555) -> Result<()> {556 collection.consume_store_reads(1)?;557 let total_supply = <TotalSupply<T>>::get((collection.id, token));558559 if owner_balance == 0 {560 return Err(dispatch_to_evm::<T>(561 <CommonError<T>>::MustBeTokenOwner.into(),562 ));563 }564565 if total_supply != owner_balance {566 return Err("token has multiple owners".into());567 }568 Ok(())569}570571/// @title ERC721 Token that can be irreversibly burned (destroyed).572#[solidity_interface(name = ERC721Burnable)]573impl<T: Config> RefungibleHandle<T> {574 /// @notice Burns a specific ERC721 token.575 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized576 /// operator of the current owner.577 /// @param tokenId The RFT to approve578 #[weight(<SelfWeightOf<T>>::burn_item_fully())]579 fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {580 let caller = T::CrossAccountId::from_eth(caller);581 let token = token_id.try_into()?;582583 let balance = balance(&self, token, &caller)?;584 ensure_single_owner(&self, token, balance)?;585586 <Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;587 Ok(())588 }589}590591/// @title ERC721 minting logic.592#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]593impl<T: Config> RefungibleHandle<T> {594 fn minting_finished(&self) -> Result<bool> {595 Ok(false)596 }597598 /// @notice Function to mint a token.599 /// @param to The new owner600 /// @return uint256 The id of the newly minted token601 #[weight(<SelfWeightOf<T>>::create_item())]602 fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {603 let token_id: uint256 = <TokensMinted<T>>::get(self.id)604 .checked_add(1)605 .ok_or("item id overflow")?606 .into();607 self.mint_check_id(caller, to, token_id)?;608 Ok(token_id)609 }610611 /// @notice Function to mint a token.612 /// @dev `tokenId` should be obtained with `nextTokenId` method,613 /// unlike standard, you can't specify it manually614 /// @param to The new owner615 /// @param tokenId ID of the minted RFT616 #[solidity(hide, rename_selector = "mint")]617 #[weight(<SelfWeightOf<T>>::create_item())]618 fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {619 let caller = T::CrossAccountId::from_eth(caller);620 let to = T::CrossAccountId::from_eth(to);621 let token_id: u32 = token_id.try_into()?;622 let budget = self623 .recorder624 .weight_calls_budget(<StructureWeight<T>>::find_parent());625626 if <TokensMinted<T>>::get(self.id)627 .checked_add(1)628 .ok_or("item id overflow")?629 != token_id630 {631 return Err("item id should be next".into());632 }633634 let users = [(to.clone(), 1)]635 .into_iter()636 .collect::<BTreeMap<_, _>>()637 .try_into()638 .unwrap();639 <Pallet<T>>::create_item(640 self,641 &caller,642 CreateItemData::<T> {643 users,644 properties: CollectionPropertiesVec::default(),645 },646 &budget,647 )648 .map_err(dispatch_to_evm::<T>)?;649650 Ok(true)651 }652653 /// @notice Function to mint token with the given tokenUri.654 /// @param to The new owner655 /// @param tokenUri Token URI that would be stored in the NFT properties656 /// @return uint256 The id of the newly minted token657 #[solidity(rename_selector = "mintWithTokenURI")]658 #[weight(<SelfWeightOf<T>>::create_item())]659 fn mint_with_token_uri(660 &mut self,661 caller: caller,662 to: address,663 token_uri: string,664 ) -> Result<uint256> {665 let token_id: uint256 = <TokensMinted<T>>::get(self.id)666 .checked_add(1)667 .ok_or("item id overflow")?668 .into();669 self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;670 Ok(token_id)671 }672673 /// @notice Function to mint token with the given tokenUri.674 /// @dev `tokenId` should be obtained with `nextTokenId` method,675 /// unlike standard, you can't specify it manually676 /// @param to The new owner677 /// @param tokenId ID of the minted RFT678 /// @param tokenUri Token URI that would be stored in the RFT properties679 #[solidity(hide, rename_selector = "mintWithTokenURI")]680 #[weight(<SelfWeightOf<T>>::create_item())]681 fn mint_with_token_uri_check_id(682 &mut self,683 caller: caller,684 to: address,685 token_id: uint256,686 token_uri: string,687 ) -> Result<bool> {688 let key = key::url();689 let permission = get_token_permission::<T>(self.id, &key)?;690 if !permission.collection_admin {691 return Err("Operation is not allowed".into());692 }693694 let caller = T::CrossAccountId::from_eth(caller);695 let to = T::CrossAccountId::from_eth(to);696 let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;697 let budget = self698 .recorder699 .weight_calls_budget(<StructureWeight<T>>::find_parent());700701 if <TokensMinted<T>>::get(self.id)702 .checked_add(1)703 .ok_or("item id overflow")?704 != token_id705 {706 return Err("item id should be next".into());707 }708709 let mut properties = CollectionPropertiesVec::default();710 properties711 .try_push(Property {712 key,713 value: token_uri714 .into_bytes()715 .try_into()716 .map_err(|_| "token uri is too long")?,717 })718 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;719720 let users = [(to.clone(), 1)]721 .into_iter()722 .collect::<BTreeMap<_, _>>()723 .try_into()724 .unwrap();725 <Pallet<T>>::create_item(726 self,727 &caller,728 CreateItemData::<T> { users, properties },729 &budget,730 )731 .map_err(dispatch_to_evm::<T>)?;732 Ok(true)733 }734735 /// @dev Not implemented736 fn finish_minting(&mut self, _caller: caller) -> Result<bool> {737 Err("not implementable".into())738 }739}740741fn get_token_property<T: Config>(742 collection: &CollectionHandle<T>,743 token_id: u32,744 key: &up_data_structs::PropertyKey,745) -> Result<string> {746 collection.consume_store_reads(1)?;747 let properties = <TokenProperties<T>>::try_get((collection.id, token_id))748 .map_err(|_| Error::Revert("Token properties not found".into()))?;749 if let Some(property) = properties.get(key) {750 return Ok(string::from_utf8_lossy(property).into());751 }752753 Err("Property tokenURI not found".into())754}755756fn get_token_permission<T: Config>(757 collection_id: CollectionId,758 key: &PropertyKey,759) -> Result<PropertyPermission> {760 let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)761 .map_err(|_| Error::Revert("No permissions for collection".into()))?;762 let a = token_property_permissions763 .get(key)764 .map(Clone::clone)765 .ok_or_else(|| {766 let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();767 Error::Revert(alloc::format!("No permission for key {}", key))768 })?;769 Ok(a)770}771772/// @title Unique extensions for ERC721.773#[solidity_interface(name = ERC721UniqueExtensions)]774impl<T: Config> RefungibleHandle<T>775where776 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,777{778 /// @notice A descriptive name for a collection of NFTs in this contract779 fn name(&self) -> Result<string> {780 Ok(decode_utf16(self.name.iter().copied())781 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))782 .collect::<string>())783 }784785 /// @notice An abbreviated name for NFTs in this contract786 fn symbol(&self) -> Result<string> {787 Ok(string::from_utf8_lossy(&self.token_prefix).into())788 }789790 /// @notice A description for the collection.791 fn description(&self) -> Result<string> {792 Ok(decode_utf16(self.description.iter().copied())793 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))794 .collect::<string>())795 }796797 /// Returns the owner (in cross format) of the token.798 ///799 /// @param tokenId Id for the token.800 fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAccount> {801 Self::token_owner(&self, token_id.try_into()?)802 .map(|o| pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(&o))803 .ok_or(Error::Revert("key too large".into()))804 }805806 /// Returns the token properties.807 ///808 /// @param tokenId Id for the token.809 /// @param keys Properties keys. Empty keys for all propertyes.810 /// @return Vector of properties key/value pairs.811 fn properties(812 &self,813 token_id: uint256,814 keys: Vec<string>,815 ) -> Result<Vec<pallet_common::eth::Property>> {816 let keys = keys817 .into_iter()818 .map(|key| {819 <Vec<u8>>::from(key)820 .try_into()821 .map_err(|_| Error::Revert("key too large".into()))822 })823 .collect::<Result<Vec<_>>>()?;824825 <Self as CommonCollectionOperations<T>>::token_properties(826 &self,827 token_id.try_into()?,828 if keys.is_empty() { None } else { Some(keys) },829 )830 .into_iter()831 .map(|p| {832 let key = string::from_utf8(p.key.to_vec())833 .map_err(|e| Error::Revert(alloc::format!("{}", e)))?;834 let value = bytes(p.value.to_vec());835 Ok(pallet_common::eth::Property::new(key, value))836 })837 .collect::<Result<Vec<_>>>()838 }839 /// @notice Transfer ownership of an RFT840 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`841 /// is the zero address. Throws if `tokenId` is not a valid RFT.842 /// Throws if RFT pieces have multiple owners.843 /// @param to The new owner844 /// @param tokenId The RFT to transfer845 #[weight(<SelfWeightOf<T>>::transfer_creating_removing())]846 fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {847 let caller = T::CrossAccountId::from_eth(caller);848 let to = T::CrossAccountId::from_eth(to);849 let token = token_id.try_into()?;850 let budget = self851 .recorder852 .weight_calls_budget(<StructureWeight<T>>::find_parent());853854 let balance = balance(self, token, &caller)?;855 ensure_single_owner(self, token, balance)?;856857 <Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)858 .map_err(dispatch_to_evm::<T>)?;859 Ok(())860 }861862 /// @notice Transfer ownership of an RFT863 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`864 /// is the zero address. Throws if `tokenId` is not a valid RFT.865 /// Throws if RFT pieces have multiple owners.866 /// @param to The new owner867 /// @param tokenId The RFT to transfer868 #[weight(<SelfWeightOf<T>>::transfer_creating_removing())]869 fn transfer_cross(870 &mut self,871 caller: caller,872 to: pallet_common::eth::CrossAccount,873 token_id: uint256,874 ) -> Result<void> {875 let caller = T::CrossAccountId::from_eth(caller);876 let to = to.into_sub_cross_account::<T>()?;877 let token = token_id.try_into()?;878 let budget = self879 .recorder880 .weight_calls_budget(<StructureWeight<T>>::find_parent());881882 let balance = balance(self, token, &caller)?;883 ensure_single_owner(self, token, balance)?;884885 <Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)886 .map_err(dispatch_to_evm::<T>)?;887 Ok(())888 }889890 /// @notice Transfer ownership of an RFT891 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`892 /// is the zero address. Throws if `tokenId` is not a valid RFT.893 /// Throws if RFT pieces have multiple owners.894 /// @param to The new owner895 /// @param tokenId The RFT to transfer896 #[weight(<SelfWeightOf<T>>::transfer_creating_removing())]897 fn transfer_from_cross(898 &mut self,899 caller: caller,900 from: pallet_common::eth::CrossAccount,901 to: pallet_common::eth::CrossAccount,902 token_id: uint256,903 ) -> Result<void> {904 let caller = T::CrossAccountId::from_eth(caller);905 let from = from.into_sub_cross_account::<T>()?;906 let to = to.into_sub_cross_account::<T>()?;907 let token_id = token_id.try_into()?;908 let budget = self909 .recorder910 .weight_calls_budget(<StructureWeight<T>>::find_parent());911912 let balance = balance(self, token_id, &from)?;913 ensure_single_owner(self, token_id, balance)?;914915 Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)916 .map_err(dispatch_to_evm::<T>)?;917 Ok(())918 }919920 /// @notice Burns a specific ERC721 token.921 /// @dev Throws unless `msg.sender` is the current owner or an authorized922 /// operator for this RFT. Throws if `from` is not the current owner. Throws923 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.924 /// Throws if RFT pieces have multiple owners.925 /// @param from The current owner of the RFT926 /// @param tokenId The RFT to transfer927 #[solidity(hide)]928 #[weight(<SelfWeightOf<T>>::burn_from())]929 fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {930 let caller = T::CrossAccountId::from_eth(caller);931 let from = T::CrossAccountId::from_eth(from);932 let token = token_id.try_into()?;933 let budget = self934 .recorder935 .weight_calls_budget(<StructureWeight<T>>::find_parent());936937 let balance = balance(self, token, &from)?;938 ensure_single_owner(self, token, balance)?;939940 <Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)941 .map_err(dispatch_to_evm::<T>)?;942 Ok(())943 }944945 /// @notice Burns a specific ERC721 token.946 /// @dev Throws unless `msg.sender` is the current owner or an authorized947 /// operator for this RFT. Throws if `from` is not the current owner. Throws948 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.949 /// Throws if RFT pieces have multiple owners.950 /// @param from The current owner of the RFT951 /// @param tokenId The RFT to transfer952 #[weight(<SelfWeightOf<T>>::burn_from())]953 fn burn_from_cross(954 &mut self,955 caller: caller,956 from: pallet_common::eth::CrossAccount,957 token_id: uint256,958 ) -> Result<void> {959 let caller = T::CrossAccountId::from_eth(caller);960 let from = from.into_sub_cross_account::<T>()?;961 let token = token_id.try_into()?;962 let budget = self963 .recorder964 .weight_calls_budget(<StructureWeight<T>>::find_parent());965966 let balance = balance(self, token, &from)?;967 ensure_single_owner(self, token, balance)?;968969 <Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)970 .map_err(dispatch_to_evm::<T>)?;971 Ok(())972 }973974 /// @notice Returns next free RFT ID.975 fn next_token_id(&self) -> Result<uint256> {976 self.consume_store_reads(1)?;977 Ok(<TokensMinted<T>>::get(self.id)978 .checked_add(1)979 .ok_or("item id overflow")?980 .into())981 }982983 /// @notice Function to mint multiple tokens.984 /// @dev `tokenIds` should be an array of consecutive numbers and first number985 /// should be obtained with `nextTokenId` method986 /// @param to The new owner987 /// @param tokenIds IDs of the minted RFTs988 #[solidity(hide)]989 #[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]990 fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {991 let caller = T::CrossAccountId::from_eth(caller);992 let to = T::CrossAccountId::from_eth(to);993 let mut expected_index = <TokensMinted<T>>::get(self.id)994 .checked_add(1)995 .ok_or("item id overflow")?;996 let budget = self997 .recorder998 .weight_calls_budget(<StructureWeight<T>>::find_parent());9991000 let total_tokens = token_ids.len();1001 for id in token_ids.into_iter() {1002 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1003 if id != expected_index {1004 return Err("item id should be next".into());1005 }1006 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;1007 }1008 let users = [(to.clone(), 1)]1009 .into_iter()1010 .collect::<BTreeMap<_, _>>()1011 .try_into()1012 .unwrap();1013 let create_item_data = CreateItemData::<T> {1014 users,1015 properties: CollectionPropertiesVec::default(),1016 };1017 let data = (0..total_tokens)1018 .map(|_| create_item_data.clone())1019 .collect();10201021 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1022 .map_err(dispatch_to_evm::<T>)?;1023 Ok(true)1024 }10251026 /// @notice Function to mint multiple tokens with the given tokenUris.1027 /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive1028 /// numbers and first number should be obtained with `nextTokenId` method1029 /// @param to The new owner1030 /// @param tokens array of pairs of token ID and token URI for minted tokens1031 #[solidity(hide, rename_selector = "mintBulkWithTokenURI")]1032 #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]1033 fn mint_bulk_with_token_uri(1034 &mut self,1035 caller: caller,1036 to: address,1037 tokens: Vec<(uint256, string)>,1038 ) -> Result<bool> {1039 let key = key::url();1040 let caller = T::CrossAccountId::from_eth(caller);1041 let to = T::CrossAccountId::from_eth(to);1042 let mut expected_index = <TokensMinted<T>>::get(self.id)1043 .checked_add(1)1044 .ok_or("item id overflow")?;1045 let budget = self1046 .recorder1047 .weight_calls_budget(<StructureWeight<T>>::find_parent());10481049 let mut data = Vec::with_capacity(tokens.len());1050 let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]1051 .into_iter()1052 .collect::<BTreeMap<_, _>>()1053 .try_into()1054 .unwrap();1055 for (id, token_uri) in tokens {1056 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1057 if id != expected_index {1058 return Err("item id should be next".into());1059 }1060 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10611062 let mut properties = CollectionPropertiesVec::default();1063 properties1064 .try_push(Property {1065 key: key.clone(),1066 value: token_uri1067 .into_bytes()1068 .try_into()1069 .map_err(|_| "token uri is too long")?,1070 })1071 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10721073 let create_item_data = CreateItemData::<T> {1074 users: users.clone(),1075 properties,1076 };1077 data.push(create_item_data);1078 }10791080 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1081 .map_err(dispatch_to_evm::<T>)?;1082 Ok(true)1083 }10841085 /// @notice Function to mint a token.1086 /// @param to The new owner crossAccountId1087 /// @param properties Properties of minted token1088 /// @return uint256 The id of the newly minted token1089 #[weight(<SelfWeightOf<T>>::create_item())]1090 fn mint_cross(1091 &mut self,1092 caller: caller,1093 to: pallet_common::eth::CrossAccount,1094 properties: Vec<pallet_common::eth::Property>,1095 ) -> Result<uint256> {1096 let token_id = <TokensMinted<T>>::get(self.id)1097 .checked_add(1)1098 .ok_or("item id overflow")?;10991100 let to = to.into_sub_cross_account::<T>()?;11011102 let properties = properties1103 .into_iter()1104 .map(|property| {1105 let (key, value) = property.take_key_value();1106 let key = <Vec<u8>>::from(key)1107 .try_into()1108 .map_err(|_| "key too large")?;11091110 let value = value.0.try_into().map_err(|_| "value too large")?;11111112 Ok(Property { key, value })1113 })1114 .collect::<Result<Vec<_>>>()?1115 .try_into()1116 .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;11171118 let caller = T::CrossAccountId::from_eth(caller);11191120 let budget = self1121 .recorder1122 .weight_calls_budget(<StructureWeight<T>>::find_parent());11231124 let users = [(to, 1)]1125 .into_iter()1126 .collect::<BTreeMap<_, _>>()1127 .try_into()1128 .unwrap();1129 <Pallet<T>>::create_item(1130 self,1131 &caller,1132 CreateItemData::<T> { users, properties },1133 &budget,1134 )1135 .map_err(dispatch_to_evm::<T>)?;11361137 Ok(token_id.into())1138 }11391140 /// Returns EVM address for refungible token1141 ///1142 /// @param token ID of the token1143 fn token_contract_address(&self, token: uint256) -> Result<address> {1144 Ok(T::EvmTokenAddressMapping::token_to_address(1145 self.id,1146 token.try_into().map_err(|_| "token id overflow")?,1147 ))1148 }1149}11501151#[solidity_interface(1152 name = UniqueRefungible,1153 is(1154 ERC721,1155 ERC721Enumerable,1156 ERC721UniqueExtensions,1157 ERC721UniqueMintable,1158 ERC721Burnable,1159 ERC721Metadata(if(this.flags.erc721metadata)),1160 Collection(via(common_mut returns CollectionHandle<T>)),1161 TokenProperties,1162 )1163)]1164impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}11651166// Not a tests, but code generators1167generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);1168generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);11691170impl<T: Config> CommonEvmHandler for RefungibleHandle<T>1171where1172 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1173{1174 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");1175 fn call(1176 self,1177 handle: &mut impl PrecompileHandle,1178 ) -> Option<pallet_common::erc::PrecompileResult> {1179 call::<T, UniqueRefungibleCall<T>, _, _>(handle, self)1180 }1181}pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -224,7 +224,7 @@
fn burn_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAccount,
+ from: pallet_common::eth::CrossAddress,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -250,7 +250,7 @@
fn approve_cross(
&mut self,
caller: caller,
- spender: pallet_common::eth::CrossAccount,
+ spender: pallet_common::eth::CrossAddress,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -280,7 +280,7 @@
fn transfer_cross(
&mut self,
caller: caller,
- to: pallet_common::eth::CrossAccount,
+ to: pallet_common::eth::CrossAddress,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
@@ -303,8 +303,8 @@
fn transfer_from_cross(
&mut self,
caller: caller,
- from: pallet_common::eth::CrossAccount,
- to: pallet_common::eth::CrossAccount,
+ from: pallet_common::eth::CrossAddress,
+ to: pallet_common::eth::CrossAddress,
amount: uint256,
) -> Result<bool> {
let caller = T::CrossAccountId::from_eth(caller);
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
@@ -256,7 +256,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(CrossAccount memory sponsor) public {
+ function setCollectionSponsorCross(CrossAddress memory sponsor) public {
require(false, stub_error);
sponsor;
dummy = 0;
@@ -294,10 +294,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 (CrossAccount memory) {
+ function collectionSponsor() public view returns (CrossAddress memory) {
require(false, stub_error);
dummy;
- return CrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAddress(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -335,7 +335,7 @@
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
/// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(CrossAccount memory newAdmin) public {
+ function addCollectionAdminCross(CrossAddress memory newAdmin) public {
require(false, stub_error);
newAdmin;
dummy = 0;
@@ -345,7 +345,7 @@
/// @param admin Cross account administrator address.
/// @dev EVM selector for this function is: 0x6c0cd173,
/// or in textual repr: removeCollectionAdminCross((address,uint256))
- function removeCollectionAdminCross(CrossAccount memory admin) public {
+ function removeCollectionAdminCross(CrossAddress memory admin) public {
require(false, stub_error);
admin;
dummy = 0;
@@ -431,7 +431,7 @@
/// @param user User address to check.
/// @dev EVM selector for this function is: 0x91b6df49,
/// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(CrossAccount memory user) public view returns (bool) {
+ function allowlistedCross(CrossAddress memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -454,7 +454,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(CrossAccount memory user) public {
+ function addToCollectionAllowListCross(CrossAddress memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -476,7 +476,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(CrossAccount memory user) public {
+ function removeFromCollectionAllowListCross(CrossAddress memory user) public {
require(false, stub_error);
user;
dummy = 0;
@@ -512,7 +512,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(CrossAccount memory user) public view returns (bool) {
+ function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {
require(false, stub_error);
user;
dummy;
@@ -536,10 +536,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 (CrossAccount memory) {
+ function collectionOwner() public view returns (CrossAddress memory) {
require(false, stub_error);
dummy;
- return CrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAddress(0x0000000000000000000000000000000000000000, 0);
}
// /// Changes collection owner to another account
@@ -560,10 +560,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 (CrossAccount[] memory) {
+ function collectionAdmins() public view returns (CrossAddress[] memory) {
require(false, stub_error);
dummy;
- return new CrossAccount[](0);
+ return new CrossAddress[](0);
}
/// Changes collection owner to another account
@@ -572,7 +572,7 @@
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0x6496c497,
/// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
+ function changeCollectionOwnerCross(CrossAddress memory newOwner) public {
require(false, stub_error);
newOwner;
dummy = 0;
@@ -580,7 +580,7 @@
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
address eth;
uint256 sub;
}
@@ -815,11 +815,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 (CrossAccount memory) {
+ function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {
require(false, stub_error);
tokenId;
dummy;
- return CrossAccount(0x0000000000000000000000000000000000000000, 0);
+ return CrossAddress(0x0000000000000000000000000000000000000000, 0);
}
/// Returns the token properties.
@@ -860,7 +860,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(CrossAccount memory to, uint256 tokenId) public {
+ function transferCross(CrossAddress memory to, uint256 tokenId) public {
require(false, stub_error);
to;
tokenId;
@@ -876,8 +876,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- CrossAccount memory from,
- CrossAccount memory to,
+ CrossAddress memory from,
+ CrossAddress memory to,
uint256 tokenId
) public {
require(false, stub_error);
@@ -912,7 +912,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(CrossAccount memory from, uint256 tokenId) public {
+ function burnFromCross(CrossAddress memory from, uint256 tokenId) public {
require(false, stub_error);
from;
tokenId;
@@ -964,7 +964,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(CrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ function mintCross(CrossAddress 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(CrossAccount memory from, uint256 amount) public returns (bool) {
+ function burnFromCross(CrossAddress 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(CrossAccount memory spender, uint256 amount) public returns (bool) {
+ function approveCross(CrossAddress 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(CrossAccount memory to, uint256 amount) public returns (bool) {
+ function transferCross(CrossAddress 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(
- CrossAccount memory from,
- CrossAccount memory to,
+ CrossAddress memory from,
+ CrossAddress memory to,
uint256 amount
) public returns (bool) {
require(false, stub_error);
@@ -129,7 +129,7 @@
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
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 CrossAccount",
+ "internalType": "struct CrossAddress",
"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 CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "newAdmin",
"type": "tuple"
}
@@ -73,7 +73,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -100,7 +100,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -127,7 +127,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "spender",
"type": "tuple"
},
@@ -154,7 +154,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "from",
"type": "tuple"
},
@@ -172,7 +172,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "newOwner",
"type": "tuple"
}
@@ -191,7 +191,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount[]",
+ "internalType": "struct CrossAddress[]",
"name": "",
"type": "tuple[]"
}
@@ -282,7 +282,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "",
"type": "tuple"
}
@@ -325,7 +325,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "",
"type": "tuple"
}
@@ -384,7 +384,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -428,7 +428,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "to",
"type": "tuple"
},
@@ -453,7 +453,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "admin",
"type": "tuple"
}
@@ -477,7 +477,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -575,7 +575,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "sponsor",
"type": "tuple"
}
@@ -625,7 +625,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "to",
"type": "tuple"
},
@@ -654,7 +654,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "from",
"type": "tuple"
},
@@ -663,7 +663,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"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 CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "newAdmin",
"type": "tuple"
}
@@ -104,7 +104,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -121,7 +121,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -148,7 +148,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "approved",
"type": "tuple"
},
@@ -184,7 +184,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "from",
"type": "tuple"
},
@@ -202,7 +202,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "newOwner",
"type": "tuple"
}
@@ -221,7 +221,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount[]",
+ "internalType": "struct CrossAddress[]",
"name": "",
"type": "tuple[]"
}
@@ -312,7 +312,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "",
"type": "tuple"
}
@@ -355,7 +355,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "",
"type": "tuple"
}
@@ -388,7 +388,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "",
"type": "tuple"
}
@@ -462,7 +462,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -486,7 +486,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "to",
"type": "tuple"
},
@@ -582,7 +582,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "admin",
"type": "tuple"
}
@@ -606,7 +606,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -737,7 +737,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "sponsor",
"type": "tuple"
}
@@ -891,7 +891,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "to",
"type": "tuple"
},
@@ -920,7 +920,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "from",
"type": "tuple"
},
@@ -929,7 +929,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"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 CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "newAdmin",
"type": "tuple"
}
@@ -104,7 +104,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -121,7 +121,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -166,7 +166,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "from",
"type": "tuple"
},
@@ -184,7 +184,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "newOwner",
"type": "tuple"
}
@@ -203,7 +203,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount[]",
+ "internalType": "struct CrossAddress[]",
"name": "",
"type": "tuple[]"
}
@@ -294,7 +294,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "",
"type": "tuple"
}
@@ -337,7 +337,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "",
"type": "tuple"
}
@@ -370,7 +370,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "",
"type": "tuple"
}
@@ -444,7 +444,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -468,7 +468,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "to",
"type": "tuple"
},
@@ -564,7 +564,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "admin",
"type": "tuple"
}
@@ -588,7 +588,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "user",
"type": "tuple"
}
@@ -719,7 +719,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "sponsor",
"type": "tuple"
}
@@ -882,7 +882,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "to",
"type": "tuple"
},
@@ -911,7 +911,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "from",
"type": "tuple"
},
@@ -920,7 +920,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"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 CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "spender",
"type": "tuple"
},
@@ -113,7 +113,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "from",
"type": "tuple"
},
@@ -201,7 +201,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "to",
"type": "tuple"
},
@@ -230,7 +230,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"name": "from",
"type": "tuple"
},
@@ -239,7 +239,7 @@
{ "internalType": "address", "name": "eth", "type": "address" },
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct CrossAccount",
+ "internalType": "struct CrossAddress",
"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 (CrossAccount memory);
+ function sponsor(address contractAddress) external view returns (CrossAddress memory);
/// Check tat contract has confirmed sponsor.
///
@@ -172,7 +172,7 @@
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
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(CrossAccount memory sponsor) external;
+ function setCollectionSponsorCross(CrossAddress 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 (CrossAccount memory);
+ function collectionSponsor() external view returns (CrossAddress 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(CrossAccount memory newAdmin) external;
+ function addCollectionAdminCross(CrossAddress 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(CrossAccount memory admin) external;
+ function removeCollectionAdminCross(CrossAddress 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(CrossAccount memory user) external view returns (bool);
+ function allowlistedCross(CrossAddress 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(CrossAccount memory user) external;
+ function addToCollectionAllowListCross(CrossAddress 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(CrossAccount memory user) external;
+ function removeFromCollectionAllowListCross(CrossAddress 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(CrossAccount memory user) external view returns (bool);
+ function isOwnerOrAdminCross(CrossAddress 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 (CrossAccount memory);
+ function collectionOwner() external view returns (CrossAddress 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 (CrossAccount[] memory);
+ function collectionAdmins() external view returns (CrossAddress[] 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(CrossAccount memory newOwner) external;
+ function changeCollectionOwnerCross(CrossAddress memory newOwner) external;
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
address eth;
uint256 sub;
}
@@ -354,11 +354,11 @@
/// @dev EVM selector for this function is: 0x269e6158,
/// or in textual repr: mintCross((address,uint256),uint256)
- function mintCross(CrossAccount memory to, uint256 amount) external returns (bool);
+ function mintCross(CrossAddress 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(CrossAccount memory spender, uint256 amount) external returns (bool);
+ function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);
// /// Burn tokens from account
// /// @dev Function that burns an `amount` of the tokens of a given account,
@@ -376,7 +376,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(CrossAccount memory from, uint256 amount) external returns (bool);
+ function burnFromCross(CrossAddress memory from, uint256 amount) external returns (bool);
/// Mint tokens for multiple accounts.
/// @param amounts array of pairs of account address and amount
@@ -386,13 +386,13 @@
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(CrossAccount memory to, uint256 amount) external returns (bool);
+ function transferCross(CrossAddress 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(
- CrossAccount memory from,
- CrossAccount memory to,
+ CrossAddress memory from,
+ CrossAddress 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
@@ -178,7 +178,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(CrossAccount memory sponsor) external;
+ function setCollectionSponsorCross(CrossAddress memory sponsor) external;
/// Whether there is a pending sponsor.
/// @dev EVM selector for this function is: 0x058ac185,
@@ -202,7 +202,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 (CrossAccount memory);
+ function collectionSponsor() external view returns (CrossAddress memory);
/// Get current collection limits.
///
@@ -227,13 +227,13 @@
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
/// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(CrossAccount memory newAdmin) external;
+ function addCollectionAdminCross(CrossAddress 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(CrossAccount memory admin) external;
+ function removeCollectionAdminCross(CrossAddress memory admin) external;
// /// Add collection admin.
// /// @param newAdmin Address of the added administrator.
@@ -286,7 +286,7 @@
/// @param user User address to check.
/// @dev EVM selector for this function is: 0x91b6df49,
/// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(CrossAccount memory user) external view returns (bool);
+ function allowlistedCross(CrossAddress memory user) external view returns (bool);
// /// Add the user to the allowed list.
// ///
@@ -300,7 +300,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(CrossAccount memory user) external;
+ function addToCollectionAllowListCross(CrossAddress memory user) external;
// /// Remove the user from the allowed list.
// ///
@@ -314,7 +314,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(CrossAccount memory user) external;
+ function removeFromCollectionAllowListCross(CrossAddress memory user) external;
/// Switch permission for minting.
///
@@ -337,7 +337,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(CrossAccount memory user) external view returns (bool);
+ function isOwnerOrAdminCross(CrossAddress memory user) external view returns (bool);
/// Returns collection type
///
@@ -352,7 +352,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 (CrossAccount memory);
+ function collectionOwner() external view returns (CrossAddress memory);
// /// Changes collection owner to another account
// ///
@@ -368,7 +368,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 (CrossAccount[] memory);
+ function collectionAdmins() external view returns (CrossAddress[] memory);
/// Changes collection owner to another account
///
@@ -376,11 +376,11 @@
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0x6496c497,
/// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(CrossAccount memory newOwner) external;
+ function changeCollectionOwnerCross(CrossAddress memory newOwner) external;
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
address eth;
uint256 sub;
}
@@ -556,7 +556,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 (CrossAccount memory);
+ function crossOwnerOf(uint256 tokenId) external view returns (CrossAddress memory);
/// Returns the token properties.
///
@@ -575,7 +575,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(CrossAccount memory approved, uint256 tokenId) external;
+ function approveCross(CrossAddress memory approved, uint256 tokenId) external;
/// @notice Transfer ownership of an NFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -593,7 +593,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(CrossAccount memory to, uint256 tokenId) external;
+ function transferCross(CrossAddress 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`
@@ -604,8 +604,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- CrossAccount memory from,
- CrossAccount memory to,
+ CrossAddress memory from,
+ CrossAddress memory to,
uint256 tokenId
) external;
@@ -627,7 +627,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(CrossAccount memory from, uint256 tokenId) external;
+ function burnFromCross(CrossAddress memory from, uint256 tokenId) external;
/// @notice Returns next free NFT ID.
/// @dev EVM selector for this function is: 0x75794a3c,
@@ -658,7 +658,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(CrossAccount memory to, Property[] memory properties) external returns (uint256);
+ function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);
}
/// @dev anonymous struct
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -178,7 +178,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(CrossAccount memory sponsor) external;
+ function setCollectionSponsorCross(CrossAddress memory sponsor) external;
/// Whether there is a pending sponsor.
/// @dev EVM selector for this function is: 0x058ac185,
@@ -202,7 +202,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 (CrossAccount memory);
+ function collectionSponsor() external view returns (CrossAddress memory);
/// Get current collection limits.
///
@@ -227,13 +227,13 @@
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
/// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(CrossAccount memory newAdmin) external;
+ function addCollectionAdminCross(CrossAddress 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(CrossAccount memory admin) external;
+ function removeCollectionAdminCross(CrossAddress memory admin) external;
// /// Add collection admin.
// /// @param newAdmin Address of the added administrator.
@@ -286,7 +286,7 @@
/// @param user User address to check.
/// @dev EVM selector for this function is: 0x91b6df49,
/// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(CrossAccount memory user) external view returns (bool);
+ function allowlistedCross(CrossAddress memory user) external view returns (bool);
// /// Add the user to the allowed list.
// ///
@@ -300,7 +300,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(CrossAccount memory user) external;
+ function addToCollectionAllowListCross(CrossAddress memory user) external;
// /// Remove the user from the allowed list.
// ///
@@ -314,7 +314,7 @@
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(CrossAccount memory user) external;
+ function removeFromCollectionAllowListCross(CrossAddress memory user) external;
/// Switch permission for minting.
///
@@ -337,7 +337,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(CrossAccount memory user) external view returns (bool);
+ function isOwnerOrAdminCross(CrossAddress memory user) external view returns (bool);
/// Returns collection type
///
@@ -352,7 +352,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 (CrossAccount memory);
+ function collectionOwner() external view returns (CrossAddress memory);
// /// Changes collection owner to another account
// ///
@@ -368,7 +368,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 (CrossAccount[] memory);
+ function collectionAdmins() external view returns (CrossAddress[] memory);
/// Changes collection owner to another account
///
@@ -376,11 +376,11 @@
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0x6496c497,
/// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(CrossAccount memory newOwner) external;
+ function changeCollectionOwnerCross(CrossAddress memory newOwner) external;
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
address eth;
uint256 sub;
}
@@ -554,7 +554,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 (CrossAccount memory);
+ function crossOwnerOf(uint256 tokenId) external view returns (CrossAddress memory);
/// Returns the token properties.
///
@@ -583,7 +583,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(CrossAccount memory to, uint256 tokenId) external;
+ function transferCross(CrossAddress memory to, uint256 tokenId) external;
/// @notice Transfer ownership of an RFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -594,8 +594,8 @@
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
- CrossAccount memory from,
- CrossAccount memory to,
+ CrossAddress memory from,
+ CrossAddress memory to,
uint256 tokenId
) external;
@@ -619,7 +619,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(CrossAccount memory from, uint256 tokenId) external;
+ function burnFromCross(CrossAddress memory from, uint256 tokenId) external;
/// @notice Returns next free RFT ID.
/// @dev EVM selector for this function is: 0x75794a3c,
@@ -650,7 +650,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(CrossAccount memory to, Property[] memory properties) external returns (uint256);
+ function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);
/// Returns EVM address for refungible token
///
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(CrossAccount memory from, uint256 amount) external returns (bool);
+ function burnFromCross(CrossAddress 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(CrossAccount memory spender, uint256 amount) external returns (bool);
+ function approveCross(CrossAddress 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(CrossAccount memory to, uint256 amount) external returns (bool);
+ function transferCross(CrossAddress 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(
- CrossAccount memory from,
- CrossAccount memory to,
+ CrossAddress memory from,
+ CrossAddress memory to,
uint256 amount
) external returns (bool);
}
/// @dev Cross account struct
-struct CrossAccount {
+struct CrossAddress {
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, CrossAccount} from "../api/UniqueRefungible.sol";
+import {UniqueRefungible, CrossAddress} 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(CrossAccount({eth: address(this), sub: uint256(0)})),
+ refungibleContract.isOwnerOrAdminCross(CrossAddress({eth: address(this), sub: uint256(0)})),
"Fractionalizer contract should be an admin of the collection"
);
rftCollection = _collection;
tests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/types.ts
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -19,7 +19,7 @@
value: bigint,
}
-export interface TEthCrossAccount {
+export interface CrossAddress {
readonly eth: string,
readonly sub: string | Uint8Array,
}
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -18,7 +18,7 @@
import {DevUniqueHelper} from '../../../util/playgrounds/unique.dev';
-import {ContractImports, CompiledContract, TEthCrossAccount, NormalizedEvent, EthProperty} from './types';
+import {ContractImports, CompiledContract, CrossAddress, NormalizedEvent, EthProperty} from './types';
// Native contracts ABI
import collectionHelpersAbi from '../../abi/collectionHelpers.json';
@@ -388,7 +388,7 @@
export type EthUniqueHelperConstructor = new (...args: any[]) => EthUniqueHelper;
export class EthCrossAccountGroup extends EthGroupBase {
- createAccount(): TEthCrossAccount {
+ createAccount(): CrossAddress {
return this.fromAddress(this.helper.eth.createAccount());
}
@@ -396,14 +396,14 @@
return this.fromAddress(await this.helper.eth.createAccountWithBalance(donor, amount));
}
- fromAddress(address: TEthereumAccount): TEthCrossAccount {
+ fromAddress(address: TEthereumAccount): CrossAddress {
return {
eth: address,
sub: '0',
};
}
- fromKeyringPair(keyring: IKeyringPair): TEthCrossAccount {
+ fromKeyringPair(keyring: IKeyringPair): CrossAddress {
return {
eth: '0x0000000000000000000000000000000000000000',
sub: keyring.addressRaw,