@gooddollar/goodprotocol 1.0.7-beta.2 → 1.0.7-beta.3

package/contracts/staking/compound/GoodCompoundStaking.sol

@@ -20,9 +20,9 @@ contract GoodCompoundStaking is SimpleStaking {
 	address public compUsdOracle;
 
 	// Gas cost to collect interest from this staking contract
-	uint32 public collectInterestGasCost = 250000;
+	uint32 public collectInterestGasCost;
 	// Gas cost to collect COMP rewards
-	uint32 public compCollectGasCost = 150000;
+	uint32 public compCollectGasCost;
 
 	address[] public tokenToDaiSwapPath;
 
@@ -75,7 +75,8 @@ contract GoodCompoundStaking is SimpleStaking {
 		tokenToDaiSwapPath = _tokenToDaiSwapPath;
 		comp = ERC20(nameService.getAddress("COMP"));
 		uniswapContract = Uniswap(nameService.getAddress("UNISWAP_ROUTER"));
-
+		collectInterestGasCost = 250000;
+		compCollectGasCost = 150000;
 		_approveTokens();
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.7-beta.2",
+  "version": "1.0.7-beta.3",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",

package/scripts/deployFullDAO.ts

@@ -219,13 +219,13 @@ export const createDAO = async () => {
     BancorFormula: release.BancorFormula,
     Avatar: release.Avatar,
     Controller: release.Controller,
-    DAIUsdOracle: release.DAIUsdOracle || ethers.constants.AddressZero,
-    COMPUsdOracle: release.COMPUsdOracle || ethers.constants.AddressZero,
-    USDCUsdOracle: release.USDCUsdOracle || ethers.constants.AddressZero,
-    AAVEUsdOracle: release.AAVEUsdOracle || ethers.constants.AddressZero,
-    AaveLendingPool: ethers.constants.AddressZero,
-    AaveIncentiveController: ethers.constants.AddressZero,
-    GasPriceOracle: release.GasPriceOracle || ethers.constants.AddressZero,
+    DAIUsdOracle: release.DAIUsdOracle,
+    COMPUsdOracle: release.COMPUsdOracle,
+    USDCUsdOracle: release.USDCUsdOracle,
+    AAVEUsdOracle: release.AAVEUsdOracle,
+    AaveLendingPool: null,
+    AaveIncentiveController: null,
+    GasPriceOracle: release.GasPriceOracle,
     cDAI: release.cDAI || ethers.constants.AddressZero,
     DAI: release.DAI || ethers.constants.AddressZero,
     COMP: release.COMP || ethers.constants.AddressZero,

package/scripts/misc/goodgiveback.ts

@@ -0,0 +1,65 @@
+import { get, range, chunk, flatten, mergeWith, sortBy, uniq } from "lodash";
+import fs from "fs";
+import { network, ethers, upgrades } from "hardhat";
+import { Contract, Provider, setMulticallAddress } from "ethers-multicall";
+import Identity from "../../artifacts/contracts/Interfaces.sol/IIdentity.json";
+
+setMulticallAddress(122, "0x3CE6158b7278Bf6792e014FA7B4f3c6c46fe9410");
+const fuseProvider = new ethers.providers.JsonRpcProvider(
+  "https://rpc.fuse.io"
+);
+const ethcallProvider = new Provider(fuseProvider, 122);
+
+const GD_FUSE = "0x495d133b938596c9984d462f007b676bdc57ecec";
+const IDENTITY_FUSE = "0xFa8d865A962ca8456dF331D78806152d3aC5B84F";
+
+let gd = new ethers.Contract(
+  GD_FUSE,
+  [
+    "event Transfer(address indexed from, address indexed to, uint amount)",
+    "function balanceOf(address) view returns(uint256)"
+  ],
+  fuseProvider
+);
+const identityContract = new Contract(IDENTITY_FUSE, Identity.abi);
+
+const getDonations = async recipient => {
+  const filter = gd.filters.Transfer(null, recipient);
+  const events = await gd.queryFilter(filter, 14300689, 14800689);
+  console.log("events found:", events.length);
+  const agg = {};
+  events.forEach(e => {
+    const { from, amount } = e.args;
+    agg[from] = (agg[from] || 0) + amount.toNumber();
+  });
+  const donators = Object.keys(agg);
+  const calls = donators.map(d => identityContract.isWhitelisted(d));
+  const result = await ethcallProvider.all(calls);
+  const final = donators.map((d, i) => [recipient, d, agg[d], result[i]]);
+  return final;
+};
+const main = async () => {
+  const recipients = [
+    "0x4c841e892d24faf01e7738800db8aed1160098ca",
+    "0xf8b4c7098d195d12c1336a09fddaa9afa11bd097",
+    "0x834f750aaab09d14a1101a15b185121f9a1475b2",
+    "0x956e72df332ee17ecb3d641fca1f600ea19d1d09",
+    "0x13dfefdc4713b98c07abdd9f7d93d2b8db716e6c",
+    "0xbbc680560a88cf06c9ae8a36b209288577d9a143",
+    "0x626c86ff4749043df4dd5e9dce650325955a4e6d",
+    "0x82a92d1949498d494189152a040aeb0ef0175730",
+    "0x27fb119b81b26104c0865435b741b6031bb35bb6",
+    "0x6214D6b492528fc5517f57499c436A5FF72B6D5B"
+  ];
+  const results = await Promise.all(recipients.map(r => getDonations(r)));
+
+  //   console.log(flatten(flatten(results)));
+
+  fs.writeFileSync(
+    "goodgive.csv",
+    flatten(results)
+      .map(_ => _.join(","))
+      .join("\n")
+  );
+};
+main().catch(e => console.log(e));

package/scripts/verify.ts

@@ -1,54 +1,67 @@
-import fs from "fs"
-import { isArray } from "lodash"
+import fs from "fs";
+import { isArray } from "lodash";
 import type EthersT from "ethers";
-import type HreT from "hardhat"
-import { HardhatEthersHelpers } from "@nomiclabs/hardhat-ethers/types"
-import { execSync } from "child_process"
-type Ethers = typeof EthersT.ethers & HardhatEthersHelpers
-type HRE = typeof HreT
+import type HreT from "hardhat";
+import { HardhatEthersHelpers } from "@nomiclabs/hardhat-ethers/types";
+import { execSync } from "child_process";
+type Ethers = typeof EthersT.ethers & HardhatEthersHelpers;
+type HRE = typeof HreT;
 
-let ethers:Ethers
+let ethers: Ethers;
 export const verify = async (hre: HRE) => {
-    console.log("truffle compiling....")
-    const Verify = require("truffle-plugin-verify") //not imported because of bug    
-    const truffleOutput = execSync("npx truffle compile").toString("utf8")
-    console.log({truffleOutput})
-    ethers = hre.ethers
-    const deployed = JSON.parse(fs.readFileSync("releases/deployment.json").toString())
-    const contracts = deployed[hre.network.name]
-    
-    const contractPairs = (await Promise.all(Object.entries(contracts).map(async (entry) => {
-        if(isArray(entry[1]))
-            return
-        const addr = await getImplementationAddress(entry[1])
-        return entry[0]+'@'+addr
-    }))).filter(_ => _)
+  console.log("truffle compiling....");
+  const Verify = require("truffle-plugin-verify"); //not imported because of bug
+  const truffleOutput = execSync("npx truffle compile").toString("utf8");
+  console.log({ truffleOutput });
+  ethers = hre.ethers;
+  const deployed = JSON.parse(
+    fs.readFileSync("releases/deployment.json").toString()
+  );
+  const contracts = deployed[hre.network.name];
 
-    contractPairs.unshift()
+  const contractPairs = (
+    await Promise.all(
+      Object.entries(contracts).map(async entry => {
+        if (isArray(entry[1])) return;
+        if (
+          typeof entry[1] !== "string" ||
+          (entry[1] as string).startsWith("0x") === false
+        )
+          return;
+        const addr = await getImplementationAddress(entry[1]);
+        return entry[0] + "@" + addr;
+      })
+    )
+  ).filter(_ => _);
 
-    const config = {
-        debug: false,
-        network_id: hre.network.config.chainId,
-        api_keys: { 
-            etherscan: hre.config.etherscan.apiKey
-        },
-        working_directory: ".",
-        contracts_build_directory: "build/contracts",
-        '_':contractPairs
-    }
-    return Verify(config)
+  contractPairs.unshift();
+
+  const config = {
+    debug: false,
+    network_id: hre.network.config.chainId,
+    api_keys: {
+      etherscan: hre.config.etherscan.apiKey
+    },
+    working_directory: ".",
+    contracts_build_directory: "build/contracts",
+    _: contractPairs
+  };
+  return Verify(config);
 };
 
-const getImplementationAddress = async (addr) => {
-    let proxy = await ethers.provider.getStorageAt(addr,"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc")
-    let res = addr
-    if(proxy != ethers.constants.HashZero)
-        res = "0x"+proxy.slice(-40)
-    else { 
-        const code = await ethers.getDefaultProvider().getCode(addr)
-        if(code.startsWith("0x363d3d373d3d3d363d73"))
-            res = "0x"+code.slice(22,62)
-    }    
-    console.log("impl address for:",addr,res)
-    return res
-}
+const getImplementationAddress = async addr => {
+  console.log("finding impl for:", addr);
+  let proxy = await ethers.provider.getStorageAt(
+    addr,
+    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"
+  );
+  let res = addr;
+  if (proxy != ethers.constants.HashZero) res = "0x" + proxy.slice(-40);
+  else {
+    const code = await ethers.getDefaultProvider().getCode(addr);
+    if (code.startsWith("0x363d3d373d3d3d363d73"))
+      res = "0x" + code.slice(22, 62);
+  }
+  console.log("impl address for:", addr, res);
+  return res;
+};

package/truffle-config.js

@@ -70,6 +70,18 @@ module.exports = {
       timeoutBlocks: 200, // # of blocks before a deployment times out  (minimum/default: 50)
       skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
     },
+    ropsten: {
+      provider: () =>
+        new HDWalletProvider(
+          mnemonic,
+          `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`
+        ),
+      network_id: 3, // Ropsten's id
+      gas: 5000000, // Ropsten has a lower block limit than mainnet
+      confirmations: 2, // # of confs to wait between deployments. (default: 0)
+      timeoutBlocks: 200, // # of blocks before a deployment times out  (minimum/default: 50)
+      skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
+    },
     fuse: {
       provider: () => new HDWalletProvider(mnemonic, `https://rpc.fuse.io`),
       network_id: 122, // Ropsten's id