@gooddollar/goodprotocol 1.0.7-beta.2 → 1.0.9-beta.0

package/contracts/staking/aave/GoodAaveStakingV2.sol

@@ -0,0 +1,263 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8.0;
+import "../SimpleStakingV2.sol";
+import "../../Interfaces.sol";
+import "../../utils/DataTypes.sol";
+import "../UniswapV2SwapHelper.sol";
+
+/**
+ * @title Staking contract that donates earned interest to the DAO
+ * allowing stakers to deposit Token
+ * or withdraw their stake in Token
+ * the contracts buy cToken and can transfer the daily interest to the  DAO
+ */
+contract GoodAaveStakingV2 is SimpleStakingV2 {
+	using UniswapV2SwapHelper for IHasRouter;
+
+	// Address of the TOKEN/USD oracle from chainlink
+	address public tokenUsdOracle;
+
+	//LendingPool of aave
+	ILendingPool public lendingPool;
+
+	//Address of the AaveIncentivesController
+	IAaveIncentivesController public incentiveController;
+
+	//address of the AAVE/USD oracle
+	address public aaveUSDOracle;
+	// Gas cost to collect interest from this staking contract
+	uint32 public collectInterestGasCost;
+	// Gas cost to claim stkAave rewards
+	uint32 public stkAaveClaimGasCost;
+
+	address[] public tokenToDaiSwapPath;
+
+	/**
+	 * @param _token Token to swap DEFI token
+	 * @param _lendingPool LendingPool address
+	 * @param _ns Address of the NameService
+	 * @param _tokenName Name of the staking token which will be provided to staker for their staking share
+	 * @param _tokenSymbol Symbol of the staking token which will be provided to staker for their staking share
+	 * @param _tokenSymbol Determines blocks to pass for 1x Multiplier
+	 * @param _tokenUsdOracle address of the TOKEN/USD oracle
+	 * @param _incentiveController Aave incentive controller which provides AAVE rewards
+	 * @param _aaveUSDOracle address of the AAVE/USD oracle
+	 */
+	function init(
+		address _token,
+		address _lendingPool,
+		INameService _ns,
+		string memory _tokenName,
+		string memory _tokenSymbol,
+		uint64 _maxRewardThreshold,
+		address _tokenUsdOracle,
+		IAaveIncentivesController _incentiveController,
+		address _aaveUSDOracle,
+		address[] memory _tokenToDaiSwapPath
+	) public {
+		lendingPool = ILendingPool(_lendingPool);
+		DataTypes.ReserveData memory reserve = lendingPool.getReserveData(_token);
+		initialize(
+			_token,
+			reserve.aTokenAddress,
+			_ns,
+			_tokenName,
+			_tokenSymbol,
+			_maxRewardThreshold
+		);
+		require(
+			_tokenToDaiSwapPath[0] == _token &&
+				_tokenToDaiSwapPath[_tokenToDaiSwapPath.length - 1] ==
+				nameService.getAddress("DAI"),
+			"invalid _tokenToDaiSwapPath"
+		);
+		tokenToDaiSwapPath = _tokenToDaiSwapPath;
+
+		//above  initialize going  to revert on second call, so this is safe
+		tokenUsdOracle = _tokenUsdOracle;
+		incentiveController = _incentiveController;
+		aaveUSDOracle = _aaveUSDOracle;
+		collectInterestGasCost = 250000;
+		stkAaveClaimGasCost = 50000;
+		_approveTokens();
+	}
+
+	/**
+	 * @dev stake some Token
+	 * @param _amount of Token to stake
+	 */
+	function mintInterestToken(uint256 _amount) internal override {
+		lendingPool.deposit(address(token), _amount, address(this), 0);
+	}
+
+	/**
+	 * @dev redeem Token from aave
+	 * @param _amount of token to redeem in Token
+	 */
+	function redeem(uint256 _amount) internal override {
+		uint256 withdrawnAmount = lendingPool.withdraw(
+			address(token),
+			_amount,
+			address(this)
+		);
+		require(withdrawnAmount > 0, "Withdrawn amount should be bigger than zero");
+	}
+
+	/**
+	 * @dev Function to redeem aToken for DAI, so reserve knows how to handle it. (reserve can handle dai or cdai)
+	 * also transfers stkaave to reserve
+	 * @dev _amount of token in iToken
+	 * @dev _recipient recipient of the DAI
+	 * @return actualTokenGains amount of token redeemed for dai,
+			actualRewardTokenGains amount of reward token earned,
+			daiAmount total dai received
+	 */
+	function redeemUnderlyingToDAI(uint256 _amount, address _recipient)
+		internal
+		override
+		returns (
+			uint256 actualTokenGains,
+			uint256 actualRewardTokenGains,
+			uint256 daiAmount
+		)
+	{
+		//out of requested interests to withdraw how much is it safe to swap
+		actualTokenGains = IHasRouter(this).maxSafeTokenAmount(
+			address(token),
+			tokenToDaiSwapPath[1],
+			_amount,
+			maxLiquidityPercentageSwap
+		);
+
+		lendingPool.withdraw(address(token), actualTokenGains, address(this));
+		actualTokenGains = token.balanceOf(address(this));
+
+		address[] memory tokenAddress = new address[](1);
+		tokenAddress[0] = address(iToken);
+
+		actualRewardTokenGains = incentiveController.claimRewards(
+			tokenAddress,
+			type(uint256).max,
+			avatar
+		);
+
+		if (actualTokenGains > 0) {
+			daiAmount = IHasRouter(this).swap(
+				tokenToDaiSwapPath,
+				actualTokenGains,
+				0,
+				_recipient
+			);
+		}
+	}
+
+	/**
+	 * @dev returns decimals of token.
+	 */
+	function tokenDecimal() internal view override returns (uint256) {
+		ERC20 token = ERC20(address(token));
+		return uint256(token.decimals());
+	}
+
+	/**
+	 * @dev returns decimals of interest token.
+	 */
+	function iTokenDecimal() internal view override returns (uint256) {
+		ERC20 aToken = ERC20(address(iToken));
+		return uint256(aToken.decimals());
+	}
+
+	/**
+	 * @dev Function that calculates current interest gains of this staking contract
+	 * @param _returnTokenBalanceInUSD determine return token balance of staking contract in USD
+	 * @param _returnTokenGainsInUSD determine return token gains of staking contract in USD
+	 * @return iTokenGains gains in iToken, tokenGains gains in token,  tokenBalance current balance , balanceInUSD, tokenGainsInUSD
+	 */
+	function currentGains(
+		bool _returnTokenBalanceInUSD,
+		bool _returnTokenGainsInUSD
+	)
+		public
+		view
+		override
+		returns (
+			uint256 iTokenGains,
+			uint256 tokenGains,
+			uint256 tokenBalance,
+			uint256 balanceInUSD,
+			uint256 tokenGainsInUSD
+		)
+	{
+		ERC20 aToken = ERC20(address(iToken));
+		tokenBalance = aToken.balanceOf(address(this));
+		balanceInUSD = _returnTokenBalanceInUSD
+			? getTokenValueInUSD(tokenUsdOracle, tokenBalance, token.decimals())
+			: 0;
+		address[] memory tokenAddress = new address[](1);
+		tokenAddress[0] = address(token);
+		if (tokenBalance <= totalProductivity) {
+			return (0, 0, tokenBalance, balanceInUSD, 0);
+		}
+		iTokenGains = tokenGains = tokenBalance - totalProductivity;
+
+		tokenGainsInUSD = _returnTokenGainsInUSD
+			? getTokenValueInUSD(tokenUsdOracle, tokenGains, token.decimals())
+			: 0;
+	}
+
+	/**
+	 * @dev Function to get interest transfer cost for this particular staking contract
+	 */
+	function getGasCostForInterestTransfer()
+		external
+		view
+		override
+		returns (uint32)
+	{
+		address[] memory tokenAddress = new address[](1);
+		tokenAddress[0] = address(iToken);
+		uint256 stkAaaveBalance = incentiveController.getRewardsBalance(
+			tokenAddress,
+			address(this)
+		);
+		if (stkAaaveBalance > 0)
+			return collectInterestGasCost + stkAaveClaimGasCost;
+
+		return collectInterestGasCost;
+	}
+
+	/**
+	 * @dev Set Gas cost to interest collection for this contract
+	 * @param _collectInterestGasCost Gas cost to collect interest
+	 * @param _rewardTokenCollectCost gas cost to collect reward tokens
+	 */
+	function setcollectInterestGasCostParams(
+		uint32 _collectInterestGasCost,
+		uint32 _rewardTokenCollectCost
+	) external {
+		_onlyAvatar();
+		collectInterestGasCost = _collectInterestGasCost;
+		stkAaveClaimGasCost = _rewardTokenCollectCost;
+	}
+
+	/**
+	 * @dev Calculates worth of given amount of iToken in Token
+	 * @param _amount Amount of token to calculate worth in Token
+	 * @return Worth of given amount of token in Token
+	 */
+	function iTokenWorthInToken(uint256 _amount)
+		public
+		view
+		override
+		returns (uint256)
+	{
+		return _amount; // since aToken is peg to Token 1:1 return exact amount
+	}
+
+	function _approveTokens() internal override {
+		address uniswapRouter = nameService.getAddress("UNISWAP_ROUTER");
+		token.approve(uniswapRouter, type(uint256).max);
+		token.approve(address(lendingPool), type(uint256).max); // approve the transfers to defi protocol as much as possible in order to save gas
+	}
+}

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/contracts/ubi/UBIScheme.sol

@@ -362,12 +362,12 @@ contract UBIScheme is DAOUpgradeableContract {
 			claimDay[currentDay].claimAmount += awardAmount;
 			emit UBIClaimed(_account, awardAmount);
 		} else {
-			IGoodDollar token = nativeToken();
-			require(token.transfer(_account, _amount), "claim transfer failed");
 			if (_isClaimed) {
 				claimDay[currentDay].claimAmount += _amount;
 				emit UBIClaimed(_account, _amount);
 			}
+			IGoodDollar token = nativeToken();
+			require(token.transfer(_account, _amount), "claim transfer failed");
 		}
 	}
 

package/package.json

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

package/releases/deployment.json

@@ -132,7 +132,7 @@
         "GoodDollar": "0x79BeecC4b165Ccf547662cB4f7C0e83b3796E5b3",
         "Controller": "0xb453024495525908E6cC1e3C115f4B6B30cc56b9",
         "Avatar": "0x71ddE7b8362724bd65D88Fe29d42636a9F8f9064",
-        "HomeBridge": "0xb0aD96B62567Ebcb1660e2Af5755A11B42b3Ade5",
+        "HomeBridge": "0x2a84f4E41c1f0E245A7278e32150Ecf1a179b7B2",
         "FuseFaucet": "0x09Ad3430D146aa662eA8c20cBEBceBC0bbB3FB0a",
         "Invites": "0x187fc9fB37DF0fbf75149913a97B17c968Fc90d0",
         "OneTimePayments": "0x184C1F83b3eB75a2dac483D4a6b9FBD59Df961f8",
@@ -166,7 +166,7 @@
         "Contribution": "0x2250c5131bf9DdCbD55F9bEFc999D691c419ad93",
         "DAI": "0xB5E5D0F8C0cbA267CD3D7035d6AdC8eBA7Df7Cdd",
         "cDAI": "0x6ce27497a64fffb5517aa4aee908b1e7eb63b9ff",
-        "ForeignBridge": "0x18F2a22Aa6420D06C079e70838a21a3c75322834",
+        "ForeignBridge": "0x292c17365D729d367f4556F1Bd17eB8434ebF6d1",
         "GoodDollar": "0x22A4720e32e3419e809731E7114042D6C3055845",
         "Reputation": "0x5925F6Bf62147D2b14B85e6dCB979e3D1A81Dbb1",
         "Identity": "0x4D347bda25BEf041BfCB5205deECD1A33ab46db9",
@@ -184,63 +184,74 @@
         "FeeFormula": "0x416B5A5e12235De6838D62Fd053e7Ce59E944426"
     },
     "dapptest": {
-        "NameService": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc",
-        "GReputation": "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07",
-        "CompoundVotingMachine": "0x922D6956C99E12DFeB3224DEA977D0939758A1Fe",
-        "ClaimersDistribution": "0x1fA02b2d6A771842690194Cf62D91bdd92BfE28d",
-        "GovernanceStaking": "0xdbC43Ba45381e02825b14322cDdd15eC4B3164E6",
-        "UBIScheme": "0x4C4a2f8c81640e47606d3fd77B353E87Ba015584",
-        "ProtocolUpgradeFuse": "0x21dF544947ba3E8b3c32561399E88B52Dc8b2823",
-        "HomeBridge": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
-        "AdminWallet": "0x998abeb3E57409262aE5b751f60747921B33613E",
-        "Identity": "0x0165878A594ca255338adfa4d48449f69242Eb8F",
-        "GoodDollar": "0x9bd03768a7DCc129555dE410FF8E85528A4F88b5",
-        "Controller": "0x23dB4a08f2272df049a4932a4Cc3A6Dc1002B33E",
-        "Avatar": "0x61c36a8d610163660E21a8b7359e1Cac0C9133e1",
-        "FirstClaimPool": "0x67d269191c92Caf3cD7723F116c85e6E9bf55933",
-        "BancorFormula": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
-        "DAI": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
-        "cDAI": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
-        "COMP": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
+        "NameService": "0x9059f66843F564f7870f7135fB039EB2034a23a3",
+        "GReputation": "0x90dE2F86DBdB2110a798326e880c83bc8779d149",
+        "CompoundVotingMachine": "0x2EF9f88EEB737655FF01F9b5017f1e3399726AF1",
+        "ClaimersDistribution": "0x035A59F228e776Cc396a8F5E1cEF989E235B0035",
+        "GovernanceStaking": "0xC65cCB966873969179B6b0bA53D67D14Bbf1204C",
+        "UBIScheme": "0xBb02F06762FBc51aD222915e6855f7482a93F9Cd",
+        "ProtocolUpgradeFuse": "0xBb976201B607f16dc76586dB8Ca5EF6C50C41c22",
+        "HomeBridge": "0x180FAF09AdD6a27554b11a131DCe6f6A3ddF4cBf",
+        "AdminWallet": "0xB8357F7f41125d4b24AD052c1b7288BeF5C43446",
+        "Identity": "0x63766F0efAa46a86E9055bB46e41ff7bc64CBEA2",
+        "GoodDollar": "0x94a9D2532DA2d9153336159907604A01c3E91C11",
+        "Controller": "0x0B57Fd12F7A95c322aD176D23765507ce09892Cb",
+        "Avatar": "0xf6Ee31185AC05C2b558fF2a561C600AF3E9486dd",
+        "FirstClaimPool": "0xC20654dB7F9483f10c91dc94924dC8F04F79bfd5",
+        "BancorFormula": "0x6852Adb5Fce1D73c08A9b3Aa7edE9A03437ac2fE",
+        "DAI": "0x0000000000000000000000000000000000000000",
+        "cDAI": "0x0000000000000000000000000000000000000000",
+        "COMP": "0x0000000000000000000000000000000000000000",
         "networkId": 4447,
-        "network": "dapptest"
+        "network": "dapptest",
+        "FeeFormula": "0x24ef01de6baE76eE73Da210940A296F739d87952",
+        "OneTimePayments": "0xB10982193B39Eda3428d6AaeBbd7986f2A2Baa1a",
+        "Invites": "0x74156A1F9736307b7AD34e3691f3A5B54A0B3Eb8",
+        "FuseFaucet": "0x0Db32f0b116773fDD78C2e1b5E6609CC502e6784",
+        "ProxyFactory": "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90"
     },
     "dapptest-mainnet": {
-        "NameService": "0x51A1ceB83B83F1985a81C295d1fF28Afef186E02",
-        "GReputation": "0x36b58F5C1969B7b6591D752ea6F5486D069010AB",
-        "CompoundVotingMachine": "0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7",
-        "GoodMarketMaker": "0x202CCe504e04bEd6fC0521238dDf04Bc9E8E15aB",
-        "GoodReserveCDai": "0x172076E0166D1F9Cc711C77Adf8488051744980C",
-        "ExchangeHelper": "0xBEc49fA140aCaA83533fB00A2BB19bDdd0290f25",
-        "GoodFundManager": "0x2B0d36FACD61B71CC05ab8F3D2355ec3631C0dd5",
-        "StakersDistribution": "0x46b142DD1E924FAb83eCc3c08e4D46E82f005e0E",
-        "ProtocolUpgrade": "0xC9a43158891282A2B1475592D5719c001986Aaec",
-        "CompoundStakingFactory": "0x1c85638e118b37167e9298c2268758e058DdfDA0",
-        "AaveStakingFactory": "0x367761085BF3C12e5DA2Df99AC6E1a824612b8fb",
-        "ForeignBridge": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
-        "Contribution": "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0",
+        "NameService": "0xe528aaCA8E7cD3ce503bB4a2dEadFD4088229E1F",
+        "GReputation": "0x77423AE3ce64482ef3BB601a2EA42cf30349735A",
+        "CompoundVotingMachine": "0x6804DB9596c651A1CA24bBB821712A8899932d76",
+        "GoodMarketMaker": "0xa36ADAE77B1f6f87eD60aafEF9c080c38Ca30D0F",
+        "GoodReserveCDai": "0x411CEb987F801CdEa5a301a0CCfa4a5Df37f3f7F",
+        "ExchangeHelper": "0x1333788523bEA7C7cBdd0684Bd1ee75E940fF0Eb",
+        "GoodFundManager": "0x50589243cb1d8eEF751f4BAb253Aabef6e434c0d",
+        "StakersDistribution": "0x214c3C71191AB9bD868a5f408A61c540c787662F",
+        "ProtocolUpgrade": "0x1Fb0D426927Dab092Def63b73E1397b3F29E7b33",
+        "CompoundStakingFactory": "0xe4FEed16F54b4244C174b408Ba3B5F1f19DD1E4D",
+        "AaveStakingFactory": "0xe7213b68DC25bf30bC7f1DE9BAead075c66979F9",
+        "ForeignBridge": "0x570ADc5880D778aE5935f199aa590091586CDf75",
+        "Contribution": "0x24F2D7c50357C7B1156Ca85945D3A901c88651cB",
         "StakingContracts": [
             [
-                "0x7c3c0A0EC38ad2DDaF9e89FE82B7a85D21366fA1",
+                "0xc782Ee4B0d6204Ff77471884bB95d2D2f8D60fE6",
                 13888
-            ],
-            [
-                "0xdc43741637B4Dd5f7f6A3201b6d00A49812Fc4D3",
-                "6944"
             ]
         ],
-        "DonationsStaking": "0x4631BCAbD6dF18D94796344963cB60d44a4136b6",
-        "Identity": "0x0165878A594ca255338adfa4d48449f69242Eb8F",
-        "GoodDollar": "0x9bd03768a7DCc129555dE410FF8E85528A4F88b5",
-        "Controller": "0x23dB4a08f2272df049a4932a4Cc3A6Dc1002B33E",
-        "Avatar": "0x61c36a8d610163660E21a8b7359e1Cac0C9133e1",
-        "FirstClaimPool": "0x67d269191c92Caf3cD7723F116c85e6E9bf55933",
-        "BancorFormula": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
-        "DAI": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
-        "cDAI": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
-        "COMP": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
+        "DonationsStaking": "0x4bfd12E943f25621d4FA368Ca7a5c0E7F6488000",
+        "Identity": "0xb2377aAE57F2072F52FBc38696BE573af2ce5bd9",
+        "GoodDollar": "0x5Bbaf48c102373B55079F941c40822C96E715d62",
+        "Controller": "0x67d49FAF26CA6A34D483B6BDFA45824EdA64D509",
+        "Avatar": "0xE9ED26a450aC15ea88b5801E5940B58F2f778b03",
+        "FirstClaimPool": "0xe3963EF7CC3044B64842d0AAe7F2Bf1543D341Ec",
+        "BancorFormula": "0x30474Ce2DE03045B8D0AE76F8a30DbfC8f000cea",
+        "DAI": "0xadf7b0f46EB35C748438F3e215F064E01cc7f5dF",
+        "cDAI": "0x0037272a7048132b10Dd8970AC964Bab2fDB3F62",
+        "COMP": "0xE8E9B139c6477D4EaD599bE5f2bB9335533D14f7",
         "networkId": 4447,
-        "network": "dapptest-mainnet"
+        "network": "dapptest-mainnet",
+        "FeeFormula": "0x8B87065fdfe4A130108E50f74ae7F85cD20A5967",
+        "ProxyFactory": "0xF47e3B0A1952A81F1afc41172762CB7CE8700133",
+        "UniswapV2SwapHelper": "0xB4059a6808Af368A69d12FBbD104Bb6B9c37e629",
+        "ETHUsdOracle": "0x79613D7834Ad35EE8dC3F9298030eaADc2A8c250",
+        "DAIEthOracle": "0x6397866132887b206EEA19f910730443E71a8CfB",
+        "DAIUsdOracle": "0xC2E1FC63cE06C279c5De18D7119C7cA123B42C1c",
+        "COMPUsdOracle": "0x9301981F27950e6546033EADD046C86754263f2D",
+        "USDCUsdOracle": "0x89Be7D874a17cD0295B2d86436a920593b5f4480",
+        "AAVEUsdOracle": "0xDFF3455E08AB33B1599D1c5B5A1D65de63d3FCd0",
+        "GasPriceOracle": "0xFAE6fA2097792Edfd7429A282F21ec2D955279D9"
     },
     "staging-mainnet": {
         "NameService": "0xC87FAb8A8CDD346079ca6177e47408Ba18066104",
@@ -258,11 +269,11 @@
         "DonationsStaking": "0x66Fb63cB6c4E2800db9d1691B3d00361Ada9dE61",
         "network": "staging-mainnet",
         "networkId": 3,
-        "ForeignBridge": "0xDaAc9A734242C2D99dD1cb3680770ACA26A25CeB",
+        "ForeignBridge": "0xF629c80BfCaA9080e229b555924D5c72B47F5C22",
         "Contribution": "0x27816e32270a413AF676A2E3a25dB93C7F565a80",
         "StakingContracts": [
             [
-                "0x61b36EcaEd25c4EE3017905B5Dd006129a4dfb0B",
+                "0x1189c2227bAa8f0749e842B366b0912d29A5A04E",
                 13888
             ]
         ],
@@ -301,7 +312,7 @@
         "network": "staging",
         "networkId": 122,
         "ProxyFactory": "0x240d844AdA767bE0AB08F9BcCcB6D8a04aE370EC",
-        "HomeBridge": "0x3B25860174ECb3a0962bA3A5065b1f4063253419",
+        "HomeBridge": "0xc116Be98ad4574EE771553a0977fA9591d48C383",
         "FirstClaimPool": "0x5D007A7633D05b0dDD068B71E8448CD1fcdbd823",
         "FeeFormula": "0x05eb1C46bd539Fd2A098b06D83a5bB81E5a58e63",
         "DAI": "0x0000000000000000000000000000000000000000",
@@ -310,62 +321,62 @@
     },
     "test": {
         "ProxyFactory": "0x36dE29DB57062A583436Ae071e141404dFE2311C",
-        "NameService": "0x9771321265cAD7049903EaF4a574Eab51fD97378",
-        "GReputation": "0x8E02433C31B51ABe3Ac65908d59eF82ddB52714F",
-        "CompoundVotingMachine": "0x289A06513a4C4d9bF7DBD201c01BA2492fe6e03C",
-        "ClaimersDistribution": "0x426dcD4fa088D7b33797Da0002bF36a669B398D5",
-        "GovernanceStaking": "0x48D662D1D10505f9bf25c993f30c40118A37E7a2",
-        "UBIScheme": "0x53E447841DD116a640b1983873601Ade94388702",
-        "ProtocolUpgradeFuse": "0x81B2b28442e743954C8678b0d2e4be396976F561",
+        "NameService": "0xAd8C024cE4E90D0bf00eD29f441581F6FDE54C34",
+        "GReputation": "0x80073051B408D4011221634c7fe464d16Eef4eb5",
+        "CompoundVotingMachine": "0xFA18ab3DD023DAFB2cEB6cb0507557b26362180E",
+        "ClaimersDistribution": "0x065A4F59bEE2Eaca8a73Ca4eD84CA0aB288b5BdD",
+        "GovernanceStaking": "0xcFa693a6B5d8399b771582afF07B5a8f55D75d40",
+        "UBIScheme": "0x4dd4301DB4461EbD0ac859fFFCc90531EBaC5D75",
+        "ProtocolUpgradeFuse": "0xAf49e224e71AF966D5367E6c8DED0CF7FcD110d0",
         "network": "test",
         "networkId": 4447,
-        "HomeBridge": "0x8B8776BEDB1eD89Ab6BD2388bCbef3C579ca53b9",
-        "OneTimePayments": "0x2Cd63cc1Ff41E263c5E1493C078E2cEDd6c8f018",
-        "AdminWallet": "0xd3aF095DE5D1419ADabE47a48d6110e37236A97F",
-        "Identity": "0xFE0730c6426b87BEBE9bf73474B1310F93617822",
-        "GoodDollar": "0xa3c6564C8f95fb3Fee1F753C93505cD5E4529EDC",
-        "Controller": "0x0354A1E121ce60B9f7d4754D250a85adb974a1BC",
-        "Avatar": "0xa128F2383D46E06b248640848D4FD10ab372A6A0",
-        "FirstClaimPool": "0x50D0F8Fe8b59878706A7bC0288c960255d55867b",
-        "BancorFormula": "0x570ADc5880D778aE5935f199aa590091586CDf75",
-        "DAI": "0x79613D7834Ad35EE8dC3F9298030eaADc2A8c250",
-        "cDAI": "0x743F3Ae880D7357690b5ff6C5f16110d9294F352",
-        "COMP": "0x6f3203B069cfb6e408ddFa6040d3FD1f26C22F48"
+        "HomeBridge": "0xc90C13734D20e27904dF248FB850f50C81CE3642",
+        "OneTimePayments": "0x4D5D3FaE9b08a4FA2aEB9Bc0d86E3dB3b3126438",
+        "AdminWallet": "0x65E001B67f1aD28FF337C4F6e1cA52F31F5Eb9Fd",
+        "Identity": "0x473A31861aB89d5D7a78E7efc57ad31d84ED5343",
+        "GoodDollar": "0x040F0292f908c83BdEcCAE7600344503F2a20691",
+        "Controller": "0x75B282FdEaEce36C6E9363F30010058c284D9199",
+        "Avatar": "0xB3cbA81d4ce278661E26E2107936A014efc31343",
+        "FirstClaimPool": "0xd3aF095DE5D1419ADabE47a48d6110e37236A97F",
+        "BancorFormula": "0x0d6e43d4d7944408d9a5A10BC57B4348d61cD764",
+        "DAI": "0xB3a1e45D60f9394bC4327f5Dc46dB56D8a3c3688",
+        "cDAI": "0x1f720E7952650ED8Ca142feBD52aCBe8b7A21741",
+        "COMP": "0xD83C9f1B0DaFb1992eF92ac62D6509e54AD4eD48"
     },
     "test-mainnet": {
         "ProxyFactory": "0xce17442a9e26bcFDFAb2e9028e3A655d046f1654",
-        "NameService": "0xBcA21A2e4c0b2Dc1279a282E6e6d8FaC8d88adAd",
-        "GReputation": "0x607c2d79E406a5DC2D1E01b6820dd5a72FbA58C7",
-        "CompoundVotingMachine": "0x35BDA1D4f4E4D397d5b81a8cdc7fE183b98F537C",
-        "GoodMarketMaker": "0xfC3035f60A3d862E0753eA3D2Eec7679227E8B37",
-        "GoodReserveCDai": "0x25e67aedBA8aCe016Dd4573df46c50E4F8a97497",
-        "ExchangeHelper": "0x8a5592b0E95767886642269AEb0B7A80dAa22c8f",
-        "GoodFundManager": "0xD7F61C5979BBc9d50B30e7459945726670FFdeA3",
-        "StakersDistribution": "0xA3BfB8850644482cFdBB5eF8a7Fcc666f71565fb",
-        "ProtocolUpgrade": "0xcFa693a6B5d8399b771582afF07B5a8f55D75d40",
-        "UniswapV2SwapHelper": "0x5200ff0ce8965Ac565DA4dE9D56CCAdAd995136c",
-        "CompoundStakingFactory": "0x9D76393e381FE089950c5bFbDD603f033BfB08c2",
-        "AaveStakingFactory": "0xAf49e224e71AF966D5367E6c8DED0CF7FcD110d0",
+        "NameService": "0x55125Ed5fa29594A8DbD7D0fB186888537B9c140",
+        "GReputation": "0x7235eC3c7b450eE36De0141b205d89D08C5de5fE",
+        "CompoundVotingMachine": "0xE8A10EA2E8764EB25684A2974913dDAbFefA4494",
+        "GoodMarketMaker": "0xF4eD16cBD64f07230C5bc9667357cE1D161DF894",
+        "GoodReserveCDai": "0x1bEA43626e0b6Afe157FBD1398093359261bB53e",
+        "ExchangeHelper": "0x6fad49b578CbF1d8F21b6dF17ccBB5d409Fb6BC8",
+        "GoodFundManager": "0x7963849A738719BE64c669c8Ce5613A6331C8caC",
+        "StakersDistribution": "0x5c73Ed454acB4467C0a35264D7a455C607FcE1bA",
+        "ProtocolUpgrade": "0x9c15162c1f7f01C64c0e068f2E48D39Cd7b18f86",
+        "UniswapV2SwapHelper": "0x39683C5c01B4a875FA7d4f5766D2Df521Fc0b4AD",
+        "CompoundStakingFactory": "0x712e1b726F6149C768fff8572CeA0Bdba23a561B",
+        "AaveStakingFactory": "0x36c7b0946e701EA6cE8e101B4C959FF15D0DeE15",
         "network": "test-mainnet",
         "networkId": 4447,
-        "ForeignBridge": "0x0018b7506e118c97E54d4FFebcef808ca785bA01",
-        "Contribution": "0x24ef01de6baE76eE73Da210940A296F739d87952",
+        "ForeignBridge": "0x9F95c870a4104603630CBEDBbbd56c6465Cc8A58",
+        "Contribution": "0x770ace66dd84B035F71FfC977448032EE688604d",
         "StakingContracts": [
             [
-                "0x34ae8025E7123bee3d17033417CabFfD2d04282A",
+                "0xb440419193c65B52e68a819BBe11Bd770Bf93B33",
                 13888
             ]
         ],
-        "DonationsStaking": "0xd060c65cA125d9209Ea703136526d6fc3805c833",
-        "Identity": "0xc47EF4D1d3C2e18c02B2163A8dAB2F5B5099C3Ff",
-        "GoodDollar": "0x89abe81E6FC0eFc94FADdDCc17BBD67EF6F175Bc",
-        "Controller": "0xf0c16789aB60928725E9c723b3a268288aBF85dc",
-        "Avatar": "0xF101E14Dcabe2898D4E2e3e1e86481dC36a22580",
-        "FirstClaimPool": "0x16B293F3E1C995b4ea9938c41006021D9810878B",
-        "BancorFormula": "0x0b943500AA8A8BbB8992654e57511f1CEfb2BB9f",
-        "DAI": "0xaF15B6Db0b6220391007701228883BA2f04D04F9",
-        "cDAI": "0x8DcC7438Ccc3006165783e0fD1C6261CaFC0AA69",
-        "COMP": "0xb0fA41E2DF531C26dBA0E16D514381A816Aa2554"
+        "DonationsStaking": "0x4e21A8F1d5C27C3A99b2781E1aB215f6a75A0122",
+        "Identity": "0x66a2BECe75FCE45ddFe2C06216CE9350a4c46498",
+        "GoodDollar": "0x53DE0F59992D932020ad00CF4ABEe89051F8961d",
+        "Controller": "0x86851c91c15A49Ba4a9Cc9859f2d84C47b7aD91d",
+        "Avatar": "0xB8FC6cFAb3E190e648aac2d7aB69d466f3674bDB",
+        "FirstClaimPool": "0x59E0b0C67a8f14BE8C5855C95CdD2ba95a7f2BbB",
+        "BancorFormula": "0x1aaaD333A7d363a8576779B71BF589580cC9D82E",
+        "DAI": "0x63766F0efAa46a86E9055bB46e41ff7bc64CBEA2",
+        "cDAI": "0x24ef01de6baE76eE73Da210940A296F739d87952",
+        "COMP": "0x3C3297C2Be0F0C51b604dC0A798cF610d7406De2"
     },
     "production": {
         "ProxyFactory": "0x4659176E962763e7C8A4eF965ecfD0fdf9f52057",