git.delta.rocks / unique-network / refs/commits / 238681dec68a

difftreelog

added `transferFromCross` method in `ERC20` refungible pallet interface

PraetorP2022-12-07parent: #b238f7b.patch.diff
in: master

5 files changed

modifiedpallets/refungible/src/erc_token.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -299,6 +299,31 @@
 			.map_err(dispatch_to_evm::<T>)?;
 		Ok(true)
 	}
+
+	/// @dev Transfer tokens from one address to another
+	/// @param from address The address which you want to send tokens from
+	/// @param to address The address which you want to transfer to
+	/// @param amount uint256 the amount of tokens to be transferred
+	#[weight(<CommonWeights<T>>::transfer_from())]
+	fn transfer_from_cross(
+		&mut self,
+		caller: caller,
+		from: EthCrossAccount,
+		to: EthCrossAccount,
+		amount: uint256,
+	) -> Result<bool> {
+		let caller = T::CrossAccountId::from_eth(caller);
+		let from = from.into_sub_cross_account::<T>()?;
+		let to = to.into_sub_cross_account::<T>()?;
+		let amount = amount.try_into().map_err(|_| "amount overflow")?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+		<Pallet<T>>::transfer_from(self, &caller, &from, &to, self.1, amount, &budget)
+			.map_err(dispatch_to_evm::<T>)?;
+		Ok(true)
+	}
 }
 
 impl<T: Config> RefungibleTokenHandle<T> {
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 0x34b53e20
+/// @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.
@@ -107,6 +107,25 @@
 		dummy = 0;
 		return false;
 	}
+
+	/// @dev Transfer tokens from one address to another
+	/// @param from address The address which you want to send tokens from
+	/// @param to address The address which you want to transfer to
+	/// @param amount uint256 the amount of tokens to be transferred
+	/// @dev EVM selector for this function is: 0xd5cf430b,
+	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
+	function transferFromCross(
+		EthCrossAccount memory from,
+		EthCrossAccount memory to,
+		uint256 amount
+	) public returns (bool) {
+		require(false, stub_error);
+		from;
+		to;
+		amount;
+		dummy = 0;
+		return false;
+	}
 }
 
 /// @dev Cross account struct
modifiedtests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -222,5 +222,32 @@
     "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
     "stateMutability": "nonpayable",
     "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+        "name": "from",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+        "name": "to",
+        "type": "tuple"
+      },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "transferFromCross",
+    "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 0x34b53e2027interface 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(EthCrossAccount 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(EthCrossAccount 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(EthCrossAccount memory to, uint256 amount) external returns (bool);68}6970/// @dev Cross account struct71struct EthCrossAccount {72	address eth;73	uint256 sub;74}7576/// @dev inlined interface77interface ERC20Events {78	event Transfer(address indexed from, address indexed to, uint256 value);79	event Approval(address indexed owner, address indexed spender, uint256 value);80}8182/// @title Standard ERC20 token83///84/// @dev Implementation of the basic standard token.85/// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md86/// @dev the ERC-165 identifier for this interface is 0x942e8b2287interface ERC20 is Dummy, ERC165, ERC20Events {88	/// @return the name of the token.89	/// @dev EVM selector for this function is: 0x06fdde03,90	///  or in textual repr: name()91	function name() external view returns (string memory);9293	/// @return the symbol of the token.94	/// @dev EVM selector for this function is: 0x95d89b41,95	///  or in textual repr: symbol()96	function symbol() external view returns (string memory);9798	/// @dev Total number of tokens in existence99	/// @dev EVM selector for this function is: 0x18160ddd,100	///  or in textual repr: totalSupply()101	function totalSupply() external view returns (uint256);102103	/// @dev Not supported104	/// @dev EVM selector for this function is: 0x313ce567,105	///  or in textual repr: decimals()106	function decimals() external view returns (uint8);107108	/// @dev Gets the balance of the specified address.109	/// @param owner The address to query the balance of.110	/// @return An uint256 representing the amount owned by the passed address.111	/// @dev EVM selector for this function is: 0x70a08231,112	///  or in textual repr: balanceOf(address)113	function balanceOf(address owner) external view returns (uint256);114115	/// @dev Transfer token for a specified address116	/// @param to The address to transfer to.117	/// @param amount The amount to be transferred.118	/// @dev EVM selector for this function is: 0xa9059cbb,119	///  or in textual repr: transfer(address,uint256)120	function transfer(address to, uint256 amount) external returns (bool);121122	/// @dev Transfer tokens from one address to another123	/// @param from address The address which you want to send tokens from124	/// @param to address The address which you want to transfer to125	/// @param amount uint256 the amount of tokens to be transferred126	/// @dev EVM selector for this function is: 0x23b872dd,127	///  or in textual repr: transferFrom(address,address,uint256)128	function transferFrom(129		address from,130		address to,131		uint256 amount132	) external returns (bool);133134	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.135	/// Beware that changing an allowance with this method brings the risk that someone may use both the old136	/// and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this137	/// race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:138	/// https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729139	/// @param spender The address which will spend the funds.140	/// @param amount The amount of tokens to be spent.141	/// @dev EVM selector for this function is: 0x095ea7b3,142	///  or in textual repr: approve(address,uint256)143	function approve(address spender, uint256 amount) external returns (bool);144145	/// @dev Function to check the amount of tokens that an owner allowed to a spender.146	/// @param owner address The address which owns the funds.147	/// @param spender address The address which will spend the funds.148	/// @return A uint256 specifying the amount of tokens still available for the spender.149	/// @dev EVM selector for this function is: 0xdd62ed3e,150	///  or in textual repr: allowance(address,address)151	function allowance(address owner, address spender) external view returns (uint256);152}153154interface 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(EthCrossAccount 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(EthCrossAccount 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(EthCrossAccount memory to, uint256 amount) external returns (bool);6869	/// @dev Transfer tokens from one address to another70	/// @param from address The address which you want to send tokens from71	/// @param to address The address which you want to transfer to72	/// @param amount uint256 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		EthCrossAccount memory from,77		EthCrossAccount memory to,78		uint256 amount79	) external returns (bool);80}8182/// @dev Cross account struct83struct EthCrossAccount {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/reFungibleToken.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -223,6 +223,46 @@
       expect(+balance).to.equal(151);
     }
   });
+  
+  itEth('Can perform transferFromCross()', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const ownerCross = helper.ethCrossAccount.fromAddress(owner);
+    const spender = await helper.eth.createAccountWithBalance(donor);
+    const receiver = helper.eth.createAccount();
+    const receiverCross = helper.ethCrossAccount.fromAddress(receiver);
+    const collection = await helper.rft.mintCollection(alice);
+    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});
+
+    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);
+    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);
+
+    await contract.methods.approve(spender, 100).send();
+
+    {
+      const result = await contract.methods.transferFromCross(ownerCross, receiverCross, 49).send({from: spender});
+      let event = result.events.Transfer;
+      expect(event.address).to.be.equal(tokenAddress);
+      expect(event.returnValues.from).to.be.equal(owner);
+      expect(event.returnValues.to).to.be.equal(receiver);
+      expect(event.returnValues.value).to.be.equal('49');
+
+      event = result.events.Approval;
+      expect(event.address).to.be.equal(tokenAddress);
+      expect(event.returnValues.owner).to.be.equal(owner);
+      expect(event.returnValues.spender).to.be.equal(spender);
+      expect(event.returnValues.value).to.be.equal('51');
+    }
+
+    {
+      const balance = await contract.methods.balanceOf(receiver).call();
+      expect(+balance).to.equal(49);
+    }
+
+    {
+      const balance = await contract.methods.balanceOf(owner).call();
+      expect(+balance).to.equal(151);
+    }
+  });
 
   itEth('Can perform transfer()', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);