update contracts&test

Author: jjyaoao

contracts/nft-market.sol

@@ -2,7 +2,6 @@
 
 pragma solidity ^0.8.20;
 
-// import "@openzeppelin/contracts/interfaces/IERC721Receiver.sol"; 
 import "@openzeppelin/contracts/interfaces/IERC721.sol";
 import "@openzeppelin/contracts/interfaces/IERC20.sol";
 
@@ -21,14 +20,30 @@ contract Market {
     uint256 public currentOrderId;
     mapping(uint256 => NFTListing) public listings; 
 
+    // Event declarations
+    event NFTListed(uint256 indexed orderId, address indexed nftAddress, uint256 tokenId, uint256 price);
+    event NFTUnlisted(uint256 indexed orderId);
+    event NFTPriceChanged(uint256 indexed orderId, uint256 newPrice);
+    event NFTBought(uint256 indexed orderId, address indexed buyer, uint256 price);
+
     constructor(IERC20 _erc20, IERC721 _erc721) {
         erc20 = _erc20;
         erc721 = _erc721;
     }
 
-    function listNFTToMarket(IERC721 _nft, uint256 _tokenId, uint256 _price) public {
-        require(_nft.ownerOf(_tokenId) == msg.sender, "You are not the owner of this NFT");
-        require(_nft.getApproved(_tokenId) == address(this), "Token is not approved for the market");
+    function listNFTToMarket(
+        IERC721 _nft, 
+        uint256 _tokenId, 
+        uint256 _price
+        ) public {
+            require(
+                _nft.ownerOf(_tokenId) == msg.sender, 
+                "You are not the owner of this NFT"
+            );
+            require(
+                _nft.getApproved(_tokenId) == address(this), 
+                "Token is not approved for the market"
+            );
 
         NFTListing memory listing;
         listing.nftAddress = _nft;
@@ -37,17 +52,32 @@ contract Market {
         listing.isListed = true;
 
         listings[currentOrderId] = listing;
+        
+        emit NFTListed(
+            currentOrderId, 
+            address(_nft), 
+            _tokenId, 
+            _price
+        );
+
         currentOrderId++;
     }
 
     function unlistNFTFromMarket(uint256 _orderId) external {
         require(listings[_orderId].nftAddress.ownerOf(listings[_orderId].tokenId) == msg.sender, "You are not the owner of this NFT");
         listings[_orderId].isListed = false;
+
+        emit NFTUnlisted(_orderId);
     }
 
-    function changeNFTPrice(uint256 _orderId, uint256 _newPrice) external {
+    function changeNFTPrice(
+        uint256 _orderId, 
+        uint256 _newPrice
+        ) external {
         require(listings[_orderId].nftAddress.ownerOf(listings[_orderId].tokenId) == msg.sender, "You are not the owner of this NFT");
         listings[_orderId].price = _newPrice;
+
+        emit NFTPriceChanged(_orderId, _newPrice);
     }
 
     function buyNFT(uint256 _orderId) external payable{
@@ -59,6 +89,34 @@ contract Market {
         payable(owner).transfer(listings[_orderId].price);
 
         listings[_orderId].isSold = true;
+
+        emit NFTBought(_orderId, msg.sender, listings[_orderId].price);
+    }
+
+    function getListNFTsOrderNumber() public view returns(
+        uint256[] memory
+        ){
+        uint256 count = 0;
+        for (uint256 i = 0; i < currentOrderId; i++) {
+            if (listings[i].isListed) {
+                count++;
+            }
+        }
+
+        uint256[] memory allListNFTs = new uint256[](count);
+        uint256 index = 0;
+        for (uint256 i = 0; i < currentOrderId; i++) {
+            if (listings[i].isListed) {
+                allListNFTs[index] = i;
+                index++;
+            }
+        }
+
+        return allListNFTs;
+    }
+
+    function getListLength() public view returns(uint256) {
+        return getListNFTsOrderNumber().length;
     }
 
     receive() external payable {}

test/market.js

@@ -84,6 +84,7 @@ describe("Market", function () {
       await listNFT(tokenId);
     }
 
+    expect(await market.getListLength()).to.equal(2);
     await market.connect(accountB).buyNFT(1, { value: ethers.parseUnits('500000000000000', 'wei') })
 
     expect(await nft.ownerOf(1)).to.equal(accountB.address);