git.delta.rocks / unique-network / refs/commits / 9871bd2fd605

difftreelog

feat balanceOfCross for RFT token

Trubnikov Sergey2023-04-18parent: #fc48e60.patch.diff
in: master

7 files changed

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/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
@@ -343,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/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/UniqueRefungibleToken.soldiffbeforeafterboth
before · tests/src/eth/api/UniqueRefungibleToken.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12	function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @dev the ERC-165 identifier for this interface is 0x5755c3f216interface ERC1633 is Dummy, ERC165 {17	/// @dev EVM selector for this function is: 0x80a54001,18	///  or in textual repr: parentToken()19	function parentToken() external view returns (address);2021	/// @dev EVM selector for this function is: 0xd7f083f3,22	///  or in textual repr: parentTokenId()23	function parentTokenId() external view returns (uint256);24}2526/// @dev the ERC-165 identifier for this interface is 0x01d536fc27interface ERC20UniqueExtensions is Dummy, ERC165 {28	/// @dev Function to check the amount of tokens that an owner allowed to a spender.29	/// @param owner crossAddress The address which owns the funds.30	/// @param spender crossAddress The address which will spend the funds.31	/// @return A uint256 specifying the amount of tokens still available for the spender.32	/// @dev EVM selector for this function is: 0xe0af4bd7,33	///  or in textual repr: allowanceCross((address,uint256),(address,uint256))34	function allowanceCross(CrossAddress memory owner, CrossAddress memory spender) external view returns (uint256);3536	// /// @dev Function that burns an amount of the token of a given account,37	// /// deducting from the sender's allowance for said account.38	// /// @param from The account whose tokens will be burnt.39	// /// @param amount The amount that will be burnt.40	// /// @dev EVM selector for this function is: 0x79cc6790,41	// ///  or in textual repr: burnFrom(address,uint256)42	// function burnFrom(address from, uint256 amount) external returns (bool);4344	/// @dev Function that burns an amount of the token of a given account,45	/// deducting from the sender's allowance for said account.46	/// @param from The account whose tokens will be burnt.47	/// @param amount The amount that will be burnt.48	/// @dev EVM selector for this function is: 0xbb2f5a58,49	///  or in textual repr: burnFromCross((address,uint256),uint256)50	function burnFromCross(CrossAddress memory from, uint256 amount) external returns (bool);5152	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.53	/// Beware that changing an allowance with this method brings the risk that someone may use both the old54	/// and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this55	/// race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:56	/// https://github.com/ethereum/EIPs/issues/20#issuecomment-26352472957	/// @param spender The crossaccount which will spend the funds.58	/// @param amount The amount of tokens to be spent.59	/// @dev EVM selector for this function is: 0x0ecd0ab0,60	///  or in textual repr: approveCross((address,uint256),uint256)61	function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);6263	/// @dev Function that changes total amount of the tokens.64	///  Throws if `msg.sender` doesn't owns all of the tokens.65	/// @param amount New total amount of the tokens.66	/// @dev EVM selector for this function is: 0xd2418ca7,67	///  or in textual repr: repartition(uint256)68	function repartition(uint256 amount) external returns (bool);6970	/// @dev Transfer token for a specified address71	/// @param to The crossaccount to transfer to.72	/// @param amount The amount to be transferred.73	/// @dev EVM selector for this function is: 0x2ada85ff,74	///  or in textual repr: transferCross((address,uint256),uint256)75	function transferCross(CrossAddress memory to, uint256 amount) external returns (bool);7677	/// @dev Transfer tokens from one address to another78	/// @param from The address which you want to send tokens from79	/// @param to The address which you want to transfer to80	/// @param amount the amount of tokens to be transferred81	/// @dev EVM selector for this function is: 0xd5cf430b,82	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)83	function transferFromCross(84		CrossAddress memory from,85		CrossAddress memory to,86		uint256 amount87	) external returns (bool);88}8990/// Cross account struct91struct CrossAddress {92	address eth;93	uint256 sub;94}9596/// @dev inlined interface97interface ERC20Events {98	event Transfer(address indexed from, address indexed to, uint256 value);99	event Approval(address indexed owner, address indexed spender, uint256 value);100}101102/// @title Standard ERC20 token103///104/// @dev Implementation of the basic standard token.105/// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md106/// @dev the ERC-165 identifier for this interface is 0x942e8b22107interface ERC20 is Dummy, ERC165, ERC20Events {108	/// @return the name of the token.109	/// @dev EVM selector for this function is: 0x06fdde03,110	///  or in textual repr: name()111	function name() external view returns (string memory);112113	/// @return the symbol of the token.114	/// @dev EVM selector for this function is: 0x95d89b41,115	///  or in textual repr: symbol()116	function symbol() external view returns (string memory);117118	/// @dev Total number of tokens in existence119	/// @dev EVM selector for this function is: 0x18160ddd,120	///  or in textual repr: totalSupply()121	function totalSupply() external view returns (uint256);122123	/// @dev Not supported124	/// @dev EVM selector for this function is: 0x313ce567,125	///  or in textual repr: decimals()126	function decimals() external view returns (uint8);127128	/// @dev Gets the balance of the specified address.129	/// @param owner The address to query the balance of.130	/// @return An uint256 representing the amount owned by the passed address.131	/// @dev EVM selector for this function is: 0x70a08231,132	///  or in textual repr: balanceOf(address)133	function balanceOf(address owner) external view returns (uint256);134135	/// @dev Transfer token for a specified address136	/// @param to The address to transfer to.137	/// @param amount The amount to be transferred.138	/// @dev EVM selector for this function is: 0xa9059cbb,139	///  or in textual repr: transfer(address,uint256)140	function transfer(address to, uint256 amount) external returns (bool);141142	/// @dev Transfer tokens from one address to another143	/// @param from address The address which you want to send tokens from144	/// @param to address The address which you want to transfer to145	/// @param amount uint256 the amount of tokens to be transferred146	/// @dev EVM selector for this function is: 0x23b872dd,147	///  or in textual repr: transferFrom(address,address,uint256)148	function transferFrom(149		address from,150		address to,151		uint256 amount152	) external returns (bool);153154	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.155	/// Beware that changing an allowance with this method brings the risk that someone may use both the old156	/// and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this157	/// race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:158	/// https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729159	/// @param spender The address which will spend the funds.160	/// @param amount The amount of tokens to be spent.161	/// @dev EVM selector for this function is: 0x095ea7b3,162	///  or in textual repr: approve(address,uint256)163	function approve(address spender, uint256 amount) external returns (bool);164165	/// @dev Function to check the amount of tokens that an owner allowed to a spender.166	/// @param owner address The address which owns the funds.167	/// @param spender address The address which will spend the funds.168	/// @return A uint256 specifying the amount of tokens still available for the spender.169	/// @dev EVM selector for this function is: 0xdd62ed3e,170	///  or in textual repr: allowance(address,address)171	function allowance(address owner, address spender) external view returns (uint256);172}173174interface UniqueRefungibleToken is Dummy, ERC165, ERC20, ERC20UniqueExtensions, ERC1633 {}
after · tests/src/eth/api/UniqueRefungibleToken.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12	function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @dev the ERC-165 identifier for this interface is 0x5755c3f216interface ERC1633 is Dummy, ERC165 {17	/// @dev EVM selector for this function is: 0x80a54001,18	///  or in textual repr: parentToken()19	function parentToken() external view returns (address);2021	/// @dev EVM selector for this function is: 0xd7f083f3,22	///  or in textual repr: parentTokenId()23	function parentTokenId() external view returns (uint256);24}2526/// @dev the ERC-165 identifier for this interface is 0xedd3a56427interface ERC20UniqueExtensions is Dummy, ERC165 {28	/// @dev Function to check the amount of tokens that an owner allowed to a spender.29	/// @param owner crossAddress The address which owns the funds.30	/// @param spender crossAddress The address which will spend the funds.31	/// @return A uint256 specifying the amount of tokens still available for the spender.32	/// @dev EVM selector for this function is: 0xe0af4bd7,33	///  or in textual repr: allowanceCross((address,uint256),(address,uint256))34	function allowanceCross(CrossAddress memory owner, CrossAddress memory spender) external view returns (uint256);3536	// /// @dev Function that burns an amount of the token of a given account,37	// /// deducting from the sender's allowance for said account.38	// /// @param from The account whose tokens will be burnt.39	// /// @param amount The amount that will be burnt.40	// /// @dev EVM selector for this function is: 0x79cc6790,41	// ///  or in textual repr: burnFrom(address,uint256)42	// function burnFrom(address from, uint256 amount) external returns (bool);4344	/// @dev Function that burns an amount of the token of a given account,45	/// deducting from the sender's allowance for said account.46	/// @param from The account whose tokens will be burnt.47	/// @param amount The amount that will be burnt.48	/// @dev EVM selector for this function is: 0xbb2f5a58,49	///  or in textual repr: burnFromCross((address,uint256),uint256)50	function burnFromCross(CrossAddress memory from, uint256 amount) external returns (bool);5152	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.53	/// Beware that changing an allowance with this method brings the risk that someone may use both the old54	/// and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this55	/// race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:56	/// https://github.com/ethereum/EIPs/issues/20#issuecomment-26352472957	/// @param spender The crossaccount which will spend the funds.58	/// @param amount The amount of tokens to be spent.59	/// @dev EVM selector for this function is: 0x0ecd0ab0,60	///  or in textual repr: approveCross((address,uint256),uint256)61	function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);6263	/// @notice Balance of account64	/// @param owner An cross address for whom to query the balance65	/// @return The number of fingibles owned by `owner`, possibly zero66	/// @dev EVM selector for this function is: 0xec069398,67	///  or in textual repr: balanceOfCross((address,uint256))68	function balanceOfCross(CrossAddress memory owner) external view returns (uint256);6970	/// @dev Function that changes total amount of the tokens.71	///  Throws if `msg.sender` doesn't owns all of the tokens.72	/// @param amount New total amount of the tokens.73	/// @dev EVM selector for this function is: 0xd2418ca7,74	///  or in textual repr: repartition(uint256)75	function repartition(uint256 amount) external returns (bool);7677	/// @dev Transfer token for a specified address78	/// @param to The crossaccount to transfer to.79	/// @param amount The amount to be transferred.80	/// @dev EVM selector for this function is: 0x2ada85ff,81	///  or in textual repr: transferCross((address,uint256),uint256)82	function transferCross(CrossAddress memory to, uint256 amount) external returns (bool);8384	/// @dev Transfer tokens from one address to another85	/// @param from The address which you want to send tokens from86	/// @param to The address which you want to transfer to87	/// @param amount the amount of tokens to be transferred88	/// @dev EVM selector for this function is: 0xd5cf430b,89	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)90	function transferFromCross(91		CrossAddress memory from,92		CrossAddress memory to,93		uint256 amount94	) external returns (bool);95}9697/// Cross account struct98struct CrossAddress {99	address eth;100	uint256 sub;101}102103/// @dev inlined interface104interface ERC20Events {105	event Transfer(address indexed from, address indexed to, uint256 value);106	event Approval(address indexed owner, address indexed spender, uint256 value);107}108109/// @title Standard ERC20 token110///111/// @dev Implementation of the basic standard token.112/// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md113/// @dev the ERC-165 identifier for this interface is 0x942e8b22114interface ERC20 is Dummy, ERC165, ERC20Events {115	/// @return the name of the token.116	/// @dev EVM selector for this function is: 0x06fdde03,117	///  or in textual repr: name()118	function name() external view returns (string memory);119120	/// @return the symbol of the token.121	/// @dev EVM selector for this function is: 0x95d89b41,122	///  or in textual repr: symbol()123	function symbol() external view returns (string memory);124125	/// @dev Total number of tokens in existence126	/// @dev EVM selector for this function is: 0x18160ddd,127	///  or in textual repr: totalSupply()128	function totalSupply() external view returns (uint256);129130	/// @dev Not supported131	/// @dev EVM selector for this function is: 0x313ce567,132	///  or in textual repr: decimals()133	function decimals() external view returns (uint8);134135	/// @dev Gets the balance of the specified address.136	/// @param owner The address to query the balance of.137	/// @return An uint256 representing the amount owned by the passed address.138	/// @dev EVM selector for this function is: 0x70a08231,139	///  or in textual repr: balanceOf(address)140	function balanceOf(address owner) external view returns (uint256);141142	/// @dev Transfer token for a specified address143	/// @param to The address to transfer to.144	/// @param amount The amount to be transferred.145	/// @dev EVM selector for this function is: 0xa9059cbb,146	///  or in textual repr: transfer(address,uint256)147	function transfer(address to, uint256 amount) external returns (bool);148149	/// @dev Transfer tokens from one address to another150	/// @param from address The address which you want to send tokens from151	/// @param to address The address which you want to transfer to152	/// @param amount uint256 the amount of tokens to be transferred153	/// @dev EVM selector for this function is: 0x23b872dd,154	///  or in textual repr: transferFrom(address,address,uint256)155	function transferFrom(156		address from,157		address to,158		uint256 amount159	) external returns (bool);160161	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.162	/// Beware that changing an allowance with this method brings the risk that someone may use both the old163	/// and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this164	/// race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:165	/// https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729166	/// @param spender The address which will spend the funds.167	/// @param amount The amount of tokens to be spent.168	/// @dev EVM selector for this function is: 0x095ea7b3,169	///  or in textual repr: approve(address,uint256)170	function approve(address spender, uint256 amount) external returns (bool);171172	/// @dev Function to check the amount of tokens that an owner allowed to a spender.173	/// @param owner address The address which owns the funds.174	/// @param spender address The address which will spend the funds.175	/// @return A uint256 specifying the amount of tokens still available for the spender.176	/// @dev EVM selector for this function is: 0xdd62ed3e,177	///  or in textual repr: allowance(address,address)178	function allowance(address owner, address spender) external view returns (uint256);179}180181interface UniqueRefungibleToken is Dummy, ERC165, ERC20, ERC20UniqueExtensions, ERC1633 {}
modifiedtests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -466,6 +466,21 @@
       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 {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(BigInt(await tokenContract.methods.balanceOfCross(owner).call({from: owner.eth})) === 200n).to.be.true;
+
+    for (let i = 1n; i < 100n; i++) {
+      await tokenContract.methods.repartition(i).send({from: owner.eth});
+      expect(BigInt(await tokenContract.methods.balanceOfCross(owner).call({from: owner.eth})) === i).to.be.true;
+    }
+  });
 });
 
 describe('Refungible: Fees', () => {