@gooddollar/goodprotocol 1.0.19-beta.3 → 1.0.20

package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json

@@ -74,8 +74,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5060405161035c38038061035c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102c9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212204e7ecf50608024b30b943ad63c2e064e321d773f386de2f9a7c838fe1a54e40964736f6c63430008080033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212204e7ecf50608024b30b943ad63c2e064e321d773f386de2f9a7c838fe1a54e40964736f6c63430008080033",
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161035c38038061035c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102c9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220fde96c0140534281b2023b496f1ce00db0a20029d246a9149dab11c8062ac9ff64736f6c63430008080033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220fde96c0140534281b2023b496f1ce00db0a20029d246a9149dab11c8062ac9ff64736f6c63430008080033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/contracts/Interfaces.sol

@@ -15,8 +15,6 @@ interface ERC20 {
 
 	function mint(address to, uint256 mintAmount) external returns (uint256);
 
-	function burn(uint256 amount) external;
-
 	function totalSupply() external view returns (uint256);
 
 	function allowance(address owner, address spender)
@@ -449,13 +447,3 @@ interface IAdminWallet {
 
 	function transferOwnership(address _owner) external;
 }
-
-interface IMultichainRouter {
-	// Swaps `amount` `token` from this chain to `toChainID` chain with recipient `to`
-	function anySwapOut(
-		address token,
-		address to,
-		uint256 amount,
-		uint256 toChainID
-	) external;
-}

package/contracts/reserve/GoodReserveCDai.sol

@@ -11,7 +11,6 @@ import "../utils/NameService.sol";
 import "../DAOStackInterfaces.sol";
 import "../Interfaces.sol";
 import "./GoodMarketMaker.sol";
-import "./DistributionHelper.sol";
 
 interface ContributionCalc {
 	function calculateContribution(
@@ -52,9 +51,6 @@ contract GoodReserveCDai is
 	/// @dev mark if user claimed his GDX
 	mapping(address => bool) public isClaimedGDX;
 
-	uint32 public nonUbiBps; //how much of expansion G$ to allocate for non Ubi causes
-	DistributionHelper public distributionHelper; //in charge of distributing non UBI to different recipients
-
 	// Emits when new GD tokens minted
 	event UBIMinted(
 		//epoch of UBI
@@ -113,8 +109,6 @@ contract GoodReserveCDai is
 		address indexed receiverAddress
 	);
 
-	event NonUBIMinted(address distributionHelper, uint256 amountMinted);
-
 	function initialize(INameService _ns, bytes32 _gdxAirdrop)
 		public
 		virtual
@@ -359,22 +353,10 @@ contract GoodReserveCDai is
 			interestInCdai
 		);
 		uint256 gdExpansionToMint = getMarketMaker().mintExpansion(_interestToken);
-
-		uint256 nonUBI;
-
-		lastMinted = block.number;
 		uint256 gdUBI = gdInterestToMint + gdExpansionToMint;
-
-		if (nonUbiBps > 0) {
-			nonUBI = (gdExpansionToMint * nonUbiBps) / 10000;
-			gdUBI -= nonUBI;
-			_mintGoodDollars(address(distributionHelper), nonUBI, false);
-			emit NonUBIMinted(address(distributionHelper), nonUBI);
-			try distributionHelper.onDistribution(nonUBI) {} catch {}
-		}
 		//this enforces who can call the public mintUBI method. only an address with permissions at reserve of  RESERVE_MINTER_ROLE
-
 		_mintGoodDollars(nameService.getAddress("FUND_MANAGER"), gdUBI, false);
+		lastMinted = block.number;
 		emit UBIMinted(
 			lastMinted,
 			address(_interestToken),
@@ -383,18 +365,9 @@ contract GoodReserveCDai is
 			gdExpansionToMint,
 			gdUBI
 		);
-
 		return (gdUBI, interestInCdai);
 	}
 
-	function setDistributionHelper(DistributionHelper _helper, uint32 _bps)
-		public
-	{
-		_onlyAvatar();
-		distributionHelper = _helper;
-		nonUbiBps = _bps;
-	}
-
 	/**
 	 * @dev Allows the DAO to change the daily expansion rate
 	 * it is calculated by _nom/_denom with e27 precision. Emits

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.19-beta.3",
+  "version": "1.0.20",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",
@@ -31,7 +31,8 @@
     "LICENSE",
     "truffle-config.js",
     "tsconfig.json",
-    "test"
+    "test",
+    "types"
   ],
   "repository": {
     "type": "git",

package/releases/deployment.json

@@ -87,8 +87,8 @@
         "GoodFundManager": "0xAeEC5Af38c034D2f983dA5948646617Eee3a3372",
         "StakersDistribution": "0x139F5DD0D48b9BDbF9d12e7A2A2fDc42577746ad",
         "ProtocolUpgrade": "0x15Ac42377D9eD4168DFf9126DAf188F20b23E54D",
-        "CompoundStakingFactory": "0x932DC4c08140272D658C5059589A6f862991aB02",
-        "AaveStakingFactory": "0xeB348140d16eacf3BF321247504FeDD448Fd0B8F",
+        "CompoundStakingFactory": "0xba5b519b80d044038159b980d1c8657d53ed08a8",
+        "AaveStakingFactory": "0xd30dacCE904EBACC642Ab6dd3415e6Fc7B7B2E10",
         "StakingContracts": [
             [
                 "0xbc371c5c98d40de18382e3e0eeb58805d76d3d50",
@@ -99,6 +99,16 @@
                 6944
             ]
         ],
+        "StakingContractsV3": [
+            [
+                "0x19afea8633db478a5d7a8910dc2adc982c576045",
+                13888
+            ],
+            [
+                "0x2e34a18CeDf2485fbA4e19495f29245A07869039",
+                6944
+            ]
+        ],
         "DonationsStaking": "0xe58501733711B966f9c1d81B29557674c11bD840",
         "ExchangeHelper": "0x7C8f7F618c2F84C656aeb51D652848ce76990dB7",
         "Reserve": "0x7330BbDd9Fc99Cc82bE0078fB643C1DDbF9be03f",
@@ -538,10 +548,7 @@
         "Identity": "0x96B81f82A29e78C5ba9E2034Ce8490fd641a24eb",
         "NameService": "0x563a80a452264a9e1aa37c6FA0B46D04C3c71b24",
         "GReputation": "0xAC132ECe25217867E318eA8ff63420C90d5a74A6",
-        "GuardiansSafe": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
         "network": "production-celo",
-        "networkId": 42220,
-        "MultichainWrapper": "0x5566b6E4962BA83e05a426Ad89031ec18e9CadD3",
-        "MultichainRouter": "0xf27Ee99622C3C9b264583dACB2cCE056e194494f"
+        "networkId": 42220
     }
 }

package/scripts/multichain-deploy/basicdao-deploy.ts

@@ -1,15 +1,24 @@
-/***
- * to get same addresses as on Celo
- * deploy proxyfactory with 0x271cd5391016eb621aB3f9c0c70F5cF91DFd3FB0 with nonce 2
- * create a gnosissafe with 0x3de7216149f12d8f51540d9a870149560fc11bfb with nonce 3
- * run this script with 0x3de7216149f12d8f51540d9a870149560fc11bfb with nonce 7
- */
 import { network, ethers, upgrades, run } from "hardhat";
+import { networkNames } from "@openzeppelin/upgrades-core";
+import { isFunction, get, omitBy } from "lodash";
+import { getImplementationAddress } from "@openzeppelin/upgrades-core";
+import pressAnyKey from "press-any-key";
 import { Contract } from "ethers";
-import DAOCreatorABI from "@gooddollar/goodcontracts/contracts/build/contracts/DaoCreatorGoodDollarWithRep.json";
-import IdentityABI from "@gooddollar/goodcontracts/contracts/build/contracts/IdentityWithOwner.json";
+import { range } from "lodash";
+// import DAOCreatorABI from "@gooddollar/goodcontracts/build/contracts/DaoCreatorGoodDollar.json";
+import DAOCreatorABI from "../../../GoodBootstrap/packages/contracts/build/contracts/DaoCreatorGoodDollarWithRep.json";
+// import IdentityABI from "@gooddollar/goodcontracts/build/contracts/Identity.json";
+import IdentityABI from "../../../GoodBootstrap/packages/contracts/build/contracts/IdentityWithOwner.json";
 import FeeFormulaABI from "@gooddollar/goodcontracts/build/contracts/FeeFormula.json";
-import AddFoundersABI from "@gooddollar/goodcontracts/contracts/build/contracts/AddFoundersGoodDollarWithRep.json";
+// import AddFoundersABI from "@gooddollar/goodcontracts/build/contracts/AddFoundersGoodDollar.json";
+import AddFoundersABI from "../../../GoodBootstrap/packages/contracts/build/contracts/AddFoundersGoodDollarWithRep.json";
+import ContributionCalculation from "@gooddollar/goodcontracts/stakingModel/build/contracts/ContributionCalculation.json";
+import FirstClaimPool from "@gooddollar/goodcontracts/stakingModel/build/contracts/FirstClaimPool.json";
+import BridgeMock from "@gooddollar/goodcontracts/stakingModel/build/contracts/BridgeMock.json";
+import AdminWalletABI from "@gooddollar/goodcontracts/build/contracts/AdminWallet.json";
+import OTPABI from "@gooddollar/goodcontracts/build/contracts/OneTimePayments.json";
+import HomeBridgeABI from "@gooddollar/goodcontracts/build/contracts/DeployHomeBridge.json";
+import ForeignBridgeABI from "@gooddollar/goodcontracts/build/contracts/DeployForeignBridge.json";
 
 import { deployDeterministic } from "./helpers";
 import releaser from "../../scripts/releaser";
@@ -52,17 +61,6 @@ export const createDAO = async () => {
       .then(_ => _.toString())
   });
 
-  if (network.name.includes("production")) {
-    const txCount = await root.getTransactionCount();
-    if (txCount !== 7) {
-      console.error(
-        "nonce doesnt match expected 7, to have same contract address",
-        { txCount }
-      );
-      return;
-    }
-  }
-
   const DAOCreatorFactory = new ethers.ContractFactory(
     DAOCreatorABI.abi,
     DAOCreatorABI.bytecode,
@@ -116,7 +114,7 @@ export const createDAO = async () => {
   const GReputation = (await deployDeterministic(
     {
       name: "GReputation",
-      isUpgradeable: true,
+      isUpgradable: true,
       initializer: "initialize(address, string, bytes32, uint256)"
     },
     [
@@ -186,7 +184,7 @@ export const createDAO = async () => {
     .then(printDeploy);
 
   const NameService = await deployDeterministic(
-    { name: "NameService", isUpgradeable: true },
+    { name: "NameService", isUpgradable: true },
     [
       controller,
       ["CONTROLLER", "AVATAR", "IDENTITY", "GOODDOLLAR"].map(_ =>

package/scripts/multichain-deploy/helpers.ts

@@ -3,7 +3,7 @@ import { network, ethers, upgrades, run } from "hardhat";
 
 let totalGas = 0;
 const gasUsage = {};
-const GAS_SETTINGS = { gasLimit: 5000000 };
+const GAS_SETTINGS = {};
 export const countTotalGas = async (tx, name) => {
   let res = tx;
   if (tx.deployTransaction) tx = tx.deployTransaction;
@@ -36,12 +36,10 @@ export const deployDeterministic = async (
       (await ethers.getContractFactory(contract.name, factoryOpts));
 
     const salt = ethers.BigNumber.from(
-      ethers.utils.keccak256(
-        ethers.utils.toUtf8Bytes(contract.salt || contract.name)
-      )
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes(contract.name))
     );
 
-    if (contract.isUpgradeable === true) {
+    if (contract.isUpgradable === true) {
       console.log("Deploying:", contract.name, "using proxyfactory");
       const encoded = Contract.interface.encodeFunctionData(
         contract.initializer || "initialize",