Polygon Testnet Deployment

Author: Shachindra

CreatifyArguments.js

@@ -0,0 +1 @@
+module.exports = ["Creatify", "CRFTY", "", "0x604860eFB014242c5a49f7ee4095A9527F7BE575"];

MarketplaceArguments.js

@@ -0,0 +1 @@
+module.exports = [30];

README.md

@@ -30,18 +30,18 @@ npx solhint 'contracts/**/*.sol' --fix
 
 # Etherscan verification
 
-To try out Etherscan verification, you first need to deploy a contract to an Ethereum network that's supported by Etherscan, such as Ropsten.
+To try out Etherscan verification, you first need to deploy a contract to an Ethereum network that's supported by Etherscan, such as maticmum.
 
-In this project, copy the .env.template file to a file named .env, and then edit it to fill in the details. Enter your Etherscan API key, your Ropsten node URL (eg from Alchemy), and the private key of the account which will send the deployment transaction. With a valid .env file in place, first deploy your contract:
+In this project, copy the .env.template file to a file named .env, and then edit it to fill in the details. Enter your Etherscan API key, your maticmum node URL (eg from Alchemy), and the private key of the account which will send the deployment transaction. With a valid .env file in place, first deploy your contract:
 
 ```shell
-hardhat run --network ropsten scripts/deploy.js
+hardhat run --network maticmum scripts/deploy.js --constructor-args contractConstructorArguments.js DEPLOYED_CONTRACT_ADDRESS
 ```
 
 Then, copy the deployment address and paste it in to replace `DEPLOYED_CONTRACT_ADDRESS` in this command:
 
 ```shell
-npx hardhat verify --network ropsten DEPLOYED_CONTRACT_ADDRESS "Hello, Hardhat!"
+npx hardhat verify --network maticmum DEPLOYED_CONTRACT_ADDRESS --constructor-args "Constructor Argument"
 ```
 
 # Next App

config.js

@@ -1,2 +1,2 @@
-export const marketplaceAddress = "0x5FbDB2315678afecb367f032d93F642f64180aa3"
-export const creatifyAddress = "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
+export const marketplaceAddress = "0x604860eFB014242c5a49f7ee4095A9527F7BE575"
+export const creatifyAddress = "0x588F2d9EA0043Ff77343AaB23df5B5FfD49eA6B7"

contracts/Marketplace.sol

@@ -23,7 +23,7 @@ contract Marketplace is Context, AccessControlEnumerable, ReentrancyGuard {
     }
 
     address public owner;
-    uint96 public platformFeeBasisPoint = 300;
+    uint96 public platformFeeBasisPoint = 30;
 
     struct MarketItem {
         uint256 itemId;
@@ -68,8 +68,9 @@ contract Marketplace is Context, AccessControlEnumerable, ReentrancyGuard {
 
         // Calculate Payouts between seller and platform
         uint256 amountReceived = msg.value;
-        uint256 amountToSeller = (amountReceived * (1000 - platformFeeBasisPoint)) / 1000;
+
         uint256 amountToMarketplace = (amountReceived * platformFeeBasisPoint) / 1000;
+        uint256 amountToSeller = amountReceived - amountToMarketplace;        
 
         idToMarketItem[itemId].seller.transfer(amountToSeller);
         payable(address(owner)).transfer(amountToMarketplace);
@@ -87,12 +88,12 @@ contract Marketplace is Context, AccessControlEnumerable, ReentrancyGuard {
 
         MarketItem[] memory items = new MarketItem[](unsoldItemCount);
         for (uint256 i = 0; i < itemCount; i++) {
-        if (idToMarketItem[i + 1].owner == address(0)) {
-            uint256 currentId = i + 1;
-            MarketItem storage currentItem = idToMarketItem[currentId];
-            items[currentIndex] = currentItem;
-            currentIndex += 1;
-        }
+            if (idToMarketItem[i + 1].owner == address(0)) {
+                uint256 currentId = i + 1;
+                MarketItem storage currentItem = idToMarketItem[currentId];
+                items[currentIndex] = currentItem;
+                currentIndex += 1;
+            }
         }
         return items;
     }

pages/create-artifacts.js

@@ -60,8 +60,8 @@ export default function CreateItem() {
 
     /* next, create the item */
     let contract = new ethers.Contract(creatifyAddress, Creatify.abi, signer)
-    console.log(url);
-    let transaction = await contract.createArtifact(ipfsHash);
+    console.log("ipfs://"+ipfsHash);
+    let transaction = await contract.createArtifact(url);
     let tx = await transaction.wait();
     let event = tx.events[0]
     let value = event.args[2]
@@ -71,10 +71,11 @@ export default function CreateItem() {
 
     /* then list the item for sale on the marketplace */
     contract = new ethers.Contract(marketplaceAddress, Marketplace.abi, signer)
-    let listingPrice = await contract.getListingPrice()
-    listingPrice = listingPrice.toString()
+    // let listingPrice = await contract.getListingPrice()
+    // listingPrice = listingPrice.toString()
 
-    transaction = await contract.createMarketItem(creatifyAddress, tokenId, price, { value: listingPrice })
+    // transaction = await contract.createMarketItem(creatifyAddress, tokenId, price, { value: listingPrice })
+    transaction = await contract.createMarketItem(creatifyAddress, tokenId, price)
     await transaction.wait()
     router.push('/')
   }

pages/my-artifacts.js

@@ -43,6 +43,7 @@ export default function MyAssets() {
       }
       return item
     }))
+    console.log(items)
     setNfts(items)
     setLoadingState('loaded') 
   }

scripts/deploy.js

@@ -15,12 +15,12 @@ async function main() {
 
     // We get the contract to deploy
     const Marketplace = await hre.ethers.getContractFactory("Marketplace");
-    const marketplace = await Marketplace.deploy(300);
+    const marketplace = await Marketplace.deploy(30);
     await marketplace.deployed();
     console.log("Marketplace Deployed to: ", marketplace.address);
 
     const Creatify = await hre.ethers.getContractFactory("Creatify");
-    const creatify = await Creatify.deploy("Creatify", "CRFTY", "https://localhost:9080/creatify/artifacts/", marketplace.address);
+    const creatify = await Creatify.deploy("Creatify", "CRFTY", "", marketplace.address);
     await creatify.deployed();
     console.log("Creatify Deployed to:", creatify.address);
 }

test/test.js

@@ -23,7 +23,7 @@ describe("Creatify Marketplace Contract", function () {
 		creator = accounts[1];
 		buyer = accounts[2];
 		marketplace = await Marketplace.new(300);
-		creatify = await Creatify.new("Creatify", "CRFTY", "https://ipfs.infura.io/ipfs/", marketplace.address);
+		creatify = await Creatify.new("Creatify", "CRFTY", "", marketplace.address);
 	});
 
 	it("Should return the right name and symbol of the token once Creatify is deployed", async function() {
@@ -45,8 +45,8 @@ describe("Creatify Marketplace Contract", function () {
 		const salePrice = ethers.utils.parseUnits("1", "ether");
 
 		/* create two tokens */
-		await creatify.createArtifact("QmbXvKra8Re7sxCMAEpquWJEq5qmSqis5VPCvo9uTA7AcF");
-		await creatify.createArtifact("QmbXvKra8Re7sxCMAEpquWJEq5qmSqis5VPCvo9uTA7AcF");
+		await creatify.createArtifact("https://ipfs.infura.io/ipfs/QmbXvKra8Re7sxCMAEpquWJEq5qmSqis5VPCvo9uTA7AcF");
+		await creatify.createArtifact("https://ipfs.infura.io/ipfs/QmbXvKra8Re7sxCMAEpquWJEq5qmSqis5VPCvo9uTA7AcF");
 
 		console.log(await creatify.tokenURI(1));