@gooddollar/goodprotocol 1.0.31-beta.0 → 2.0.1

package/contracts/utils/BuyAndBridgeHelper.sol

@@ -0,0 +1,108 @@
+pragma solidity >=0.8.0;
+import "../reserve/ExchangeHelper.sol";
+
+contract BuyAndBridgeHelper {
+	struct BuyParams {
+		address[] buyPath;
+		uint256 tokenAmount;
+		uint256 minReturn;
+		uint256 minDAIAmount;
+		address targetAddress;
+	}
+
+	uint256 public constant CELO = 42220;
+	uint256 public constant FUSE = 122;
+
+	ExchangeHelper public exHelper;
+
+	address public gd;
+	address public gdx;
+	address public fuseBridge;
+	IMultichainRouter public multiChainBridge;
+	address public anyGoodDollar; //G$ multichain wrapper on ethereum
+
+	constructor(ExchangeHelper _exh) {
+		exHelper = _exh;
+		updateAddresses();
+	}
+
+	function updateAddresses() public {
+		fuseBridge = exHelper.nameService().getAddress("BRIDGE_CONTRACT");
+		multiChainBridge = IMultichainRouter(
+			exHelper.nameService().getAddress("MULTICHAIN_ROUTER")
+		);
+		anyGoodDollar = exHelper.nameService().getAddress(
+			"MULTICHAIN_ANYGOODDOLLAR"
+		);
+		gd = exHelper.nameService().getAddress("GOODDOLLAR");
+		gdx = exHelper.nameService().getAddress("RESERVE");
+	}
+
+	function buyAndBridge(BuyParams memory _params, uint256 _toChain)
+		public
+		payable
+		returns (uint256)
+	{
+		require(_toChain == FUSE || _toChain == CELO, "invalid chainId");
+		uint256 valueToSend;
+		if (_params.buyPath[0] != address(0)) {
+			ERC20(_params.buyPath[0]).approve(address(exHelper), type(uint256).max);
+			ERC20(_params.buyPath[0]).transferFrom(
+				msg.sender,
+				address(this),
+				_params.tokenAmount
+			);
+		} else {
+			valueToSend = _params.tokenAmount;
+		}
+
+		address recipient = _params.targetAddress == address(0)
+			? msg.sender
+			: _params.targetAddress;
+
+		//we send bought G$s here
+		uint256 bought = exHelper.buy{ value: valueToSend }(
+			_params.buyPath,
+			_params.tokenAmount,
+			_params.minReturn,
+			_params.minDAIAmount,
+			address(this)
+		);
+
+		require(bought > 0, "buy failed");
+
+		address gdx = exHelper.nameService().getAddress("RESERVE");
+		//make sure we send GDX we received to buyer
+		if (ERC20(gdx).balanceOf(address(this)) >= bought) {
+			require(ERC20(gdx).transfer(msg.sender, bought), "gdx");
+		}
+		bridge(_toChain, recipient, bought);
+	}
+
+	/**
+	 * @notice internal function that takes care of sending the G$s according to the transfer type
+	 * @param _recipient data about the recipient
+	 * @param _amount how much to send
+	 */
+	function bridge(
+		uint256 _toChain,
+		address _recipient,
+		uint256 _amount
+	) internal {
+		if (_toChain == FUSE) {
+			IGoodDollar(gd).transferAndCall(
+				fuseBridge,
+				_amount,
+				abi.encodePacked(_recipient)
+			);
+		} else if (_toChain == CELO) {
+			IGoodDollar(gd).approve(address(multiChainBridge), _amount);
+			multiChainBridge.anySwapOutUnderlying(
+				anyGoodDollar,
+				_recipient,
+				_amount,
+				_toChain
+			);
+		}
+	}
+}

package/contracts/utils/GoodDollarMintBurnWrapper.sol

@@ -17,7 +17,7 @@ import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeab
 import "@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";
-import "hardhat/console.sol";
+// import "hardhat/console.sol";
 
 import "./DAOUpgradeableContract.sol";
 
@@ -625,4 +625,22 @@ contract GoodDollarMintBurnWrapper is
 			minterSupply[minter].lastDayReset = currentDay;
 		}
 	}
+
+	function upgradeSuperGoodDollar() external onlyRole(DEFAULT_ADMIN_ROLE) {
+		address _newns = 0x0F5dB7a64A6a64052693676CA898EC7F7A94FF4e;
+		_revokeRole(DEFAULT_ADMIN_ROLE, avatar); //old avatar
+		setDAO(INameService(_newns)); //changes avatar + nativeToken
+		token = address(nativeToken());
+		_setupRole(DEFAULT_ADMIN_ROLE, avatar); //new avatar
+		updateFrequency = 3 days;
+		_setMinterCaps(
+			0xf27Ee99622C3C9b264583dACB2cCE056e194494f,
+			0,
+			0,
+			0,
+			0,
+			300 * 1e6 * 1e18, //300M
+			5000 //50%
+		);
+	}
 }

package/contracts/utils/ProxyFactory1967.sol

@@ -42,7 +42,7 @@ contract ProxyFactory1967 {
 
 	bytes32 private contractCodeHash;
 
-	constructor() public {
+	constructor() {
 		contractCodeHash = keccak256(type(ERC1967Proxy).creationCode);
 	}
 

package/hardhat.config.ts

@@ -9,11 +9,14 @@ import "@openzeppelin/hardhat-upgrades";
 import "solidity-coverage";
 import "hardhat-gas-reporter";
 import "hardhat-contract-sizer";
+import "hardhat-storage-layout";
 import { task, types } from "hardhat/config";
 import { sha3 } from "web3-utils";
 import { config } from "dotenv";
-import { airdrop } from "./scripts/governance/airdropCalculation";
+import { airdrop } from "./scripts/governance/airdropCalculationSorted";
 import { airdrop as repAirdropRecover } from "./scripts/governance/airdropCalculationRecover";
+import { airdrop as goodCheckpoint } from "./scripts/governance/goodCheckpointSorted";
+
 import {
   airdrop as gdxAirdrop,
   airdropRecover as gdxAirdropRecover
@@ -41,7 +44,7 @@ const MAINNET_URL = "https://mainnet.infura.io/v3/" + infura_api;
 // console.log({ mnemonic: sha3(mnemonic) });
 const hhconfig: HardhatUserConfig = {
   solidity: {
-    version: "0.8.8",
+    version: "0.8.16",
     settings: {
       optimizer: {
         enabled: true,
@@ -62,8 +65,8 @@ const hhconfig: HardhatUserConfig = {
         network: "celo",
         chainId: 42220,
         urls: {
-          apiURL: "https://api.celoscan.io",
-          browserURL: "https://celoscan.io"
+          apiURL: "https://api.celoscan.io/api",
+          browserURL: "https://celoscan.io/"
         }
       }
     ]
@@ -184,13 +187,13 @@ const hhconfig: HardhatUserConfig = {
       accounts: [deployerPrivateKey],
       url: MAINNET_URL,
       gas: 3000000,
-      gasPrice: 50000000000,
+      gasPrice: 15000000000,
       chainId: 1
     },
     "production-celo": {
       accounts: [deployerPrivateKey],
       url: "https://forno.celo.org",
-      gas: 3000000,
+      gas: 8000000,
       gasPrice: 500000000,
       chainId: 42220
     },
@@ -302,6 +305,26 @@ task("gdxAirdropRecover", "Calculates new airdrop data for recovery")
     }
   });
 
+task(
+  "goodCheckpoint",
+  "Calculates good checkpoint data and merkle tree for GOOD sync"
+)
+  .addParam("action", "calculate/tree/proof")
+  .addOptionalPositionalParam("address", "proof for address")
+  .setAction(async (taskArgs, hre) => {
+    const actions = goodCheckpoint(hre.ethers, ethplorer_key, etherscan_key);
+    switch (taskArgs.action) {
+      case "calculate":
+        return actions.collectAirdropData();
+      case "tree":
+        return actions.buildMerkleTree();
+      case "proof":
+        return actions.getProof(taskArgs.address);
+      default:
+        console.log("unknown action use calculate or tree");
+    }
+  });
+
 task("verifyjson", "verify contracts on etherscan").setAction(
   async (taskArgs, hre) => {
     return verify(hre);

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.31-beta.0",
+  "version": "2.0.1",
   "description": "GoodDollar Protocol",
   "scripts": {
+    "prepack": "npm run minimize",
     "build": "scripts/build.sh deploy",
     "coverage:report": "export COVERALLS_REPO_TOKEN='qiXNelh1HXMAsoPah9yRD2yG2WlqrDfLh' && cat ../coverage/lcov.info coverage/lcov.info | coveralls",
     "coverage": "export CODE_COVERAGE=true; hardhat --max-memory 6096 coverage",
@@ -55,16 +56,18 @@
   },
   "homepage": "https://gooddollar.org",
   "dependencies": {
-    "@gooddollar/goodcontracts": "^2.6.2",
+    "@gooddollar/goodcontracts": "^2.6.6",
     "@jsier/retrier": "^1.2.4",
-    "@openzeppelin/contracts": "^4.5.0",
-    "@openzeppelin/contracts-upgradeable": "^4.3.2",
+    "@openzeppelin/contracts": "^4.8.0",
+    "@openzeppelin/contracts-upgradeable": "^4.8.0",
+    "@superfluid-finance/ethereum-contracts": "^1.4.3",
+    "@superfluid-finance/sdk-core": "^0.5.8",
     "@typechain/hardhat": "^6.1.2",
     "async-promise-pool": "^1.0.4",
     "openzeppelin-solidity": "^4.3.2",
     "patch-package": "latest",
     "press-any-key": "^0.1.1",
-    "truffle-plugin-verify": "^0.5.11",
+    "truffle-plugin-verify": "^0.6.1",
     "truffle-source-verify": "^0.0.6"
   },
   "devDependencies": {
@@ -95,16 +98,17 @@
     "dotenv": "*",
     "ethereum-waffle": "^3.4.4",
     "ethers": "^5.7.2",
-    "ethers-multicall": "^0.2.3",
     "ethers-eip712": "*",
+    "ethers-multicall": "^0.2.3",
     "fs-extra": "9.0.0",
     "graphql": "^15.5.0",
     "graphql-request": "^3.4.0",
     "hardhat": "^2.10.2",
     "hardhat-contract-sizer": "^2.6.1",
     "hardhat-gas-reporter": "^1.0.8",
+    "hardhat-storage-layout": "^0.1.7",
     "lodash": "^4.17.21",
-    "merkle-tree-solidity": "*",
+    "merkletreejs": "^0.3.9",
     "mocha": "^9.1.2",
     "mocha-lcov-reporter": "*",
     "node-fetch": "*",

package/releases/deploy-settings.json

@@ -1,8 +1,15 @@
 {
   "default": {
     "governance": {
-      "proposalVotingPeriod": 241920
+      "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
+      "gdaoTotalSupply": "24000000000000000000000000",
+      "proposalVotingPeriod": 241920,
+      "claimersGOODMonthly": "1000000000000000000000000",
+      "stakersGOODMonthly": "1000000000000000000000000"
     },
+    "guardiansSafe": null,
+    "walletAdminsCount": 10,
+    "gasPrice": 100000000,
     "compound": {},
     "aave": {},
     "expansionRatio": {
@@ -20,6 +27,14 @@
     "GoodAaveStaking": {
       "stkAaveClaimCost": 50000,
       "CollectInterestGasCost": 250000
+    },
+    "savings": {
+      "blockAPY": "1000000007735630000",
+      "daysUntilUpgrade": "7",
+      "blocksPerYear": "6307200"
+    },
+    "ubi": {
+      "maxInactiveDays": 14
     }
   },
   "develop": {
@@ -47,7 +62,9 @@
       "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
       "gdaoTotalSupply": "24000000000000000000000000",
       "proposalVotingPeriod": 241920
-    }
+    },
+    "walletAdminsCount": 10,
+    "gasPrice": 1000000000
   },
   "dapptest-mainnet": {
     "gdxAirdrop": "0x707f775d730a9b17ee62c21e00188da4dff26602a58c338269cd115f30acbe2f",
@@ -84,6 +101,9 @@
       "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
       "gdaoTotalSupply": "24000000000000000000000000",
       "proposalVotingPeriod": 241920
+    },
+    "savings": {
+      "daysUntilUpgrade": "7"
     }
   },
   "fuse-mainnet": {
@@ -193,7 +213,11 @@
       "gdaoTotalSupply": "96000000000000000000000000",
       "proposalVotingPeriod": 241920,
       "guardian": "0x914dA3B2508634998d244059dAb5488D9bA1814f"
-    }
+    },
+    "savings": {
+      "daysUntilUpgrade": 30
+    },
+    "guardiansSafe": "0x5878123fe880881f1Ecc92D5fd31e5D3F5Fba2e9"
   },
   "production-mainnet": {
     "gdxAirdrop": "0x707f775d730a9b17ee62c21e00188da4dff26602a58c338269cd115f30acbe2f",
@@ -223,6 +247,36 @@
       "dai_eth": "0x773616E4d11A78F511299002da57A0a94577F1f4",
       "eth_usd": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419"
     },
-    "uniswapRouter": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D"
+    "uniswapRouter": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
+    "guardiansSafe": "0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec"
+  },
+  "development-celo": {
+    "guardiansSafe": "0xdF3e980a175904a26A7BA627048a789Ae6A141cD",
+    "gasPrice": 150000000,
+    "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585",
+    "governance": {
+      "claimersGOODMonthly": "1000000000000000000000000",
+      "stakersGOODMonthly": "1000000000000000000000000"
+    }
+  },
+  "staging-celo": {
+    "guardiansSafe": "0xdF3e980a175904a26A7BA627048a789Ae6A141cD",
+    "gasPrice": 150000000,
+    "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585",
+    "governance": {
+      "claimersGOODMonthly": "1000000000000000000000000",
+      "stakersGOODMonthly": "1000000000000000000000000"
+    }
+  },
+  "production-celo": {
+    "governance": {
+      "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
+      "gdaoTotalSupply": "96000000000000000000000000",
+      "proposalVotingPeriod": 241920,
+      "guardian": "0xa2521e8F5A990903fdD8Afa6570C52526e7E0D5E"
+    },
+    "gasPrice": 150000000,
+    "guardiansSafe": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
+    "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585"
   }
 }