@gooddollar/goodprotocol 1.0.3-beta.4 → 1.0.4

package/contracts/unaudited-foundation/InvitesV1.sol

@@ -134,13 +134,12 @@ contract InvitesV1 is Initializable {
 	}
 
 	function canCollectBountyFor(address _invitee) public view returns (bool) {
-		User memory user = users[_invitee];
-		User memory inviter = users[user.invitedBy];
-		Level memory level = levels[inviter.level];
+		User storage user = users[_invitee];
+		User storage inviter = users[user.invitedBy];
+		uint256 daysToComplete = levels[inviter.level].daysToComplete;
 		bool isLevelExpired = levelExpirationEnabled == true &&
-			level.daysToComplete > 0 &&
-			level.daysToComplete <
-			user.joinedAt.sub(inviter.levelStarted).div(1 days);
+			daysToComplete > 0 &&
+			daysToComplete < user.joinedAt.sub(inviter.levelStarted).div(1 days);
 
 		return
 			!user.bountyPaid &&
@@ -201,41 +200,44 @@ contract InvitesV1 is Initializable {
 	 */
 	function bountyFor(address _invitee) public isActive {
 		require(canCollectBountyFor(_invitee), "user not elligble for bounty yet");
+		return _bountyFor(_invitee);
+	}
 
-		User storage user = users[_invitee];
-		User storage inviter = users[user.invitedBy];
-		Level memory level = levels[inviter.level];
+	function _bountyFor(address _invitee) internal {
+		address invitedBy = users[_invitee].invitedBy;
+		uint256 joinedAt = users[_invitee].joinedAt;
+		Level memory level = levels[users[invitedBy].level];
 
 		bool isLevelExpired = level.daysToComplete > 0 &&
-			user.joinedAt > inviter.levelStarted && //prevent overflow in subtraction
+			joinedAt > users[invitedBy].levelStarted && //prevent overflow in subtraction
 			level.daysToComplete <
-			user.joinedAt.sub(inviter.levelStarted).div(1 days); //how long after level started did invitee join
+			joinedAt.sub(users[invitedBy].levelStarted).div(1 days); //how long after level started did invitee join
 
-		user.bountyPaid = true;
-		inviter.totalApprovedInvites += 1;
-		inviter.totalEarned += level.bounty;
+		users[_invitee].bountyPaid = true;
+		users[invitedBy].totalApprovedInvites += 1;
+		users[invitedBy].totalEarned += level.bounty;
 		stats.totalApprovedInvites += 1;
 		stats.totalBountiesPaid += level.bounty;
 
 		bool earnedLevel = false;
 		if (
 			level.toNext > 0 &&
-			inviter.totalApprovedInvites >= level.toNext &&
+			users[invitedBy].totalApprovedInvites >= level.toNext &&
 			isLevelExpired == false
 		) {
-			inviter.level += 1;
-			inviter.levelStarted = block.timestamp;
+			users[invitedBy].level += 1;
+			users[invitedBy].levelStarted = block.timestamp;
 			earnedLevel = true;
 		}
 
-		goodDollar.transfer(user.invitedBy, level.bounty);
+		goodDollar.transfer(invitedBy, level.bounty);
 		goodDollar.transfer(_invitee, level.bounty.div(2)); //pay invitee half the bounty
 
 		emit InviterBounty(
-			user.invitedBy,
+			invitedBy,
 			_invitee,
 			level.bounty,
-			inviter.level,
+			users[invitedBy].level,
 			earnedLevel
 		);
 	}
@@ -247,10 +249,12 @@ contract InvitesV1 is Initializable {
 		User storage inviter = users[msg.sender];
 
 		for (uint256 i = 0; i < inviter.pending.length; i++) {
-			if (canCollectBountyFor(inviter.pending[i])) {
-				bountyFor(inviter.pending[i]);
+			if (gasleft() < 340000) return;
+			address pending = inviter.pending[i];
+			if (canCollectBountyFor(pending)) {
+				_bountyFor(pending);
 			}
-			if (users[inviter.pending[i]].bountyPaid) {
+			if (users[pending].bountyPaid) {
 				//if still elements in array move last item to current position
 				if (inviter.pending.length - 1 > i) {
 					inviter.pending[i] = inviter.pending[inviter.pending.length - 1];
@@ -292,8 +296,9 @@ contract InvitesV1 is Initializable {
 	 * @dev
 	 * 1.2.0 - final changes before release
 	 * 1.3.0 - allow to set inviter later
+	 * 1.4.0 - improve gas for bounty collection
 	 */
 	function version() public pure returns (string memory) {
-		return "1.3.0";
+		return "1.4.0";
 	}
 }

package/hardhat.config.ts

@@ -103,7 +103,9 @@ const hhconfig: HardhatUserConfig = {
     fuse: {
       accounts: { mnemonic },
       url: "https://rpc.fuse.io/",
-      chainId: 122
+      chainId: 122,
+      gas: 6000000,
+      gasPrice: 1000000000
     },
     fusespark: {
       accounts: { mnemonic },
@@ -115,19 +117,22 @@ const hhconfig: HardhatUserConfig = {
     "fuse-mainnet": {
       accounts: { mnemonic },
       url: "https://ropsten.infura.io/v3/" + infura_api,
-
+      gasPrice: 20000000000,
+      gas: 5000000,
       chainId: 3
     },
     staging: {
       accounts: { mnemonic },
       url: "https://rpc.fuse.io/",
-
-      chainId: 122
+      chainId: 122,
+      gas: 6000000,
+      gasPrice: 1000000000
     },
     "staging-mainnet": {
       accounts: { mnemonic },
       url: "https://ropsten.infura.io/v3/" + infura_api,
-
+      gasPrice: 20000000000,
+      gas: 5000000,
       chainId: 3
     },
     production: {
@@ -141,7 +146,7 @@ const hhconfig: HardhatUserConfig = {
       accounts: [deployerPrivateKey],
       url: "https://mainnet.infura.io/v3/" + infura_api,
       gas: 3000000,
-      gasPrice: 25000000000,
+      gasPrice: 50000000000,
       chainId: 1
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.3-beta.4",
+  "version": "1.0.4",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",
@@ -60,6 +60,7 @@
     "ethers-multicall": "^0.2.1",
     "openzeppelin-solidity": "^4.3.2",
     "patch-package": "latest",
+    "press-any-key": "^0.1.1",
     "truffle-plugin-verify": "^0.5.11",
     "truffle-source-verify": "^0.0.6"
   },

package/releases/deployment.json

@@ -120,67 +120,68 @@
         "UniswapV2SwapHelper": "0x7D7200b2b049BB3d91bCbdf95eC0EE6c2b5f8b7E"
     },
     "fuse": {
-        "NameService": "0xE2CeeFB08f6729D8Ef764658750ce412B391a900",
-        "GReputation": "0x9F4362beB6e6a464192154926Dd7CeA0F2780277",
-        "FirstClaimPool": "0x6CF223eE3c5f95CF97065de35757247E04EaaAe3",
-        "CompoundVotingMachine": "0x7783c57c7ECa8571733Ae5b8484c756cB0CCD883",
-        "ClaimersDistribution": "0xe0f7A939cDc8750b6ebf94526396e3b62BEF2634",
-        "GovernanceStaking": "0x9b1d581bdC3491979B185dA8ee98Fc29Be3c64fd",
-        "UBIScheme": "0xec97ee6d70C626044224998192B96fEF05949De1",
-        "ProtocolUpgradeFuse": "0xd47F223FfB6a3c08ECf01158C5D5696420F6c293",
-        "Identity": "0x30e1403C075dB97fD9FE02b114cEbea5acce38b7",
-        "GoodDollar": "0xeE724540706296ebad65aeA2515Efe0949F97Ae6",
-        "Controller": "0x903a6Ba8b5A43FBd34a511fB5Cf193CE8dc8907B",
-        "Avatar": "0x07B41192DD74172576a443C7B28DDC3dC2CE3074",
-        "HomeBridge": "0x628980264f86b20BbF4181f55a35602fEe6B4E6F",
-        "FuseFaucet": "0xEEcc2620fb1EaC08Af5923B4D1D54d4703FBb29B",
-        "ProxyAdmin": "0xA74F8Ca91bA870608A909A9685e4a984Bbc068b5",
-        "Invites": "0x4218263062854C3953EF61699a85231b524A896a",
-        "ProxyAdmin2": "0x97429324686d39B424bC2d3228478280B46080Ed",
-        "UBI": "0xCC9B1382b0Ae9D80E81eCB1863DcE8685a044603",
-        "SignupBonus": "0xcdC704D3dEA0FcFD1Cae95dfdCB7883632E171b2",
-        "OneTimePayments": "0x94079dF920115c5296Cc06AE6D8F29E077906246",
-        "AdminWallet": "0xf61e08a98B446856eE3fbD6597D3698a1a138565",
+        "NameService": "0x27E3B64C671a25c191535743d63Bd06CB9B93E37",
+        "GReputation": "0xdFF4cE07253b2c3fa9dCEC8B918f91d150AC26a4",
+        "FirstClaimPool": "0x5E8732889f2d84c3D834223c38361B38D7D4B9bc",
+        "CompoundVotingMachine": "0xb9978C071f2F64016A2f8515BC03bd25684201aF",
+        "ClaimersDistribution": "0xEaDa76013C87C22843b907Ce0110ea55C8E7E2a0",
+        "GovernanceStaking": "0xe3E75Ee6895F8b30d8eC3260dAa20ec1aba6DA77",
+        "UBIScheme": "0x3bdeB796950301FfC9568fAF89B7370f8B217321",
+        "ProtocolUpgradeFuse": "0x4dB8602482576321F829baa593150393f7595439",
+        "Identity": "0x7ccF1011610138b484fCc921858e7971342d213c",
+        "GoodDollar": "0x79BeecC4b165Ccf547662cB4f7C0e83b3796E5b3",
+        "Controller": "0xb453024495525908E6cC1e3C115f4B6B30cc56b9",
+        "Avatar": "0x71ddE7b8362724bd65D88Fe29d42636a9F8f9064",
+        "HomeBridge": "0xb0aD96B62567Ebcb1660e2Af5755A11B42b3Ade5",
+        "FuseFaucet": "0x09Ad3430D146aa662eA8c20cBEBceBC0bbB3FB0a",
+        "Invites": "0x187fc9fB37DF0fbf75149913a97B17c968Fc90d0",
+        "OneTimePayments": "0x184C1F83b3eB75a2dac483D4a6b9FBD59Df961f8",
+        "AdminWallet": "0x14204288286823042263156146334B1a4d61227c",
         "network": "fuse",
         "networkId": 122,
-        "ProxyFactory": "0x86119f44AEbA334eDef64cc23D8b34188088D977"
+        "ProxyFactory": "0x4136dfD47F47792fC820E2354e9F0ce8e9c586A6",
+        "BancorFormula": "0x88e111b2A42457655A34896E5B929a75E7B82F88",
+        "DAI": "0x0000000000000000000000000000000000000000",
+        "cDAI": "0x0000000000000000000000000000000000000000",
+        "COMP": "0x0000000000000000000000000000000000000000"
     },
     "fuse-mainnet": {
-        "NameService": "0x5e8bF25c75787e9fa17e2321266b0cbE95c830d0",
-        "GReputation": "0x8be7F5a424240e828F937f7dB92A4b4B44708410",
-        "CompoundVotingMachine": "0x31e831f7950F1d127856974AeE594f796c84af11",
-        "GoodMarketMaker": "0xdd9A6822745d017E42d976FF791E9d6Bed396C00",
-        "GoodReserveCDai": "0x8ECd5577aAf386806C2724CcEdB168B369BeFa99",
-        "ExchangeHelper": "0xA5C33Eb014267DA1dd69d7c0E1d3be7AAC2640e1",
-        "GoodFundManager": "0xb51CF5c8aeaa85fBB86cFF6175Bc31e8256686b1",
-        "StakersDistribution": "0xC5E509eE778E4A1Ca1D141Dd381A12A608bE71f1",
-        "ProtocolUpgrade": "0x6d3037CfBE39854744CE98469bee1837364B3286",
-        "CompoundStakingFactory": "0xF115708be5dF1D069EED031117bA7969c925F69A",
+        "NameService": "0x3baeEff20Cb02a5b8eF413C611c015E69221663e",
+        "GReputation": "0x30A5Ba8ED4864bf3B1fa30c78Ac774fA9D5C62CC",
+        "CompoundVotingMachine": "0xE2C57968b52A417132511fBDCAB1763D41a4F270",
+        "GoodMarketMaker": "0xD2cf3205EA36AEFf3CF0e8e8701EAe40AA3f6E4F",
+        "GoodReserveCDai": "0x2AEe03Bb8b182AF876B9d008AF9416D2A3dF6dB3",
+        "ExchangeHelper": "0xeFF1EfCf1F0247f82B0d8406f32831b00Bfdf729",
+        "GoodFundManager": "0x3419945657B6Bd89DaFD7F2bafC75FF46511298F",
+        "StakersDistribution": "0xe8C67A909d3231ddD97E4CC2c1B17a8FFA94475E",
+        "ProtocolUpgrade": "0x1a521868ED7B4d8835f1F52172d38C1C3e630E92",
+        "CompoundStakingFactory": "0xE1193dE8716400ee5aD7b4B96CBdf0dABaF7d088",
         "StakingContracts": [
             [
-                "0x235fEd3D403CDbC7CC78E58744f823F7c738476F",
+                "0x98867484E2F0c902F64bCdEDc2e289307c988214",
                 13888
             ]
         ],
-        "DonationsStaking": "0x0A53e103E65deB1Ba18F374f6A2Bc6660305fd9C",
-        "Contribution": "0xd9dD31139a544Df145cf10cC73e7FC1Db33971Fa",
+        "DonationsStaking": "0x2aAd517DE8256ee6DC7ce31Ae09EBb99F17F9975",
+        "Contribution": "0x2250c5131bf9DdCbD55F9bEFc999D691c419ad93",
         "DAI": "0xB5E5D0F8C0cbA267CD3D7035d6AdC8eBA7Df7Cdd",
         "cDAI": "0x6ce27497a64fffb5517aa4aee908b1e7eb63b9ff",
-        "ForeignBridge": "0xEE0756A5394721e54A092F9aEbd525DD3A2Ace8d",
-        "GoodDollar": "0xd76135e33B9ee4F1bF1D57Ec18bBBC11AFf30941",
+        "ForeignBridge": "0x18F2a22Aa6420D06C079e70838a21a3c75322834",
+        "GoodDollar": "0x22A4720e32e3419e809731E7114042D6C3055845",
         "Reputation": "0x5925F6Bf62147D2b14B85e6dCB979e3D1A81Dbb1",
-        "Identity": "0x13973e242C75091E605844F816b9a8E211929559",
-        "Avatar": "0xB7D068E9e4235176FA51c5971081117DFE5e7F75",
-        "Controller": "0xd6513d7145a208d94E508BAB2E4bE31f6dce5147",
+        "Identity": "0x4D347bda25BEf041BfCB5205deECD1A33ab46db9",
+        "Avatar": "0x11655e9D725Fc1f8D1410C03f136aC586f7161ee",
+        "Controller": "0xD458BAEC7E8864A2c9c2e1261D87A4FAf77002B7",
         "AbsoluteVote": "0x57312053C36A226Df13B01089218A5f9951D3f9c",
         "ProxyAdmin": "0xE383e9D08e3e4f76CBb4a6953aF343E7bbcc6e98",
         "COMP": "0xf76d4a441e4ba86a923ce32b89aff89dbccaa075",
         "network": "fuse-mainnet",
         "networkId": 3,
         "ProxyFactory": "0x163b69fA3a7d3e5347a29A5A49b282c35d17C87A",
-        "UniswapV2SwapHelper": "0x9aed4D407EAc930B00CB19072D4ea477e98Ae397",
-        "AaveStakingFactory": "0xfACb3efbFd5E4d7511b233D0d5d6CA96CFa97578",
-        "BancorFormula": "0x57b2c85934Ef1A891eC9b9945f3fdbcf1104c302"
+        "UniswapV2SwapHelper": "0x28b3Bc8F2a1E5cf3BfE06d22971955a53a0F52d8",
+        "AaveStakingFactory": "0xfC32F09b85aB3134195bC237C2b69001B5c609dB",
+        "BancorFormula": "0x57b2c85934Ef1A891eC9b9945f3fdbcf1104c302",
+        "FeeFormula": "0x416B5A5e12235De6838D62Fd053e7Ce59E944426"
     },
     "dapptest": {
         "NameService": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc",
@@ -242,65 +243,70 @@
         "network": "dapptest-mainnet"
     },
     "staging-mainnet": {
-        "NameService": "0x1C8F3CE77a6958fF2F4b422851b6Ce9C09dcAF8A",
-        "GReputation": "0xd398951013E1bd097B82Df94159e219455DA4fC5",
-        "CompoundVotingMachine": "0xB301e738A8A2c8c95BE0822b264653bBcd265362",
-        "GoodMarketMaker": "0x9B276580B1694143F59a853B47D9b4a72504A686",
-        "GoodReserveCDai": "0x17a399CdC103490E561b3CBFf5E4263C26f3000D",
-        "ExchangeHelper": "0xed768F4C9184cAead84679af39AEed9Fe542F59e",
-        "GoodFundManager": "0xCB67BCFEA070eF05533168A59DC1181FD6b39990",
-        "StakersDistribution": "0x56a8fA4a1F793fac39c7749F5ddF0ACDcaD4b951",
-        "ProtocolUpgrade": "0xc3069547cDAf7d7F8A9916B24702Da3CBbefFC78",
-        "UniswapV2SwapHelper": "0xCdDe99dDD1bf4fa22d808697F306DfC59412F46f",
-        "CompoundStakingFactory": "0x6049e33E3179a22cf79057B2C8E7dCDc775710ed",
-        "AaveStakingFactory": "0xFA3E3BD1149CeB820dbcaB6472e36d663C4F9066",
-        "DonationsStaking": "0x431B770626546153593E1576F8E66fa9E01E7b40",
+        "NameService": "0xC87FAb8A8CDD346079ca6177e47408Ba18066104",
+        "GReputation": "0xD50604E530fF36B2747aE8574b37B21B9f779d37",
+        "CompoundVotingMachine": "0x40f42698A07B19Ac431Cc115a7B9CddD294d248b",
+        "GoodMarketMaker": "0x78a76Ad9A5d4a1d0c9FABcA20083442160840d0C",
+        "GoodReserveCDai": "0x6D728DE2Be4b3d7c6B50E6F3bF46CA1F64dF7820",
+        "ExchangeHelper": "0x6BC7a1310DfE3EfE7401Aff3C598C9d948f8b245",
+        "GoodFundManager": "0x1A231e22BE9923EE4C453095A7a94820D930A553",
+        "StakersDistribution": "0xF24Ef005134208Ac62aD50EafD052Ddb2C3e7bb5",
+        "ProtocolUpgrade": "0xC60411d3Bc9F36946a6de1f3890c214192255497",
+        "UniswapV2SwapHelper": "0x24D19000790fD11e244E76fA4D86FDd92e57c144",
+        "CompoundStakingFactory": "0xf22EF80a76f41424b813C9b38b3064dBfa87cf79",
+        "AaveStakingFactory": "0x9093B908b35C08f2E8DEABA352D5C319952a7e55",
+        "DonationsStaking": "0x66Fb63cB6c4E2800db9d1691B3d00361Ada9dE61",
         "network": "staging-mainnet",
         "networkId": 3,
-        "ForeignBridge": "0xEDA39475415f1A2944a467Aa6359CB4C1c3ed50f",
-        "Contribution": "0x7cC2CcDA5483e721778C4040B1DbD23B3Ab1B4A5",
+        "ForeignBridge": "0xDaAc9A734242C2D99dD1cb3680770ACA26A25CeB",
+        "Contribution": "0x27816e32270a413AF676A2E3a25dB93C7F565a80",
         "StakingContracts": [
             [
                 "0x61b36EcaEd25c4EE3017905B5Dd006129a4dfb0B",
                 13888
             ]
         ],
-        "Identity": "0xfb5dAF44cd18Db7b96DB3F9c6E411D65fcf4f372",
-        "GoodDollar": "0x4738C5e91C4F809da21DD0Df4B5aD5f699878C1c",
-        "Controller": "0x589F7ae100a7dbd80DC512208b7a0F457A041BE6",
-        "Avatar": "0x3BC91a65f53dACBd2336C04AC060741f70dCd187",
+        "Identity": "0x7599F95677cb14d7D8834a58B3b0545a13870A56",
+        "GoodDollar": "0x2e975e7711088aAfb38119454fF7fb99bAA9142F",
+        "Controller": "0x52F0584bfB6F55cc4a3E351427fACbA7e23A3fd4",
+        "Avatar": "0xFCF6029bD177370C79173D48e05AAFf3c5f0C0bC",
         "BancorFormula": "0x57b2c85934Ef1A891eC9b9945f3fdbcf1104c302",
         "DAI": "0xB5E5D0F8C0cbA267CD3D7035d6AdC8eBA7Df7Cdd",
         "cDAI": "0x6ce27497a64fffb5517aa4aee908b1e7eb63b9ff",
         "COMP": "0xf76d4a441e4ba86a923ce32b89aff89dbccaa075",
-        "ProxyFactory": "0x1268c5d249746546f95E2cE8Bf7477C9729EbaBE"
+        "ProxyFactory": "0x33D3712b90ade5d7363F3548650e508ad8eACfAA",
+        "FeeFormula": "0xc43514e62190A6253C56C7c50DAdb907e3eda666"
     },
     "staging": {
-        "FuseFaucet": "0xDfCb356c9bd420263aC56D7980f409AcE9050896",
+        "FuseFaucet": "0x70f361EDB97B245E8A68573637A31886A427fe2a",
         "ProxyAdmin": "0x2Ea4aAA8351CfE63B537E81Cd4a13c435B945C1D",
-        "Invites": "0x7d5FC799dE6fB6a30161684f27320BAcAdBf4126",
+        "Invites": "0x763b49F901DC894F2dEc1c7d19e46250B4452679",
         "ProxyAdmin2": "0x23D8492444DA663fcb2bDa8cA9A0e84989D1f59e",
-        "GoodDollar": "0x100b8fd10ff8DC43fda45E636B4BB1eE6088270a",
-        "NameService": "0xd6D206e19Aab34761E62dC30FA37b8D3d071Dd1D",
-        "GReputation": "0xF5e5098e070c6798b84ca2742cC9d4EEf9d110Fc",
-        "CompoundVotingMachine": "0xde3CbD2823E5f541457f63854e400a375016c7F9",
-        "ClaimersDistribution": "0x74C2665E988b7b4559F7401Aa7AAEcB9440d31AE",
-        "GovernanceStaking": "0xa04865a50dF03607fB17Aa00bf00Dd2A02EC8A6B",
-        "UBIScheme": "0x65D36106C057263939a6BddaA02D4DF6BB2df5C5",
-        "ProtocolUpgradeFuse": "0x34c0770400f5F8F22B6fB59b5785A5bEA37af9c5",
-        "Identity": "0x104efFcBDddae9cd4813b8A05Ecd6A17BaBfE6d9",
-        "Avatar": "0xcA9E4D51bc496F0b661E9fa02d25E4f67Dd88870",
-        "Controller": "0x7CBA0778748960145F3E56b3285255064D86709D",
+        "GoodDollar": "0xe39236a9Cf13f65DB8adD06BD4b834C65c523d2b",
+        "NameService": "0xE63402A7dc11AB4D03c477cc92209463a55A5134",
+        "GReputation": "0x80312bad9dd71d3a159e794B7fb1B2386F82F07F",
+        "CompoundVotingMachine": "0xcF624DfdA707De7C7a5669A472F81dAc130264c3",
+        "ClaimersDistribution": "0x86d43F93eD9AD1182981C19567f83BAc1DC1513B",
+        "GovernanceStaking": "0x18525875Bd0259d3efE1c04927A027fAd8cA0b86",
+        "UBIScheme": "0x54469071Ca82B46A2C01C09D38ca6Ca4347EB21d",
+        "ProtocolUpgradeFuse": "0x1495D6f5434376981778F64c63d2E15dA25B0541",
+        "Identity": "0x0af5eF8cdCeddDD9033cEf1E83B0Ae54f3a793A5",
+        "Avatar": "0x28523b680d4ffBd6e4FC95c3c12F5485F9635E00",
+        "Controller": "0xb6808120fB648c0bdc483Ec423d933a7eBf6BB0a",
         "AbsoluteVote": "0x7b58A5737440Bc05ca3972fDeFf8ac3bA984536B",
         "SchemeRegistrar": "0x0E79f80809180aB8FAE189D4e76fC814672d9a40",
-        "AdminWallet": "0x8b0Ec4aFaEE9974233c29fa52cC5D2493FB81D45",
+        "AdminWallet": "0x2961a6C2Fe39F0FFC4f4b1D9E037CD95f4e9C993",
         "UpgradeScheme": "0xfC9F6F5E3ff7BAAB3fEf82e66f56917D625ba38B",
-        "OneTimePayments": "0x2b5Ef42bc3D1BEfCbA20E3233DeDadD2439B8Ac2",
+        "OneTimePayments": "0x7912636D68E5d92708862b38698f764BF1EC297C",
         "network": "staging",
         "networkId": 122,
         "ProxyFactory": "0x240d844AdA767bE0AB08F9BcCcB6D8a04aE370EC",
-        "HomeBridge": "0x53f6Bd6Da1564f5B00D2069d8E0F316AF859fb99",
-        "FirstClaimPool": "0x1EA5564a28F34107b99dC591f142537404329762"
+        "HomeBridge": "0x3B25860174ECb3a0962bA3A5065b1f4063253419",
+        "FirstClaimPool": "0x5D007A7633D05b0dDD068B71E8448CD1fcdbd823",
+        "FeeFormula": "0x05eb1C46bd539Fd2A098b06D83a5bB81E5a58e63",
+        "DAI": "0x0000000000000000000000000000000000000000",
+        "cDAI": "0x0000000000000000000000000000000000000000",
+        "COMP": "0x0000000000000000000000000000000000000000"
     },
     "test": {
         "ProxyFactory": "0x36dE29DB57062A583436Ae071e141404dFE2311C",
@@ -365,7 +371,7 @@
         "ProxyFactory": "0x4659176E962763e7C8A4eF965ecfD0fdf9f52057",
         "NameService": "0xe26867DDd22F9342d9F0D566D182f2c960683971",
         "GReputation": "0x3A9299BE789ac3730e4E4c49d6d2Ad1b8BC34DFf",
-        "CompoundVotingMachine": "0xd356358f2da1018a3733a304E9bb39CF7ED51059",
+        "CompoundVotingMachine": "0xc2Ff55b896e3c42f9e1c2f7467C51b93F1C23dFD",
         "ClaimersDistribution": "0xF34552F1583c0B981dbB09611128c3375b47182e",
         "GovernanceStaking": "0xFAF457Fb4A978Be059506F6CD41f9B30fCa753b0",
         "UBIScheme": "0x87d77A30a6819860eB8332D293810ed7b510035A",
@@ -390,7 +396,7 @@
         "ProxyFactory": "0x4659176E962763e7C8A4eF965ecfD0fdf9f52057",
         "NameService": "0xe26867DDd22F9342d9F0D566D182f2c960683971",
         "GReputation": "0x3A9299BE789ac3730e4E4c49d6d2Ad1b8BC34DFf",
-        "CompoundVotingMachine": "0xd356358f2da1018a3733a304E9bb39CF7ED51059",
+        "CompoundVotingMachine": "0xc2Ff55b896e3c42f9e1c2f7467C51b93F1C23dFD",
         "GoodMarketMaker": "0x30D37B05cF73Edd8c59ce8450F093f6C06dA9272",
         "GoodReserveCDai": "0x6C35677206ae7FF1bf753877649cF57cC30D1c42",
         "ExchangeHelper": "0x0a8c6bB832801454F6CC21761D0A293Caa003296",