@gooddollar/goodprotocol 1.0.29-beta.1 → 1.0.29-beta.2

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

@@ -74,8 +74,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5060405161035c38038061035c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102c9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220a9e79a4dd3fd1fa013d0a2232cbff569221ba33b84f992e39b9a89213eb5edac64736f6c63430008080033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220a9e79a4dd3fd1fa013d0a2232cbff569221ba33b84f992e39b9a89213eb5edac64736f6c63430008080033",
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161035c38038061035c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102c9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220bf5af15fd554b440d628427d634d0ac3eb559002d7f37b7154c4e720322a9e9c64736f6c63430008080033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220bf5af15fd554b440d628427d634d0ac3eb559002d7f37b7154c4e720322a9e9c64736f6c63430008080033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/contracts/Interfaces.sol

@@ -77,6 +77,12 @@ interface IGoodDollar is ERC20 {
 	) external returns (bool);
 
 	function formula() external view returns (address);
+
+	function setIdentity(address identity) external;
+
+	function identity() external view returns (address);
+
+	function owner() external view returns (address);
 }
 
 interface IERC2917 is ERC20 {
@@ -264,9 +270,29 @@ interface IIdentity {
 
 	function owner() external view returns (address);
 
+	function removeContract(address account) external;
+
+	function isDAOContract(address account) external view returns (bool);
+
+	function addrToDID(address account) external view returns (string memory);
+
 	event WhitelistedAdded(address user);
 }
 
+interface IIdentityV2 is IIdentity {
+	function addWhitelistedWithDIDAndChain(
+		address account,
+		string memory did,
+		uint256 orgChainId,
+		uint256 dateAuthenticated
+	) external;
+
+	function getWhitelistedRoot(address account)
+		external
+		view
+		returns (address root);
+}
+
 interface IUBIScheme {
 	function currentDay() external view returns (uint256);
 

package/contracts/fuseFaucet/Faucet.sol

@@ -0,0 +1,245 @@
+//SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8.0;
+
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
+import "../Interfaces.sol";
+import "../utils/NameService.sol";
+
+/**
+ * @title DonationStaking contract that receives funds in ETH/DAI
+ * and stake them in the SimpleStaking contract
+ */
+contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
+	bytes32 public constant RELAYER_ROLE = keccak256("relayer");
+
+	event WalletTopped(
+		address indexed account, //address topped
+		uint256 amount,
+		address whitelistedRoot, //if account is connected to a whitelisted account, this will be it
+		address indexed relayerOrWhitelisted //the sender of the tx
+	);
+
+	uint256 public perDayRoughLimit;
+	uint256 public toppingAmount;
+	uint256 public gasRefund;
+	uint256 public startTime;
+	uint256 public currentDay;
+
+	NameService public nameService;
+
+	mapping(uint256 => mapping(address => uint256)) public toppings;
+	mapping(address => bool) public notFirstTime;
+
+	struct Wallet {
+		uint128 lastDayTopped;
+		uint32 dailyToppingCount;
+		uint128[7] lastWeekToppings;
+	}
+
+	mapping(address => Wallet) public wallets;
+	uint32 public maxDailyToppings;
+	uint64 public gasPrice;
+	uint32 public maxPerWeekMultiplier;
+	uint32 public maxSwapAmount;
+	address public goodDollar_unused; //kept because of upgrades
+	uint64 public maxDailyNewWallets;
+	uint64 public dailyNewWalletsCount;
+
+	function initialize(
+		NameService _ns,
+		uint64 _gasPrice,
+		address relayer,
+		address owner
+	) public initializer {
+		__AccessControl_init_unchained();
+		_setupRole(DEFAULT_ADMIN_ROLE, owner);
+		if (relayer != address(0)) _setupRole(RELAYER_ROLE, relayer);
+		gasPrice = _gasPrice;
+		toppingAmount = 600000 * gasPrice; //0.6M gwei
+		perDayRoughLimit = 2 * toppingAmount;
+		maxDailyToppings = 3;
+		startTime = block.timestamp;
+		nameService = _ns;
+		maxPerWeekMultiplier = 2;
+		maxSwapAmount = 1000;
+		maxDailyNewWallets = 5000;
+	}
+
+	function _authorizeUpgrade(address newImplementation)
+		internal
+		override
+		onlyRole(DEFAULT_ADMIN_ROLE)
+	{}
+
+	function getIdentity() public view returns (IIdentityV2) {
+		return IIdentityV2(nameService.getAddress("IDENTITY"));
+	}
+
+	function upgrade() public {
+		if (maxDailyNewWallets == 0) maxDailyNewWallets = 5000;
+	}
+
+	modifier reimburseGas() {
+		uint256 _gasRefund = gasleft();
+		_;
+		_gasRefund = _gasRefund - gasleft() + 42000;
+		payable(msg.sender).transfer(_gasRefund * gasPrice); //gas price assumed 1e9 = 1gwei
+	}
+
+	receive() external payable {}
+
+	/*
+	 * only whitelisted account or relayer can top non whitelisted accounts
+	 * if target account is whitelisted anyone can top it
+	 */
+	modifier onlyAuthorized(address toTop) {
+		require(
+			getIdentity().getWhitelistedRoot(toTop) != address(0) ||
+				getIdentity().getWhitelistedRoot(msg.sender) != address(0) ||
+				hasRole(RELAYER_ROLE, msg.sender)
+		);
+		_;
+	}
+
+	modifier toppingLimit(address _user) {
+		//switch wallet to the account we do the accounting for
+		address whitelistedRoot = getIdentity().getWhitelistedRoot(_user);
+		_user = whitelistedRoot == address(0) ? _user : payable(whitelistedRoot);
+
+		uint256 prevDay = currentDay;
+
+		setDay();
+		if (currentDay != prevDay) dailyNewWalletsCount = 0;
+
+		require(
+			wallets[_user].lastDayTopped != uint128(currentDay) ||
+				wallets[_user].dailyToppingCount < maxDailyToppings,
+			"max daily toppings"
+		);
+
+		require(
+			(notFirstTime[_user] == false &&
+				dailyNewWalletsCount < maxDailyNewWallets) ||
+				whitelistedRoot != address(0),
+			"User not whitelisted or not first time"
+		);
+
+		//reset inactive days
+		uint256 dayOfWeek = currentDay % 7;
+		uint256 dayDiff = (currentDay - wallets[_user].lastDayTopped);
+		dayDiff = dayDiff > 7 ? 7 : dayDiff;
+		dayDiff = dayDiff > dayOfWeek ? dayOfWeek + 1 : dayDiff;
+		for (uint256 day = dayOfWeek + 1 - dayDiff; day <= dayOfWeek; day++) {
+			wallets[_user].lastWeekToppings[day] = 0;
+		}
+
+		uint128 weekTotal = 0;
+		for (uint256 i = 0; i <= dayOfWeek; i++) {
+			weekTotal += wallets[_user].lastWeekToppings[uint256(i)];
+		}
+
+		require(
+			weekTotal < perDayRoughLimit * maxPerWeekMultiplier,
+			"User wallet has been topped too many times this week"
+		);
+		_;
+	}
+
+	/* @dev Internal function that sets current day
+	 */
+	function setDay() internal {
+		currentDay = (block.timestamp - startTime) / 1 days;
+	}
+
+	function canTop(address _user) external view returns (bool) {
+		address whitelistedRoot = getIdentity().getWhitelistedRoot(_user);
+		_user = whitelistedRoot == address(0) ? _user : whitelistedRoot;
+
+		uint256 _currentDay = (block.timestamp - startTime) / 1 days;
+		bool can = (wallets[_user].lastDayTopped != uint128(_currentDay) ||
+			wallets[_user].dailyToppingCount < 3) &&
+			((notFirstTime[_user] == false &&
+				dailyNewWalletsCount < maxDailyNewWallets) ||
+				whitelistedRoot != address(0));
+
+		uint128[7] memory lastWeekToppings = wallets[_user].lastWeekToppings;
+		//reset inactive days
+		uint256 dayOfWeek = _currentDay % 7;
+		uint256 dayDiff = (_currentDay - wallets[_user].lastDayTopped);
+		dayDiff = dayDiff > 7 ? 7 : dayDiff;
+		dayDiff = dayDiff > dayOfWeek ? dayOfWeek + 1 : dayDiff;
+
+		for (uint256 day = dayOfWeek + 1 - dayDiff; day <= dayOfWeek; day++) {
+			lastWeekToppings[day] = 0;
+		}
+
+		uint128 weekTotal = 0;
+		for (uint256 i = 0; i <= dayOfWeek; i++) {
+			weekTotal += lastWeekToppings[uint256(i)];
+		}
+		can = can && weekTotal < perDayRoughLimit * maxPerWeekMultiplier;
+		return can;
+	}
+
+	/* @dev Function to top given address with amount of G$ given in constructor
+	 * can only be done by admin the amount of times specified in constructor per day
+	 * @param _user The address to transfer to
+	 */
+	function topWallet(address payable _user)
+		public
+		reimburseGas
+		toppingLimit(_user)
+		onlyAuthorized(_user)
+	{
+		_topWallet(_user);
+	}
+
+	function _topWallet(address payable _wallet) internal {
+		address payable target = _wallet;
+
+		//switch wallet to the account we do the accounting for
+		address whitelistedRoot = getIdentity().getWhitelistedRoot(_wallet);
+		_wallet = whitelistedRoot == address(0)
+			? _wallet
+			: payable(whitelistedRoot);
+
+		require(toppingAmount > address(_wallet).balance);
+		uint256 toTop = toppingAmount - address(_wallet).balance;
+
+		uint256 dayOfWeek = currentDay % 7;
+
+		if (wallets[_wallet].lastDayTopped == uint128(currentDay))
+			wallets[_wallet].dailyToppingCount += 1;
+		else wallets[_wallet].dailyToppingCount = 1;
+		wallets[_wallet].lastDayTopped = uint128(currentDay);
+		wallets[_wallet].lastWeekToppings[dayOfWeek] += uint128(toTop);
+
+		if (notFirstTime[_wallet] == false && whitelistedRoot == address(0)) {
+			dailyNewWalletsCount++;
+		}
+		notFirstTime[_wallet] = true;
+
+		target.transfer(toTop);
+		emit WalletTopped(target, toTop, whitelistedRoot, msg.sender);
+	}
+
+	function onTokenTransfer(
+		address payable _from,
+		uint256 amount,
+		bytes calldata data
+	) external returns (bool) {
+		require(amount <= maxSwapAmount, "slippage");
+		address uniswapLike = abi.decode(data, (address));
+		Uniswap uniswap = Uniswap(uniswapLike);
+		address[] memory path = new address[](2);
+		path[0] = address(msg.sender);
+		path[1] = uniswap.WETH();
+
+		cERC20(msg.sender).approve(address(uniswapLike), type(uint256).max);
+		uniswap.swapExactTokensForETH(amount, 0, path, _from, block.timestamp);
+		return true;
+	}
+}

package/contracts/governance/GoodDollarStaking.sol

@@ -17,6 +17,10 @@ interface RewardsMinter {
 	function sendOrMint(address to, uint256 amount) external returns (uint256);
 }
 
+interface IGovernanceStaking {
+	function withdrawRewards() external returns (uint256);
+}
+
 /**
  * @title Staking contract that allows citizens to stake G$ to get GOOD + G$ rewards
  * it implements
@@ -271,7 +275,7 @@ contract GoodDollarStaking is
 	 * @return gdRewards recieved G$ rewards
 	 */
 	function withdrawRewards()
-		public
+		external
 		returns (uint256 goodRewards, uint256 gdRewards)
 	{
 		uint256 gdRewardsShares = amountToShares(earned(msg.sender));
@@ -363,6 +367,11 @@ contract GoodDollarStaking is
 		emit GOODRewardsSet(_monthlyAmount);
 	}
 
+	function setBlockPerYear(uint128 _blocksPerYear) external {
+		_onlyAvatar();
+		numberOfBlocksPerYear = _blocksPerYear;
+	}
+
 	/**
 	 * @dev interest rate per one block in 1e18 precision.
 	 * for example APY=5% then per block = nroot(1+0.05,numberOfBlocksPerYear)
@@ -465,14 +474,19 @@ contract GoodDollarStaking is
 		emit GOODRewardsSet(2 ether * 1e6);
 
 		//this will make sure rewards are set at 0, so no withdraw issue will happen.
-		//on governacnestaking anyone withdrawing from now on will get 0 GOOD, not matter how long he has been staking
-		(bool ok, ) = dao.genericCall(
-			nameService.getAddress("GDAO_STAKING"),
-			abi.encodeWithSignature("setMonthlyRewards(uint256)", 0),
-			avatar,
-			0
-		);
-		require(ok, "calling setMonthlyRewards failed");
+		address curStaking = nameService.getAddress("GDAO_STAKING");
+		bool ok;
+		if (curStaking != address(0)) {
+			//this will trigger updating of accumulated rewards, so everyone's rewards are updated to this point
+			IGovernanceStaking(curStaking).withdrawRewards();
+			(ok, ) = dao.genericCall(
+				curStaking,
+				abi.encodeWithSignature("setMonthlyRewards(uint256)", 0),
+				avatar,
+				0
+			);
+			require(ok, "calling setMonthlyRewards failed");
+		}
 
 		//this will set this contract as the GDAO_STAKING contract and give us minting rights on the reputation token
 		(ok, ) = dao.genericCall(