git.delta.rocks / unique-network / refs/commits / 9fca092ae260

difftreelog

Deprecate burnFrom for rftToken

Max Andreev2023-01-11parent: #de30192.patch.diff
in: master

7 files changed

modifiedpallets/refungible/src/stubs/UniqueRefungibleToken.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
@@ -38,19 +38,19 @@
 
 /// @dev the ERC-165 identifier for this interface is 0xe17a7d2b
 contract ERC20UniqueExtensions is Dummy, ERC165 {
-	/// @dev Function that burns an amount of the token of a given account,
-	/// deducting from the sender's allowance for said account.
-	/// @param from The account whose tokens will be burnt.
-	/// @param amount The amount that will be burnt.
-	/// @dev EVM selector for this function is: 0x79cc6790,
-	///  or in textual repr: burnFrom(address,uint256)
-	function burnFrom(address from, uint256 amount) public returns (bool) {
-		require(false, stub_error);
-		from;
-		amount;
-		dummy = 0;
-		return false;
-	}
+	// /// @dev Function that burns an amount of the token of a given account,
+	// /// deducting from the sender's allowance for said account.
+	// /// @param from The account whose tokens will be burnt.
+	// /// @param amount The amount that will be burnt.
+	// /// @dev EVM selector for this function is: 0x79cc6790,
+	// ///  or in textual repr: burnFrom(address,uint256)
+	// function burnFrom(address from, uint256 amount) public returns (bool) {
+	// 	require(false, stub_error);
+	// 	from;
+	// 	amount;
+	// 	dummy = 0;
+	// 	return false;
+	// }
 
 	/// @dev Function that burns an amount of the token of a given account,
 	/// deducting from the sender's allowance for said account.
modifiedtests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -98,16 +98,6 @@
   },
   {
     "inputs": [
-      { "internalType": "address", "name": "from", "type": "address" },
-      { "internalType": "uint256", "name": "amount", "type": "uint256" }
-    ],
-    "name": "burnFrom",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
       {
         "components": [
           { "internalType": "address", "name": "eth", "type": "address" },
addedtests/src/eth/abi/reFungibleTokenDeprecated.jsondiffbeforeafterboth
--- /dev/null
+++ b/tests/src/eth/abi/reFungibleTokenDeprecated.json
@@ -0,0 +1,12 @@
+[
+  {
+    "inputs": [
+      { "internalType": "address", "name": "from", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "burnFrom",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
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 0xe17a7d2b27interface ERC20UniqueExtensions is Dummy, ERC165 {28	/// @dev Function that burns an amount of the token of a given account,29	/// deducting from the sender's allowance for said account.30	/// @param from The account whose tokens will be burnt.31	/// @param amount The amount that will be burnt.32	/// @dev EVM selector for this function is: 0x79cc6790,33	///  or in textual repr: burnFrom(address,uint256)34	function burnFrom(address from, uint256 amount) external returns (bool);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: 0xbb2f5a58,41	///  or in textual repr: burnFromCross((address,uint256),uint256)42	function burnFromCross(CrossAddress memory from, uint256 amount) external returns (bool);4344	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.45	/// Beware that changing an allowance with this method brings the risk that someone may use both the old46	/// and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this47	/// race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:48	/// https://github.com/ethereum/EIPs/issues/20#issuecomment-26352472949	/// @param spender The crossaccount which will spend the funds.50	/// @param amount The amount of tokens to be spent.51	/// @dev EVM selector for this function is: 0x0ecd0ab0,52	///  or in textual repr: approveCross((address,uint256),uint256)53	function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);5455	/// @dev Function that changes total amount of the tokens.56	///  Throws if `msg.sender` doesn't owns all of the tokens.57	/// @param amount New total amount of the tokens.58	/// @dev EVM selector for this function is: 0xd2418ca7,59	///  or in textual repr: repartition(uint256)60	function repartition(uint256 amount) external returns (bool);6162	/// @dev Transfer token for a specified address63	/// @param to The crossaccount to transfer to.64	/// @param amount The amount to be transferred.65	/// @dev EVM selector for this function is: 0x2ada85ff,66	///  or in textual repr: transferCross((address,uint256),uint256)67	function transferCross(CrossAddress memory to, uint256 amount) external returns (bool);6869	/// @dev Transfer tokens from one address to another70	/// @param from The address which you want to send tokens from71	/// @param to The address which you want to transfer to72	/// @param amount the amount of tokens to be transferred73	/// @dev EVM selector for this function is: 0xd5cf430b,74	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)75	function transferFromCross(76		CrossAddress memory from,77		CrossAddress memory to,78		uint256 amount79	) external returns (bool);80}8182/// Cross account struct83struct CrossAddress {84	address eth;85	uint256 sub;86}8788/// @dev inlined interface89interface ERC20Events {90	event Transfer(address indexed from, address indexed to, uint256 value);91	event Approval(address indexed owner, address indexed spender, uint256 value);92}9394/// @title Standard ERC20 token95///96/// @dev Implementation of the basic standard token.97/// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md98/// @dev the ERC-165 identifier for this interface is 0x942e8b2299interface ERC20 is Dummy, ERC165, ERC20Events {100	/// @return the name of the token.101	/// @dev EVM selector for this function is: 0x06fdde03,102	///  or in textual repr: name()103	function name() external view returns (string memory);104105	/// @return the symbol of the token.106	/// @dev EVM selector for this function is: 0x95d89b41,107	///  or in textual repr: symbol()108	function symbol() external view returns (string memory);109110	/// @dev Total number of tokens in existence111	/// @dev EVM selector for this function is: 0x18160ddd,112	///  or in textual repr: totalSupply()113	function totalSupply() external view returns (uint256);114115	/// @dev Not supported116	/// @dev EVM selector for this function is: 0x313ce567,117	///  or in textual repr: decimals()118	function decimals() external view returns (uint8);119120	/// @dev Gets the balance of the specified address.121	/// @param owner The address to query the balance of.122	/// @return An uint256 representing the amount owned by the passed address.123	/// @dev EVM selector for this function is: 0x70a08231,124	///  or in textual repr: balanceOf(address)125	function balanceOf(address owner) external view returns (uint256);126127	/// @dev Transfer token for a specified address128	/// @param to The address to transfer to.129	/// @param amount The amount to be transferred.130	/// @dev EVM selector for this function is: 0xa9059cbb,131	///  or in textual repr: transfer(address,uint256)132	function transfer(address to, uint256 amount) external returns (bool);133134	/// @dev Transfer tokens from one address to another135	/// @param from address The address which you want to send tokens from136	/// @param to address The address which you want to transfer to137	/// @param amount uint256 the amount of tokens to be transferred138	/// @dev EVM selector for this function is: 0x23b872dd,139	///  or in textual repr: transferFrom(address,address,uint256)140	function transferFrom(141		address from,142		address to,143		uint256 amount144	) external returns (bool);145146	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.147	/// Beware that changing an allowance with this method brings the risk that someone may use both the old148	/// and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this149	/// race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:150	/// https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729151	/// @param spender The address which will spend the funds.152	/// @param amount The amount of tokens to be spent.153	/// @dev EVM selector for this function is: 0x095ea7b3,154	///  or in textual repr: approve(address,uint256)155	function approve(address spender, uint256 amount) external returns (bool);156157	/// @dev Function to check the amount of tokens that an owner allowed to a spender.158	/// @param owner address The address which owns the funds.159	/// @param spender address The address which will spend the funds.160	/// @return A uint256 specifying the amount of tokens still available for the spender.161	/// @dev EVM selector for this function is: 0xdd62ed3e,162	///  or in textual repr: allowance(address,address)163	function allowance(address owner, address spender) external view returns (uint256);164}165166interface 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 0xe17a7d2b27interface ERC20UniqueExtensions is Dummy, ERC165 {28	// /// @dev Function that burns an amount of the token of a given account,29	// /// deducting from the sender's allowance for said account.30	// /// @param from The account whose tokens will be burnt.31	// /// @param amount The amount that will be burnt.32	// /// @dev EVM selector for this function is: 0x79cc6790,33	// ///  or in textual repr: burnFrom(address,uint256)34	// function burnFrom(address from, uint256 amount) external returns (bool);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: 0xbb2f5a58,41	///  or in textual repr: burnFromCross((address,uint256),uint256)42	function burnFromCross(CrossAddress memory from, uint256 amount) external returns (bool);4344	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.45	/// Beware that changing an allowance with this method brings the risk that someone may use both the old46	/// and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this47	/// race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:48	/// https://github.com/ethereum/EIPs/issues/20#issuecomment-26352472949	/// @param spender The crossaccount which will spend the funds.50	/// @param amount The amount of tokens to be spent.51	/// @dev EVM selector for this function is: 0x0ecd0ab0,52	///  or in textual repr: approveCross((address,uint256),uint256)53	function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);5455	/// @dev Function that changes total amount of the tokens.56	///  Throws if `msg.sender` doesn't owns all of the tokens.57	/// @param amount New total amount of the tokens.58	/// @dev EVM selector for this function is: 0xd2418ca7,59	///  or in textual repr: repartition(uint256)60	function repartition(uint256 amount) external returns (bool);6162	/// @dev Transfer token for a specified address63	/// @param to The crossaccount to transfer to.64	/// @param amount The amount to be transferred.65	/// @dev EVM selector for this function is: 0x2ada85ff,66	///  or in textual repr: transferCross((address,uint256),uint256)67	function transferCross(CrossAddress memory to, uint256 amount) external returns (bool);6869	/// @dev Transfer tokens from one address to another70	/// @param from The address which you want to send tokens from71	/// @param to The address which you want to transfer to72	/// @param amount the amount of tokens to be transferred73	/// @dev EVM selector for this function is: 0xd5cf430b,74	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)75	function transferFromCross(76		CrossAddress memory from,77		CrossAddress memory to,78		uint256 amount79	) external returns (bool);80}8182/// Cross account struct83struct CrossAddress {84	address eth;85	uint256 sub;86}8788/// @dev inlined interface89interface ERC20Events {90	event Transfer(address indexed from, address indexed to, uint256 value);91	event Approval(address indexed owner, address indexed spender, uint256 value);92}9394/// @title Standard ERC20 token95///96/// @dev Implementation of the basic standard token.97/// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md98/// @dev the ERC-165 identifier for this interface is 0x942e8b2299interface ERC20 is Dummy, ERC165, ERC20Events {100	/// @return the name of the token.101	/// @dev EVM selector for this function is: 0x06fdde03,102	///  or in textual repr: name()103	function name() external view returns (string memory);104105	/// @return the symbol of the token.106	/// @dev EVM selector for this function is: 0x95d89b41,107	///  or in textual repr: symbol()108	function symbol() external view returns (string memory);109110	/// @dev Total number of tokens in existence111	/// @dev EVM selector for this function is: 0x18160ddd,112	///  or in textual repr: totalSupply()113	function totalSupply() external view returns (uint256);114115	/// @dev Not supported116	/// @dev EVM selector for this function is: 0x313ce567,117	///  or in textual repr: decimals()118	function decimals() external view returns (uint8);119120	/// @dev Gets the balance of the specified address.121	/// @param owner The address to query the balance of.122	/// @return An uint256 representing the amount owned by the passed address.123	/// @dev EVM selector for this function is: 0x70a08231,124	///  or in textual repr: balanceOf(address)125	function balanceOf(address owner) external view returns (uint256);126127	/// @dev Transfer token for a specified address128	/// @param to The address to transfer to.129	/// @param amount The amount to be transferred.130	/// @dev EVM selector for this function is: 0xa9059cbb,131	///  or in textual repr: transfer(address,uint256)132	function transfer(address to, uint256 amount) external returns (bool);133134	/// @dev Transfer tokens from one address to another135	/// @param from address The address which you want to send tokens from136	/// @param to address The address which you want to transfer to137	/// @param amount uint256 the amount of tokens to be transferred138	/// @dev EVM selector for this function is: 0x23b872dd,139	///  or in textual repr: transferFrom(address,address,uint256)140	function transferFrom(141		address from,142		address to,143		uint256 amount144	) external returns (bool);145146	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.147	/// Beware that changing an allowance with this method brings the risk that someone may use both the old148	/// and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this149	/// race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:150	/// https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729151	/// @param spender The address which will spend the funds.152	/// @param amount The amount of tokens to be spent.153	/// @dev EVM selector for this function is: 0x095ea7b3,154	///  or in textual repr: approve(address,uint256)155	function approve(address spender, uint256 amount) external returns (bool);156157	/// @dev Function to check the amount of tokens that an owner allowed to a spender.158	/// @param owner address The address which owns the funds.159	/// @param spender address The address which will spend the funds.160	/// @return A uint256 specifying the amount of tokens still available for the spender.161	/// @dev EVM selector for this function is: 0xdd62ed3e,162	///  or in textual repr: allowance(address,address)163	function allowance(address owner, address spender) external view returns (uint256);164}165166interface UniqueRefungibleToken is Dummy, ERC165, ERC20, ERC20UniqueExtensions, ERC1633 {}
modifiedtests/src/eth/reFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -74,7 +74,7 @@
 
     const result = await contract.methods.mint(caller).send();
     const tokenId = result.events.Transfer.returnValues.tokenId;
-    const tokenContract = await helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);
+    const tokenContract = await helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller, true);
 
     await tokenContract.methods.repartition(2).send();
     await tokenContract.methods.transfer(receiver, 1).send();
@@ -316,7 +316,7 @@
     const address = helper.ethAddress.fromCollectionId(collection.collectionId);
     const contract = await helper.ethNativeContract.collection(address, 'rft');
 
-    const rftToken = await helper.ethNativeContract.rftTokenById(token.collectionId, token.tokenId, owner);
+    const rftToken = await helper.ethNativeContract.rftTokenById(token.collectionId, token.tokenId, owner, true);
 
     {
       await rftToken.methods.approve(operator, 15n).send({from: owner});
modifiedtests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -458,7 +458,7 @@
     const result = await contract.methods.mint(caller).send();
     const tokenId = result.events.Transfer.returnValues.tokenId;
     const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);
-    const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, caller);
+    const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, caller, true);
 
     await tokenContract.methods.repartition(2).send();
     await tokenContract.methods.transfer(receiver, 1).send();
modifiedtests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -29,6 +29,7 @@
 import refungibleAbi from '../../abi/reFungible.json';
 import refungibleDeprecatedAbi from '../../abi/reFungibleDeprecated.json';
 import refungibleTokenAbi from '../../abi/reFungibleToken.json';
+import refungibleTokenDeprecatedAbi from '../../abi/reFungibleTokenDeprecated.json';
 import contractHelpersAbi from '../../abi/contractHelpers.json';
 import {ICrossAccountId, TEthereumAccount} from '../../../util/playgrounds/types';
 import {TCollectionMode} from '../../../util/playgrounds/types';
@@ -187,17 +188,18 @@
     return this.collection(this.helper.ethAddress.fromCollectionId(collectionId), mode, caller, mergeDeprecated);
   }
 
-  async rftToken(address: string, caller?: string) {
+  async rftToken(address: string, caller?: string, mergeDeprecated = false) {
     const web3 = this.helper.getWeb3();
-    return unlimitedMoneyHack(new web3.eth.Contract(refungibleTokenAbi as any, address, {
+    let abi = mergeDeprecated ? [...refungibleTokenAbi, ...refungibleTokenDeprecatedAbi] : refungibleTokenAbi;
+    return unlimitedMoneyHack(new web3.eth.Contract(abi as any, address, {
       gas: this.helper.eth.DEFAULT_GAS,
       gasPrice: await this.getGasPrice(),
       ...(caller ? {from: caller} : {}),
     }));
   }
 
-  rftTokenById(collectionId: number, tokenId: number, caller?: string) {
-    return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller);
+  rftTokenById(collectionId: number, tokenId: number, caller?: string, mergeDeprecated = false) {
+    return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller, true);
   }
 }