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

--- 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> {

--- 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

--- 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"
   }
 ]

--- 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 0x34b53e20
+/// @dev the ERC-165 identifier for this interface is 0xe17a7d2b
 interface 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.
@@ -65,6 +65,18 @@
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
 	function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+
+	/// @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
+	) external returns (bool);
 }
 
 /// @dev Cross account struct

224    }224    }
225  });225  });
226  
227  itEth('Can perform transferFromCross()', async ({helper}) => {
228    const owner = await helper.eth.createAccountWithBalance(donor);
229    const ownerCross = helper.ethCrossAccount.fromAddress(owner);
230    const spender = await helper.eth.createAccountWithBalance(donor);
231    const receiver = helper.eth.createAccount();
232    const receiverCross = helper.ethCrossAccount.fromAddress(receiver);
233    const collection = await helper.rft.mintCollection(alice);
234    const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner});
235
236    const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);
237    const contract = helper.ethNativeContract.rftToken(tokenAddress, owner);
238
239    await contract.methods.approve(spender, 100).send();
240
241    {
242      const result = await contract.methods.transferFromCross(ownerCross, receiverCross, 49).send({from: spender});
243      let event = result.events.Transfer;
244      expect(event.address).to.be.equal(tokenAddress);
245      expect(event.returnValues.from).to.be.equal(owner);
246      expect(event.returnValues.to).to.be.equal(receiver);
247      expect(event.returnValues.value).to.be.equal('49');
248
249      event = result.events.Approval;
250      expect(event.address).to.be.equal(tokenAddress);
251      expect(event.returnValues.owner).to.be.equal(owner);
252      expect(event.returnValues.spender).to.be.equal(spender);
253      expect(event.returnValues.value).to.be.equal('51');
254    }
255
256    {
257      const balance = await contract.methods.balanceOf(receiver).call();
258      expect(+balance).to.equal(49);
259    }
260
261    {
262      const balance = await contract.methods.balanceOf(owner).call();
263      expect(+balance).to.equal(151);
264    }
265  });
226266
227  itEth('Can perform transfer()', async ({helper}) => {267  itEth('Can perform transfer()', async ({helper}) => {
228    const owner = await helper.eth.createAccountWithBalance(donor);268    const owner = await helper.eth.createAccountWithBalance(donor);