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.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -797,9 +797,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()))
}
@@ -869,7 +869,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);
@@ -897,8 +897,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);
@@ -953,7 +953,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);
@@ -1090,7 +1090,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/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.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034/* eslint-disable function-call-argument-newline */5// eslint-disable-next-line @typescript-eslint/triple-slash-reference6/// <reference path="unique.dev.d.ts" />78import {readFile} from 'fs/promises';910import Web3 from 'web3';11import {WebsocketProvider} from 'web3-core';12import {Contract} from 'web3-eth-contract';1314import * as solc from 'solc';1516import {evmToAddress} from '@polkadot/util-crypto';17import {IKeyringPair} from '@polkadot/types/types';1819import {DevUniqueHelper} from '../../../util/playgrounds/unique.dev';2021import {ContractImports, CompiledContract, TEthCrossAccount, NormalizedEvent, EthProperty} from './types';2223// Native contracts ABI24import collectionHelpersAbi from '../../abi/collectionHelpers.json';25import fungibleAbi from '../../abi/fungible.json';26import fungibleDeprecatedAbi from '../../abi/fungibleDeprecated.json';27import nonFungibleAbi from '../../abi/nonFungible.json';28import nonFungibleDeprecatedAbi from '../../abi/nonFungibleDeprecated.json';29import refungibleAbi from '../../abi/reFungible.json';30import refungibleDeprecatedAbi from '../../abi/reFungibleDeprecated.json';31import refungibleTokenAbi from '../../abi/reFungibleToken.json';32import contractHelpersAbi from '../../abi/contractHelpers.json';33import {ICrossAccountId, TEthereumAccount} from '../../../util/playgrounds/types';34import {TCollectionMode} from '../../../util/playgrounds/types';3536class EthGroupBase {37 helper: EthUniqueHelper;3839 constructor(helper: EthUniqueHelper) {40 this.helper = helper;41 }42}434445class ContractGroup extends EthGroupBase {46 async findImports(imports?: ContractImports[]){47 if(!imports) return function(path: string) {48 return {error: `File not found: ${path}`};49 };5051 const knownImports = {} as {[key: string]: string};52 for(const imp of imports) {53 knownImports[imp.solPath] = (await readFile(imp.fsPath)).toString();54 }5556 return function(path: string) {57 if(path in knownImports) return {contents: knownImports[path]};58 return {error: `File not found: ${path}`};59 };60 }6162 async compile(name: string, src: string, imports?: ContractImports[]): Promise<CompiledContract> {63 const compiled = JSON.parse(solc.compile(JSON.stringify({64 language: 'Solidity',65 sources: {66 [`${name}.sol`]: {67 content: src,68 },69 },70 settings: {71 outputSelection: {72 '*': {73 '*': ['*'],74 },75 },76 },77 }), {import: await this.findImports(imports)}));7879 const hasErrors = compiled['errors']80 && compiled['errors'].length > 081 && compiled.errors.some(function(err: any) {82 return err.severity == 'error';83 });84 85 if (hasErrors) {86 throw compiled.errors;87 }88 const out = compiled.contracts[`${name}.sol`][name];8990 return {91 abi: out.abi,92 object: '0x' + out.evm.bytecode.object,93 };94 }9596 async deployByCode(signer: string, name: string, src: string, imports?: ContractImports[], gas?: number): Promise<Contract> {97 const compiledContract = await this.compile(name, src, imports);98 return this.deployByAbi(signer, compiledContract.abi, compiledContract.object, gas);99 }100101 async deployByAbi(signer: string, abi: any, object: string, gas?: number): Promise<Contract> {102 const web3 = this.helper.getWeb3();103 const contract = new web3.eth.Contract(abi, undefined, {104 data: object,105 from: signer,106 gas: gas ?? this.helper.eth.DEFAULT_GAS,107 });108 return await contract.deploy({data: object}).send({from: signer});109 }110111}112113class NativeContractGroup extends EthGroupBase {114115 contractHelpers(caller: string): Contract {116 const web3 = this.helper.getWeb3();117 return new web3.eth.Contract(contractHelpersAbi as any, this.helper.getApi().consts.evmContractHelpers.contractAddress.toString(), {from: caller, gas: this.helper.eth.DEFAULT_GAS});118 }119120 collectionHelpers(caller: string) {121 const web3 = this.helper.getWeb3();122 return new web3.eth.Contract(collectionHelpersAbi as any, this.helper.getApi().consts.common.contractAddress.toString(), {from: caller, gas: this.helper.eth.DEFAULT_GAS});123 }124125 collection(address: string, mode: TCollectionMode, caller?: string, mergeDeprecated = false): Contract {126 let abi = {127 'nft': nonFungibleAbi,128 'rft': refungibleAbi,129 'ft': fungibleAbi,130 }[mode];131 if (mergeDeprecated) {132 const deprecated = {133 'nft': nonFungibleDeprecatedAbi,134 'rft': refungibleDeprecatedAbi,135 'ft': fungibleDeprecatedAbi,136 }[mode];137 abi = [...abi,...deprecated];138 }139 const web3 = this.helper.getWeb3();140 return new web3.eth.Contract(abi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});141 }142143 collectionById(collectionId: number, mode: 'nft' | 'rft' | 'ft', caller?: string, mergeDeprecated = false): Contract {144 return this.collection(this.helper.ethAddress.fromCollectionId(collectionId), mode, caller, mergeDeprecated);145 }146147 rftToken(address: string, caller?: string): Contract {148 const web3 = this.helper.getWeb3();149 return new web3.eth.Contract(refungibleTokenAbi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});150 }151152 rftTokenById(collectionId: number, tokenId: number, caller?: string): Contract {153 return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller);154 }155}156157158class EthGroup extends EthGroupBase {159 DEFAULT_GAS = 2_500_000;160161 createAccount() {162 const web3 = this.helper.getWeb3();163 const account = web3.eth.accounts.create();164 web3.eth.accounts.wallet.add(account.privateKey);165 return account.address;166 }167168 async createAccountWithBalance(donor: IKeyringPair, amount=100n) {169 const account = this.createAccount();170 await this.transferBalanceFromSubstrate(donor, account, amount);171172 return account;173 }174175 async transferBalanceFromSubstrate(donor: IKeyringPair, recepient: string, amount=100n, inTokens=true) {176 return await this.helper.balance.transferToSubstrate(donor, evmToAddress(recepient), amount * (inTokens ? this.helper.balance.getOneTokenNominal() : 1n));177 }178179 async getCollectionCreationFee(signer: string) {180 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);181 return await collectionHelper.methods.collectionCreationFee().call();182 }183184 async sendEVM(signer: IKeyringPair, contractAddress: string, abi: string, value: string, gasLimit?: number) {185 if(!gasLimit) gasLimit = this.DEFAULT_GAS;186 const web3 = this.helper.getWeb3();187 const gasPrice = await web3.eth.getGasPrice();188 // TODO: check execution status189 await this.helper.executeExtrinsic(190 signer,191 'api.tx.evm.call', [this.helper.address.substrateToEth(signer.address), contractAddress, abi, value, gasLimit, gasPrice, null, null, []],192 true,193 );194 }195196 async callEVM(signer: TEthereumAccount, contractAddress: string, abi: string) {197 return await this.helper.callRpc('api.rpc.eth.call', [{from: signer, to: contractAddress, data: abi}]);198 }199200 createCollectionMethodName(mode: TCollectionMode) {201 switch (mode) {202 case 'ft':203 return 'createFTCollection';204 case 'nft':205 return 'createNFTCollection';206 case 'rft':207 return 'createRFTCollection';208 }209 }210211 async createCollection(mode: TCollectionMode, signer: string, name: string, description: string, tokenPrefix: string, decimals = 18): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {212 const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();213 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);214 const functionName: string = this.createCollectionMethodName(mode);215216 const functionParams = mode === 'ft' ? [name, decimals, description, tokenPrefix] : [name, description, tokenPrefix];217 const result = await collectionHelper.methods[functionName](...functionParams).send({value: Number(collectionCreationPrice)});218219 const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);220 const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);221 const events = this.helper.eth.normalizeEvents(result.events);222223 return {collectionId, collectionAddress, events};224 }225226 createNFTCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {227 return this.createCollection('nft', signer, name, description, tokenPrefix);228 }229230 async createERC721MetadataCompatibleNFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {231 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);232233 const {collectionId, collectionAddress, events} = await this.createCollection('nft', signer, name, description, tokenPrefix);234235 await collectionHelper.methods.makeCollectionERC721MetadataCompatible(collectionAddress, baseUri).send();236237 return {collectionId, collectionAddress, events};238 }239240 createRFTCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string, events: NormalizedEvent[]}> {241 return this.createCollection('rft', signer, name, description, tokenPrefix);242 }243244 createFungibleCollection(signer: string, name: string, decimals: number, description: string, tokenPrefix: string): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[]}> {245 return this.createCollection('ft', signer, name, description, tokenPrefix, decimals);246 }247248 async createERC721MetadataCompatibleRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {249 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);250251 const {collectionId, collectionAddress, events} = await this.createCollection('rft', signer, name, description, tokenPrefix);252253 await collectionHelper.methods.makeCollectionERC721MetadataCompatible(collectionAddress, baseUri).send();254255 return {collectionId, collectionAddress, events};256 }257258 async deployCollectorContract(signer: string): Promise<Contract> {259 return await this.helper.ethContract.deployByCode(signer, 'Collector', `260 // SPDX-License-Identifier: UNLICENSED261 pragma solidity ^0.8.6;262263 contract Collector {264 uint256 collected;265 fallback() external payable {266 giveMoney();267 }268 function giveMoney() public payable {269 collected += msg.value;270 }271 function getCollected() public view returns (uint256) {272 return collected;273 }274 function getUnaccounted() public view returns (uint256) {275 return address(this).balance - collected;276 }277278 function withdraw(address payable target) public {279 target.transfer(collected);280 collected = 0;281 }282 }283 `);284 }285286 async deployFlipper(signer: string): Promise<Contract> {287 return await this.helper.ethContract.deployByCode(signer, 'Flipper', `288 // SPDX-License-Identifier: UNLICENSED289 pragma solidity ^0.8.6;290291 contract Flipper {292 bool value = false;293 function flip() public {294 value = !value;295 }296 function getValue() public view returns (bool) {297 return value;298 }299 }300 `);301 }302303 async recordCallFee(user: string, call: () => Promise<any>): Promise<bigint> {304 const before = await this.helper.balance.getEthereum(user);305 await call();306 // In dev mode, the transaction might not finish processing in time307 await this.helper.wait.newBlocks(1);308 const after = await this.helper.balance.getEthereum(user);309310 return before - after;311 }312313 normalizeEvents(events: any): NormalizedEvent[] {314 const output = [];315 for (const key of Object.keys(events)) {316 if (key.match(/^[0-9]+$/)) {317 output.push(events[key]);318 } else if (Array.isArray(events[key])) {319 output.push(...events[key]);320 } else {321 output.push(events[key]);322 }323 }324 output.sort((a, b) => a.logIndex - b.logIndex);325 return output.map(({address, event, returnValues}) => {326 const args: { [key: string]: string } = {};327 for (const key of Object.keys(returnValues)) {328 if (!key.match(/^[0-9]+$/)) {329 args[key] = returnValues[key];330 }331 }332 return {333 address,334 event,335 args,336 };337 });338 }339340 async calculateFee(address: ICrossAccountId, code: () => Promise<any>): Promise<bigint> {341 const wrappedCode = async () => {342 await code();343 // In dev mode, the transaction might not finish processing in time344 await this.helper.wait.newBlocks(1);345 };346 return await this.helper.arrange.calculcateFee(address, wrappedCode);347 }348}349350class EthAddressGroup extends EthGroupBase {351 extractCollectionId(address: string): number {352 if (!(address.length === 42 || address.length === 40)) throw new Error('address wrong format');353 return parseInt(address.substr(address.length - 8), 16);354 }355356 fromCollectionId(collectionId: number): string {357 if (collectionId >= 0xffffffff || collectionId < 0) throw new Error('collectionId overflow');358 return Web3.utils.toChecksumAddress(`0x17c4e6453cc49aaaaeaca894e6d9683e${collectionId.toString(16).padStart(8,'0')}`);359 }360361 extractTokenId(address: string): {collectionId: number, tokenId: number} {362 if (!address.startsWith('0x'))363 throw 'address not starts with "0x"';364 if (address.length > 42)365 throw 'address length is more than 20 bytes';366 return {367 collectionId: Number('0x' + address.substring(address.length - 16, address.length - 8)),368 tokenId: Number('0x' + address.substring(address.length - 8)),369 };370 }371372 fromTokenId(collectionId: number, tokenId: number): string {373 return this.helper.util.getTokenAddress({collectionId, tokenId});374 }375376 normalizeAddress(address: string): string {377 return '0x' + address.substring(address.length - 40);378 }379}380export class EthPropertyGroup extends EthGroupBase {381 property(key: string, value: string): EthProperty {382 return [383 key,384 '0x'+Buffer.from(value).toString('hex'),385 ];386 }387}388export type EthUniqueHelperConstructor = new (...args: any[]) => EthUniqueHelper;389390export class EthCrossAccountGroup extends EthGroupBase {391 createAccount(): TEthCrossAccount {392 return this.fromAddress(this.helper.eth.createAccount());393 }394395 async createAccountWithBalance(donor: IKeyringPair, amount=100n) {396 return this.fromAddress(await this.helper.eth.createAccountWithBalance(donor, amount));397 }398399 fromAddress(address: TEthereumAccount): TEthCrossAccount {400 return {401 eth: address,402 sub: '0',403 };404 }405406 fromKeyringPair(keyring: IKeyringPair): TEthCrossAccount {407 return {408 eth: '0x0000000000000000000000000000000000000000',409 sub: keyring.addressRaw,410 };411 }412}413414export class EthUniqueHelper extends DevUniqueHelper {415 web3: Web3 | null = null;416 web3Provider: WebsocketProvider | null = null;417418 eth: EthGroup;419 ethAddress: EthAddressGroup;420 ethCrossAccount: EthCrossAccountGroup;421 ethNativeContract: NativeContractGroup;422 ethContract: ContractGroup;423 ethProperty: EthPropertyGroup;424425 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {426 options.helperBase = options.helperBase ?? EthUniqueHelper;427428 super(logger, options);429 this.eth = new EthGroup(this);430 this.ethAddress = new EthAddressGroup(this);431 this.ethCrossAccount = new EthCrossAccountGroup(this);432 this.ethNativeContract = new NativeContractGroup(this);433 this.ethContract = new ContractGroup(this);434 this.ethProperty = new EthPropertyGroup(this);435 }436437 getWeb3(): Web3 {438 if(this.web3 === null) throw Error('Web3 not connected');439 return this.web3;440 }441442 connectWeb3(wsEndpoint: string) {443 if(this.web3 !== null) return;444 this.web3Provider = new Web3.providers.WebsocketProvider(wsEndpoint);445 this.web3 = new Web3(this.web3Provider);446 }447448 async disconnect() {449 if(this.web3 === null) return;450 this.web3Provider?.connection.close();451452 await super.disconnect();453 }454455 clearApi() {456 super.clearApi();457 this.web3 = null;458 }459460 clone(helperCls: EthUniqueHelperConstructor, options?: { [key: string]: any; }): EthUniqueHelper {461 const newHelper = super.clone(helperCls, options) as EthUniqueHelper;462 newHelper.web3 = this.web3;463 newHelper.web3Provider = this.web3Provider;464465 return newHelper;466 }467}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034/* eslint-disable function-call-argument-newline */5// eslint-disable-next-line @typescript-eslint/triple-slash-reference6/// <reference path="unique.dev.d.ts" />78import {readFile} from 'fs/promises';910import Web3 from 'web3';11import {WebsocketProvider} from 'web3-core';12import {Contract} from 'web3-eth-contract';1314import * as solc from 'solc';1516import {evmToAddress} from '@polkadot/util-crypto';17import {IKeyringPair} from '@polkadot/types/types';1819import {DevUniqueHelper} from '../../../util/playgrounds/unique.dev';2021import {ContractImports, CompiledContract, CrossAddress, NormalizedEvent, EthProperty} from './types';2223// Native contracts ABI24import collectionHelpersAbi from '../../abi/collectionHelpers.json';25import fungibleAbi from '../../abi/fungible.json';26import fungibleDeprecatedAbi from '../../abi/fungibleDeprecated.json';27import nonFungibleAbi from '../../abi/nonFungible.json';28import nonFungibleDeprecatedAbi from '../../abi/nonFungibleDeprecated.json';29import refungibleAbi from '../../abi/reFungible.json';30import refungibleDeprecatedAbi from '../../abi/reFungibleDeprecated.json';31import refungibleTokenAbi from '../../abi/reFungibleToken.json';32import contractHelpersAbi from '../../abi/contractHelpers.json';33import {ICrossAccountId, TEthereumAccount} from '../../../util/playgrounds/types';34import {TCollectionMode} from '../../../util/playgrounds/types';3536class EthGroupBase {37 helper: EthUniqueHelper;3839 constructor(helper: EthUniqueHelper) {40 this.helper = helper;41 }42}434445class ContractGroup extends EthGroupBase {46 async findImports(imports?: ContractImports[]){47 if(!imports) return function(path: string) {48 return {error: `File not found: ${path}`};49 };5051 const knownImports = {} as {[key: string]: string};52 for(const imp of imports) {53 knownImports[imp.solPath] = (await readFile(imp.fsPath)).toString();54 }5556 return function(path: string) {57 if(path in knownImports) return {contents: knownImports[path]};58 return {error: `File not found: ${path}`};59 };60 }6162 async compile(name: string, src: string, imports?: ContractImports[]): Promise<CompiledContract> {63 const compiled = JSON.parse(solc.compile(JSON.stringify({64 language: 'Solidity',65 sources: {66 [`${name}.sol`]: {67 content: src,68 },69 },70 settings: {71 outputSelection: {72 '*': {73 '*': ['*'],74 },75 },76 },77 }), {import: await this.findImports(imports)}));7879 const hasErrors = compiled['errors']80 && compiled['errors'].length > 081 && compiled.errors.some(function(err: any) {82 return err.severity == 'error';83 });84 85 if (hasErrors) {86 throw compiled.errors;87 }88 const out = compiled.contracts[`${name}.sol`][name];8990 return {91 abi: out.abi,92 object: '0x' + out.evm.bytecode.object,93 };94 }9596 async deployByCode(signer: string, name: string, src: string, imports?: ContractImports[], gas?: number): Promise<Contract> {97 const compiledContract = await this.compile(name, src, imports);98 return this.deployByAbi(signer, compiledContract.abi, compiledContract.object, gas);99 }100101 async deployByAbi(signer: string, abi: any, object: string, gas?: number): Promise<Contract> {102 const web3 = this.helper.getWeb3();103 const contract = new web3.eth.Contract(abi, undefined, {104 data: object,105 from: signer,106 gas: gas ?? this.helper.eth.DEFAULT_GAS,107 });108 return await contract.deploy({data: object}).send({from: signer});109 }110111}112113class NativeContractGroup extends EthGroupBase {114115 contractHelpers(caller: string): Contract {116 const web3 = this.helper.getWeb3();117 return new web3.eth.Contract(contractHelpersAbi as any, this.helper.getApi().consts.evmContractHelpers.contractAddress.toString(), {from: caller, gas: this.helper.eth.DEFAULT_GAS});118 }119120 collectionHelpers(caller: string) {121 const web3 = this.helper.getWeb3();122 return new web3.eth.Contract(collectionHelpersAbi as any, this.helper.getApi().consts.common.contractAddress.toString(), {from: caller, gas: this.helper.eth.DEFAULT_GAS});123 }124125 collection(address: string, mode: TCollectionMode, caller?: string, mergeDeprecated = false): Contract {126 let abi = {127 'nft': nonFungibleAbi,128 'rft': refungibleAbi,129 'ft': fungibleAbi,130 }[mode];131 if (mergeDeprecated) {132 const deprecated = {133 'nft': nonFungibleDeprecatedAbi,134 'rft': refungibleDeprecatedAbi,135 'ft': fungibleDeprecatedAbi,136 }[mode];137 abi = [...abi,...deprecated];138 }139 const web3 = this.helper.getWeb3();140 return new web3.eth.Contract(abi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});141 }142143 collectionById(collectionId: number, mode: 'nft' | 'rft' | 'ft', caller?: string, mergeDeprecated = false): Contract {144 return this.collection(this.helper.ethAddress.fromCollectionId(collectionId), mode, caller, mergeDeprecated);145 }146147 rftToken(address: string, caller?: string): Contract {148 const web3 = this.helper.getWeb3();149 return new web3.eth.Contract(refungibleTokenAbi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});150 }151152 rftTokenById(collectionId: number, tokenId: number, caller?: string): Contract {153 return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller);154 }155}156157158class EthGroup extends EthGroupBase {159 DEFAULT_GAS = 2_500_000;160161 createAccount() {162 const web3 = this.helper.getWeb3();163 const account = web3.eth.accounts.create();164 web3.eth.accounts.wallet.add(account.privateKey);165 return account.address;166 }167168 async createAccountWithBalance(donor: IKeyringPair, amount=100n) {169 const account = this.createAccount();170 await this.transferBalanceFromSubstrate(donor, account, amount);171172 return account;173 }174175 async transferBalanceFromSubstrate(donor: IKeyringPair, recepient: string, amount=100n, inTokens=true) {176 return await this.helper.balance.transferToSubstrate(donor, evmToAddress(recepient), amount * (inTokens ? this.helper.balance.getOneTokenNominal() : 1n));177 }178179 async getCollectionCreationFee(signer: string) {180 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);181 return await collectionHelper.methods.collectionCreationFee().call();182 }183184 async sendEVM(signer: IKeyringPair, contractAddress: string, abi: string, value: string, gasLimit?: number) {185 if(!gasLimit) gasLimit = this.DEFAULT_GAS;186 const web3 = this.helper.getWeb3();187 const gasPrice = await web3.eth.getGasPrice();188 // TODO: check execution status189 await this.helper.executeExtrinsic(190 signer,191 'api.tx.evm.call', [this.helper.address.substrateToEth(signer.address), contractAddress, abi, value, gasLimit, gasPrice, null, null, []],192 true,193 );194 }195196 async callEVM(signer: TEthereumAccount, contractAddress: string, abi: string) {197 return await this.helper.callRpc('api.rpc.eth.call', [{from: signer, to: contractAddress, data: abi}]);198 }199200 createCollectionMethodName(mode: TCollectionMode) {201 switch (mode) {202 case 'ft':203 return 'createFTCollection';204 case 'nft':205 return 'createNFTCollection';206 case 'rft':207 return 'createRFTCollection';208 }209 }210211 async createCollection(mode: TCollectionMode, signer: string, name: string, description: string, tokenPrefix: string, decimals = 18): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {212 const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();213 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);214 const functionName: string = this.createCollectionMethodName(mode);215216 const functionParams = mode === 'ft' ? [name, decimals, description, tokenPrefix] : [name, description, tokenPrefix];217 const result = await collectionHelper.methods[functionName](...functionParams).send({value: Number(collectionCreationPrice)});218219 const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);220 const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);221 const events = this.helper.eth.normalizeEvents(result.events);222223 return {collectionId, collectionAddress, events};224 }225226 createNFTCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {227 return this.createCollection('nft', signer, name, description, tokenPrefix);228 }229230 async createERC721MetadataCompatibleNFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {231 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);232233 const {collectionId, collectionAddress, events} = await this.createCollection('nft', signer, name, description, tokenPrefix);234235 await collectionHelper.methods.makeCollectionERC721MetadataCompatible(collectionAddress, baseUri).send();236237 return {collectionId, collectionAddress, events};238 }239240 createRFTCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string, events: NormalizedEvent[]}> {241 return this.createCollection('rft', signer, name, description, tokenPrefix);242 }243244 createFungibleCollection(signer: string, name: string, decimals: number, description: string, tokenPrefix: string): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[]}> {245 return this.createCollection('ft', signer, name, description, tokenPrefix, decimals);246 }247248 async createERC721MetadataCompatibleRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {249 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);250251 const {collectionId, collectionAddress, events} = await this.createCollection('rft', signer, name, description, tokenPrefix);252253 await collectionHelper.methods.makeCollectionERC721MetadataCompatible(collectionAddress, baseUri).send();254255 return {collectionId, collectionAddress, events};256 }257258 async deployCollectorContract(signer: string): Promise<Contract> {259 return await this.helper.ethContract.deployByCode(signer, 'Collector', `260 // SPDX-License-Identifier: UNLICENSED261 pragma solidity ^0.8.6;262263 contract Collector {264 uint256 collected;265 fallback() external payable {266 giveMoney();267 }268 function giveMoney() public payable {269 collected += msg.value;270 }271 function getCollected() public view returns (uint256) {272 return collected;273 }274 function getUnaccounted() public view returns (uint256) {275 return address(this).balance - collected;276 }277278 function withdraw(address payable target) public {279 target.transfer(collected);280 collected = 0;281 }282 }283 `);284 }285286 async deployFlipper(signer: string): Promise<Contract> {287 return await this.helper.ethContract.deployByCode(signer, 'Flipper', `288 // SPDX-License-Identifier: UNLICENSED289 pragma solidity ^0.8.6;290291 contract Flipper {292 bool value = false;293 function flip() public {294 value = !value;295 }296 function getValue() public view returns (bool) {297 return value;298 }299 }300 `);301 }302303 async recordCallFee(user: string, call: () => Promise<any>): Promise<bigint> {304 const before = await this.helper.balance.getEthereum(user);305 await call();306 // In dev mode, the transaction might not finish processing in time307 await this.helper.wait.newBlocks(1);308 const after = await this.helper.balance.getEthereum(user);309310 return before - after;311 }312313 normalizeEvents(events: any): NormalizedEvent[] {314 const output = [];315 for (const key of Object.keys(events)) {316 if (key.match(/^[0-9]+$/)) {317 output.push(events[key]);318 } else if (Array.isArray(events[key])) {319 output.push(...events[key]);320 } else {321 output.push(events[key]);322 }323 }324 output.sort((a, b) => a.logIndex - b.logIndex);325 return output.map(({address, event, returnValues}) => {326 const args: { [key: string]: string } = {};327 for (const key of Object.keys(returnValues)) {328 if (!key.match(/^[0-9]+$/)) {329 args[key] = returnValues[key];330 }331 }332 return {333 address,334 event,335 args,336 };337 });338 }339340 async calculateFee(address: ICrossAccountId, code: () => Promise<any>): Promise<bigint> {341 const wrappedCode = async () => {342 await code();343 // In dev mode, the transaction might not finish processing in time344 await this.helper.wait.newBlocks(1);345 };346 return await this.helper.arrange.calculcateFee(address, wrappedCode);347 }348}349350class EthAddressGroup extends EthGroupBase {351 extractCollectionId(address: string): number {352 if (!(address.length === 42 || address.length === 40)) throw new Error('address wrong format');353 return parseInt(address.substr(address.length - 8), 16);354 }355356 fromCollectionId(collectionId: number): string {357 if (collectionId >= 0xffffffff || collectionId < 0) throw new Error('collectionId overflow');358 return Web3.utils.toChecksumAddress(`0x17c4e6453cc49aaaaeaca894e6d9683e${collectionId.toString(16).padStart(8,'0')}`);359 }360361 extractTokenId(address: string): {collectionId: number, tokenId: number} {362 if (!address.startsWith('0x'))363 throw 'address not starts with "0x"';364 if (address.length > 42)365 throw 'address length is more than 20 bytes';366 return {367 collectionId: Number('0x' + address.substring(address.length - 16, address.length - 8)),368 tokenId: Number('0x' + address.substring(address.length - 8)),369 };370 }371372 fromTokenId(collectionId: number, tokenId: number): string {373 return this.helper.util.getTokenAddress({collectionId, tokenId});374 }375376 normalizeAddress(address: string): string {377 return '0x' + address.substring(address.length - 40);378 }379}380export class EthPropertyGroup extends EthGroupBase {381 property(key: string, value: string): EthProperty {382 return [383 key,384 '0x'+Buffer.from(value).toString('hex'),385 ];386 }387}388export type EthUniqueHelperConstructor = new (...args: any[]) => EthUniqueHelper;389390export class EthCrossAccountGroup extends EthGroupBase {391 createAccount(): CrossAddress {392 return this.fromAddress(this.helper.eth.createAccount());393 }394395 async createAccountWithBalance(donor: IKeyringPair, amount=100n) {396 return this.fromAddress(await this.helper.eth.createAccountWithBalance(donor, amount));397 }398399 fromAddress(address: TEthereumAccount): CrossAddress {400 return {401 eth: address,402 sub: '0',403 };404 }405406 fromKeyringPair(keyring: IKeyringPair): CrossAddress {407 return {408 eth: '0x0000000000000000000000000000000000000000',409 sub: keyring.addressRaw,410 };411 }412}413414export class EthUniqueHelper extends DevUniqueHelper {415 web3: Web3 | null = null;416 web3Provider: WebsocketProvider | null = null;417418 eth: EthGroup;419 ethAddress: EthAddressGroup;420 ethCrossAccount: EthCrossAccountGroup;421 ethNativeContract: NativeContractGroup;422 ethContract: ContractGroup;423 ethProperty: EthPropertyGroup;424425 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {426 options.helperBase = options.helperBase ?? EthUniqueHelper;427428 super(logger, options);429 this.eth = new EthGroup(this);430 this.ethAddress = new EthAddressGroup(this);431 this.ethCrossAccount = new EthCrossAccountGroup(this);432 this.ethNativeContract = new NativeContractGroup(this);433 this.ethContract = new ContractGroup(this);434 this.ethProperty = new EthPropertyGroup(this);435 }436437 getWeb3(): Web3 {438 if(this.web3 === null) throw Error('Web3 not connected');439 return this.web3;440 }441442 connectWeb3(wsEndpoint: string) {443 if(this.web3 !== null) return;444 this.web3Provider = new Web3.providers.WebsocketProvider(wsEndpoint);445 this.web3 = new Web3(this.web3Provider);446 }447448 async disconnect() {449 if(this.web3 === null) return;450 this.web3Provider?.connection.close();451452 await super.disconnect();453 }454455 clearApi() {456 super.clearApi();457 this.web3 = null;458 }459460 clone(helperCls: EthUniqueHelperConstructor, options?: { [key: string]: any; }): EthUniqueHelper {461 const newHelper = super.clone(helperCls, options) as EthUniqueHelper;462 newHelper.web3 = this.web3;463 newHelper.web3Provider = this.web3Provider;464465 return newHelper;466 }467}