Bring CW721 pointer contract up to spec

contracts/src/ERC721.sol

@@ -51,6 +51,9 @@ contract ERC721 is IERC721 {
         bool approved
     );
 
+    // Keeps track of current token supply
+    uint256 internal _totalSupply = 0;
+
     // Mapping from token ID to owner address
     mapping(uint => address) internal _ownerOf;
 
@@ -79,6 +82,10 @@ contract ERC721 is IERC721 {
         return _balanceOf[owner];
     }
 
+    function totalSupply() external view returns (uint256) {
+        return _totalSupply;
+    }
+
     function setApprovalForAll(address operator, bool approved) external {
         isApprovedForAll[msg.sender][operator] = approved;
         emit ApprovalForAll(msg.sender, operator, approved);
@@ -158,6 +165,7 @@ contract ERC721 is IERC721 {
         require(_ownerOf[id] == address(0), "already minted");
 
         _balanceOf[to]++;
+        _totalSupply++;
         _ownerOf[id] = to;
 
         emit Transfer(address(0), to, id);
@@ -168,6 +176,7 @@ contract ERC721 is IERC721 {
         require(owner != address(0), "not minted");
 
         _balanceOf[owner] -= 1;
+        _totalSupply--;
 
         delete _ownerOf[id];
         delete _approvals[id];
@@ -222,4 +231,9 @@ contract MyNFT is ERC721 {
         require(msg.sender == _ownerOf[id], "not owner");
         _burn(id);
     }
+
+    function royaltyInfo(uint, uint256 salePrice) external pure returns (address receiver, uint256 royaltyAmount) {
+        receiver = 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266;
+        royaltyAmount = (salePrice * 500) / 10_000;
+    }
 }

contracts/test/CW721toERC721PointerTest.js

@@ -73,39 +73,48 @@ describe("CW721 to ERC721 Pointer", function () {
             });
         });
 
+        it("should retrieve number of circulating tokens", async function () {
+            const result = await queryWasm(pointer, "num_tokens", {});
+            expect(result).to.deep.equal({data:{count:3}});
+        });
+
         it("should retrieve contract information", async function () {
             const result = await queryWasm(pointer, "contract_info", {});
             expect(result).to.deep.equal({data:{name:"MyNFT",symbol:"MYNFT"}});
         });
 
-        it("should fetch NFT info based on token ID", async function () {
-            const result = await queryWasm(pointer, "nft_info", { token_id: "1" });
-            expect(result).to.deep.equal({ data: { token_uri: 'https://sei.io/token/1', extension: '' } });
-        });
-
         it("should fetch all information about an NFT", async function () {
             const result = await queryWasm(pointer, "all_nft_info", { token_id: "1" });
-            expect(result).to.deep.equal({
-                data: {
-                    access: {
-                        owner: accounts[0].seiAddress,
-                        approvals: [
-                            {
-                                spender: accounts[1].seiAddress,
-                                expires: {
-                                    never: {}
-                                }
-                            }
-                        ]
-                    },
-                    info: {
-                        token_uri: "https://sei.io/token/1",
-                        extension: ""
+            expect(result.data.access).to.deep.equal({
+                owner: accounts[0].seiAddress,
+                approvals: [
+                    {
+                        spender: accounts[1].seiAddress,
+                        expires: {
+                            never: {}
+                        }
                     }
-                }
+                ]
             });
+            expect(result.data.info.token_uri).to.equal('https://sei.io/token/1');
+            expect(result.data.info.extension.royalty_percentage).to.equal(5);
+            expect(result.data.info.extension.royalty_payment_address).to.include("sei1");
+        });
+
+        it("should retrieve all minted NFT token ids", async function () {
+            const result = await queryWasm(pointer, "all_tokens", {});
+            expect(result).to.deep.equal({data:{tokens:["1","2","3"]}});
         });
 
+        it("should retrieve list of 1 minted NFT token id after token id 1", async function () {
+            const result = await queryWasm(pointer, "all_tokens", { start_after: "1", limit: 1 });
+            expect(result).to.deep.equal({data:{tokens:["2"]}});
+        });
+
+        it("should retrieve list of NFT token ids owned by admin", async function () {
+            const result = await queryWasm(pointer, "tokens", { owner: admin.seiAddress });
+            expect(result).to.deep.equal({data:{tokens:["3"]}});
+        });
     })
 
     describe("execute operations", function () {

contracts/test/lib.js

@@ -23,6 +23,7 @@ const ABI = {
         "function symbol() view returns (string)",
         "function totalSupply() view returns (uint256)",
         "function tokenURI(uint256 tokenId) view returns (string)",
+        "function royaltyInfo(uint256 tokenId, utin256 salePrice) view returns (address, uint256)",
         "function balanceOf(address owner) view returns (uint256 balance)",
         "function ownerOf(uint256 tokenId) view returns (address owner)",
         "function getApproved(uint256 tokenId) view returns (address operator)",

example/contracts/erc721/DummyERC721.abi

@@ -1 +1 @@
-[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"approved","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"operator","type":"address"},{"indexed":false,"internalType":"bool","name":"approved","type":"bool"}],"name":"ApprovalForAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"approve","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"balance","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"getApproved","outputs":[{"internalType":"address","name":"operator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"operator","type":"address"}],"name":"isApprovedForAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"ownerOf","outputs":[{"internalType":"address","name":"owner","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"randomAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"bool","name":"approved","type":"bool"}],"name":"setApprovalForAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceId","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"tokenURI","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"transferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"}]
+[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"approved","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"operator","type":"address"},{"indexed":false,"internalType":"bool","name":"approved","type":"bool"}],"name":"ApprovalForAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"approve","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"balance","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"getApproved","outputs":[{"internalType":"address","name":"operator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"operator","type":"address"}],"name":"isApprovedForAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"ownerOf","outputs":[{"internalType":"address","name":"owner","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"randomAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"uint256","name":"salePrice","type":"uint256"}],"name":"royaltyInfo","outputs":[{"internalType":"address","name":"receiver","type":"address"},{"internalType":"uint256","name":"royaltyAmount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"bool","name":"approved","type":"bool"}],"name":"setApprovalForAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceId","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"tokenURI","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"supply","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"transferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"}]