Merge pull request #1 from anwen/v2

V2 merge

Author: askender

.gitignore

@@ -43,4 +43,7 @@ node_modules
 cache
 artifacts
 
-*_raw
+# contract type generation
+/contracts/types
+
+*_raw

README_raw.md

@@ -0,0 +1,109 @@
+## Full stack NFT marketplace built with Polygon, Solidity, IPFS, & Next.js
+
+![Header](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/pfofv47dooojerkmfgr4.png)
+
+### Running this project
+
+#### Gitpod
+
+To deploy this project to Gitpod, follow these steps:
+
+1. Click this link to deploy
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#github.com/dabit3/polygon-ethereum-nextjs-marketplace)
+
+2. In __pages/index.js__, pass in the RPC address given to you by GitPod to the call to `JsonRpcProvider` function:
+
+```javascript
+/* update this: */
+const provider = new ethers.providers.JsonRpcProvider()
+
+/* to this: */
+const provider = new ethers.providers.JsonRpcProvider("https://8545-youendpoint.gitpod.io/")
+```
+
+3. Import the RPC address given to you by GitPod into your MetaMask wallet
+
+![MetaMask RPC Import](wallet.png)
+
+#### Local setup
+
+To run this project locally, follow these steps.
+
+1. Clone the project locally, change into the directory, and install the dependencies:
+
+```sh
+git clone https://github.com/dabit3/polygon-ethereum-nextjs-marketplace.git
+
+cd polygon-ethereum-nextjs-marketplace
+
+# install using NPM or Yarn
+npm install
+
+# or
+
+yarn
+```
+
+2. Start the local Hardhat node
+
+```sh
+npx hardhat node
+```
+
+3. With the network running, deploy the contracts to the local network in a separate terminal window
+
+```sh
+npx hardhat run scripts/deploy.js --network localhost
+```
+
+4. Start the app
+
+```
+npm run dev
+```
+
+### Configuration
+
+To deploy to Polygon test or main networks, update the configurations located in __hardhat.config.js__ to use a private key and, optionally, deploy to a private RPC like Infura.
+
+```javascript
+require("@nomiclabs/hardhat-waffle");
+const fs = require('fs');
+const privateKey = fs.readFileSync(".secret").toString().trim() || "01234567890123456789";
+
+// infuraId is optional if you are using Infura RPC
+const infuraId = fs.readFileSync(".infuraid").toString().trim() || "";
+
+module.exports = {
+  defaultNetwork: "hardhat",
+  networks: {
+    hardhat: {
+      chainId: 1337
+    },
+    mumbai: {
+      // Infura
+      // url: `https://polygon-mumbai.infura.io/v3/${infuraId}`
+      url: "https://rpc-mumbai.matic.today",
+      accounts: [privateKey]
+    },
+    matic: {
+      // Infura
+      // url: `https://polygon-mainnet.infura.io/v3/${infuraId}`,
+      url: "https://rpc-mainnet.maticvigil.com",
+      accounts: [privateKey]
+    }
+  },
+  solidity: {
+    version: "0.8.4",
+    settings: {
+      optimizer: {
+        enabled: true,
+        runs: 200
+      }
+    }
+  }
+};
+```
+
+If using Infura, update __.infuraid__ with your [Infura](https://infura.io/) project ID.

contracts/Market.sol

@@ -4,17 +4,14 @@ pragma solidity ^0.8.3;
 import "@openzeppelin/contracts/utils/Counters.sol";
 import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
-
 import "hardhat/console.sol";
 
 contract NFTMarket is ReentrancyGuard {
   using Counters for Counters.Counter;
   Counters.Counter private _itemIds;
   Counters.Counter private _itemsSold;
-
   address payable owner;
-  // uint256 listingPrice = 0.025 ether;
-  uint256 listingPrice = 0.001 ether;
+  uint256 listingPrice = 0.0001 ether;
 
   constructor() {
     owner = payable(msg.sender);
@@ -31,6 +28,7 @@ contract NFTMarket is ReentrancyGuard {
   }
 
   mapping(uint256 => MarketItem) private idToMarketItem;
+  mapping(uint256 => MarketItem) private tidToMarketItem;
 
   event MarketItemCreated (
     uint indexed itemId,
@@ -56,9 +54,9 @@ contract NFTMarket is ReentrancyGuard {
     require(price > 0, "Price must be at least 1 wei");
     require(msg.value == listingPrice, "Price must be equal to listing price");
 
-    _itemIds.increment();
+    _itemIds.increment(); // should not use itemid
     uint256 itemId = _itemIds.current();
-  
+    
     idToMarketItem[itemId] =  MarketItem(
       itemId,
       nftContract,
@@ -68,6 +66,16 @@ contract NFTMarket is ReentrancyGuard {
       price,
       false
     );
+    // fix bug, use tokenId, needed when sale
+    tidToMarketItem[tokenId] =  MarketItem(
+      itemId,
+      nftContract,
+      tokenId,
+      payable(msg.sender),
+      payable(address(0)),
+      price,
+      false
+    );
 
     IERC721(nftContract).transferFrom(msg.sender, address(this), tokenId);
 
@@ -88,14 +96,22 @@ contract NFTMarket is ReentrancyGuard {
     address nftContract,
     uint256 itemId
     ) public payable nonReentrant {
-    uint price = idToMarketItem[itemId].price;
-    uint tokenId = idToMarketItem[itemId].tokenId;
+    // Note: idToMarketItem maybe less than allItem(some item-minted-not-goto-market)
+    // so price = allItem[itemId].price
+    // so tokenId = allItem[itemId].tokenId // tokenId === itemId
+
+    // uint tokenId = idToMarketItem[itemId].tokenId;
+    // get price by itemid
+    uint tokenId = itemId;
+    uint price = tidToMarketItem[itemId].price;
+
     require(msg.value == price, "Please submit the asking price in order to complete the purchase");
 
     idToMarketItem[itemId].seller.transfer(msg.value);
     IERC721(nftContract).transferFrom(address(this), msg.sender, tokenId);
     idToMarketItem[itemId].owner = payable(msg.sender);
     idToMarketItem[itemId].sold = true;
+    // tidToMarketItem
     _itemsSold.increment();
     payable(owner).transfer(listingPrice);
   }
@@ -115,9 +131,11 @@ contract NFTMarket is ReentrancyGuard {
         currentIndex += 1;
       }
     }
+
     return items;
   }
 
+
   /* Returns only items that a user has purchased */
   function fetchMyNFTs() public view returns (MarketItem[] memory) {
     uint totalItemCount = _itemIds.current();

contracts/NFT.sol

@@ -5,47 +5,27 @@ import "@openzeppelin/contracts/utils/Counters.sol";
 import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
-
 import "hardhat/console.sol";
 
-// contract DwebNFT is ERC721, Ownable {
 contract NFT is ERC721URIStorage {
     using Counters for Counters.Counter;
     Counters.Counter private _tokenIds;
     address contractAddress;
-
-    using Strings for uint256;
+    using Strings for uint256; // uint256 is uint
     mapping (uint256 => string) private _tokenURIs;
-    // constructor() ERC721("DwebNFT", "DNFT") {}
-    // constructor(address marketplaceAddress) ERC721("Metaverse", "METT") {
-    constructor(address marketplaceAddress) ERC721("DwebVerse", "DWV") {
+
+    constructor(address marketplaceAddress) ERC721("CC4", "CC4") {
         contractAddress = marketplaceAddress;
     }
 
-    // function mint
+    // mint, uri is tokenURI
     function createToken(string memory uri) public returns (uint) {
         _tokenIds.increment();
         uint256 newItemId = _tokenIds.current();
-        // recipient is msg.sender
-        // uri is tokenURI
-        // uint256 is uint
-        _mint(msg.sender, newItemId);
+        _mint(msg.sender, newItemId); // msg.sender is recipient
         _setTokenURI(newItemId, uri);
         setApprovalForAll(contractAddress, true);
         return newItemId;
     }
 
-    // function _setTokenURI(uint256 tokenId, string memory _tokenURI) internal virtual {
-    //     _tokenURIs[tokenId] = _tokenURI;
-    // }
-
-    // function tokenURI(uint256 tokenId) public view virtual override returns (string memory) {
-    //     require(_exists(tokenId), "ERC721Metadata: URI query for nonexistent token");
-    //     string memory _tokenURI = _tokenURIs[tokenId];
-    //     return _tokenURI;
-    // }
-
-    
-
-
 }

hardhat.config.js

@@ -13,7 +13,9 @@ module.exports = {
       // Infura
       // url: `https://polygon-mumbai.infura.io/v3/${infuraId}`
       // url: "https://rpc-mumbai.matic.today",
-      url: "https://rpc-mumbai.maticvigil.com",
+      // url: "https://rpc-mumbai.maticvigil.com",
+      url: "https://matic-mumbai.chainstacklabs.com",
+      // url: "https://rpc-mumbai.maticvigil.com/v1/35346f853fb4496728602ff72a70eb9a8785064e",
       accounts: [privateKey]
     },
     matic: {

next.config.js

@@ -1,3 +1,5 @@
-module.exports = {
-  reactStrictMode: true,
-}
+const withTM = require("next-transpile-modules")(["react-markdown"]);
+
+module.exports = withTM({
+  reactStrictMode: true
+});

package.json

@@ -5,22 +5,30 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build",
-    "start": "next start",
+    "start": "export PORT=4006 next start",
     "lint": "next lint"
   },
   "dependencies": {
+    "@headlessui/react": "^1.4.1",
+    "@heroicons/react": "^1.0.4",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@openzeppelin/contracts": "^4.2.0",
+    "@textile/eth-storage": "^1.0.0",
     "axios": "^0.21.1",
     "chai": "^4.3.4",
     "ethereum-waffle": "^3.4.0",
     "ethers": "^5.4.1",
+    "graphql-tag": "^2.12.6",
+    "gray-matter": "^4.0.3",
     "hardhat": "^2.4.1",
     "ipfs-http-client": "^50.1.2",
-    "next": "11.0.1",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "next": "^12.0.4",
+    "next-transpile-modules": "^8.0.0",
+    "nft.storage": "^3.3.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-markdown": "^7.1.0",
     "web3modal": "^1.9.3"
   },
   "devDependencies": {