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

--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -516,9 +516,14 @@
 	}
 
 	/// @dev Not implemented
-	fn get_approved(&self, _token_id: U256) -> Result<Address> {
-		// TODO: Not implemetable
-		Err("not implemented".into())
+	fn get_approved(&self, token_id: U256) -> Result<Address> {
+		let token = token_id.try_into()?;
+		let operator = <Pallet<T>>::get_allowance(self, token).map_err(dispatch_to_evm::<T>)?;
+		Ok(if let Some(operator) = operator {
+			*operator.as_eth()
+		} else {
+			Address::zero()
+		})
 	}
 
 	/// @notice Tells whether the given `owner` approves the `operator`.

1083		}1083		}
1084	}1084	}
1085
1086	pub fn get_allowance(
1087		collection: &NonfungibleHandle<T>,
1088		token: TokenId,
1089	) -> Result<Option<T::CrossAccountId>, DispatchError> {
1090		ensure! {
1091		<TokenData<T>>::iter_keys().find(
1092			|(c, t)| return *c == collection.id && *t == token).is_some()
1093		,<CommonError<T>>::TokenNotFound
1094		};
1095		Ok(<Allowance<T>>::get((collection.id, token)))
1096	}
10851097
1086	/// Set allowance for the spender to `transfer` or `burn` sender's token.1098	/// Set allowance for the spender to `transfer` or `burn` sender's token.
1087	///1099	///

--- 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();