Fixed the balance checks

k3jph · May 9, 2023 · 4c0cc0e · 4c0cc0e
1 parent 21430a9
commit 4c0cc0e
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 71 deletions.
diff --git a/contracts/ELEN_E6883_NFT.sol b/contracts/ELEN_E6883_NFT.sol
@@ -143,7 +143,11 @@ contract ELEN_E6883_NFT is ERC721URIStorage, Ownable {
         return Listings[tokenId].active;
     }
 
-    // Buy an NFT
+    function getBalanceOf(address addr) public view virtual returns (uint256) {
+        return addr.balance;
+    }
+
+// Buy an NFT
     function purchaseNFT(uint256 tokenId) public payable {
         require(_exists(tokenId), "Token ID does not exist");
         require(msg.value >= Listings[tokenId].price, "Not enough ether to cover asking price");

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
   "homepage": "https://github.com/truffle-box/nft-box#readme",
   "dependencies": {
     "@openzeppelin/contracts": "^4.5.0",
+    "bn.js": "^5.2.1",
     "dotenv": "^16.0.0",
     "typescript": "^4.6.4"
   },

diff --git a/scripts/balanceOf.js b/scripts/balanceOf.js
@@ -1,20 +1,17 @@
 //SPDX-License-Identifier: MIT
 
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
-const ownerOf = async (unique_id) => {
+const balanceOf = async (addr) => {
     try {
         const nftContract = await ELEN_E6883_NFT.deployed();
-        const txn = await nftContract.ownerOf(unique_id);
-        return txn.toLowerCase();
+        const txn = await nftContract.getBalanceOf(addr);
+        return txn;
     } catch(err) {
         console.log('Doh! ', getErrorMessage(err));
     }
 }
 
-module.exports = ownerOf;
+module.exports = balanceOf;
diff --git a/scripts/createNFT.js b/scripts/createNFT.js
@@ -2,11 +2,7 @@
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
 const util = require('util')
-
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
 const createNFT = async (unique_id, name, description) => {
     try {

diff --git a/scripts/createSale.js b/scripts/createSale.js
@@ -2,11 +2,8 @@
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
 const util = require('util')
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
 const createSale = async (unique_id, price) => {
     try {

diff --git a/scripts/getErrorMessage.js b/scripts/getErrorMessage.js
@@ -3,4 +3,6 @@
 function getErrorMessage(error) {
     if (error instanceof Error) return error.message
     return String(error)
-}
+}
+
+module.exports = getErrorMessage;
diff --git a/scripts/getPrice.js b/scripts/getPrice.js
@@ -2,11 +2,8 @@
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
 const util = require('util')
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
 const getPrice = async (unique_id) => {
     try {

diff --git a/scripts/getURIData.js b/scripts/getURIData.js
@@ -1,11 +1,8 @@
 //SPDX-License-Identifier: MIT
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
 const getURIData = async (token_id) => {
     try {

diff --git a/scripts/isNFTForSale.js b/scripts/isNFTForSale.js
@@ -1,11 +1,8 @@
 //SPDX-License-Identifier: MIT
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
 const isNFTForSale = async (unique_id) => {
     try {

diff --git a/scripts/listNFTForSale.js b/scripts/listNFTForSale.js
@@ -1,11 +1,8 @@
 //SPDX-License-Identifier: MIT
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
 const listNFTForSale = async (unique_id, price) => {
     try {

diff --git a/scripts/mint.js b/scripts/mint.js
@@ -4,11 +4,7 @@
   If you want to mint more than one NFT, just pass in the number
  */
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
-
-function getErrorMessage(error) {
-  if (error instanceof Error) return error.message
-  return String(error)
-}
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
 const main = async (cb) => {
   try {

diff --git a/scripts/ownerOf.js b/scripts/ownerOf.js
@@ -1,11 +1,7 @@
 //SPDX-License-Identifier: MIT
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
-
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
 const ownerOf = async (unique_id) => {
     try {

diff --git a/scripts/purchaseNFT.js b/scripts/purchaseNFT.js
@@ -1,11 +1,8 @@
 //SPDX-License-Identifier: MIT
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
 const purchaseNFT = async (unique_id, price) => {
     try {

diff --git a/scripts/removeNFTFromSale.js b/scripts/removeNFTFromSale.js
@@ -1,11 +1,8 @@
 //SPDX-License-Identifier: MIT
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
 const removeNFTFromSale = async (unique_id, price) => {
     try {

diff --git a/scripts/setOwner.js b/scripts/setOwner.js
@@ -2,11 +2,8 @@
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
 const util = require('util')
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
 const setOwner = async (unique_id, newAddress) => {
     try {

diff --git a/scripts/transferNFT.js b/scripts/transferNFT.js
@@ -1,11 +1,8 @@
 //SPDX-License-Identifier: MIT
 
 var ELEN_E6883_NFT = artifacts.require("./ELEN_E6883_NFT.sol");
+const getErrorMessage = require("../scripts/getErrorMessage.js");
 
-function getErrorMessage(error) {
-    if (error instanceof Error) return error.message
-    return String(error)
-}
 
 const transferNFT = async (unique_id, newOwner) => {
     try {

diff --git a/test/testELEN_E6883_NFT.js b/test/testELEN_E6883_NFT.js
@@ -1,3 +1,8 @@
+//SPDX-License-Identifier: MIT
+
+const BN = require('bn.js');
+
+const balanceOf = require("../scripts/balanceOf.js");
 const createNFT = require("../scripts/createNFT.js");
 const getPrice = require("../scripts/getPrice.js");
 const getURIData = require("../scripts/getURIData.js");
@@ -62,28 +67,34 @@ contract("ELEN_E6883_NFT", function (accounts) {
     it("TC5: Purchase the NFT from a seller", async () => {
         const name = "Test NFT #5";
         const desc = "This is a test NFT description for test case 5";
-        const price = 1;
+        let price = 1000000;  // 1000000wei
 
         const tokenID = await createNFT(1220, name, desc);
         await listNFTForSale(1220, price);
 
         //  Here we make a custom call to the purchase NFT to test the contract
         //  the JS code can be exercised elsewhere
         const nftContract = await ELEN_E6883_NFT.deployed();
+        var account0_balance_old = await balanceOf(accounts[0]);
         const txn = await nftContract.purchaseNFT(1220, {from : accounts[1], value : price});
+        var account0_balance_new = await balanceOf(accounts[0]);
 
         const currOwner = await ownerOf(1220);
+
+        assert.equal(account0_balance_old.add(new BN(price)).toString(), account0_balance_new.toString(), "The buyers's account balance is incorrect");
         assert.equal(currOwner, accounts[1].toLowerCase(), "The owners should be the same.");
     });
 
     it("TC6: Fail to purchase the NFT from a seller", async () => {
         const name = "Test NFT #5";
         const desc = "This is a test NFT description for test case 5";
-        const price = 2;
+        let price = 1000000;  // 1000000wei
 
         const tokenID = await createNFT(1221, name, desc);
         await listNFTForSale(1221, price);
 
+        var account0_balance_old = await balanceOf(accounts[0]);
+
         try {
             //  Here we make a custom call to the purchase NFT to test the contract
             //  the JS code can be exercised elsewhere
@@ -92,8 +103,10 @@ contract("ELEN_E6883_NFT", function (accounts) {
         } catch(err) {
             // Gracefully do nothing
         }
+        var account0_balance_new = await balanceOf(accounts[0]);
 
         const currOwner = await ownerOf(1221);
+        assert.equal(account0_balance_old.toString(), account0_balance_new.toString(), "The buyers's account balance is incorrect");
         assert.equal(currOwner, accounts[0].toLowerCase(), "The owners should be the same.");
     });
     //*** VK end code #3 ***    

diff --git a/truffle-config.js b/truffle-config.js
@@ -1,8 +1,6 @@
 const path = require("path");
 
 require('dotenv').config();
-const HDWalletProvider = require('@truffle/hdwallet-provider');
-const { INFURA_API_KEY, MNEMONIC } = process.env;
 
 module.exports = {
   contracts_build_directory: path.join(__dirname, "client/src/contracts"),
@@ -12,15 +10,10 @@ module.exports = {
       port: 7545,
       network_id: "*"
     },
- 
+
     dashboard: {
       port: 24012
     },
-    sepolia: {
-      provider: () => new HDWalletProvider(MNEMONIC, INFURA_API_KEY),
-      network_id: '11155111',
-      gas: 4465030
-    }
   },
   mocha: {},
   compilers: {