From 609b4e839b3a601d31f5a0d16face7ee631cd152 Mon Sep 17 00:00:00 2001
From: 050ujjwal <050ujjwal.pal@gmail.com>
Date: Mon, 10 Apr 2023 16:46:20 +0530
Subject: [PATCH 1/6] last commit

---
 .../.gitignore                                |  11 ++
 .../README.md                                 |  13 ++
 .../contracts/Ecom.sol                        | 157 ++++++++++++++++++
 .../contracts/paymentProcessing.sol           |  46 +++++
 .../contracts/productDetails.sol              |  54 ++++++
 .../contracts/shippingContract.sol            |  52 ++++++
 .../hardhat.config.js                         | 105 ++++++++++++
 .../package.json                              |  16 ++
 .../scripts/deploy.js                         |  23 +++
 Alliance_University_Ujjwal_pal_CSE081/test.js |  48 ++++++
 .../test/Lock.js                              | 126 ++++++++++++++
 11 files changed, 651 insertions(+)
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/.gitignore
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/README.md
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/contracts/Ecom.sol
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/contracts/paymentProcessing.sol
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/contracts/productDetails.sol
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/contracts/shippingContract.sol
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/package.json
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/scripts/deploy.js
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/test.js
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/test/Lock.js

diff --git a/Alliance_University_Ujjwal_pal_CSE081/.gitignore b/Alliance_University_Ujjwal_pal_CSE081/.gitignore
new file mode 100644
index 00000000..00dad773
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/.gitignore
@@ -0,0 +1,11 @@
+node_modules
+.env
+coverage
+coverage.json
+typechain
+typechain-types
+
+# Hardhat files
+cache
+artifacts
+
diff --git a/Alliance_University_Ujjwal_pal_CSE081/README.md b/Alliance_University_Ujjwal_pal_CSE081/README.md
new file mode 100644
index 00000000..e9dd5f34
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/README.md
@@ -0,0 +1,13 @@
+# Sample Hardhat Project
+
+This project demonstrates a basic Hardhat use case. It comes with a sample contract, a test for that contract, and a script that deploys that contract.
+
+Try running some of the following tasks:
+
+```shell
+npx hardhat help
+npx hardhat test
+REPORT_GAS=true npx hardhat test
+npx hardhat node
+npx hardhat run scripts/deploy.js
+```
diff --git a/Alliance_University_Ujjwal_pal_CSE081/contracts/Ecom.sol b/Alliance_University_Ujjwal_pal_CSE081/contracts/Ecom.sol
new file mode 100644
index 00000000..f4b06617
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/contracts/Ecom.sol
@@ -0,0 +1,157 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^ 0.5.4;
+contract shopping {
+
+	address payable public owner;
+
+	constructor() public {
+		owner = msg.sender;
+	}
+	uint id;
+	uint purchaseId;
+	struct seller {
+		string name;
+		address addre;
+		uint bankGuaraantee;
+		bool bgPaid;
+	}
+	struct product {
+		string productId;
+		string productName;
+		string Category;
+		uint price;
+		string description;
+		address payable seller;
+		bool isActive;
+
+	}
+	struct ordersPlaced {
+		string productId;
+		uint purchaseId;
+		address orderedBy;
+	}
+	struct sellerShipment {
+		string productId;
+		uint purchaseId;
+		string shipmentStatus;
+		string deliveryAddress;
+		address payable orderedBy;
+		bool isActive;
+		bool isCanceled;
+	}
+	struct user {
+		string name;
+		string email;
+		string deliveryAddress;
+		bool isCreated;
+	}
+	struct orders {
+		string productId;
+		string orderStatus;
+		uint purchaseId;
+		string shipmentStatus;
+	}
+	mapping(address => seller) public sellers;
+	mapping(string => product) products;
+	product[] public allProducts;
+	mapping(address => ordersPlaced[]) sellerOrders;
+	mapping(address => mapping(uint => sellerShipment)) sellerShipments;
+	mapping(address => user) users;
+	mapping(address => orders[]) userOrders;
+
+	function sellerSignUp(string memory _name) public payable {
+		require(!sellers[msg.sender].bgPaid, "You are Already Registered");
+		require(msg.value == 1000 wei, "Bank Guarantee of 1000 wei Required");
+		owner.transfer(msg.value);
+		sellers[msg.sender].name = _name;
+		sellers[msg.sender].addre = msg.sender;
+		sellers[msg.sender].bankGuaraantee = msg.value;
+		sellers[msg.sender].bgPaid = true;
+	}
+
+	function createAccount(string memory _name, string memory _email, string memory _deliveryAddress) public {
+
+		users[msg.sender].name = _name;
+		users[msg.sender].email = _email;
+		users[msg.sender].deliveryAddress = _deliveryAddress;
+		users[msg.sender].isCreated = true;
+	}
+
+	function buyProduct(string memory _productId) public payable {
+
+
+		require(msg.value == products[_productId].price, "Value Must be Equal to Price of Product");
+		require(users[msg.sender].isCreated, "You Must Be Registered to Buy");
+
+		products[_productId].seller.transfer(msg.value);
+
+		purchaseId = id++;
+		orders memory order = orders(_productId, "Order Placed With Seller", purchaseId, sellerShipments[products[_productId].seller][purchaseId].shipmentStatus);
+		userOrders[msg.sender].push(order);
+		ordersPlaced memory ord = ordersPlaced(_productId, purchaseId, msg.sender);
+		sellerOrders[products[_productId].seller].push(ord);
+
+		sellerShipments[products[_productId].seller][purchaseId].productId = _productId;
+		sellerShipments[products[_productId].seller][purchaseId].orderedBy = msg.sender;
+		sellerShipments[products[_productId].seller][purchaseId].purchaseId = purchaseId;
+		sellerShipments[products[_productId].seller][purchaseId].deliveryAddress = users[msg.sender].deliveryAddress;
+		sellerShipments[products[_productId].seller][purchaseId].isActive = true;
+	}
+
+	function addProduct(string memory _productId, string memory _productName, string memory _category, uint _price, string memory _description) public {
+		require(sellers[msg.sender].bgPaid, "You are not Registered as Seller");
+		require(!products[_productId].isActive, "Product With this Id is already Active. Use other UniqueId");
+
+
+		product memory newProduct = product(_productId, _productName, _category, _price, _description, msg.sender, true);
+		products[_productId].productId = _productId;
+		products[_productId].productName = _productName;
+		products[_productId].Category = _category;
+		products[_productId].description = _description;
+		products[_productId].price = _price;
+		products[_productId].seller = msg.sender;
+		products[_productId].isActive = true;
+		allProducts.push(newProduct);
+
+	}
+
+	function cancelOrder(string memory _productId, uint _purchaseId) public payable {
+		require(sellerShipments[products[_productId].seller][_purchaseId].orderedBy == msg.sender, "Aww Crap.. You are not Authorized to This Product PurchaseId");
+		require(sellerShipments[products[_productId].seller][purchaseId].isActive, "Aww crap..You Already Canceled This order");
+
+
+		sellerShipments[products[_productId].seller][_purchaseId].shipmentStatus = "Order Canceled By Buyer, Payment will Be  Refunded";
+		sellerShipments[products[_productId].seller][_purchaseId].isCanceled = true;
+		sellerShipments[products[_productId].seller][_purchaseId].isActive = false;
+	}
+
+	function updateShipment(uint _purchaseId, string memory _shipmentDetails) public {
+		require(sellerShipments[msg.sender][_purchaseId].isActive, "Order is either inActive or cancelled");
+
+		sellerShipments[msg.sender][_purchaseId].shipmentStatus = _shipmentDetails;
+
+	}
+
+	function refund(string memory _productId, uint _purchaseId) public payable {
+		require(sellerShipments[msg.sender][_purchaseId].isCanceled, "Order is not Yet Cancelled");
+		require(!sellerShipments[products[_productId].seller][purchaseId].isActive, "Order is Active and not yet Cancelled");
+		require(msg.value == products[_productId].price, "Value Must be Equal to Product Price");
+		sellerShipments[msg.sender][_purchaseId].orderedBy.transfer(msg.value);
+		sellerShipments[products[_productId].seller][_purchaseId].shipmentStatus = "Order Canceled By Buyer, Payment Refunded";
+
+	}
+
+	function myOrders(uint _index) public view returns(string memory, string memory, uint, string memory) {
+		return (userOrders[msg.sender][_index].productId, userOrders[msg.sender][_index].orderStatus, userOrders[msg.sender][_index].purchaseId, sellerShipments[products[userOrders[msg.sender][_index].productId].seller][userOrders[msg.sender][_index].purchaseId].shipmentStatus);
+	}
+
+	function getOrdersPlaced(uint _index) public view returns(string memory, uint, address, string memory) {
+		return (sellerOrders[msg.sender][_index].productId, sellerOrders[msg.sender][_index].purchaseId, sellerOrders[msg.sender][_index].orderedBy, sellerShipments[msg.sender][sellerOrders[msg.sender][_index].purchaseId].shipmentStatus);
+	}
+
+	function getShipmentDetails(uint _purchaseId) public view returns(string memory, string memory, address, string memory) {
+
+		return (sellerShipments[msg.sender][_purchaseId].productId, sellerShipments[msg.sender][_purchaseId].shipmentStatus, sellerShipments[msg.sender][_purchaseId].orderedBy, sellerShipments[msg.sender][_purchaseId].deliveryAddress);
+	}
+
+}
\ No newline at end of file
diff --git a/Alliance_University_Ujjwal_pal_CSE081/contracts/paymentProcessing.sol b/Alliance_University_Ujjwal_pal_CSE081/contracts/paymentProcessing.sol
new file mode 100644
index 00000000..697ca935
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/contracts/paymentProcessing.sol
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract PaymentProcessor {
+    enum PaymentStatus { Pending, Paid, Refunded }
+    
+    struct Payment {
+        uint256 paymentId;
+        address payable buyer;
+        address payable seller;
+        uint256 amount;
+        PaymentStatus status;
+    }
+    
+    uint256 public paymentCount;
+    mapping(uint256 => Payment) public payments;
+    
+    event PaymentCreated(uint256 indexed paymentId, address indexed buyer, address indexed seller, uint256 amount);
+    event PaymentPaid(uint256 indexed paymentId, address indexed payer);
+    event PaymentRefunded(uint256 indexed paymentId, address indexed payer);
+    
+    function createPayment(address payable _seller) public payable {
+        paymentCount++;
+        payments[paymentCount] = Payment(paymentCount, payable(msg.sender), _seller, msg.value, PaymentStatus.Pending);
+        emit PaymentCreated(paymentCount, msg.sender, _seller, msg.value);
+    }
+    
+    function pay(uint256 _paymentId) public payable {
+        Payment storage payment = payments[_paymentId];
+        require(msg.sender == payment.buyer, "Only the buyer can pay for this payment");
+        require(msg.value == payment.amount, "Incorrect payment amount");
+        require(payment.status == PaymentStatus.Pending, "Invalid payment status for payment");
+        payment.seller.transfer(msg.value);
+        payment.status = PaymentStatus.Paid;
+        emit PaymentPaid(_paymentId, msg.sender);
+    }
+    
+    function refund(uint256 _paymentId) public {
+        Payment storage payment = payments[_paymentId];
+        require(msg.sender == payment.seller, "Only the seller can refund this payment");
+        require(payment.status == PaymentStatus.Paid, "Invalid payment status for refund");
+        payment.buyer.transfer(payment.amount);
+        payment.status = PaymentStatus.Refunded;
+        emit PaymentRefunded(_paymentId, msg.sender);
+    }
+}
diff --git a/Alliance_University_Ujjwal_pal_CSE081/contracts/productDetails.sol b/Alliance_University_Ujjwal_pal_CSE081/contracts/productDetails.sol
new file mode 100644
index 00000000..1856ebfc
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/contracts/productDetails.sol
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^ 0.5.4;
+contract shopping {
+
+	address payable public owner;
+
+	constructor() public {
+		owner = msg.sender;
+	}
+	struct seller {
+		string name;
+		address addr;
+		uint bankGuaraantee;
+		bool bgPaid;
+	}
+	struct product {
+		string productId;
+		string productName;
+		string Category;
+		uint price;
+		string description;
+		address payable seller;
+		bool isActive;
+	}
+	mapping(address => seller) public sellers;
+	mapping(string => product) products;
+	product[] public allProducts;
+
+	function sellerSignUp(string memory _name) public payable {
+		require(!sellers[msg.sender].bgPaid);
+		require(msg.value == 1000 wei, "Bank Guarantee of 1000 wei Required");
+		owner.transfer(msg.value);
+		sellers[msg.sender].name = _name;
+		sellers[msg.sender].addr = msg.sender;
+		sellers[msg.sender].bankGuaraantee = msg.value;
+		sellers[msg.sender].bgPaid = true;
+	}
+
+	function addProduct(string memory _productId, string memory _productName, string memory _category, uint _price, string memory _description) public {
+		require(!products[_productId].isActive);
+		require(sellers[msg.sender].bgPaid);
+
+		product memory product = product(_productId, _productName, _category, _price, _description, msg.sender, true);
+		products[_productId].productId = _productId;
+		products[_productId].productName = _productName;
+		products[_productId].Category = _category;
+		products[_productId].description = _description;
+		products[_productId].price = _price;
+		products[_productId].seller = msg.sender;
+		products[_productId].isActive = true;
+		allProducts.push(product);
+
+	}
+}
\ No newline at end of file
diff --git a/Alliance_University_Ujjwal_pal_CSE081/contracts/shippingContract.sol b/Alliance_University_Ujjwal_pal_CSE081/contracts/shippingContract.sol
new file mode 100644
index 00000000..87417f91
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/contracts/shippingContract.sol
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract Shipping {
+    enum ShipmentStatus { Created, InTransit, Delivered, Lost }
+    
+    struct Shipment {
+        uint256 shipmentId;
+        address buyer;
+        address seller;
+        string item;
+        ShipmentStatus status;
+    }
+    
+    uint256 public shipmentCount;
+    mapping(uint256 => Shipment) public shipments;
+    
+    event ShipmentCreated(uint256 indexed shipmentId, address indexed buyer, address indexed seller, string item);
+    event ShipmentInTransit(uint256 indexed shipmentId);
+    event ShipmentDelivered(uint256 indexed shipmentId);
+    event ShipmentLost(uint256 indexed shipmentId);
+    
+    function createShipment(address _buyer, string memory _item) public {
+        shipmentCount++;
+        shipments[shipmentCount] = Shipment(shipmentCount, _buyer, msg.sender, _item, ShipmentStatus.Created);
+        emit ShipmentCreated(shipmentCount, _buyer, msg.sender, _item);
+    }
+    
+    function markInTransit(uint256 _shipmentId) public {
+        Shipment storage shipment = shipments[_shipmentId];
+        require(msg.sender == shipment.seller, "Only the seller can mark a shipment as in transit");
+        require(shipment.status == ShipmentStatus.Created, "Invalid shipment status for in transit");
+        shipment.status = ShipmentStatus.InTransit;
+        emit ShipmentInTransit(_shipmentId);
+    }
+    
+    function markDelivered(uint256 _shipmentId) public {
+        Shipment storage shipment = shipments[_shipmentId];
+        require(msg.sender == shipment.buyer, "Only the buyer can mark a shipment as delivered");
+        require(shipment.status == ShipmentStatus.InTransit, "Invalid shipment status for delivery");
+        shipment.status = ShipmentStatus.Delivered;
+        emit ShipmentDelivered(_shipmentId);
+    }
+    
+    function markLost(uint256 _shipmentId) public {
+        Shipment storage shipment = shipments[_shipmentId];
+        require(msg.sender == shipment.buyer || msg.sender == shipment.seller, "Only the buyer or seller can mark a shipment as lost");
+        require(shipment.status == ShipmentStatus.InTransit, "Invalid shipment status for lost");
+        shipment.status = ShipmentStatus.Lost;
+        emit ShipmentLost(_shipmentId);
+    }
+}
diff --git a/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js b/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js
new file mode 100644
index 00000000..5d9c156b
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js
@@ -0,0 +1,105 @@
+/**
+ * @type import('hardhat/config').HardhatUserConfig
+ */
+
+require('@nomiclabs/hardhat-ethers');
+require('@nomiclabs/hardhat-etherscan');
+
+// Change private keys accordingly - ONLY FOR DEMOSTRATION PURPOSES - PLEASE STORE PRIVATE KEYS IN A SAFE PLACE
+// Export your private key as
+//       export PRIVKEY=0x.....
+
+
+module.exports = {
+  defaultNetwork: 'buildbear',
+
+  networks: {
+    hardhat: {},
+    buildbear: {
+      url: "https://rpc.buildbear.io/Critical_Mon_Mothma_150e5c8a"
+    }
+
+  },
+  solidity: {
+    compilers: [
+      {
+        version: '0.8.16',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 200,
+          },
+        },
+      },
+      {
+        version: '0.8.4',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 200,
+          },
+        },
+      },
+      {
+        version: '0.8.9',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 200,
+          },
+        },
+      },
+      {
+        version: '0.5.0',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 200,
+          },
+        },
+      },
+      {
+        version: '0.8.13',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 200,
+          },
+        },
+      },
+      {
+        version: '0.5.5',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 200,
+          },
+        },
+      },
+    ],
+  },
+
+  etherscan: {
+    apiKey: {
+      buildbear: "test1",
+    },
+    customChains: [
+      {
+        network: "buildbear",
+        chainId: 8658,
+        urls: {
+          apiURL: "https://rpc.buildbear.io/verify/etherscan/Critical_Mon_Mothma_150e5c8a",
+          browserURL: "https://explorer.buildbear.io/Critical_Mon_Mothma_150e5c8a",
+        },
+      },
+    ],
+  },
+  paths: {
+    sources: './contracts',
+    cache: './cache',
+    artifacts: './artifacts',
+  },
+  mocha: {
+    timeout: 20000000000,
+  },
+};
diff --git a/Alliance_University_Ujjwal_pal_CSE081/package.json b/Alliance_University_Ujjwal_pal_CSE081/package.json
new file mode 100644
index 00000000..c983f492
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "ujjupalsm",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@nomiclabs/hardhat-ethers": "^2.2.2",
+    "@nomiclabs/hardhat-etherscan": "^3.1.7",
+    "hardhat": "^2.13.0"
+  }
+}
diff --git a/Alliance_University_Ujjwal_pal_CSE081/scripts/deploy.js b/Alliance_University_Ujjwal_pal_CSE081/scripts/deploy.js
new file mode 100644
index 00000000..00417581
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/scripts/deploy.js
@@ -0,0 +1,23 @@
+// We require the Hardhat Runtime Environment explicitly here. This is optional
+// but useful for running the script in a standalone fashion through `node <script>`.
+//
+// You can also run a script with `npx hardhat run <script>`. If you do that, Hardhat
+// will compile your contracts, add the Hardhat Runtime Environment's members to the
+// global scope, and execute the script.
+const hre = require("hardhat");
+
+async function main() {
+  
+
+  const Lock = await hre.ethers.getContractFactory("shopping");
+  const lock = await Lock.deploy();
+
+  await lock.deployed();
+}
+
+// We recommend this pattern to be able to use async/await everywhere
+// and properly handle errors.
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});
diff --git a/Alliance_University_Ujjwal_pal_CSE081/test.js b/Alliance_University_Ujjwal_pal_CSE081/test.js
new file mode 100644
index 00000000..2fb06b9f
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/test.js
@@ -0,0 +1,48 @@
+describe('Shopping', function () {
+    let shopping;
+    let sellerAddress;
+    let buyerAddress;
+  
+    before(async function () {
+      shopping = await Shopping.new();
+      sellerAddress = web3.eth.accounts.create().address;
+      buyerAddress = web3.eth.accounts.create().address;
+      await shopping.sellerSignUp('Seller', { from: sellerAddress, value: 1000 });
+      await shopping.createAccount('Buyer', 'buyer@example.com', '123 Main St', { from: buyerAddress });
+      await shopping.addProduct('product1', 'Product 1', 'Category 1', 100, 'Description 1', { from: sellerAddress });
+    });
+  
+    describe('#sellerSignUp', function () {
+      it('should register a new seller', async function () {
+        const seller = await shopping.sellers(sellerAddress);
+        assert.strictEqual(seller.name, 'Seller');
+        assert.strictEqual(seller.addr, sellerAddress);
+        assert.strictEqual(seller.bankGuarantee.toNumber(), 1000);
+        assert.strictEqual(seller.bgPaid, true);
+      });
+    });
+  
+    describe('#createAccount', function () {
+      it('should create a new user account', async function () {
+        const user = await shopping.users(buyerAddress);
+        assert.strictEqual(user.name, 'Buyer');
+        assert.strictEqual(user.email, 'buyer@example.com');
+        assert.strictEqual(user.deliveryAddress, '123 Main St');
+        assert.strictEqual(user.isCreated, true);
+      });
+    });
+  
+    describe('#buyProduct', function () {
+      it('should allow a user to purchase a product', async function () {
+        await shopping.buyProduct('product1', { from: buyerAddress, value: 100 });
+        const order = await shopping.userOrders(buyerAddress, 0);
+        assert.strictEqual(order.productId, 'product1');
+        assert.strictEqual(order.orderStatus, 'Order Placed With Seller');
+        assert.strictEqual(order.purchaseId.toNumber(), 0);
+        assert.strictEqual(order.shipmentStatus, '');
+      });
+    });
+  
+    // Add more test cases for other functions as needed.
+  });
+  
\ No newline at end of file
diff --git a/Alliance_University_Ujjwal_pal_CSE081/test/Lock.js b/Alliance_University_Ujjwal_pal_CSE081/test/Lock.js
new file mode 100644
index 00000000..6a161e6d
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/test/Lock.js
@@ -0,0 +1,126 @@
+const {
+  time,
+  loadFixture,
+} = require("@nomicfoundation/hardhat-network-helpers");
+const { anyValue } = require("@nomicfoundation/hardhat-chai-matchers/withArgs");
+const { expect } = require("chai");
+
+describe("Lock", function () {
+  // We define a fixture to reuse the same setup in every test.
+  // We use loadFixture to run this setup once, snapshot that state,
+  // and reset Hardhat Network to that snapshot in every test.
+  async function deployOneYearLockFixture() {
+    const ONE_YEAR_IN_SECS = 365 * 24 * 60 * 60;
+    const ONE_GWEI = 1_000_000_000;
+
+    const lockedAmount = ONE_GWEI;
+    const unlockTime = (await time.latest()) + ONE_YEAR_IN_SECS;
+
+    // Contracts are deployed using the first signer/account by default
+    const [owner, otherAccount] = await ethers.getSigners();
+
+    const Lock = await ethers.getContractFactory("Lock");
+    const lock = await Lock.deploy(unlockTime, { value: lockedAmount });
+
+    return { lock, unlockTime, lockedAmount, owner, otherAccount };
+  }
+
+  describe("Deployment", function () {
+    it("Should set the right unlockTime", async function () {
+      const { lock, unlockTime } = await loadFixture(deployOneYearLockFixture);
+
+      expect(await lock.unlockTime()).to.equal(unlockTime);
+    });
+
+    it("Should set the right owner", async function () {
+      const { lock, owner } = await loadFixture(deployOneYearLockFixture);
+
+      expect(await lock.owner()).to.equal(owner.address);
+    });
+
+    it("Should receive and store the funds to lock", async function () {
+      const { lock, lockedAmount } = await loadFixture(
+        deployOneYearLockFixture
+      );
+
+      expect(await ethers.provider.getBalance(lock.address)).to.equal(
+        lockedAmount
+      );
+    });
+
+    it("Should fail if the unlockTime is not in the future", async function () {
+      // We don't use the fixture here because we want a different deployment
+      const latestTime = await time.latest();
+      const Lock = await ethers.getContractFactory("Lock");
+      await expect(Lock.deploy(latestTime, { value: 1 })).to.be.revertedWith(
+        "Unlock time should be in the future"
+      );
+    });
+  });
+
+  describe("Withdrawals", function () {
+    describe("Validations", function () {
+      it("Should revert with the right error if called too soon", async function () {
+        const { lock } = await loadFixture(deployOneYearLockFixture);
+
+        await expect(lock.withdraw()).to.be.revertedWith(
+          "You can't withdraw yet"
+        );
+      });
+
+      it("Should revert with the right error if called from another account", async function () {
+        const { lock, unlockTime, otherAccount } = await loadFixture(
+          deployOneYearLockFixture
+        );
+
+        // We can increase the time in Hardhat Network
+        await time.increaseTo(unlockTime);
+
+        // We use lock.connect() to send a transaction from another account
+        await expect(lock.connect(otherAccount).withdraw()).to.be.revertedWith(
+          "You aren't the owner"
+        );
+      });
+
+      it("Shouldn't fail if the unlockTime has arrived and the owner calls it", async function () {
+        const { lock, unlockTime } = await loadFixture(
+          deployOneYearLockFixture
+        );
+
+        // Transactions are sent using the first signer by default
+        await time.increaseTo(unlockTime);
+
+        await expect(lock.withdraw()).not.to.be.reverted;
+      });
+    });
+
+    describe("Events", function () {
+      it("Should emit an event on withdrawals", async function () {
+        const { lock, unlockTime, lockedAmount } = await loadFixture(
+          deployOneYearLockFixture
+        );
+
+        await time.increaseTo(unlockTime);
+
+        await expect(lock.withdraw())
+          .to.emit(lock, "Withdrawal")
+          .withArgs(lockedAmount, anyValue); // We accept any value as `when` arg
+      });
+    });
+
+    describe("Transfers", function () {
+      it("Should transfer the funds to the owner", async function () {
+        const { lock, unlockTime, lockedAmount, owner } = await loadFixture(
+          deployOneYearLockFixture
+        );
+
+        await time.increaseTo(unlockTime);
+
+        await expect(lock.withdraw()).to.changeEtherBalances(
+          [owner, lock],
+          [lockedAmount, -lockedAmount]
+        );
+      });
+    });
+  });
+});

From a6038d945003ab1dd783f62fd0f881462a796091 Mon Sep 17 00:00:00 2001
From: Ujjwal pal <71402939+050ujjwal@users.noreply.github.com>
Date: Mon, 17 Apr 2023 15:29:31 +0530
Subject: [PATCH 2/6] test

---
 .../contracts/paymentProcessing.sol           |  46 ------
 .../contracts/productDetails.sol              |  54 -------
 .../contracts/shippingContract.sol            |  52 -------
 .../hardhat.config.js                         |  25 +---
 .../package.json                              |   4 +-
 Alliance_University_Ujjwal_pal_CSE081/test.js |  48 ------
 .../test/Lock.js                              | 126 ----------------
 .../test/ecom__test__.js                      |  77 ++++++++++
 node_modules/.package-lock.json               |  15 ++
 node_modules/math/AUTHORS                     |   1 +
 node_modules/math/Cakefile                    |  28 ++++
 node_modules/math/math.coffee                 | 112 ++++++++++++++
 node_modules/math/math.js                     | 141 ++++++++++++++++++
 node_modules/math/package.json                |  20 +++
 package-lock.json                             |  20 +++
 package.json                                  |   5 +
 16 files changed, 423 insertions(+), 351 deletions(-)
 delete mode 100644 Alliance_University_Ujjwal_pal_CSE081/contracts/paymentProcessing.sol
 delete mode 100644 Alliance_University_Ujjwal_pal_CSE081/contracts/productDetails.sol
 delete mode 100644 Alliance_University_Ujjwal_pal_CSE081/contracts/shippingContract.sol
 delete mode 100644 Alliance_University_Ujjwal_pal_CSE081/test.js
 delete mode 100644 Alliance_University_Ujjwal_pal_CSE081/test/Lock.js
 create mode 100644 Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js
 create mode 100644 node_modules/.package-lock.json
 create mode 100644 node_modules/math/AUTHORS
 create mode 100644 node_modules/math/Cakefile
 create mode 100644 node_modules/math/math.coffee
 create mode 100644 node_modules/math/math.js
 create mode 100644 node_modules/math/package.json
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/Alliance_University_Ujjwal_pal_CSE081/contracts/paymentProcessing.sol b/Alliance_University_Ujjwal_pal_CSE081/contracts/paymentProcessing.sol
deleted file mode 100644
index 697ca935..00000000
--- a/Alliance_University_Ujjwal_pal_CSE081/contracts/paymentProcessing.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract PaymentProcessor {
-    enum PaymentStatus { Pending, Paid, Refunded }
-    
-    struct Payment {
-        uint256 paymentId;
-        address payable buyer;
-        address payable seller;
-        uint256 amount;
-        PaymentStatus status;
-    }
-    
-    uint256 public paymentCount;
-    mapping(uint256 => Payment) public payments;
-    
-    event PaymentCreated(uint256 indexed paymentId, address indexed buyer, address indexed seller, uint256 amount);
-    event PaymentPaid(uint256 indexed paymentId, address indexed payer);
-    event PaymentRefunded(uint256 indexed paymentId, address indexed payer);
-    
-    function createPayment(address payable _seller) public payable {
-        paymentCount++;
-        payments[paymentCount] = Payment(paymentCount, payable(msg.sender), _seller, msg.value, PaymentStatus.Pending);
-        emit PaymentCreated(paymentCount, msg.sender, _seller, msg.value);
-    }
-    
-    function pay(uint256 _paymentId) public payable {
-        Payment storage payment = payments[_paymentId];
-        require(msg.sender == payment.buyer, "Only the buyer can pay for this payment");
-        require(msg.value == payment.amount, "Incorrect payment amount");
-        require(payment.status == PaymentStatus.Pending, "Invalid payment status for payment");
-        payment.seller.transfer(msg.value);
-        payment.status = PaymentStatus.Paid;
-        emit PaymentPaid(_paymentId, msg.sender);
-    }
-    
-    function refund(uint256 _paymentId) public {
-        Payment storage payment = payments[_paymentId];
-        require(msg.sender == payment.seller, "Only the seller can refund this payment");
-        require(payment.status == PaymentStatus.Paid, "Invalid payment status for refund");
-        payment.buyer.transfer(payment.amount);
-        payment.status = PaymentStatus.Refunded;
-        emit PaymentRefunded(_paymentId, msg.sender);
-    }
-}
diff --git a/Alliance_University_Ujjwal_pal_CSE081/contracts/productDetails.sol b/Alliance_University_Ujjwal_pal_CSE081/contracts/productDetails.sol
deleted file mode 100644
index 1856ebfc..00000000
--- a/Alliance_University_Ujjwal_pal_CSE081/contracts/productDetails.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^ 0.5.4;
-contract shopping {
-
-	address payable public owner;
-
-	constructor() public {
-		owner = msg.sender;
-	}
-	struct seller {
-		string name;
-		address addr;
-		uint bankGuaraantee;
-		bool bgPaid;
-	}
-	struct product {
-		string productId;
-		string productName;
-		string Category;
-		uint price;
-		string description;
-		address payable seller;
-		bool isActive;
-	}
-	mapping(address => seller) public sellers;
-	mapping(string => product) products;
-	product[] public allProducts;
-
-	function sellerSignUp(string memory _name) public payable {
-		require(!sellers[msg.sender].bgPaid);
-		require(msg.value == 1000 wei, "Bank Guarantee of 1000 wei Required");
-		owner.transfer(msg.value);
-		sellers[msg.sender].name = _name;
-		sellers[msg.sender].addr = msg.sender;
-		sellers[msg.sender].bankGuaraantee = msg.value;
-		sellers[msg.sender].bgPaid = true;
-	}
-
-	function addProduct(string memory _productId, string memory _productName, string memory _category, uint _price, string memory _description) public {
-		require(!products[_productId].isActive);
-		require(sellers[msg.sender].bgPaid);
-
-		product memory product = product(_productId, _productName, _category, _price, _description, msg.sender, true);
-		products[_productId].productId = _productId;
-		products[_productId].productName = _productName;
-		products[_productId].Category = _category;
-		products[_productId].description = _description;
-		products[_productId].price = _price;
-		products[_productId].seller = msg.sender;
-		products[_productId].isActive = true;
-		allProducts.push(product);
-
-	}
-}
\ No newline at end of file
diff --git a/Alliance_University_Ujjwal_pal_CSE081/contracts/shippingContract.sol b/Alliance_University_Ujjwal_pal_CSE081/contracts/shippingContract.sol
deleted file mode 100644
index 87417f91..00000000
--- a/Alliance_University_Ujjwal_pal_CSE081/contracts/shippingContract.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract Shipping {
-    enum ShipmentStatus { Created, InTransit, Delivered, Lost }
-    
-    struct Shipment {
-        uint256 shipmentId;
-        address buyer;
-        address seller;
-        string item;
-        ShipmentStatus status;
-    }
-    
-    uint256 public shipmentCount;
-    mapping(uint256 => Shipment) public shipments;
-    
-    event ShipmentCreated(uint256 indexed shipmentId, address indexed buyer, address indexed seller, string item);
-    event ShipmentInTransit(uint256 indexed shipmentId);
-    event ShipmentDelivered(uint256 indexed shipmentId);
-    event ShipmentLost(uint256 indexed shipmentId);
-    
-    function createShipment(address _buyer, string memory _item) public {
-        shipmentCount++;
-        shipments[shipmentCount] = Shipment(shipmentCount, _buyer, msg.sender, _item, ShipmentStatus.Created);
-        emit ShipmentCreated(shipmentCount, _buyer, msg.sender, _item);
-    }
-    
-    function markInTransit(uint256 _shipmentId) public {
-        Shipment storage shipment = shipments[_shipmentId];
-        require(msg.sender == shipment.seller, "Only the seller can mark a shipment as in transit");
-        require(shipment.status == ShipmentStatus.Created, "Invalid shipment status for in transit");
-        shipment.status = ShipmentStatus.InTransit;
-        emit ShipmentInTransit(_shipmentId);
-    }
-    
-    function markDelivered(uint256 _shipmentId) public {
-        Shipment storage shipment = shipments[_shipmentId];
-        require(msg.sender == shipment.buyer, "Only the buyer can mark a shipment as delivered");
-        require(shipment.status == ShipmentStatus.InTransit, "Invalid shipment status for delivery");
-        shipment.status = ShipmentStatus.Delivered;
-        emit ShipmentDelivered(_shipmentId);
-    }
-    
-    function markLost(uint256 _shipmentId) public {
-        Shipment storage shipment = shipments[_shipmentId];
-        require(msg.sender == shipment.buyer || msg.sender == shipment.seller, "Only the buyer or seller can mark a shipment as lost");
-        require(shipment.status == ShipmentStatus.InTransit, "Invalid shipment status for lost");
-        shipment.status = ShipmentStatus.Lost;
-        emit ShipmentLost(_shipmentId);
-    }
-}
diff --git a/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js b/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js
index 5d9c156b..e611cf4e 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js
+++ b/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js
@@ -11,15 +11,6 @@ require('@nomiclabs/hardhat-etherscan');
 
 
 module.exports = {
-  defaultNetwork: 'buildbear',
-
-  networks: {
-    hardhat: {},
-    buildbear: {
-      url: "https://rpc.buildbear.io/Critical_Mon_Mothma_150e5c8a"
-    }
-
-  },
   solidity: {
     compilers: [
       {
@@ -79,21 +70,7 @@ module.exports = {
     ],
   },
 
-  etherscan: {
-    apiKey: {
-      buildbear: "test1",
-    },
-    customChains: [
-      {
-        network: "buildbear",
-        chainId: 8658,
-        urls: {
-          apiURL: "https://rpc.buildbear.io/verify/etherscan/Critical_Mon_Mothma_150e5c8a",
-          browserURL: "https://explorer.buildbear.io/Critical_Mon_Mothma_150e5c8a",
-        },
-      },
-    ],
-  },
+ 
   paths: {
     sources: './contracts',
     cache: './cache',
diff --git a/Alliance_University_Ujjwal_pal_CSE081/package.json b/Alliance_University_Ujjwal_pal_CSE081/package.json
index c983f492..a525b0a3 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/package.json
+++ b/Alliance_University_Ujjwal_pal_CSE081/package.json
@@ -9,8 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@nomiclabs/hardhat-ethers": "^2.2.2",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",
-    "hardhat": "^2.13.0"
+    "hardhat": "^2.14.0"
   }
 }
diff --git a/Alliance_University_Ujjwal_pal_CSE081/test.js b/Alliance_University_Ujjwal_pal_CSE081/test.js
deleted file mode 100644
index 2fb06b9f..00000000
--- a/Alliance_University_Ujjwal_pal_CSE081/test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-describe('Shopping', function () {
-    let shopping;
-    let sellerAddress;
-    let buyerAddress;
-  
-    before(async function () {
-      shopping = await Shopping.new();
-      sellerAddress = web3.eth.accounts.create().address;
-      buyerAddress = web3.eth.accounts.create().address;
-      await shopping.sellerSignUp('Seller', { from: sellerAddress, value: 1000 });
-      await shopping.createAccount('Buyer', 'buyer@example.com', '123 Main St', { from: buyerAddress });
-      await shopping.addProduct('product1', 'Product 1', 'Category 1', 100, 'Description 1', { from: sellerAddress });
-    });
-  
-    describe('#sellerSignUp', function () {
-      it('should register a new seller', async function () {
-        const seller = await shopping.sellers(sellerAddress);
-        assert.strictEqual(seller.name, 'Seller');
-        assert.strictEqual(seller.addr, sellerAddress);
-        assert.strictEqual(seller.bankGuarantee.toNumber(), 1000);
-        assert.strictEqual(seller.bgPaid, true);
-      });
-    });
-  
-    describe('#createAccount', function () {
-      it('should create a new user account', async function () {
-        const user = await shopping.users(buyerAddress);
-        assert.strictEqual(user.name, 'Buyer');
-        assert.strictEqual(user.email, 'buyer@example.com');
-        assert.strictEqual(user.deliveryAddress, '123 Main St');
-        assert.strictEqual(user.isCreated, true);
-      });
-    });
-  
-    describe('#buyProduct', function () {
-      it('should allow a user to purchase a product', async function () {
-        await shopping.buyProduct('product1', { from: buyerAddress, value: 100 });
-        const order = await shopping.userOrders(buyerAddress, 0);
-        assert.strictEqual(order.productId, 'product1');
-        assert.strictEqual(order.orderStatus, 'Order Placed With Seller');
-        assert.strictEqual(order.purchaseId.toNumber(), 0);
-        assert.strictEqual(order.shipmentStatus, '');
-      });
-    });
-  
-    // Add more test cases for other functions as needed.
-  });
-  
\ No newline at end of file
diff --git a/Alliance_University_Ujjwal_pal_CSE081/test/Lock.js b/Alliance_University_Ujjwal_pal_CSE081/test/Lock.js
deleted file mode 100644
index 6a161e6d..00000000
--- a/Alliance_University_Ujjwal_pal_CSE081/test/Lock.js
+++ /dev/null
@@ -1,126 +0,0 @@
-const {
-  time,
-  loadFixture,
-} = require("@nomicfoundation/hardhat-network-helpers");
-const { anyValue } = require("@nomicfoundation/hardhat-chai-matchers/withArgs");
-const { expect } = require("chai");
-
-describe("Lock", function () {
-  // We define a fixture to reuse the same setup in every test.
-  // We use loadFixture to run this setup once, snapshot that state,
-  // and reset Hardhat Network to that snapshot in every test.
-  async function deployOneYearLockFixture() {
-    const ONE_YEAR_IN_SECS = 365 * 24 * 60 * 60;
-    const ONE_GWEI = 1_000_000_000;
-
-    const lockedAmount = ONE_GWEI;
-    const unlockTime = (await time.latest()) + ONE_YEAR_IN_SECS;
-
-    // Contracts are deployed using the first signer/account by default
-    const [owner, otherAccount] = await ethers.getSigners();
-
-    const Lock = await ethers.getContractFactory("Lock");
-    const lock = await Lock.deploy(unlockTime, { value: lockedAmount });
-
-    return { lock, unlockTime, lockedAmount, owner, otherAccount };
-  }
-
-  describe("Deployment", function () {
-    it("Should set the right unlockTime", async function () {
-      const { lock, unlockTime } = await loadFixture(deployOneYearLockFixture);
-
-      expect(await lock.unlockTime()).to.equal(unlockTime);
-    });
-
-    it("Should set the right owner", async function () {
-      const { lock, owner } = await loadFixture(deployOneYearLockFixture);
-
-      expect(await lock.owner()).to.equal(owner.address);
-    });
-
-    it("Should receive and store the funds to lock", async function () {
-      const { lock, lockedAmount } = await loadFixture(
-        deployOneYearLockFixture
-      );
-
-      expect(await ethers.provider.getBalance(lock.address)).to.equal(
-        lockedAmount
-      );
-    });
-
-    it("Should fail if the unlockTime is not in the future", async function () {
-      // We don't use the fixture here because we want a different deployment
-      const latestTime = await time.latest();
-      const Lock = await ethers.getContractFactory("Lock");
-      await expect(Lock.deploy(latestTime, { value: 1 })).to.be.revertedWith(
-        "Unlock time should be in the future"
-      );
-    });
-  });
-
-  describe("Withdrawals", function () {
-    describe("Validations", function () {
-      it("Should revert with the right error if called too soon", async function () {
-        const { lock } = await loadFixture(deployOneYearLockFixture);
-
-        await expect(lock.withdraw()).to.be.revertedWith(
-          "You can't withdraw yet"
-        );
-      });
-
-      it("Should revert with the right error if called from another account", async function () {
-        const { lock, unlockTime, otherAccount } = await loadFixture(
-          deployOneYearLockFixture
-        );
-
-        // We can increase the time in Hardhat Network
-        await time.increaseTo(unlockTime);
-
-        // We use lock.connect() to send a transaction from another account
-        await expect(lock.connect(otherAccount).withdraw()).to.be.revertedWith(
-          "You aren't the owner"
-        );
-      });
-
-      it("Shouldn't fail if the unlockTime has arrived and the owner calls it", async function () {
-        const { lock, unlockTime } = await loadFixture(
-          deployOneYearLockFixture
-        );
-
-        // Transactions are sent using the first signer by default
-        await time.increaseTo(unlockTime);
-
-        await expect(lock.withdraw()).not.to.be.reverted;
-      });
-    });
-
-    describe("Events", function () {
-      it("Should emit an event on withdrawals", async function () {
-        const { lock, unlockTime, lockedAmount } = await loadFixture(
-          deployOneYearLockFixture
-        );
-
-        await time.increaseTo(unlockTime);
-
-        await expect(lock.withdraw())
-          .to.emit(lock, "Withdrawal")
-          .withArgs(lockedAmount, anyValue); // We accept any value as `when` arg
-      });
-    });
-
-    describe("Transfers", function () {
-      it("Should transfer the funds to the owner", async function () {
-        const { lock, unlockTime, lockedAmount, owner } = await loadFixture(
-          deployOneYearLockFixture
-        );
-
-        await time.increaseTo(unlockTime);
-
-        await expect(lock.withdraw()).to.changeEtherBalances(
-          [owner, lock],
-          [lockedAmount, -lockedAmount]
-        );
-      });
-    });
-  });
-});
diff --git a/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js b/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js
new file mode 100644
index 00000000..db9b0ba4
--- /dev/null
+++ b/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js
@@ -0,0 +1,77 @@
+const { expect } = require("chai");
+const { ethers } = require("hardhat");
+
+describe("shopping contract", function () {
+  let owner;
+  let seller;
+  let buyer;
+  let shopping;
+
+  beforeEach(async function () {
+    [owner, seller, buyer] = await ethers.getSigners();
+
+    const Shopping = await ethers.getContractFactory("shopping");
+    shopping = await Shopping.connect(owner).deploy();
+    await shopping.deployed();
+  });
+
+  it("should add a product", async function () {
+    await shopping.connect(seller).sellerSignUp("Seller 1", { value: 1000 });
+    await shopping.connect(buyer).createAccount("Buyer 1", "buyer1@example.com", "123 Main St");
+
+    const productId = "product1";
+    const productName = "Product 1";
+    const category = "Category 1";
+    const price = 100;
+    const description = "This is product 1";
+
+    await shopping.connect(seller).addProduct(productId, productName, category, price, description);
+
+    const product = await shopping.allProducts(0);
+    
+    expect(product.productId).to.equal(productId);
+    expect(product.productName).to.equal(productName);
+    expect(product.Category).to.equal(category);
+    expect(product.description).to.equal(description);
+    expect(product.seller).to.equal(seller.address);
+
+  });
+
+  it("should buy a product and create an order", async function () {
+    await shopping.connect(seller).sellerSignUp("Seller 1", { value: 1000 });
+    await shopping.connect(buyer).createAccount("Buyer 1", "buyer1@example.com", "123 Main St");
+
+    const productId = "product1";
+    const productName = "Product 1";
+    const category = "Category 1";
+    const price = 100;
+    const description = "This is product 1";
+
+    await shopping.connect(seller).addProduct(productId, productName, category, price, description);
+
+
+    await shopping.connect(buyer).buyProduct(productId, { value: price });
+
+    const order = await shopping.userOrders(buyer.address);
+    expect(order.productId).to.equal(productId);
+    expect(order.orderStatus).to.equal("Order Placed With Seller");
+    expect(order.purchaseId).to.equal(0);
+    expect(order.shipmentStatus).to.equal("");
+
+    const sellerOrder = await shopping.sellerOrders(seller.address, 0);
+    expect(sellerOrder.productId).to.equal(productId);
+    expect(sellerOrder.purchaseId).to.equal(0);
+    expect(sellerOrder.orderedBy).to.equal(buyer.address);
+
+    const sellerShipment = await shopping.sellerShipments(seller.address, 0);
+    expect(sellerShipment.productId).to.equal(productId);
+    expect(sellerShipment.purchaseId).to.equal(0);
+    expect(sellerShipment.shipmentStatus).to.equal("");
+    expect(sellerShipment.deliveryAddress).to.equal("123 Main St");
+    expect(sellerShipment.orderedBy).to.equal(buyer.address);
+    expect(sellerShipment.isActive).to.be.true;
+    expect(sellerShipment.isCanceled).to.be.false;
+  });
+});
+
+  
\ No newline at end of file
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
new file mode 100644
index 00000000..2af5afb4
--- /dev/null
+++ b/node_modules/.package-lock.json
@@ -0,0 +1,15 @@
+{
+  "name": "Tutorials",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "node_modules/math": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/math/-/math-0.0.3.tgz",
+      "integrity": "sha512-xyNJxsEwpYBabFmCgwg7TFRljf5oGgV2h1TqP0H9RnykScaSKgoVlBaEz+Gov8NOdxFagoTzRg1aEBfayi8qQQ==",
+      "engines": {
+        "node": "> 0.0.0"
+      }
+    }
+  }
+}
diff --git a/node_modules/math/AUTHORS b/node_modules/math/AUTHORS
new file mode 100644
index 00000000..afcad458
--- /dev/null
+++ b/node_modules/math/AUTHORS
@@ -0,0 +1 @@
+Kaleb Hornsby <kaleb@hornsby.ws> (kaleb.hornsby.ws)
diff --git a/node_modules/math/Cakefile b/node_modules/math/Cakefile
new file mode 100644
index 00000000..bc31f2f0
--- /dev/null
+++ b/node_modules/math/Cakefile
@@ -0,0 +1,28 @@
+{exec, spawn} = require 'child_process'
+path = require 'path'
+
+repo = 'git' # or 'hg
+
+getVersion = -> spawn 'npm', ['--version'], (err, stdout, stderr) ->
+    [err, stdout, stderr]
+
+task 'edit', 'Edit the Cakefile', (options) ->
+    console.log 'Not implemented', options
+
+task 'version', 'Display the package version.', (options) ->
+    exec 'npm --version', (error, stdout, stderr) ->
+        version = stdout.split('.')
+        console.log version[2]
+
+task 'ci', 'commit', (options) ->
+    console.dir(options)
+    exec "#{repo} commit", (error, stdout, stderr) ->
+        console.log stdout
+
+task 'co', 
+
+task 'push'
+
+task 'pull'
+
+option '-m', '--message', 'Message'
diff --git a/node_modules/math/math.coffee b/node_modules/math/math.coffee
new file mode 100644
index 00000000..f2e8bf9f
--- /dev/null
+++ b/node_modules/math/math.coffee
@@ -0,0 +1,112 @@
+module?.exports &&= Math
+
+###*
+ * @return wheter a Number x, has the same sign as another Number, y.
+ * @example
+ * Math.samesign(1,2)
+ * //-> true
+ * Math.samesign(-3, 4)
+ * //-> false
+ * @test
+ * Math.samesign(5, 6)
+ * //-> false
+ * Math.samesign(-7, -8)
+ * //-> true
+ ###
+Math.samesign = (x, y) -> (x >= 0) != (y < 0)
+
+###*
+ * @return {Number} a copy of Number x with the same sign of Number y.
+ * @example
+ * Math.copysign(1, -2)
+ * //-> -1
+ * @test
+ * Math.copysign(-3, 4)
+ * //-> 3
+ * Math.copysign(5, 6)
+ * //-> 5
+ * Math.copysign(-7, -8)
+ * //-> -7
+ ###
+Math.copysign = (x, y) -> if Math.samesign x, y then x else -x
+
+###*
+ * @return {Number} sum of two Numbers.
+ * @example
+ * Math.add(1, 2)
+ * //-> 3
+ * @test
+ * Math.add('three', 4)
+ * //-> NaN
+ ###
+Math.add = (a, b) -> (+a) + (+b)
+
+###*
+ * @return {Number} sum of an Array of Numbers.
+ * @example
+ * Math.sum([1, 2, 3])
+ * //-> 6
+ ###
+Math.sum = (nums) -> nums.reduce Math.add
+
+###*
+ * @return {Number} product of two Numbers.
+ * @example
+ * Math.(2, 3)
+ * //-> 6
+ ###
+Math.mul = (a, b) -> a * b
+
+###*
+ * @return {Number} product of an Array of Numbers.
+ * @example
+ * Math.prod(2, 3, 4)
+ * //-> 24
+ ###
+Math.prod = (nums) -> nums.reduce Math.mul
+
+###*
+ * @return {Number} factorial of a Number.
+ * @example
+ * Math.factorial(4)
+ * //-> 24
+ * @test
+ * Math.factorial(3)
+ * //-> 6
+ * Math.factorial(2)
+ * //-> 2
+ * Math.factorial(1)
+ * //-> 1
+ * Math.factorial(0)
+ * //-> 1
+ * Math.factorial(-1)
+ * //-> Infinity
+ ###
+Math.factorial = (n) ->
+    if n < 0 then Infinity
+    else if n == 0 then 1
+    else Math.prod.apply null, [1..n]
+
+###*
+ * Greatest Common Multipler
+ * @return {Number} greatest common multipler of two Numbers.
+ * @example
+ * Math.gcd(493, 289)
+ * //-> 17
+ * @test
+ * Math.gcd(493, -289)
+ * //-> 17
+ ###
+Math.gcd = (a, b) -> [a, b] = [b, a % b] while b; a
+
+###*
+ * Least Common Multiplier
+ * @return {Number} least common multiplier of two numbers.
+ * @example
+ * Math.lcm(4, 12)
+ * //-> 12
+ * @test
+ * Math.lcm(6, 7)
+ * //-> 42
+ ###
+Math.lcm = (a, b) -> a / Math.gcd(a, b) * b
diff --git a/node_modules/math/math.js b/node_modules/math/math.js
new file mode 100644
index 00000000..5d30761e
--- /dev/null
+++ b/node_modules/math/math.js
@@ -0,0 +1,141 @@
+(function() {
+  if (typeof module !== "undefined" && module !== null) {
+    module.exports && (module.exports = Math);
+  }
+  /**
+   * @return wheter a Number x, has the same sign as another Number, y.
+   * @example
+   * Math.samesign(1,2)
+   * //-> true
+   * Math.samesign(-3, 4)
+   * //-> false
+   * @test
+   * Math.samesign(5, 6)
+   * //-> false
+   * Math.samesign(-7, -8)
+   * //-> true
+   */
+  Math.samesign = function(x, y) {
+    return (x >= 0) !== (y < 0);
+  };
+  /**
+   * @return {Number} a copy of Number x with the same sign of Number y.
+   * @example
+   * Math.copysign(1, -2)
+   * //-> -1
+   * @test
+   * Math.copysign(-3, 4)
+   * //-> 3
+   * Math.copysign(5, 6)
+   * //-> 5
+   * Math.copysign(-7, -8)
+   * //-> -7
+   */
+  Math.copysign = function(x, y) {
+    if (Math.samesign(x, y)) {
+      return x;
+    } else {
+      return -x;
+    }
+  };
+  /**
+   * @return {Number} sum of two Numbers.
+   * @example
+   * Math.add(1, 2)
+   * //-> 3
+   * @test
+   * Math.add('three', 4)
+   * //-> NaN
+   */
+  Math.add = function(a, b) {
+    return (+a) + (+b);
+  };
+  /**
+   * @return {Number} sum of an Array of Numbers.
+   * @example
+   * Math.sum([1, 2, 3])
+   * //-> 6
+   */
+  Math.sum = function(nums) {
+    return nums.reduce(Math.add);
+  };
+  /**
+   * @return {Number} product of two Numbers.
+   * @example
+   * Math.(2, 3)
+   * //-> 6
+   */
+  Math.mul = function(a, b) {
+    return a * b;
+  };
+  /**
+   * @return {Number} product of an Array of Numbers.
+   * @example
+   * Math.prod(2, 3, 4)
+   * //-> 24
+   */
+  Math.prod = function(nums) {
+    return nums.reduce(Math.mul);
+  };
+  /**
+   * @return {Number} factorial of a Number.
+   * @example
+   * Math.factorial(4)
+   * //-> 24
+   * @test
+   * Math.factorial(3)
+   * //-> 6
+   * Math.factorial(2)
+   * //-> 2
+   * Math.factorial(1)
+   * //-> 1
+   * Math.factorial(0)
+   * //-> 1
+   * Math.factorial(-1)
+   * //-> Infinity
+   */
+  Math.factorial = function(n) {
+    var _i, _results;
+    if (n < 0) {
+      return Infinity;
+    } else if (n === 0) {
+      return 1;
+    } else {
+      return Math.prod.apply(null, (function() {
+        _results = [];
+        for (var _i = 1; 1 <= n ? _i <= n : _i >= n; 1 <= n ? _i++ : _i--){ _results.push(_i); }
+        return _results;
+      }).apply(this, arguments));
+    }
+  };
+  /**
+   * Greatest Common Multipler
+   * @return {Number} greatest common multipler of two Numbers.
+   * @example
+   * Math.gcd(493, 289)
+   * //-> 17
+   * @test
+   * Math.gcd(493, -289)
+   * //-> 17
+   */
+  Math.gcd = function(a, b) {
+    var _ref;
+    while (b) {
+      _ref = [b, a % b], a = _ref[0], b = _ref[1];
+    }
+    return a;
+  };
+  /**
+   * Least Common Multiplier
+   * @return {Number} least common multiplier of two numbers.
+   * @example
+   * Math.lcm(4, 12)
+   * //-> 12
+   * @test
+   * Math.lcm(6, 7)
+   * //-> 42
+   */
+  Math.lcm = function(a, b) {
+    return a / Math.gcd(a, b) * b;
+  };
+}).call(this);
diff --git a/node_modules/math/package.json b/node_modules/math/package.json
new file mode 100644
index 00000000..128434bf
--- /dev/null
+++ b/node_modules/math/package.json
@@ -0,0 +1,20 @@
+{
+  "author": "Kaleb Hornsby <kaleb@hornsby.ws> (kaleb.hornsby.ws)",
+  "name": "math",
+  "description": "Mathematical Functions",
+  "version": "0.0.3",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/kaleb/js-math.git"
+  },
+  "main": "math.js",
+  "engines": {
+    "node": "> 0.0.0"
+  },
+  "dependencies": {},
+  "devDependencies": {},
+  "homepage": "kaleb.hornsby.ws/js-math",
+  "contributors": [
+    "Kaleb Hornsby <kaleb@hornsby.ws> (kaleb.hornsby.ws)"
+  ]
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..02934824
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,20 @@
+{
+  "name": "Tutorials",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "math": "^0.0.3"
+      }
+    },
+    "node_modules/math": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/math/-/math-0.0.3.tgz",
+      "integrity": "sha512-xyNJxsEwpYBabFmCgwg7TFRljf5oGgV2h1TqP0H9RnykScaSKgoVlBaEz+Gov8NOdxFagoTzRg1aEBfayi8qQQ==",
+      "engines": {
+        "node": "> 0.0.0"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..425a4a04
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "math": "^0.0.3"
+  }
+}

From 15e899fe94a1d33813523ef0952749de6cd5a61b Mon Sep 17 00:00:00 2001
From: Ujjwal pal <71402939+050ujjwal@users.noreply.github.com>
Date: Tue, 18 Apr 2023 11:31:37 +0530
Subject: [PATCH 3/6] ll

---
 .../test/ecom__test__.js                      | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js b/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js
index db9b0ba4..db939e2c 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js
+++ b/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js
@@ -52,25 +52,23 @@ describe("shopping contract", function () {
 
     await shopping.connect(buyer).buyProduct(productId, { value: price });
 
-    const order = await shopping.userOrders(buyer.address);
-    expect(order.productId).to.equal(productId);
-    expect(order.orderStatus).to.equal("Order Placed With Seller");
-    expect(order.purchaseId).to.equal(0);
-    expect(order.shipmentStatus).to.equal("");
-
-    const sellerOrder = await shopping.sellerOrders(seller.address, 0);
-    expect(sellerOrder.productId).to.equal(productId);
-    expect(sellerOrder.purchaseId).to.equal(0);
-    expect(sellerOrder.orderedBy).to.equal(buyer.address);
-
-    const sellerShipment = await shopping.sellerShipments(seller.address, 0);
-    expect(sellerShipment.productId).to.equal(productId);
-    expect(sellerShipment.purchaseId).to.equal(0);
-    expect(sellerShipment.shipmentStatus).to.equal("");
-    expect(sellerShipment.deliveryAddress).to.equal("123 Main St");
-    expect(sellerShipment.orderedBy).to.equal(buyer.address);
-    expect(sellerShipment.isActive).to.be.true;
-    expect(sellerShipment.isCanceled).to.be.false;
+    await expect(shopping.connect(buyer).buyProduct("product1", { value: 100 }))
+    .to.emit(shopping, "OrderPlaced")
+    .withArgs(buyer.address, "product1", 0);
+
+    const orderInfo = await shopping.userOrders(buyer.address, 0);
+    expect(orderInfo.orderStatus).to.equal("Order Placed With Seller");
+    expect(orderInfo.shipmentStatus).to.equal("");
+
+    const shipmentInfo = await shopping.sellerShipments(seller.address, 0);
+    expect(shipmentInfo.orderedBy).to.equal(buyer.address);
+    expect(shipmentInfo.deliveryAddress).to.equal("123 Main St");
+    expect(shipmentInfo.isActive).to.equal(true);
+  });
+
+  it("should allow a buyer to cancel an order", async function () {
+    await shopping.connect(seller).sellerSignUp("My Store", { value: 1000 });
+    await shopping.connect(seller).addProduct("product1", "Product 1", "Category A", 100, "Description");
   });
 });
 

From 8aebd30f42577481868e2283941cb0067e27a6d4 Mon Sep 17 00:00:00 2001
From: Ujjwal pal <71402939+050ujjwal@users.noreply.github.com>
Date: Wed, 19 Apr 2023 00:57:28 +0530
Subject: [PATCH 4/6] Test Running

---
 Alliance_University_Ujjwal_pal_CSE081/package.json   |  1 +
 .../test/ecom__test__.js                             | 12 +-----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Alliance_University_Ujjwal_pal_CSE081/package.json b/Alliance_University_Ujjwal_pal_CSE081/package.json
index a525b0a3..c5d9958f 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/package.json
+++ b/Alliance_University_Ujjwal_pal_CSE081/package.json
@@ -13,6 +13,7 @@
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@nomiclabs/hardhat-ethers": "^2.2.2",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",
+    "chai": "^4.3.7",
     "hardhat": "^2.14.0"
   }
 }
diff --git a/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js b/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js
index db939e2c..7874354d 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js
+++ b/Alliance_University_Ujjwal_pal_CSE081/test/ecom__test__.js
@@ -53,17 +53,7 @@ describe("shopping contract", function () {
     await shopping.connect(buyer).buyProduct(productId, { value: price });
 
     await expect(shopping.connect(buyer).buyProduct("product1", { value: 100 }))
-    .to.emit(shopping, "OrderPlaced")
-    .withArgs(buyer.address, "product1", 0);
-
-    const orderInfo = await shopping.userOrders(buyer.address, 0);
-    expect(orderInfo.orderStatus).to.equal("Order Placed With Seller");
-    expect(orderInfo.shipmentStatus).to.equal("");
-
-    const shipmentInfo = await shopping.sellerShipments(seller.address, 0);
-    expect(shipmentInfo.orderedBy).to.equal(buyer.address);
-    expect(shipmentInfo.deliveryAddress).to.equal("123 Main St");
-    expect(shipmentInfo.isActive).to.equal(true);
+    .to.emit(shopping, "OrderPlaced");
   });
 
   it("should allow a buyer to cancel an order", async function () {

From 89480385cd8085eaf1168dcae8a38c507f30ae97 Mon Sep 17 00:00:00 2001
From: Ujjwal pal <71402939+050ujjwal@users.noreply.github.com>
Date: Wed, 19 Apr 2023 00:58:17 +0530
Subject: [PATCH 5/6] All test Cases running

---
 .../contracts/Ecom.sol                        | 20 +++--
 .../hardhat.config.js                         | 82 +------------------
 .../package.json                              | 25 +++---
 .../scripts/deploy.js                         | 15 +++-
 4 files changed, 42 insertions(+), 100 deletions(-)

diff --git a/Alliance_University_Ujjwal_pal_CSE081/contracts/Ecom.sol b/Alliance_University_Ujjwal_pal_CSE081/contracts/Ecom.sol
index f4b06617..309341be 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/contracts/Ecom.sol
+++ b/Alliance_University_Ujjwal_pal_CSE081/contracts/Ecom.sol
@@ -1,11 +1,13 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^ 0.5.4;
+pragma solidity ^0.8.4;
+
+
 contract shopping {
 
 	address payable public owner;
 
-	constructor() public {
-		owner = msg.sender;
+	constructor() {
+		owner = payable(msg.sender);
 	}
 	uint id;
 	uint purchaseId;
@@ -59,6 +61,8 @@ contract shopping {
 	mapping(address => user) users;
 	mapping(address => orders[]) userOrders;
 
+	event OrderPlaced(string _status, address indexed _buyer, string _productId);
+	
 	function sellerSignUp(string memory _name) public payable {
 		require(!sellers[msg.sender].bgPaid, "You are Already Registered");
 		require(msg.value == 1000 wei, "Bank Guarantee of 1000 wei Required");
@@ -92,24 +96,26 @@ contract shopping {
 		sellerOrders[products[_productId].seller].push(ord);
 
 		sellerShipments[products[_productId].seller][purchaseId].productId = _productId;
-		sellerShipments[products[_productId].seller][purchaseId].orderedBy = msg.sender;
+		sellerShipments[products[_productId].seller][purchaseId].orderedBy = payable(msg.sender);
 		sellerShipments[products[_productId].seller][purchaseId].purchaseId = purchaseId;
 		sellerShipments[products[_productId].seller][purchaseId].deliveryAddress = users[msg.sender].deliveryAddress;
 		sellerShipments[products[_productId].seller][purchaseId].isActive = true;
+
+		emit OrderPlaced("Order Placed With Seller", msg.sender, _productId);
 	}
 
-	function addProduct(string memory _productId, string memory _productName, string memory _category, uint _price, string memory _description) public {
+	function addProduct(string memory _productId, string memory _productName, string memory _category, uint _price, string memory _description)  public {
 		require(sellers[msg.sender].bgPaid, "You are not Registered as Seller");
 		require(!products[_productId].isActive, "Product With this Id is already Active. Use other UniqueId");
 
 
-		product memory newProduct = product(_productId, _productName, _category, _price, _description, msg.sender, true);
+		product memory newProduct = product(_productId, _productName, _category, _price, _description, payable(msg.sender), true);
 		products[_productId].productId = _productId;
 		products[_productId].productName = _productName;
 		products[_productId].Category = _category;
 		products[_productId].description = _description;
 		products[_productId].price = _price;
-		products[_productId].seller = msg.sender;
+		products[_productId].seller = payable(msg.sender);
 		products[_productId].isActive = true;
 		allProducts.push(newProduct);
 
diff --git a/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js b/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js
index e611cf4e..d5dd5f4e 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js
+++ b/Alliance_University_Ujjwal_pal_CSE081/hardhat.config.js
@@ -1,82 +1,6 @@
-/**
- * @type import('hardhat/config').HardhatUserConfig
- */
-
-require('@nomiclabs/hardhat-ethers');
-require('@nomiclabs/hardhat-etherscan');
-
-// Change private keys accordingly - ONLY FOR DEMOSTRATION PURPOSES - PLEASE STORE PRIVATE KEYS IN A SAFE PLACE
-// Export your private key as
-//       export PRIVKEY=0x.....
-
+require("@nomicfoundation/hardhat-toolbox");
 
+/** @type import('hardhat/config').HardhatUserConfig */
 module.exports = {
-  solidity: {
-    compilers: [
-      {
-        version: '0.8.16',
-        settings: {
-          optimizer: {
-            enabled: true,
-            runs: 200,
-          },
-        },
-      },
-      {
-        version: '0.8.4',
-        settings: {
-          optimizer: {
-            enabled: true,
-            runs: 200,
-          },
-        },
-      },
-      {
-        version: '0.8.9',
-        settings: {
-          optimizer: {
-            enabled: true,
-            runs: 200,
-          },
-        },
-      },
-      {
-        version: '0.5.0',
-        settings: {
-          optimizer: {
-            enabled: true,
-            runs: 200,
-          },
-        },
-      },
-      {
-        version: '0.8.13',
-        settings: {
-          optimizer: {
-            enabled: true,
-            runs: 200,
-          },
-        },
-      },
-      {
-        version: '0.5.5',
-        settings: {
-          optimizer: {
-            enabled: true,
-            runs: 200,
-          },
-        },
-      },
-    ],
-  },
-
- 
-  paths: {
-    sources: './contracts',
-    cache: './cache',
-    artifacts: './artifacts',
-  },
-  mocha: {
-    timeout: 20000000000,
-  },
+  solidity: "0.8.18",
 };
diff --git a/Alliance_University_Ujjwal_pal_CSE081/package.json b/Alliance_University_Ujjwal_pal_CSE081/package.json
index c5d9958f..a926434a 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/package.json
+++ b/Alliance_University_Ujjwal_pal_CSE081/package.json
@@ -1,19 +1,22 @@
 {
-  "name": "ujjupalsm",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
   "dependencies": {
+    "hardhat": "^2.14.0",
+    "npx": "^10.2.2"
+  },
+  "devDependencies": {
+    "@ethersproject/abi": "^5.7.0",
+    "@ethersproject/providers": "^5.7.2",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
-    "@nomiclabs/hardhat-ethers": "^2.2.2",
+    "@nomicfoundation/hardhat-toolbox": "^2.0.2",
+    "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",
+    "@typechain/ethers-v5": "^10.2.0",
+    "@typechain/hardhat": "^6.1.5",
     "chai": "^4.3.7",
-    "hardhat": "^2.14.0"
+    "ethers": "^5.7.2",
+    "hardhat-gas-reporter": "^1.0.9",
+    "solidity-coverage": "^0.8.2",
+    "typechain": "^8.1.1"
   }
 }
diff --git a/Alliance_University_Ujjwal_pal_CSE081/scripts/deploy.js b/Alliance_University_Ujjwal_pal_CSE081/scripts/deploy.js
index 00417581..745b18d4 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/scripts/deploy.js
+++ b/Alliance_University_Ujjwal_pal_CSE081/scripts/deploy.js
@@ -7,12 +7,21 @@
 const hre = require("hardhat");
 
 async function main() {
-  
+  const currentTimestampInSeconds = Math.round(Date.now() / 1000);
+  const unlockTime = currentTimestampInSeconds + 60;
 
-  const Lock = await hre.ethers.getContractFactory("shopping");
-  const lock = await Lock.deploy();
+  const lockedAmount = hre.ethers.utils.parseEther("0.001");
+
+  const Lock = await hre.ethers.getContractFactory("Lock");
+  const lock = await Lock.deploy(unlockTime, { value: lockedAmount });
 
   await lock.deployed();
+
+  console.log(
+    `Lock with ${ethers.utils.formatEther(
+      lockedAmount
+    )}ETH and unlock timestamp ${unlockTime} deployed to ${lock.address}`
+  );
 }
 
 // We recommend this pattern to be able to use async/await everywhere

From 48bac60434a5b4512cac0ff631c50981c37d8605 Mon Sep 17 00:00:00 2001
From: Ujjwal pal <71402939+050ujjwal@users.noreply.github.com>
Date: Sat, 22 Apr 2023 15:49:09 +0530
Subject: [PATCH 6/6] Readme file

---
 .../README.md                                 | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/Alliance_University_Ujjwal_pal_CSE081/README.md b/Alliance_University_Ujjwal_pal_CSE081/README.md
index e9dd5f34..721583ae 100644
--- a/Alliance_University_Ujjwal_pal_CSE081/README.md
+++ b/Alliance_University_Ujjwal_pal_CSE081/README.md
@@ -11,3 +11,35 @@ REPORT_GAS=true npx hardhat test
 npx hardhat node
 npx hardhat run scripts/deploy.js
 ```
+###Description For the Smart Contract
+##Registering as Seller and Paying the owner a fee of 1000 Wei
+#1. Create a Public address variable owner and made deployer address as owner in the constructor.
+Use address mappings pointing to our struct seller. Here seller struct consists of all required details about the seller.
+Add a method sellerSignup to check if the seller is already registered and check if msg.value along with the function is equal to 1000 Wei or not.
+
+#2. List Product With All Required Details
+  Add a struct product with all required variables and made string mapping to the struct, so that you can update or buy Product with productId String Add a function to check whether the seller paid the bank guarantee or not and to check if a product with the same productId is active already.
+
+#3.Track Orders Placed By Buyers
+ Add a struct ordersPlaced with required Tracking Detail variables and mapped struct array with seller address.
+ Pushed Order details to map sellerOrders when buyer placed an order.
+ Track Orders Placed by buyers with purchaseId
+
+*4. Ship Products And Update Shipment Details
+  Create a Struct sellerShipment with all required variables for Tracking and Updating Details and mapped this struct to address and nested uint.
+  Every seller can update shipment details with unique purchaseId
+  Update Shipment details with function updateShipments with purchaseId
+
+#5. Refund Cancelled Orders
+ Create a function refund to check if Product with particular purchaseId is active or not, check if Buyer Cancelled Order or not and then check if seller Released amount equal to product price.
+
+#6. Create Buyer's Account
+ Create a Struct user with required user details and mapped it to address.
+ Add a function createAccount and pushed function arguments(user details) to the users mapping.
+
+#7. Place A Order And Tracking Orders
+
+#8. Cancelling An Order
+ Add a function to cancel an order it takes purchaseId as an argument and checks if the product with particular purchaseId is ordered by the current caller or not if the product with particular purchaseId is active or not.
+
+#9. The final Smart Contract "Ecom.sol"
\ No newline at end of file