git.delta.rocks / unique-network / refs/commits / 0595f0d3e1c9

difftreelog

feat implement ERC721 `getApproved` for NFT.

Trubnikov Sergey2023-03-07parent: #94299ed.patch.diff
in: master

3 files changed

modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
516 }516 }
517517
518 /// @dev Not implemented518 /// @dev Not implemented
519 fn get_approved(&self, _token_id: U256) -> Result<Address> {519 fn get_approved(&self, token_id: U256) -> Result<Address> {
520 // TODO: Not implemetable520 let token = token_id.try_into()?;
521 let operator = <Pallet<T>>::get_allowance(self, token).map_err(dispatch_to_evm::<T>)?;
521 Err("not implemented".into())522 Ok(if let Some(operator) = operator {
523 *operator.as_eth()
524 } else {
525 Address::zero()
526 })
522 }527 }
523528
524 /// @notice Tells whether the given `owner` approves the `operator`.529 /// @notice Tells whether the given `owner` approves the `operator`.
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -1083,6 +1083,18 @@
 		}
 	}
 
+	pub fn get_allowance(
+		collection: &NonfungibleHandle<T>,
+		token: TokenId,
+	) -> Result<Option<T::CrossAccountId>, DispatchError> {
+		ensure! {
+		<TokenData<T>>::iter_keys().find(
+			|(c, t)| return *c == collection.id && *t == token).is_some()
+		,<CommonError<T>>::TokenNotFound
+		};
+		Ok(<Allowance<T>>::get((collection.id, token)))
+	}
+
 	/// Set allowance for the spender to `transfer` or `burn` sender's token.
 	///
 	/// - `token`: Token the spender is allowed to `transfer` or `burn`.
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -240,6 +240,28 @@
     }
   });
 
+  itEth('Can perform setApproval()', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const operator = helper.eth.createAccount();
+
+    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
+    const contract = await helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+
+    const result = await contract.methods.mint(owner).send({from: owner});
+    const tokenId = result.events.Transfer.returnValues.tokenId;
+
+    {
+      const approved = await contract.methods.getApproved(tokenId).call();
+      expect(approved).to.be.equal('0x0000000000000000000000000000000000000000');
+    }
+    await contract.methods.approve(operator, tokenId).send({from: owner});
+    {
+      const approved = await contract.methods.getApproved(tokenId).call();
+      expect(approved).to.be.equal(operator);
+    }
+  });
+
+
   itEth('Can perform setApprovalForAll()', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const operator = helper.eth.createAccount();