Merge develop to master

README.md

@@ -1,15 +1,42 @@
-# Basic Sample Hardhat Project
+# Moonswap
 
-This project demonstrates a basic Hardhat use case. It comes with a sample contract, a test for that contract, a sample script that deploys that contract, and an example of a task implementation, which simply lists the available accounts.
 
-Try running some of the following tasks:
+# Mission
+Enable DAOs to swap tokens to create shared interests and long term partnerships
 
-```shell
-npx hardhat accounts
-npx hardhat compile
-npx hardhat clean
-npx hardhat test
-npx hardhat node
-node scripts/sample-script.js
-npx hardhat help
+# Get Started
+
+Prerequisites: [Node](https://nodejs.org/en/download/) plus [Yarn](https://classic.yarnpkg.com/en/docs/install/) and [Git](https://git-scm.com/downloads)
+
+> clone/fork Moonswap:
+
+```bash
+git clone https://github.com/moonshotcollective/moonswap.git app
+```
+
+> install and start your 👷‍ Hardhat chain:
+
+```bash
+cd app
+yarn install
+yarn chain
 ```
+
+> in a second terminal window, start your 📱 frontend:
+
+```bash
+cd app
+yarn start
+```
+
+> in a third terminal window, 🛰 deploy your contract:
+
+```bash
+cd app
+yarn deploy
+```
+
+
+# 📚 Documentation
+
+Documentation, tutorials, challenges, and many more resources, visit: [docs.scaffoldeth.io](https://docs.scaffoldeth.io)

packages/hardhat/contracts/dETH.sol

@@ -0,0 +1,17 @@
+//SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.9;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+// todo: Do we not need any other functionality here? JR
+
+// dummyToken Contract to test out TokenDistribution locally
+contract dETH is ERC20 {
+    constructor() public ERC20("dummyETH", "dETH") {
+        _mint(msg.sender, 10000000e18);
+    }
+
+    function mint4Me(uint256 amount) public {
+        _mint(msg.sender, amount);
+    }
+}

packages/hardhat/contracts/dGTC.sol

@@ -0,0 +1,17 @@
+//SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.9;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+// todo: Do we not need any other functionality here? JR
+
+// dummyToken Contract to test out TokenDistribution locally
+contract dGTC is ERC20 {
+    constructor() public ERC20("dummyGTC", "dGTC") {
+        _mint(msg.sender, 10000000e18);
+    }
+
+    function mint4Me(uint256 amount) public {
+        _mint(msg.sender, amount);
+    }
+}

packages/hardhat/deploy/00_deploy_your_contract.js

@@ -1,10 +1,19 @@
 // deploy/00_deploy_your_contract.js
 
-// const { ethers } = require("hardhat");
+const { ethers } = require("hardhat");
+
+module.exports = async ({ getNamedAccounts, getChainId, deployments }) => {
+  const frontendAddress = process.env.FRONTENDADDRESS;
+  const receiverAddress = process.env.RECEIVERADDRESS;
+
 
-module.exports = async ({ getNamedAccounts, deployments }) => {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
+  const chainId = await getChainId();
+  const deployerWallet = ethers.provider.getSigner();
+
+  const confirmationRequirement = chainId === "31337" ? 1 : 3;
+
   await deploy("MoonSwap", {
     // Learn more about args here: https://www.npmjs.com/package/hardhat-deploy#deploymentsdeploy
     from: deployer,
@@ -47,5 +56,29 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
    LibraryName: **LibraryAddress**
   });
   */
+  // run this if not for production deployment
+  if (chainId !== "1") {
+    // send test ETH to developer address on localhost
+    const developerAddress = process.env.DEVELOPER;
+
+    if (chainId === "31337" && developerAddress) {
+      const devTransfer = await deployerWallet.sendTransaction({
+        to: developerAddress,
+        value: ethers.utils.parseEther("0.15"),
+      });
+
+      await devTransfer.wait(confirmationRequirement);
+    }
+
+    await deploy("dGTC", {
+      from: deployer,
+      log: true,
+    });
+
+    await deploy("dETH", {
+      from: deployer,
+      log: true,
+    });
+  }
 };
 module.exports.tags = ["MoonSwapV1"];

packages/react-app/package.json

@@ -35,7 +35,7 @@
     "axios": "^0.21.4",
     "bnc-notify": "^1.5.0",
     "dotenv": "^8.2.0",
-    "eth-hooks": "2.3.8",
+    "eth-hooks": "2.3.9",
     "ethers": "^5.4.1",
     "fortmatic": "^2.2.1",
     "graphiql": "^1.0.5",