Transpile chiru-labs/ERC721A@2342b59

chiru-labs · Nov 15, 2022 · f08d635 · f08d635
1 parent 40bc5b0
commit f08d635
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/contracts/ERC721AUpgradeable.sol b/contracts/ERC721AUpgradeable.sol
@@ -877,10 +877,11 @@ contract ERC721AUpgradeable is ERC721A__Initializable, IERC721AUpgradeable {
     ) internal virtual {
         address owner = ownerOf(tokenId);
 
-        if (approvalCheck && _msgSenderERC721A() != owner)
-            if (!isApprovedForAll(owner, _msgSenderERC721A())) {
-                revert ApprovalCallerNotOwnerNorApproved();
-            }
+        if (approvalCheck)
+            if (_msgSenderERC721A() != owner)
+                if (!isApprovedForAll(owner, _msgSenderERC721A())) {
+                    revert ApprovalCallerNotOwnerNorApproved();
+                }
 
         ERC721AStorage.layout()._tokenApprovals[tokenId].value = to;
         emit Approval(owner, to, tokenId);

diff --git a/contracts/mocks/ERC721AMockUpgradeable.sol b/contracts/mocks/ERC721AMockUpgradeable.sol
@@ -39,6 +39,10 @@ contract ERC721AMockUpgradeable is ERC721A__Initializable, ERC721AUpgradeable {
         _setAux(owner, aux);
     }
 
+    function directApprove(address to, uint256 tokenId) public {
+        _approve(to, tokenId);
+    }
+
     function baseURI() public view returns (string memory) {
         return _baseURI();
     }

diff --git a/test/ERC721A.test.js b/test/ERC721A.test.js
@@ -283,6 +283,12 @@ const createTestSuite = ({ contract, constructorArgs }) =>
             await this.erc721a.connect(this.addr1).transferFrom(this.addr1.address, this.addr2.address, this.tokenId);
             expect(await this.erc721a.getApproved(this.tokenId)).to.not.equal(this.addr1.address);
           });
+
+          it('direct approve works', async function () {
+            expect(await this.erc721a.getApproved(this.tokenId)).to.not.equal(this.addr1.address);
+            await this.erc721a.connect(this.addr2).directApprove(this.addr1.address, this.tokenId); 
+            expect(await this.erc721a.getApproved(this.tokenId)).to.equal(this.addr1.address);
+          });
         });
 
         describe('setApprovalForAll', async function () {