git.delta.rocks / unique-network / refs/commits / 6e3cf5e45846

difftreelog

Merge pull request #919 from UniqueNetwork/feature/crossBalanceOf

Yaroslav Bolyukin2023-04-19parents: #c894432 #a1d8979.patch.diff
in: master

26 files changed

modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -327,6 +327,15 @@
 	fn collection_helper_address(&self) -> Result<Address> {
 		Ok(T::ContractAddress::get())
 	}
+
+	/// @notice Balance of account
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of fingibles owned by `owner`, possibly zero
+	fn balance_of_cross(&self, owner: CrossAddress) -> Result<U256> {
+		self.consume_store_reads(1)?;
+		let balance = <Balance<T>>::get((self.id, owner.into_sub_cross_account::<T>()?));
+		Ok(balance.into())
+	}
 }
 
 #[solidity_interface(
modifiedpallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -511,7 +511,7 @@
 	bytes value;
 }
 
-/// @dev the ERC-165 identifier for this interface is 0x85d7dea6
+/// @dev the ERC-165 identifier for this interface is 0x69d14d3e
 contract ERC20UniqueExtensions is Dummy, ERC165 {
 	/// @dev Function to check the amount of tokens that an owner allowed to a spender.
 	/// @param owner crossAddress The address which owns the funds.
@@ -630,6 +630,18 @@
 		dummy;
 		return 0x0000000000000000000000000000000000000000;
 	}
+
+	/// @notice Balance of account
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of fingibles owned by `owner`, possibly zero
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) public view returns (uint256) {
+		require(false, stub_error);
+		owner;
+		dummy;
+		return 0;
+	}
 }
 
 struct AmountForAddress {
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -749,12 +749,29 @@
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
+	#[solidity(hide)]
 	fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
+		Self::owner_of_cross(&self, token_id)
+	}
+
+	/// Returns the owner (in cross format) of the token.
+	///
+	/// @param tokenId Id for the token.
+	fn owner_of_cross(&self, token_id: U256) -> Result<eth::CrossAddress> {
 		Self::token_owner(&self, token_id.try_into()?)
 			.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
 			.map_err(|_| Error::Revert("token not found".into()))
 	}
 
+	/// @notice Count all NFTs assigned to an owner
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of NFTs owned by `owner`, possibly zero
+	fn balance_of_cross(&self, owner: eth::CrossAddress) -> Result<U256> {
+		self.consume_store_reads(1)?;
+		let balance = <AccountBalance<T>>::get((self.id, owner.into_sub_cross_account::<T>()?));
+		Ok(balance.into())
+	}
+
 	/// Returns the token properties.
 	///
 	/// @param tokenId Id for the token.
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -774,7 +774,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x16de3152
+/// @dev the ERC-165 identifier for this interface is 0x307b061a
 contract ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -803,18 +803,42 @@
 		return "";
 	}
 
+	// /// Returns the owner (in cross format) of the token.
+	// ///
+	// /// @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 (CrossAddress memory) {
+	// 	require(false, stub_error);
+	// 	tokenId;
+	// 	dummy;
+	// 	return CrossAddress(0x0000000000000000000000000000000000000000,0);
+	// }
+
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @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 (CrossAddress memory) {
+	/// @dev EVM selector for this function is: 0xcaa3a4d0,
+	///  or in textual repr: ownerOfCross(uint256)
+	function ownerOfCross(uint256 tokenId) public view returns (CrossAddress memory) {
 		require(false, stub_error);
 		tokenId;
 		dummy;
 		return CrossAddress(0x0000000000000000000000000000000000000000, 0);
 	}
 
+	/// @notice Count all NFTs assigned to an owner
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of NFTs owned by `owner`, possibly zero
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) public view returns (uint256) {
+		require(false, stub_error);
+		owner;
+		dummy;
+		return 0;
+	}
+
 	/// Returns the token properties.
 	///
 	/// @param tokenId Id for the token.
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -783,7 +783,15 @@
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
+	#[solidity(hide)]
 	fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
+		Self::owner_of_cross(&self, token_id)
+	}
+
+	/// Returns the owner (in cross format) of the token.
+	///
+	/// @param tokenId Id for the token.
+	fn owner_of_cross(&self, token_id: U256) -> Result<eth::CrossAddress> {
 		Self::token_owner(&self, token_id.try_into()?)
 			.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
 			.or_else(|err| match err {
@@ -794,6 +802,15 @@
 			})
 	}
 
+	/// @notice Count all RFTs assigned to an owner
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of RFTs owned by `owner`, possibly zero
+	fn balance_of_cross(&self, owner: eth::CrossAddress) -> Result<U256> {
+		self.consume_store_reads(1)?;
+		let balance = <AccountBalance<T>>::get((self.id, owner.into_sub_cross_account::<T>()?));
+		Ok(balance.into())
+	}
+
 	/// Returns the token properties.
 	///
 	/// @param tokenId Id for the token.
modifiedpallets/refungible/src/erc_token.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -283,6 +283,16 @@
 			.map_err(dispatch_to_evm::<T>)?;
 		Ok(true)
 	}
+
+	/// @notice Balance of account
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of fingibles owned by `owner`, possibly zero
+	fn balance_of_cross(&self, owner: CrossAddress) -> Result<U256> {
+		self.consume_store_reads(1)?;
+		let balance = <Balance<T>>::get((self.id, self.1, owner.into_sub_cross_account::<T>()?));
+		Ok(balance.into())
+	}
+
 	/// @dev Function that changes total amount of the tokens.
 	///  Throws if `msg.sender` doesn't owns all of the tokens.
 	/// @param amount New total amount of the tokens.
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -774,7 +774,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb365c124
+/// @dev the ERC-165 identifier for this interface is 0x95c0f66c
 contract ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -803,18 +803,42 @@
 		return "";
 	}
 
+	// /// Returns the owner (in cross format) of the token.
+	// ///
+	// /// @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 (CrossAddress memory) {
+	// 	require(false, stub_error);
+	// 	tokenId;
+	// 	dummy;
+	// 	return CrossAddress(0x0000000000000000000000000000000000000000,0);
+	// }
+
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @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 (CrossAddress memory) {
+	/// @dev EVM selector for this function is: 0xcaa3a4d0,
+	///  or in textual repr: ownerOfCross(uint256)
+	function ownerOfCross(uint256 tokenId) public view returns (CrossAddress memory) {
 		require(false, stub_error);
 		tokenId;
 		dummy;
 		return CrossAddress(0x0000000000000000000000000000000000000000, 0);
 	}
 
+	/// @notice Count all RFTs assigned to an owner
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of RFTs owned by `owner`, possibly zero
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) public view returns (uint256) {
+		require(false, stub_error);
+		owner;
+		dummy;
+		return 0;
+	}
+
 	/// Returns the token properties.
 	///
 	/// @param tokenId Id for the token.
modifiedpallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungibleToken.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
@@ -36,7 +36,7 @@
 	}
 }
 
-/// @dev the ERC-165 identifier for this interface is 0x01d536fc
+/// @dev the ERC-165 identifier for this interface is 0xedd3a564
 contract ERC20UniqueExtensions is Dummy, ERC165 {
 	/// @dev Function to check the amount of tokens that an owner allowed to a spender.
 	/// @param owner crossAddress The address which owns the funds.
@@ -97,6 +97,18 @@
 		return false;
 	}
 
+	/// @notice Balance of account
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of fingibles owned by `owner`, possibly zero
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) public view returns (uint256) {
+		require(false, stub_error);
+		owner;
+		dummy;
+		return 0;
+	}
+
 	/// @dev Function that changes total amount of the tokens.
 	///  Throws if `msg.sender` doesn't owns all of the tokens.
 	/// @param amount New total amount of the tokens.
modifiedruntime/common/ethereum/sponsoring/refungible.rsdiffbeforeafterboth
--- a/runtime/common/ethereum/sponsoring/refungible.rs
+++ b/runtime/common/ethereum/sponsoring/refungible.rs
@@ -227,6 +227,8 @@
 			| Symbol
 			| Description
 			| CrossOwnerOf { .. }
+			| OwnerOfCross { .. }
+			| BalanceOfCross { .. }
 			| Properties { .. }
 			| NextTokenId
 			| TokenContractAddress { .. }
@@ -341,9 +343,11 @@
 			ERC165Call(_, _) => None,
 
 			// Not sponsored
-			AllowanceCross { .. } | BurnFrom { .. } | BurnFromCross { .. } | Repartition { .. } => {
-				None
-			}
+			AllowanceCross { .. }
+			| BalanceOfCross { .. }
+			| BurnFrom { .. }
+			| BurnFromCross { .. }
+			| Repartition { .. } => None,
 
 			TransferCross { .. } | TransferFromCross { .. } => {
 				let RefungibleTokenHandle(handle, token_id) = token;
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -181,6 +181,23 @@
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
         "internalType": "struct CrossAddress",
+        "name": "owner",
+        "type": "tuple"
+      }
+    ],
+    "name": "balanceOfCross",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
         "name": "from",
         "type": "tuple"
       },
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -177,6 +177,23 @@
   },
   {
     "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
+        "name": "owner",
+        "type": "tuple"
+      }
+    ],
+    "name": "balanceOfCross",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
     ],
     "name": "burn",
@@ -386,25 +403,6 @@
   },
   {
     "inputs": [
-      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
-    ],
-    "name": "crossOwnerOf",
-    "outputs": [
-      {
-        "components": [
-          { "internalType": "address", "name": "eth", "type": "address" },
-          { "internalType": "uint256", "name": "sub", "type": "uint256" }
-        ],
-        "internalType": "struct CrossAddress",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
       { "internalType": "string[]", "name": "keys", "type": "string[]" }
     ],
     "name": "deleteCollectionProperties",
@@ -540,6 +538,25 @@
   },
   {
     "inputs": [
+      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+    ],
+    "name": "ownerOfCross",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
       { "internalType": "string[]", "name": "keys", "type": "string[]" }
     ],
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -159,6 +159,23 @@
   },
   {
     "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
+        "name": "owner",
+        "type": "tuple"
+      }
+    ],
+    "name": "balanceOfCross",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
     ],
     "name": "burn",
@@ -368,25 +385,6 @@
   },
   {
     "inputs": [
-      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
-    ],
-    "name": "crossOwnerOf",
-    "outputs": [
-      {
-        "components": [
-          { "internalType": "address", "name": "eth", "type": "address" },
-          { "internalType": "uint256", "name": "sub", "type": "uint256" }
-        ],
-        "internalType": "struct CrossAddress",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
       { "internalType": "string[]", "name": "keys", "type": "string[]" }
     ],
     "name": "deleteCollectionProperties",
@@ -522,6 +520,25 @@
   },
   {
     "inputs": [
+      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+    ],
+    "name": "ownerOfCross",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
       { "internalType": "string[]", "name": "keys", "type": "string[]" }
     ],
modifiedtests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -130,6 +130,23 @@
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
         "internalType": "struct CrossAddress",
+        "name": "owner",
+        "type": "tuple"
+      }
+    ],
+    "name": "balanceOfCross",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
         "name": "from",
         "type": "tuple"
       },
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -353,7 +353,7 @@
 	bytes value;
 }
 
-/// @dev the ERC-165 identifier for this interface is 0x85d7dea6
+/// @dev the ERC-165 identifier for this interface is 0x69d14d3e
 interface ERC20UniqueExtensions is Dummy, ERC165 {
 	/// @dev Function to check the amount of tokens that an owner allowed to a spender.
 	/// @param owner crossAddress The address which owns the funds.
@@ -416,6 +416,13 @@
 	/// @dev EVM selector for this function is: 0x1896cce6,
 	///  or in textual repr: collectionHelperAddress()
 	function collectionHelperAddress() external view returns (address);
+
+	/// @notice Balance of account
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of fingibles owned by `owner`, possibly zero
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) external view returns (uint256);
 }
 
 struct AmountForAddress {
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -533,7 +533,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x16de3152
+/// @dev the ERC-165 identifier for this interface is 0x307b061a
 interface ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -550,12 +550,26 @@
 	///  or in textual repr: description()
 	function description() external view returns (string memory);
 
+	// /// Returns the owner (in cross format) of the token.
+	// ///
+	// /// @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 (CrossAddress memory);
+
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @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 (CrossAddress memory);
+	/// @dev EVM selector for this function is: 0xcaa3a4d0,
+	///  or in textual repr: ownerOfCross(uint256)
+	function ownerOfCross(uint256 tokenId) external view returns (CrossAddress memory);
+
+	/// @notice Count all NFTs assigned to an owner
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of NFTs owned by `owner`, possibly zero
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) external view returns (uint256);
 
 	/// Returns the token properties.
 	///
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -533,7 +533,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb365c124
+/// @dev the ERC-165 identifier for this interface is 0x95c0f66c
 interface ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -550,12 +550,26 @@
 	///  or in textual repr: description()
 	function description() external view returns (string memory);
 
+	// /// Returns the owner (in cross format) of the token.
+	// ///
+	// /// @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 (CrossAddress memory);
+
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @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 (CrossAddress memory);
+	/// @dev EVM selector for this function is: 0xcaa3a4d0,
+	///  or in textual repr: ownerOfCross(uint256)
+	function ownerOfCross(uint256 tokenId) external view returns (CrossAddress memory);
+
+	/// @notice Count all RFTs assigned to an owner
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of RFTs owned by `owner`, possibly zero
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) external view returns (uint256);
 
 	/// Returns the token properties.
 	///
modifiedtests/src/eth/api/UniqueRefungibleToken.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungibleToken.sol
+++ b/tests/src/eth/api/UniqueRefungibleToken.sol
@@ -23,7 +23,7 @@
 	function parentTokenId() external view returns (uint256);
 }
 
-/// @dev the ERC-165 identifier for this interface is 0x01d536fc
+/// @dev the ERC-165 identifier for this interface is 0xedd3a564
 interface ERC20UniqueExtensions is Dummy, ERC165 {
 	/// @dev Function to check the amount of tokens that an owner allowed to a spender.
 	/// @param owner crossAddress The address which owns the funds.
@@ -60,6 +60,13 @@
 	///  or in textual repr: approveCross((address,uint256),uint256)
 	function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);
 
+	/// @notice Balance of account
+	/// @param owner An cross address for whom to query the balance
+	/// @return The number of fingibles owned by `owner`, possibly zero
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) external view returns (uint256);
+
 	/// @dev Function that changes total amount of the tokens.
 	///  Throws if `msg.sender` doesn't owns all of the tokens.
 	/// @param amount New total amount of the tokens.
modifiedtests/src/eth/fungible.test.tsdiffbeforeafterboth
before · tests/src/eth/fungible.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {expect, itEth, usingEthPlaygrounds} from './util';18import {IKeyringPair} from '@polkadot/types/types';1920describe('Fungible: Plain calls', () => {21  let donor: IKeyringPair;22  let alice: IKeyringPair;23  let owner: IKeyringPair;2425  before(async function() {26    await usingEthPlaygrounds(async (helper, privateKey) => {27      donor = await privateKey({url: import.meta.url});28      [alice, owner] = await helper.arrange.createAccounts([30n, 20n], donor);29    });30  });3132  [33    'substrate' as const,34    'ethereum' as const,35  ].map(testCase => {36    itEth(`Can perform mintCross() for ${testCase} address`, async ({helper}) => {37      // 1. Create receiver depending on the test case:38      const receiverEth = helper.eth.createAccount();39      const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);40      const receiverSub = owner;41      const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(owner);4243      const ethOwner = await helper.eth.createAccountWithBalance(donor);44      const collection = await helper.ft.mintCollection(alice);45      await collection.addAdmin(alice, {Ethereum: ethOwner});4647      const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);48      const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'ft', ethOwner);4950      // 2. Mint tokens:51      const result = await collectionEvm.methods.mintCross(testCase === 'ethereum' ? receiverCrossEth : receiverCrossSub, 100).send();5253      const event = result.events.Transfer;54      expect(event.address).to.equal(collectionAddress);55      expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');56      expect(event.returnValues.to).to.equal(testCase === 'ethereum' ? receiverEth : helper.address.substrateToEth(receiverSub.address));57      expect(event.returnValues.value).to.equal('100');5859      // 3. Get balance depending on the test case:60      let balance;61      if (testCase === 'ethereum') balance = await collection.getBalance({Ethereum: receiverEth});62      else if (testCase === 'substrate') balance = await collection.getBalance({Substrate: receiverSub.address});63      // 3.1 Check balance:64      expect(balance).to.eq(100n);65    });66  });6768  itEth('Can perform mintBulk()', async ({helper}) => {69    const owner = await helper.eth.createAccountWithBalance(donor);70    const bulkSize = 3;71    const receivers = [...new Array(bulkSize)].map(() => helper.eth.createAccount());72    const collection = await helper.ft.mintCollection(alice);73    await collection.addAdmin(alice, {Ethereum: owner});7475    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);76    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);7778    const result = await contract.methods.mintBulk(Array.from({length: bulkSize}, (_, i) => (79      [receivers[i], (i + 1) * 10]80    ))).send();81    const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.value - b.returnValues.value);82    for (let i = 0; i < bulkSize; i++) {83      const event = events[i];84      expect(event.address).to.equal(collectionAddress);85      expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');86      expect(event.returnValues.to).to.equal(receivers[i]);87      expect(event.returnValues.value).to.equal(String(10 * (i + 1)));88    }89  });9091  // Soft-deprecated92  itEth('Can perform burn()', async ({helper}) => {93    const owner = await helper.eth.createAccountWithBalance(donor);94    const receiver = await helper.eth.createAccountWithBalance(donor);95    const collection = await helper.ft.mintCollection(alice);96    await collection.addAdmin(alice, {Ethereum: owner});9798    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);99    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner, true);100    await contract.methods.mint(receiver, 100).send();101102    const result = await contract.methods.burnFrom(receiver, 49).send({from: receiver});103104    const event = result.events.Transfer;105    expect(event.address).to.equal(collectionAddress);106    expect(event.returnValues.from).to.equal(receiver);107    expect(event.returnValues.to).to.equal('0x0000000000000000000000000000000000000000');108    expect(event.returnValues.value).to.equal('49');109110    const balance = await contract.methods.balanceOf(receiver).call();111    expect(balance).to.equal('51');112  });113114  itEth('Can perform approve()', async ({helper}) => {115    const owner = await helper.eth.createAccountWithBalance(donor);116    const spender = helper.eth.createAccount();117    const collection = await helper.ft.mintCollection(alice);118    await collection.mint(alice, 200n, {Ethereum: owner});119120    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);121    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);122123    {124      const result = await contract.methods.approve(spender, 100).send({from: owner});125126      const event = result.events.Approval;127      expect(event.address).to.be.equal(collectionAddress);128      expect(event.returnValues.owner).to.be.equal(owner);129      expect(event.returnValues.spender).to.be.equal(spender);130      expect(event.returnValues.value).to.be.equal('100');131    }132133    {134      const allowance = await contract.methods.allowance(owner, spender).call();135      expect(+allowance).to.equal(100);136    }137    {138      const ownerCross = helper.ethCrossAccount.fromAddress(owner);139      const spenderCross = helper.ethCrossAccount.fromAddress(spender);140      const allowance = await contract.methods.allowanceCross(ownerCross, spenderCross).call();141      expect(+allowance).to.equal(100);142    }143  });144145  itEth('Can perform approveCross()', async ({helper}) => {146    const owner = await helper.eth.createAccountWithBalance(donor);147    const spender = helper.eth.createAccount();148    const spenderSub = (await helper.arrange.createAccounts([1n], donor))[0];149    const spenderCrossEth = helper.ethCrossAccount.fromAddress(spender);150    const spenderCrossSub = helper.ethCrossAccount.fromKeyringPair(spenderSub);151152153    const collection = await helper.ft.mintCollection(alice);154    await collection.mint(alice, 200n, {Ethereum: owner});155156    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);157    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);158159    {160      const result = await contract.methods.approveCross(spenderCrossEth, 100).send({from: owner});161      const event = result.events.Approval;162      expect(event.address).to.be.equal(collectionAddress);163      expect(event.returnValues.owner).to.be.equal(owner);164      expect(event.returnValues.spender).to.be.equal(spender);165      expect(event.returnValues.value).to.be.equal('100');166    }167168    {169      const allowance = await contract.methods.allowance(owner, spender).call();170      expect(+allowance).to.equal(100);171    }172173174    {175      const result = await contract.methods.approveCross(spenderCrossSub, 100).send({from: owner});176      const event = result.events.Approval;177      expect(event.address).to.be.equal(collectionAddress);178      expect(event.returnValues.owner).to.be.equal(owner);179      expect(event.returnValues.spender).to.be.equal(helper.address.substrateToEth(spenderSub.address));180      expect(event.returnValues.value).to.be.equal('100');181    }182183    {184      const allowance = await collection.getApprovedTokens({Ethereum: owner}, {Substrate: spenderSub.address});185      expect(allowance).to.equal(100n);186    }187188    {189      //TO-DO expect with future allowanceCross(owner, spenderCrossEth).call()190    }191  });192193  itEth('Non-owner and non admin cannot approveCross', async ({helper}) => {194    const nonOwner = await helper.eth.createAccountWithBalance(donor);195    const nonOwnerCross = helper.ethCrossAccount.fromAddress(nonOwner);196    const owner = await helper.eth.createAccountWithBalance(donor);197    const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});198    await collection.mint(alice, 100n, {Ethereum: owner});199200    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);201    const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);202203    await expect(collectionEvm.methods.approveCross(nonOwnerCross, 20).call({from: nonOwner})).to.be.rejectedWith('CantApproveMoreThanOwned');204  });205206207  itEth('Can perform burnFromCross()', async ({helper}) => {208    const sender = await helper.eth.createAccountWithBalance(donor, 100n);209210    const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);211212    await collection.mint(owner, 200n, {Substrate: owner.address});213    await collection.approveTokens(owner, {Ethereum: sender}, 100n);214215    const address = helper.ethAddress.fromCollectionId(collection.collectionId);216    const contract = await helper.ethNativeContract.collection(address, 'ft');217218    const fromBalanceBefore = await collection.getBalance({Substrate: owner.address});219220    const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);221    const result = await contract.methods.burnFromCross(ownerCross, 49).send({from: sender});222    const events = result.events;223224    expect(events).to.be.like({225      Transfer: {226        address: helper.ethAddress.fromCollectionId(collection.collectionId),227        event: 'Transfer',228        returnValues: {229          from: helper.address.substrateToEth(owner.address),230          to: '0x0000000000000000000000000000000000000000',231          value: '49',232        },233      },234      Approval: {235        address: helper.ethAddress.fromCollectionId(collection.collectionId),236        returnValues: {237          owner: helper.address.substrateToEth(owner.address),238          spender: sender,239          value: '51',240        },241        event: 'Approval',242      },243    });244245    const fromBalanceAfter = await collection.getBalance({Substrate: owner.address});246    expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(49n);247  });248249  itEth('Can perform transferFrom()', async ({helper}) => {250    const owner = await helper.eth.createAccountWithBalance(donor);251    const spender = await helper.eth.createAccountWithBalance(donor);252    const receiver = helper.eth.createAccount();253    const collection = await helper.ft.mintCollection(alice);254    await collection.mint(alice, 200n, {Ethereum: owner});255256    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);257    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);258259    await contract.methods.approve(spender, 100).send();260261    {262      const result = await contract.methods.transferFrom(owner, receiver, 49).send({from: spender});263264      let event = result.events.Transfer;265      expect(event.address).to.be.equal(collectionAddress);266      expect(event.returnValues.from).to.be.equal(owner);267      expect(event.returnValues.to).to.be.equal(receiver);268      expect(event.returnValues.value).to.be.equal('49');269270      event = result.events.Approval;271      expect(event.address).to.be.equal(collectionAddress);272      expect(event.returnValues.owner).to.be.equal(owner);273      expect(event.returnValues.spender).to.be.equal(spender);274      expect(event.returnValues.value).to.be.equal('51');275    }276277    {278      const balance = await contract.methods.balanceOf(receiver).call();279      expect(+balance).to.equal(49);280    }281282    {283      const balance = await contract.methods.balanceOf(owner).call();284      expect(+balance).to.equal(151);285    }286  });287288  itEth('Can perform transferCross()', async ({helper}) => {289    const sender = await helper.eth.createAccountWithBalance(donor);290    const receiverEth = await helper.eth.createAccountWithBalance(donor);291    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);292    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(donor);293    const collection = await helper.ft.mintCollection(alice);294    await collection.mint(alice, 200n, {Ethereum: sender});295296    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);297    const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'ft', sender);298299    {300      // Can transferCross to ethereum address:301      const result = await collectionEvm.methods.transferCross(receiverCrossEth, 50).send({from: sender});302      // Check events:303      const event = result.events.Transfer;304      expect(event.address).to.be.equal(collectionAddress);305      expect(event.returnValues.from).to.be.equal(sender);306      expect(event.returnValues.to).to.be.equal(receiverEth);307      expect(event.returnValues.value).to.be.equal('50');308      // Sender's balance decreased:309      const ownerBalance = await collectionEvm.methods.balanceOf(sender).call();310      expect(+ownerBalance).to.equal(150);311      // Receiver's balance increased:312      const receiverBalance = await collectionEvm.methods.balanceOf(receiverEth).call();313      expect(+receiverBalance).to.equal(50);314    }315316    {317      // Can transferCross to substrate address:318      const result = await collectionEvm.methods.transferCross(receiverCrossSub, 50).send({from: sender});319      // Check events:320      const event = result.events.Transfer;321      expect(event.address).to.be.equal(collectionAddress);322      expect(event.returnValues.from).to.be.equal(sender);323      expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(donor.address));324      expect(event.returnValues.value).to.be.equal('50');325      // Sender's balance decreased:326      const senderBalance = await collection.getBalance({Ethereum: sender});327      expect(senderBalance).to.equal(100n);328      // Receiver's balance increased:329      const balance = await collection.getBalance({Substrate: donor.address});330      expect(balance).to.equal(50n);331    }332  });333334  ['transfer', 'transferCross'].map(testCase => itEth(`Cannot ${testCase} incorrect amount`, async ({helper}) => {335    const sender = await helper.eth.createAccountWithBalance(donor);336    const receiverEth = await helper.eth.createAccountWithBalance(donor);337    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);338    const BALANCE = 200n;339    const BALANCE_TO_TRANSFER = BALANCE + 100n;340341    const collection = await helper.ft.mintCollection(alice);342    await collection.mint(alice, BALANCE, {Ethereum: sender});343    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);344    const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'ft', sender);345346    // 1. Cannot transfer more than have347    const receiver = testCase === 'transfer' ? receiverEth : receiverCrossEth;348    await expect(collectionEvm.methods[testCase](receiver, BALANCE_TO_TRANSFER).send({from: sender})).to.be.rejected;349    // 2. Zero transfer allowed (EIP-20):350    await collectionEvm.methods[testCase](receiver, 0n).send({from: sender});351  }));352353354  itEth('Can perform transfer()', async ({helper}) => {355    const owner = await helper.eth.createAccountWithBalance(donor);356    const receiver = await helper.eth.createAccountWithBalance(donor);357    const collection = await helper.ft.mintCollection(alice);358    await collection.mint(alice, 200n, {Ethereum: owner});359360    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);361    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);362363    {364      const result = await contract.methods.transfer(receiver, 50).send({from: owner});365366      const event = result.events.Transfer;367      expect(event.address).to.be.equal(collectionAddress);368      expect(event.returnValues.from).to.be.equal(owner);369      expect(event.returnValues.to).to.be.equal(receiver);370      expect(event.returnValues.value).to.be.equal('50');371    }372373    {374      const balance = await contract.methods.balanceOf(owner).call();375      expect(+balance).to.equal(150);376    }377378    {379      const balance = await contract.methods.balanceOf(receiver).call();380      expect(+balance).to.equal(50);381    }382  });383384  itEth('Can perform transferFromCross()', async ({helper}) => {385    const sender = await helper.eth.createAccountWithBalance(donor, 100n);386387    const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);388389    const receiver = helper.eth.createAccount();390391    await collection.mint(owner, 200n, {Substrate: owner.address});392    await collection.approveTokens(owner, {Ethereum: sender}, 100n);393394    const address = helper.ethAddress.fromCollectionId(collection.collectionId);395    const contract = await helper.ethNativeContract.collection(address, 'ft');396397    const from = helper.ethCrossAccount.fromKeyringPair(owner);398    const to = helper.ethCrossAccount.fromAddress(receiver);399400    const fromBalanceBefore = await collection.getBalance({Substrate: owner.address});401    const toBalanceBefore = await collection.getBalance({Ethereum: receiver});402403    const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender});404405    expect(result.events).to.be.like({406      Transfer: {407        address,408        event: 'Transfer',409        returnValues: {410          from: helper.address.substrateToEth(owner.address),411          to: receiver,412          value: '51',413        },414      },415      Approval: {416        address,417        event: 'Approval',418        returnValues: {419          owner: helper.address.substrateToEth(owner.address),420          spender: sender,421          value: '49',422        },423      }});424425    const fromBalanceAfter = await collection.getBalance({Substrate: owner.address});426    expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(51n);427    const toBalanceAfter = await collection.getBalance({Ethereum: receiver});428    expect(toBalanceAfter - toBalanceBefore).to.be.eq(51n);429  });430});431432describe('Fungible: Fees', () => {433  let donor: IKeyringPair;434  let alice: IKeyringPair;435436  before(async function() {437    await usingEthPlaygrounds(async (helper, privateKey) => {438      donor = await privateKey({url: import.meta.url});439      [alice] = await helper.arrange.createAccounts([20n], donor);440    });441  });442443  itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {444    const owner = await helper.eth.createAccountWithBalance(donor);445    const spender = helper.eth.createAccount();446    const collection = await helper.ft.mintCollection(alice);447    await collection.mint(alice, 200n, {Ethereum: owner});448449    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);450    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);451452    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, 100).send({from: owner}));453    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));454  });455456  itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {457    const owner = await helper.eth.createAccountWithBalance(donor);458    const spender = await helper.eth.createAccountWithBalance(donor);459    const collection = await helper.ft.mintCollection(alice);460    await collection.mint(alice, 200n, {Ethereum: owner});461462    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);463    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);464465    await contract.methods.approve(spender, 100).send({from: owner});466467    const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, 100).send({from: spender}));468    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));469  });470471  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {472    const owner = await helper.eth.createAccountWithBalance(donor);473    const receiver = helper.eth.createAccount();474    const collection = await helper.ft.mintCollection(alice);475    await collection.mint(alice, 200n, {Ethereum: owner});476477    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);478    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);479480    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, 100).send({from: owner}));481    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));482  });483});484485describe('Fungible: Substrate calls', () => {486  let donor: IKeyringPair;487  let alice: IKeyringPair;488  let owner: IKeyringPair;489490  before(async function() {491    await usingEthPlaygrounds(async (helper, privateKey) => {492      donor = await privateKey({url: import.meta.url});493      [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);494    });495  });496497  itEth('Events emitted for approve()', async ({helper}) => {498    const receiver = helper.eth.createAccount();499    const collection = await helper.ft.mintCollection(alice);500    await collection.mint(alice, 200n);501502    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);503    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft');504505    const events: any = [];506    contract.events.allEvents((_: any, event: any) => {507      events.push(event);508    });509510    await collection.approveTokens(alice, {Ethereum: receiver}, 100n);511    if (events.length == 0) await helper.wait.newBlocks(1);512    const event = events[0];513514    expect(event.event).to.be.equal('Approval');515    expect(event.address).to.be.equal(collectionAddress);516    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));517    expect(event.returnValues.spender).to.be.equal(receiver);518    expect(event.returnValues.value).to.be.equal('100');519  });520521  itEth('Events emitted for transferFrom()', async ({helper}) => {522    const [bob] = await helper.arrange.createAccounts([10n], donor);523    const receiver = helper.eth.createAccount();524    const collection = await helper.ft.mintCollection(alice);525    await collection.mint(alice, 200n);526    await collection.approveTokens(alice, {Substrate: bob.address}, 100n);527528    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);529    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft');530531    const events: any = [];532    contract.events.allEvents((_: any, event: any) => {533      events.push(event);534    });535536    await collection.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver}, 51n);537    if (events.length == 0) await helper.wait.newBlocks(1);538    let event = events[0];539540    expect(event.event).to.be.equal('Transfer');541    expect(event.address).to.be.equal(collectionAddress);542    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));543    expect(event.returnValues.to).to.be.equal(receiver);544    expect(event.returnValues.value).to.be.equal('51');545546    event = events[1];547    expect(event.event).to.be.equal('Approval');548    expect(event.address).to.be.equal(collectionAddress);549    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));550    expect(event.returnValues.spender).to.be.equal(helper.address.substrateToEth(bob.address));551    expect(event.returnValues.value).to.be.equal('49');552  });553554  itEth('Events emitted for transfer()', async ({helper}) => {555    const receiver = helper.eth.createAccount();556    const collection = await helper.ft.mintCollection(alice);557    await collection.mint(alice, 200n);558559    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);560    const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft');561562    const events: any = [];563    contract.events.allEvents((_: any, event: any) => {564      events.push(event);565    });566567    await collection.transfer(alice, {Ethereum:receiver}, 51n);568    if (events.length == 0) await helper.wait.newBlocks(1);569    const event = events[0];570571    expect(event.event).to.be.equal('Transfer');572    expect(event.address).to.be.equal(collectionAddress);573    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));574    expect(event.returnValues.to).to.be.equal(receiver);575    expect(event.returnValues.value).to.be.equal('51');576  });577578  itEth('Events emitted for transferFromCross()', async ({helper}) => {579    const sender = await helper.eth.createAccountWithBalance(donor, 100n);580581    const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);582583    const receiver = helper.eth.createAccount();584585    await collection.mint(owner, 200n, {Substrate: owner.address});586    await collection.approveTokens(owner, {Ethereum: sender}, 100n);587588    const address = helper.ethAddress.fromCollectionId(collection.collectionId);589    const contract = await helper.ethNativeContract.collection(address, 'ft');590591    const from = helper.ethCrossAccount.fromKeyringPair(owner);592    const to = helper.ethCrossAccount.fromAddress(receiver);593594    const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender});595596    expect(result.events).to.be.like({597      Transfer: {598        address,599        event: 'Transfer',600        returnValues: {601          from: helper.address.substrateToEth(owner.address),602          to: receiver,603          value: '51',604        },605      },606      Approval: {607        address,608        event: 'Approval',609        returnValues: {610          owner: helper.address.substrateToEth(owner.address),611          spender: sender,612          value: '49',613        },614      }});615  });616});
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -662,6 +662,38 @@
     // Cannot transfer token if it does not exist:
     await expect(collectionEvm.methods[testCase](receiver, 999999).send({from: sender})).to.be.rejected;
   }));
+
+  itEth('Check balanceOfCross()', async ({helper}) => {
+    const collection = await helper.nft.mintCollection(minter, {});
+    const owner = await helper.ethCrossAccount.createAccountWithBalance(donor);
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'nft', owner.eth);
+
+    expect(await collectionEvm.methods.balanceOfCross(owner).call({from: owner.eth})).to.be.eq('0');
+
+    for (let i = 1; i < 10; i++) {
+      await collection.mintToken(minter, {Ethereum: owner.eth});
+      expect(await collectionEvm.methods.balanceOfCross(owner).call({from: owner.eth})).to.be.eq(i.toString());
+    }
+  });
+
+  itEth('Check ownerOfCross()', async ({helper}) => {
+    const collection = await helper.nft.mintCollection(minter, {});
+    let owner = await helper.ethCrossAccount.createAccountWithBalance(donor);
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'nft', owner.eth);
+    const {tokenId} = await collection.mintToken(minter, {Ethereum: owner.eth});
+
+    for (let i = 1n; i < 10n; i++) {
+      const ownerCross = await collectionEvm.methods.ownerOfCross(tokenId).call({from: owner.eth});
+      expect(ownerCross.eth).to.be.eq(owner.eth);
+      expect(ownerCross.sub).to.be.eq(owner.sub);
+
+      const newOwner = await helper.ethCrossAccount.createAccountWithBalance(donor);
+      await collectionEvm.methods.transferCross(newOwner, tokenId).send({from: owner.eth});
+      owner = newOwner;
+    }
+  });
 });
 
 describe('NFT: Fees', () => {
modifiedtests/src/eth/reFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -584,6 +584,46 @@
     expect(event.returnValues.to).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');
     expect(event.returnValues.tokenId).to.equal(tokenId.toString());
   });
+
+  itEth('Check balanceOfCross()', async ({helper}) => {
+    const collection = await helper.rft.mintCollection(minter, {});
+    const owner = await helper.ethCrossAccount.createAccountWithBalance(donor);
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'nft', owner.eth);
+
+    expect(await collectionEvm.methods.balanceOfCross(owner).call({from: owner.eth})).to.be.eq('0');
+
+    for (let i = 1n; i < 10n; i++) {
+      await collection.mintToken(minter, 100n, {Ethereum: owner.eth});
+      expect(await collectionEvm.methods.balanceOfCross(owner).call({from: owner.eth})).to.be.eq(i.toString());
+    }
+  });
+
+  itEth('Check ownerOfCross()', async ({helper}) => {
+    const collection = await helper.rft.mintCollection(minter, {});
+    let owner = await helper.ethCrossAccount.createAccountWithBalance(donor);
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'nft', owner.eth);
+    const {tokenId} = await collection.mintToken(minter, 100n,{Ethereum: owner.eth});
+
+    for (let i = 1n; i < 10n; i++) {
+      const ownerCross = await collectionEvm.methods.ownerOfCross(tokenId).call({from: owner.eth});
+      expect(ownerCross.eth).to.be.eq(owner.eth);
+      expect(ownerCross.sub).to.be.eq(owner.sub);
+
+      const newOwner = await helper.ethCrossAccount.createAccountWithBalance(donor);
+      await collectionEvm.methods.transferCross(newOwner, tokenId).send({from: owner.eth});
+      owner = newOwner;
+    }
+
+    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);
+    const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, owner.eth, true);
+    const newOwner = await helper.ethCrossAccount.createAccountWithBalance(donor);
+    await tokenContract.methods.transferCross(newOwner, 50).send({from: owner.eth});
+    const ownerCross = await collectionEvm.methods.ownerOfCross(tokenId).call({from: owner.eth});
+    expect(ownerCross.eth.toUpperCase()).to.be.eq('0XFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF');
+    expect(ownerCross.sub).to.be.eq('0');
+  });
 });
 
 describe('RFT: Fees', () => {
modifiedtests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -466,6 +466,35 @@
       expect(await collection.getTokenBalance(tokenId, {Substrate: ownerSub.address})).to.be.equal(150n);
     }
   });
+
+  itEth('Check balanceOfCross()', async ({helper}) => {
+    const collection = await helper.rft.mintCollection(alice, {});
+    const owner = await helper.ethCrossAccount.createAccountWithBalance(donor);
+    const other = await helper.ethCrossAccount.createAccountWithBalance(donor);
+    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner.eth});
+    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);
+    const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, owner.eth);
+
+    expect(await tokenContract.methods.balanceOfCross(owner).call({from: owner.eth})).to.be.eq('200');
+    expect(await tokenContract.methods.balanceOfCross(other).call({from: owner.eth})).to.be.eq('0');
+
+    await tokenContract.methods.repartition(100n).send({from: owner.eth});
+    expect(await tokenContract.methods.balanceOfCross(owner).call({from: owner.eth})).to.be.eq('100');
+    expect(await tokenContract.methods.balanceOfCross(other).call({from: owner.eth})).to.be.eq('0');
+
+    await tokenContract.methods.transferCross(other, 50n).send({from: owner.eth});
+    expect(await tokenContract.methods.balanceOfCross(owner).call({from: owner.eth})).to.be.eq('50');
+    expect(await tokenContract.methods.balanceOfCross(other).call({from: owner.eth})).to.be.eq('50');
+
+    await tokenContract.methods.transferCross(other, 50n).send({from: owner.eth});
+    expect(await tokenContract.methods.balanceOfCross(owner).call({from: owner.eth})).to.be.eq('0');
+    expect(await tokenContract.methods.balanceOfCross(other).call({from: owner.eth})).to.be.eq('100');
+
+    await tokenContract.methods.repartition(1000n).send({from: other.eth});
+    await tokenContract.methods.transferCross(owner, 500n).send({from: other.eth});
+    expect(await tokenContract.methods.balanceOfCross(owner).call({from: owner.eth})).to.be.eq('500');
+    expect(await tokenContract.methods.balanceOfCross(other).call({from: owner.eth})).to.be.eq('500');
+  });
 });
 
 describe('Refungible: Fees', () => {
modifiedtests/src/eth/tokens/minting.test.tsdiffbeforeafterboth
--- a/tests/src/eth/tokens/minting.test.ts
+++ b/tests/src/eth/tokens/minting.test.ts
@@ -63,7 +63,7 @@
         const tokenId = event.returnValues.tokenId;
         expect(tokenId).to.be.equal('1');
         expect(await helper.collection.getLastTokenId(collection.collectionId)).to.eq(1);
-        expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
+        expect(await contract.methods.ownerOfCross(tokenId).call()).to.be.like([receiver, '0']);
       }
     });
   });
@@ -97,7 +97,7 @@
         const tokenId = event.returnValues.tokenId;
         expect(tokenId).to.be.equal('1');
         expect(await helper.collection.getLastTokenId(collectionId)).to.eq(1);
-        expect(await collection.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
+        expect(await collection.methods.ownerOfCross(tokenId).call()).to.be.like([receiver, '0']);
       }
     });
   });
@@ -131,7 +131,7 @@
         const tokenId = event.returnValues.tokenId;
         expect(tokenId).to.be.equal('1');
         expect(await helper.collection.getLastTokenId(collectionId)).to.eq(1);
-        expect(await collection.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
+        expect(await collection.methods.ownerOfCross(tokenId).call()).to.be.like([receiver, '0']);
       }
     });
   });
@@ -157,7 +157,7 @@
       expect(event.returnValues.to).to.be.equal(receiver);
 
       expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');
-      expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
+      expect(await contract.methods.ownerOfCross(tokenId).call()).to.be.like([receiver, '0']);
       // TODO: this wont work right now, need release 919000 first
       // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();
       // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();