@gooddollar/goodprotocol 1.0.13-beta.0 → 1.0.13

package/contracts/utils/ProtocolUpgrade.sol

@@ -288,11 +288,12 @@ contract ProtocolUpgrade {
 		(ok, ) = controller.genericCall(
 			ns.getAddress("MARKET_MAKER"),
 			abi.encodeWithSignature(
-				"initializeToken(address,uint256,uint256,uint32)",
+				"initializeToken(address,uint256,uint256,uint32,uint256)",
 				cdai,
 				rToken.gdSupply,
 				rToken.reserveSupply,
-				rToken.reserveRatio
+				rToken.reserveRatio,
+				0
 			),
 			avatar,
 			0

package/contracts/utils/ProtocolUpgradeFuseRecover.sol

@@ -0,0 +1,116 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+import "../utils/NameService.sol";
+import "../Interfaces.sol";
+
+/**
+ a scheme that once approved in old AbsoluteVotingMachine will
+ set initial settings and permissions for the new protocol contracts and revoke old permissions
+ */
+contract ProtocolUpgradeFuseRecover {
+	Controller controller;
+	address owner;
+	address avatar;
+
+	constructor(Controller _controller, address _owner) {
+		controller = _controller;
+		owner = _owner;
+		avatar = address(controller.avatar());
+	}
+
+	function upgrade(
+		INameService ns,
+		address firstClaimPool, //schemeRegistrar,upgradeScheme, old ubi, firstclaim
+		address ubiScheme,
+		bytes32[] calldata nameHash,
+		address[] calldata nameAddress
+	) external {
+		require(msg.sender == owner, "only owner");
+		require(nameHash.length == nameAddress.length, "length mismatch");
+
+		setNameServiceContracts(ns, nameHash, nameAddress);
+		upgradeUBI(ubiScheme, firstClaimPool);
+	}
+
+	function upgradeUBI(address newUBI, address firstClaim) internal {
+		IGoodDollar gd = IGoodDollar(Avatar(avatar).nativeToken());
+
+		uint256 ubiBalance = gd.balanceOf(avatar);
+
+		(bool ok, ) = controller.genericCall(
+			address(firstClaim),
+			abi.encodeWithSignature("setUBIScheme(address)", newUBI),
+			address(avatar),
+			0
+		);
+		require(ok, "setUBIScheme failed");
+
+		(ok, ) = controller.genericCall(
+			address(newUBI),
+			abi.encodeWithSignature("setUseFirstClaimPool(bool)", false),
+			address(avatar),
+			0
+		);
+		require(ok, "setUseFirstClaimPool failed");
+
+		if (ubiBalance > 0) {
+			ok = controller.externalTokenTransfer(
+				address(gd),
+				newUBI,
+				ubiBalance,
+				address(avatar)
+			);
+			require(ok, "funds transfer to new ubischeme failed");
+		}
+	}
+
+	/**
+	 * unregister old voting schemes
+	 * register new voting scheme with all DAO permissions
+	 */
+	function upgradeGovernance(
+		address schemeRegistrar,
+		address upgradeScheme,
+		address compoundVotingMachine
+	) public {
+		require(msg.sender == owner, "only owner");
+
+		require(
+			controller.registerScheme(
+				compoundVotingMachine,
+				bytes32(0x0),
+				bytes4(0x0000001F),
+				avatar
+			),
+			"registering compoundVotingMachine failed"
+		);
+
+		require(
+			controller.unregisterSelf(avatar),
+			"unregistering ProtocolUpgradeFuse failed"
+		);
+
+		selfdestruct(payable(owner));
+	}
+
+	//set contracts in nameservice that are deployed after INameService is created
+	//	FUND_MANAGER RESERVE REPUTATION GDAO_STAKING  GDAO_CLAIMERS ...
+	function setNameServiceContracts(
+		INameService ns,
+		bytes32[] memory names,
+		address[] memory addresses
+	) internal {
+		(bool ok, ) = controller.genericCall(
+			address(ns),
+			abi.encodeWithSignature(
+				"setAddresses(bytes32[],address[])",
+				names,
+				addresses
+			),
+			avatar,
+			0
+		);
+		require(ok, "Calling setNameServiceContracts failed");
+	}
+}

package/contracts/utils/ProtocolUpgradeRecover.sol

@@ -0,0 +1,198 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+import "../Interfaces.sol";
+import "../DAOStackInterfaces.sol";
+import "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
+
+/**
+ a scheme that once approved in old AbsoluteVotingMachine is in charge of upgrading to new contracts
+ */
+contract ProtocolUpgradeRecover {
+	Controller controller;
+	address owner;
+	address avatar;
+
+	modifier onlyOwner() {
+		require(msg.sender == owner, "only owner");
+		_;
+	}
+
+	constructor(Controller _controller, address _owner) {
+		controller = _controller;
+		owner = _owner;
+		avatar = address(controller.avatar());
+	}
+
+	/**
+	1. set the DAO contracts in registery after they have been deployedDAO
+	2. set the initial staking contracts and their rewards
+	 */
+	function upgradeBasic(
+		INameService ns,
+		bytes32[] calldata nameHash,
+		address[] calldata nameAddress
+	) external onlyOwner {
+		require(nameHash.length == nameAddress.length, "length mismatch");
+
+		_setNameServiceContracts(ns, nameHash, nameAddress);
+	}
+
+	//initialize rewards for v2 starting staking contracts
+	function setStakingRewards(
+		INameService ns,
+		address[] memory contracts,
+		uint256[] memory rewards
+	) external onlyOwner {
+		require(contracts.length == rewards.length, "staking length mismatch");
+		for (uint256 i = 0; i < contracts.length; i++) {
+			(bool ok, ) = controller.genericCall(
+				ns.getAddress("FUND_MANAGER"),
+				abi.encodeWithSignature(
+					"setStakingReward(uint32,address,uint32,uint32,bool)",
+					rewards[i],
+					contracts[i],
+					0,
+					0,
+					false
+				),
+				avatar,
+				0
+			);
+			require(ok, "Calling setStakingRewards failed");
+		}
+	}
+
+	/**
+	3. set new reserve as sole minter
+	4. upgrade to new reserve
+	 */
+	function upgradeReserve(INameService ns) external onlyOwner {
+		_setReserveSoleMinter(ns);
+
+		_setNewReserve(ns);
+	}
+
+	function setReserveGDXAirdrop(INameService ns, bytes32 airdrop)
+		external
+		onlyOwner
+	{
+		(bool ok, ) = controller.genericCall(
+			ns.getAddress("RESERVE"),
+			abi.encodeWithSignature("setGDXAirdrop(bytes32)", airdrop),
+			avatar,
+			0
+		);
+		require(ok, "Calling setReserveGDXAirdrop failed");
+	}
+
+	receive() external payable {}
+
+	/**
+	 * 6. upgrade to new DAO and relinquish control
+	 * register new voting scheme with all DAO permissions
+	 * NOTICE: call this last to finalize DAO decentralization!!!
+	 */
+	function upgradeGovernance(address compoundVotingMachine) external onlyOwner {
+		require(
+			controller.registerScheme(
+				compoundVotingMachine,
+				bytes32(0x0),
+				bytes4(0x0000001F),
+				avatar
+			),
+			"registering compoundVotingMachine failed"
+		);
+
+		require(
+			controller.unregisterSelf(avatar),
+			"unregistering protocolupgrade failed"
+		);
+		selfdestruct(payable(owner));
+	}
+
+	//add new reserve as minter
+	//renounace minter from avatar
+	//add reserve as global constraint on controller
+	function _setReserveSoleMinter(INameService ns) internal {
+		bool ok;
+		(ok, ) = controller.genericCall(
+			ns.getAddress("GOODDOLLAR"),
+			abi.encodeWithSignature("addMinter(address)", ns.getAddress("RESERVE")),
+			avatar,
+			0
+		);
+		require(ok, "Calling addMinter failed");
+
+		(ok, ) = controller.genericCall(
+			address(ns.getAddress("GOODDOLLAR")),
+			abi.encodeWithSignature("renounceMinter()"),
+			avatar,
+			0
+		);
+		require(ok, "Calling renounceMinter failed");
+
+		ok = controller.addGlobalConstraint(
+			ns.getAddress("RESERVE"),
+			bytes32(0x0),
+			avatar
+		);
+
+		require(ok, "Calling addGlobalConstraint failed");
+	}
+
+	//transfer funds(cdai + comp) from old reserve to new reserve/avatar
+	//end old reserve
+	//initialize new marketmaker with current cdai price, rr, reserves
+	function _setNewReserve(INameService ns) internal {
+		bool ok;
+
+		address cdai = ns.getAddress("CDAI");
+		uint256 oldReserveCdaiBalance = ERC20(cdai).balanceOf(avatar);
+
+		ok = controller.externalTokenTransfer(
+			cdai,
+			ns.getAddress("RESERVE"),
+			oldReserveCdaiBalance,
+			avatar
+		);
+
+		require(ok, "transfer cdai to new reserve failed");
+
+		(ok, ) = controller.genericCall(
+			ns.getAddress("MARKET_MAKER"),
+			abi.encodeWithSignature(
+				"initializeToken(address,uint256,uint256,uint32,uint256)",
+				cdai,
+				604798140091,
+				4325586750999495,
+				805643,
+				1645623572
+			),
+			avatar,
+			0
+		);
+
+		require(ok, "calling marketMaker initializeToken failed");
+	}
+
+	//set contracts in nameservice that are deployed after INameService is created
+	//	FUND_MANAGER RESERVE REPUTATION GDAO_STAKING  GDAO_CLAIMERS ...
+	function _setNameServiceContracts(
+		INameService ns,
+		bytes32[] memory names,
+		address[] memory addresses
+	) internal {
+		(bool ok, ) = controller.genericCall(
+			address(ns),
+			abi.encodeWithSignature(
+				"setAddresses(bytes32[],address[])",
+				names,
+				addresses
+			),
+			avatar,
+			0
+		);
+		require(ok, "Calling setNameServiceContracts failed");
+	}
+}

package/contracts/utils/ProxyFactory1967.sol

@@ -12,6 +12,7 @@ contract ERC1967Proxy is Proxy, ERC1967Upgrade {
 	 * function call, and allows initializating the storage of the proxy like a Solidity constructor.
 	 */
 	function initialize(address _logic, bytes calldata _data) external payable {
+		require(_getImplementation() == address(0), "initialized");
 		assert(
 			_IMPLEMENTATION_SLOT ==
 				bytes32(uint256(keccak256("eip1967.proxy.implementation")) - 1)

package/package.json

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

package/releases/deployment.json

@@ -382,7 +382,7 @@
         "cDAI": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
         "COMP": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
     },
-    "production": {
+    "production-bug": {
         "ProxyFactory": "0x4659176E962763e7C8A4eF965ecfD0fdf9f52057",
         "NameService": "0xe26867DDd22F9342d9F0D566D182f2c960683971",
         "GReputation": "0x3A9299BE789ac3730e4E4c49d6d2Ad1b8BC34DFf",
@@ -407,7 +407,7 @@
         "FuseFaucet": "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9",
         "FuseStaking": "0xA199F0C353E25AdF022378B0c208D600f39a6505"
     },
-    "production-mainnet": {
+    "production-mainnet-bug": {
         "ProxyFactory": "0x4659176E962763e7C8A4eF965ecfD0fdf9f52057",
         "NameService": "0xe26867DDd22F9342d9F0D566D182f2c960683971",
         "GReputation": "0x3A9299BE789ac3730e4E4c49d6d2Ad1b8BC34DFf",
@@ -451,5 +451,68 @@
         "DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
         "cDAI": "0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643",
         "COMP": "0xc00e94cb662c3520282e6f5717214004a7f26888"
+    },
+    "production-mainnet": {
+        "ProxyFactory": "0xDa85fceD9Bd193526b7667F2AD1fD4A0F900d3A7",
+        "NameService": "0xec6dcE387B1616a0c44fF2E4fA9E90E53Cf14eb0",
+        "GoodMarketMaker": "0xDAC6A0c973Ba7cF3526dE456aFfA43AB421f659F",
+        "GoodReserveCDai": "0xa150a825d425B36329D8294eeF8bD0fE68f8F6E0",
+        "ExchangeHelper": "0x98FA532Dd5C3a6b66fbf370813803192DE4e0abd",
+        "ProtocolUpgradeRecover": "0x6f1b4dFDd7156FC5752541Ef35EDF57B48E74475",
+        "network": "production-mainnet",
+        "networkId": 1,
+        "ForeignBridge": "0xD5D11eE582c8931F336fbcd135e98CEE4DB8CCB0",
+        "Contribution": "0x8eEC64bb6807c0178f96277cCE6a334B4e565E5C",
+        "Identity": "0x76e76e10Ac308A1D54a00f9df27EdCE4801F288b",
+        "GoodDollar": "0x67C5870b4A41D4Ebef24d2456547A03F1f3e094B",
+        "Controller": "0x95C0d9dCEA1E243ED696F34CAc5e6559C3c128a3",
+        "Avatar": "0x1ecFD1afb601C406fF0e13c3485f2d75699b6817",
+        "ProxyAdmin": "0xA2db14C68aB35e620fEA5bF07d65e9bff84c994C",
+        "BancorFormula": "0xA049894d5dcaD406b7C827D6dc6A0B58CA4AE73a",
+        "DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+        "cDAI": "0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643",
+        "COMP": "0xc00e94cb662c3520282e6f5717214004a7f26888",
+        "StakingContracts": [
+            [
+                "0xD33bA17C8A644C585089145e86E282fada6F3bfd",
+                310
+            ]
+        ],
+        "StakingContractsV2": [
+            [
+                "0x02416eb83cff1f19163f21010149c3867f3261e1",
+                13888
+            ],
+            [
+                "0xf4c34bed7dd779485692bb1857acf9c561b45010",
+                6944
+            ]
+        ],
+        "StakersDistribution": "0x12D15EfC3c9661AD68209CD197D416BFd9B145f5",
+        "GoodFundManager": "0x3F55BD3B432EDC73Bbb704Fa5a29CC08dc1aDBEB"
+    },
+    "production": {
+        "NameService": "0xec6dcE387B1616a0c44fF2E4fA9E90E53Cf14eb0",
+        "GReputation": "0x603B8C0F110E037b51A381CBCacAbb8d6c6E4543",
+        "CompoundVotingMachine": "0x57Ee6Ceff51CB30Ecb1245934a882c500Fbec1e9",
+        "ClaimersDistribution": "0x1aE4929090258A9D5000D98Cfb8A27174d345834",
+        "GovernanceStaking": "0x280226A143b7Dfdf84645006e32F899B531C2F98",
+        "UBIScheme": "0xd253A5203817225e9768C05E5996d642fb96bA86",
+        "ProtocolUpgradeFuseRecover": "0xBE43eCb37Af7F7C4A8606E672c504BE55Fc6226B",
+        "network": "production",
+        "networkId": 122,
+        "HomeBridge": "0xD39021DB018E2CAEadb4B2e6717D31550e7918D0",
+        "SignupBonus": "0x0000000000000000000000000000000000000000",
+        "OneTimePayments": "0xd9Aa86e0Ddb932bD78ab8c71C1B98F83cF610Bd4",
+        "Invites": "0xCa2F09c3ccFD7aD5cB9276918Bd1868f2b922ea0",
+        "AdminWallet": "0x9F75dAcB77419b87f568d417eBc84346e134144E",
+        "Identity": "0xFa8d865A962ca8456dF331D78806152d3aC5B84F",
+        "GoodDollar": "0x495d133B938596C9984d462F007B676bDc57eCEC",
+        "Controller": "0xBcE053b99e22158f8B62f4DBFbEdE1f936b2D4e4",
+        "Avatar": "0xf96dADc6D71113F6500e97590760C924dA1eF70e",
+        "FirstClaimPool": "0x18BcdF79A724648bF34eb06701be81bD072A2384",
+        "ProxyAdmin": "0x57179b2A8eB019157b0C3E761cdB26c82C982a3B",
+        "FuseFaucet": "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9",
+        "FuseStaking": "0xA199F0C353E25AdF022378B0c208D600f39a6505"
     }
 }

package/scripts/deployFullDAO.ts

@@ -256,7 +256,8 @@ export const createDAO = async () => {
       release.cDAI,
       "100",
       "10000",
-      "1000000"
+      "1000000",
+      "0"
     ]);
 
     await genericCall(release.GoodMarketMaker, encoded);