@gooddollar/goodprotocol 2.0.5-beta.0 → 2.0.5-beta.10

package/contracts/Interfaces.sol

@@ -19,10 +19,10 @@ interface ERC20 {
 
 	function totalSupply() external view returns (uint256);
 
-	function allowance(address owner, address spender)
-		external
-		view
-		returns (uint256);
+	function allowance(
+		address owner,
+		address spender
+	) external view returns (uint256);
 
 	function transferFrom(
 		address sender,
@@ -136,24 +136,25 @@ interface IERC2917 is ERC20 {
 	/// @notice It will get the productivity of given user.
 	/// @dev it will return 0 if user has no productivity proved in the contract.
 	/// @return user's productivity and overall productivity.
-	function getProductivity(address user)
-		external
-		view
-		returns (uint256, uint256);
+	function getProductivity(
+		address user
+	) external view returns (uint256, uint256);
 
 	/// @notice increase a user's productivity.
 	/// @dev Note the best practice will be restrict the callee to prove of productivity's contract address.
 	/// @return true to confirm that the productivity added success.
-	function increaseProductivity(address user, uint256 value)
-		external
-		returns (bool);
+	function increaseProductivity(
+		address user,
+		uint256 value
+	) external returns (bool);
 
 	/// @notice decrease a user's productivity.
 	/// @dev Note the best practice will be restrict the callee to prove of productivity's contract address.
 	/// @return true to confirm that the productivity removed success.
-	function decreaseProductivity(address user, uint256 value)
-		external
-		returns (bool);
+	function decreaseProductivity(
+		address user,
+		uint256 value
+	) external returns (bool);
 
 	/// @notice take() will return the interests that callee will get at current block height.
 	/// @dev it will always calculated by block.number, so it will change when block height changes.
@@ -233,28 +234,24 @@ interface Uniswap {
 		uint256 reserveOut
 	) external pure returns (uint256 amountOut);
 
-	function getAmountsOut(uint256 amountIn, address[] memory path)
-		external
-		pure
-		returns (uint256[] memory amounts);
+	function getAmountsOut(
+		uint256 amountIn,
+		address[] memory path
+	) external pure returns (uint256[] memory amounts);
 }
 
 interface UniswapFactory {
-	function getPair(address tokenA, address tokenB)
-		external
-		view
-		returns (address);
+	function getPair(
+		address tokenA,
+		address tokenB
+	) external view returns (address);
 }
 
 interface UniswapPair {
 	function getReserves()
 		external
 		view
-		returns (
-			uint112 reserve0,
-			uint112 reserve1,
-			uint32 blockTimestampLast
-		);
+		returns (uint112 reserve0, uint112 reserve1, uint32 blockTimestampLast);
 
 	function kLast() external view returns (uint256);
 
@@ -317,10 +314,9 @@ interface IIdentityV2 is IIdentity {
 		uint256 dateAuthenticated
 	) external;
 
-	function getWhitelistedRoot(address account)
-		external
-		view
-		returns (address root);
+	function getWhitelistedRoot(
+		address account
+	) external view returns (address root);
 }
 
 interface IUBIScheme {
@@ -335,13 +331,14 @@ interface IFirstClaimPool {
 	function awardUser(address user) external returns (uint256);
 
 	function claimAmount() external view returns (uint256);
+
+	function end() external;
 }
 
 interface ProxyAdmin {
-	function getProxyImplementation(address proxy)
-		external
-		view
-		returns (address);
+	function getProxyImplementation(
+		address proxy
+	) external view returns (address);
 
 	function getProxyAdmin(address proxy) external view returns (address);
 
@@ -371,7 +368,9 @@ interface AggregatorV3Interface {
 	// getRoundData and latestRoundData should both raise "No data present"
 	// if they do not have data to report, instead of returning unset values
 	// which could be misinterpreted as actual reported values.
-	function getRoundData(uint80 _roundId)
+	function getRoundData(
+		uint80 _roundId
+	)
 		external
 		view
 		returns (
@@ -429,10 +428,9 @@ interface ILendingPool {
 	 * @param asset The address of the underlying asset of the reserve
 	 * @return The state of the reserve
 	 **/
-	function getReserveData(address asset)
-		external
-		view
-		returns (DataTypes.ReserveData memory);
+	function getReserveData(
+		address asset
+	) external view returns (DataTypes.ReserveData memory);
 }
 
 interface IDonationStaking {
@@ -461,36 +459,23 @@ interface IAaveIncentivesController {
 	 * @param user The address of the user
 	 * @return The rewards
 	 **/
-	function getRewardsBalance(address[] calldata assets, address user)
-		external
-		view
-		returns (uint256);
+	function getRewardsBalance(
+		address[] calldata assets,
+		address user
+	) external view returns (uint256);
 }
 
 interface IGoodStaking {
-	function collectUBIInterest(address recipient)
-		external
-		returns (
-			uint256,
-			uint256,
-			uint256
-		);
+	function collectUBIInterest(
+		address recipient
+	) external returns (uint256, uint256, uint256);
 
 	function iToken() external view returns (address);
 
 	function currentGains(
 		bool _returnTokenBalanceInUSD,
 		bool _returnTokenGainsInUSD
-	)
-		external
-		view
-		returns (
-			uint256,
-			uint256,
-			uint256,
-			uint256,
-			uint256
-		);
+	) external view returns (uint256, uint256, uint256, uint256, uint256);
 
 	function getRewardEarned(address user) external view returns (uint256);
 

package/contracts/fuseFaucet/Faucet.sol

@@ -42,11 +42,12 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	uint32 public maxDailyToppings;
 	uint64 public gasPrice;
 	uint32 public maxPerWeekMultiplier;
-	uint32 public maxSwapAmount;
+	uint32 public maxSwapAmount_unused; // kept because of upgrades layout
 	address public goodDollar_unused; //kept because of upgrades
 	uint64 public maxDailyNewWallets;
 	uint64 public dailyNewWalletsCount;
 	uint32 public version;
+	uint8 public minTopping; //percentage of topping amount, that user can request to top
 
 	function initialize(
 		NameService _ns,
@@ -64,27 +65,18 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 		startTime = block.timestamp;
 		nameService = _ns;
 		maxPerWeekMultiplier = 2;
-		maxSwapAmount = 1000;
 		maxDailyNewWallets = 5000;
+		minTopping = 15;
 	}
 
-	function _authorizeUpgrade(address newImplementation)
-		internal
-		override
-		onlyRole(DEFAULT_ADMIN_ROLE)
-	{}
+	function _authorizeUpgrade(
+		address newImplementation
+	) internal override onlyRole(DEFAULT_ADMIN_ROLE) {}
 
 	function getIdentity() public view returns (IIdentityV2) {
 		return IIdentityV2(nameService.getAddress("IDENTITY"));
 	}
 
-	function upgrade() public {
-		require(version == 0, "already upgraded");
-		if (maxDailyNewWallets == 0) maxDailyNewWallets = 5000;
-		version++;
-		setGasTopping(gasTopping / gasPrice);
-	}
-
 	modifier reimburseGas() {
 		uint256 _gasRefund = gasleft();
 		_;
@@ -160,6 +152,8 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 
 	function canTop(address _user) external view returns (bool) {
 		if (getToppingAmount() < address(_user).balance) return false;
+		uint256 toTop = getToppingAmount() - address(_user).balance;
+		if ((toTop * 100) / getToppingAmount() < minTopping) return false;
 
 		address whitelistedRoot = getIdentity().getWhitelistedRoot(_user);
 		_user = whitelistedRoot == address(0) ? _user : whitelistedRoot;
@@ -194,12 +188,9 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	 * 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)
-	{
+	function topWallet(
+		address payable _user
+	) public reimburseGas toppingLimit(_user) onlyAuthorized(_user) {
 		_topWallet(_user);
 	}
 
@@ -212,8 +203,8 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 			? _wallet
 			: payable(whitelistedRoot);
 
-		require(getToppingAmount() > address(_wallet).balance);
 		uint256 toTop = getToppingAmount() - address(_wallet).balance;
+		require((toTop * 100) / getToppingAmount() >= minTopping, "low toTop");
 
 		uint256 dayOfWeek = currentDay % 7;
 
@@ -232,12 +223,14 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 		emit WalletTopped(target, toTop, whitelistedRoot, msg.sender);
 	}
 
+	/**
+		@notice only safe for small amounts, since we dont have slippage check
+	 */
 	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);
@@ -253,10 +246,9 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 		return gasTopping * gasPrice;
 	}
 
-	function setGasTopping(uint256 _gasUnits)
-		public
-		onlyRole(DEFAULT_ADMIN_ROLE)
-	{
+	function setGasTopping(
+		uint256 _gasUnits
+	) public onlyRole(DEFAULT_ADMIN_ROLE) {
 		gasTopping = _gasUnits;
 		perDayRoughLimit = 2 * gasTopping;
 	}
@@ -264,4 +256,8 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	function setGasPrice(uint64 _price) external onlyRole(DEFAULT_ADMIN_ROLE) {
 		gasPrice = _price;
 	}
+
+	function setMinTopping(uint8 _minTop) external onlyRole(DEFAULT_ADMIN_ROLE) {
+		minTopping = _minTop;
+	}
 }

package/contracts/fuseFaucet/FuseFaucetV2.sol

@@ -46,6 +46,7 @@ contract FuseFaucetV2 is Initializable {
 	address public relayer;
 	address public owner;
 	uint32 public version;
+	uint8 public minTopping;
 
 	function initialize(
 		NameService _ns,
@@ -53,15 +54,17 @@ contract FuseFaucetV2 is Initializable {
 		address _relayer,
 		uint64 gweiTopping
 	) public initializer {
-		if (relayer != address(0)) relayer = _relayer;
+		relayer = _relayer;
 		gasPrice = _gasPrice;
-		setGasTopping(gweiTopping);
+		gasTopping = gweiTopping; //1m gwei
+		perDayRoughLimit = 2 * gasTopping;
 		maxDailyToppings = 3;
 		startTime = block.timestamp;
 		nameService = _ns;
 		maxPerWeekMultiplier = 2;
 		maxSwapAmount = 1000;
 		maxDailyNewWallets = 5000;
+		minTopping = 15;
 	}
 
 	modifier upgrader(uint32 _newversion) {
@@ -175,6 +178,8 @@ contract FuseFaucetV2 is Initializable {
 
 	function canTop(address _user) external view returns (bool) {
 		if (getToppingAmount() < address(_user).balance) return false;
+		uint256 toTop = getToppingAmount() - address(_user).balance;
+		if ((toTop * 100) / getToppingAmount() < minTopping) return false;
 
 		address whitelistedRoot = getIdentity().getWhitelistedRoot(_user);
 		_user = whitelistedRoot == address(0) ? _user : whitelistedRoot;
@@ -209,12 +214,9 @@ contract FuseFaucetV2 is Initializable {
 	 * 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)
-	{
+	function topWallet(
+		address payable _user
+	) public reimburseGas toppingLimit(_user) onlyAuthorized(_user) {
 		_topWallet(_user);
 	}
 
@@ -227,8 +229,9 @@ contract FuseFaucetV2 is Initializable {
 			? _wallet
 			: payable(whitelistedRoot);
 
-		require(getToppingAmount() > address(_wallet).balance);
+		// require(getToppingAmount() > address(_wallet).balance);
 		uint256 toTop = getToppingAmount() - address(_wallet).balance;
+		require((toTop * 100) / getToppingAmount() >= minTopping, "low toTop");
 
 		uint256 dayOfWeek = currentDay % 7;
 
@@ -276,4 +279,8 @@ contract FuseFaucetV2 is Initializable {
 	function setGasPrice(uint64 _price) external onlyOwner {
 		gasPrice = _price;
 	}
+
+	function setMinTopping(uint8 _minTop) external onlyOwner {
+		minTopping = _minTop;
+	}
 }

package/contracts/identity/IdentityV2.sol

@@ -57,10 +57,10 @@ contract IdentityV2 is
 	event ContractAdded(address indexed account);
 	event ContractRemoved(address indexed account);
 
-	function initialize(address _owner, IIdentity _oldIdentity)
-		public
-		initializer
-	{
+	function initialize(
+		address _owner,
+		IIdentity _oldIdentity
+	) public initializer {
 		__AccessControl_init_unchained();
 		__Pausable_init_unchained();
 		__EIP712_init_unchained("Identity", "1.0.0");
@@ -107,14 +107,24 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to change its auth date
 	 */
-	function authenticate(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function authenticate(address account) public {
+		return authenticateWithTimestamp(account, block.timestamp);
+	}
+
+	/**
+	 * @dev Sets the authentication date of `account`
+	 * to the current time.
+	 * Can only be called by Identity Administrators.
+	 * @param account address to change its auth date
+	 * @param timestamp the authentication timestamp
+	 */
+	function authenticateWithTimestamp(
+		address account,
+		uint256 timestamp
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		require(identities[account].status == 1, "not whitelisted");
-		identities[account].dateAuthenticated = block.timestamp;
-		emit WhitelistedAuthenticated(account, block.timestamp);
+		identities[account].dateAuthenticated = timestamp;
+		emit WhitelistedAuthenticated(account, timestamp);
 	}
 
 	/**
@@ -122,11 +132,9 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to add as whitelisted
 	 */
-	function addWhitelisted(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function addWhitelisted(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		_addWhitelisted(account, _chainId());
 	}
 
@@ -154,11 +162,10 @@ contract IdentityV2 is
 	 * @param account The address to add
 	 * @param did the ID to add account under
 	 */
-	function addWhitelistedWithDID(address account, string memory did)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function addWhitelistedWithDID(
+		address account,
+		string memory did
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		_addWhitelistedWithDID(account, did, _chainId());
 	}
 
@@ -167,11 +174,9 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to remove as whitelisted
 	 */
-	function removeWhitelisted(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function removeWhitelisted(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		_removeWhitelisted(account);
 	}
 
@@ -228,11 +233,9 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to add as blacklisted
 	 */
-	function addBlacklisted(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function addBlacklisted(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		identities[account].status = 255;
 		emit BlacklistAdded(account);
 	}
@@ -242,11 +245,9 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to remove as blacklisted
 	 */
-	function removeBlacklisted(address account)
-		external
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function removeBlacklisted(
+		address account
+	) external onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		if (
 			address(oldIdentity) != address(0) && oldIdentity.isBlacklisted(account)
 		) oldIdentity.removeBlacklisted(account);
@@ -259,11 +260,9 @@ contract IdentityV2 is
 	 * @dev Function to add a Contract to list of contracts
 	 * @param account The address to add
 	 */
-	function addContract(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function addContract(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		require(isContract(account), "Given address is not a contract");
 		_addWhitelisted(account, _chainId());
 		identities[account].status = 2; //this must come after _addWhitelisted
@@ -275,11 +274,9 @@ contract IdentityV2 is
 	 * @dev Function to remove a Contract from list of contracts
 	 * @param account The address to add
 	 */
-	function removeContract(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function removeContract(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		if (
 			address(oldIdentity) != address(0) && oldIdentity.isDAOContract(account)
 		) {
@@ -472,11 +469,9 @@ contract IdentityV2 is
 	 @param account address to get its identity
 	 @return whitelisted the identity or address 0 if _account not connected or not identity
 	 **/
-	function getWhitelistedRoot(address account)
-		external
-		view
-		returns (address whitelisted)
-	{
+	function getWhitelistedRoot(
+		address account
+	) external view returns (address whitelisted) {
 		if (isWhitelisted(account)) return account;
 		if (isWhitelisted(connectedAccounts[account]))
 			return connectedAccounts[account];
@@ -533,11 +528,9 @@ contract IdentityV2 is
 	 @param account to get DID for
 	 @return did of the account
 	 */
-	function addrToDID(address account)
-		external
-		view
-		returns (string memory did)
-	{
+	function addrToDID(
+		address account
+	) external view returns (string memory did) {
 		did = identities[account].did;
 		bytes32 pHash = keccak256(bytes(did));
 
@@ -555,11 +548,9 @@ contract IdentityV2 is
 		return "";
 	}
 
-	function getWhitelistedOnChainId(address account)
-		external
-		view
-		returns (uint256 chainId)
-	{
+	function getWhitelistedOnChainId(
+		address account
+	) external view returns (uint256 chainId) {
 		chainId = identities[account].whitelistedOnChainId;
 		return chainId > 0 ? chainId : _chainId();
 	}

package/contracts/invite/InvitesFuseV2.sol

@@ -141,11 +141,9 @@ contract InvitesFuseV2 is Initializable {
 		emit InviteeJoined(inviter, msg.sender);
 	}
 
-	function _whitelistedOnChainOrDefault(address _invitee)
-		internal
-		view
-		returns (uint256 chainId)
-	{
+	function _whitelistedOnChainOrDefault(
+		address _invitee
+	) internal view returns (uint256 chainId) {
 		(bool success, bytes memory result) = address(identity).staticcall(
 			abi.encodeWithSignature("getWhitelistedOnChainId(address)", _invitee)
 		);
@@ -173,19 +171,15 @@ contract InvitesFuseV2 is Initializable {
 			isLevelExpired == false;
 	}
 
-	function getInvitees(address _inviter)
-		public
-		view
-		returns (address[] memory)
-	{
+	function getInvitees(
+		address _inviter
+	) public view returns (address[] memory) {
 		return users[_inviter].invitees;
 	}
 
-	function getPendingInvitees(address _inviter)
-		public
-		view
-		returns (address[] memory)
-	{
+	function getPendingInvitees(
+		address _inviter
+	) public view returns (address[] memory) {
 		address[] memory pending = users[_inviter].pending;
 		uint256 cur = 0;
 		uint256 total = 0;
@@ -222,19 +216,17 @@ contract InvitesFuseV2 is Initializable {
 	 * @dev  pay bounty for the inviter of _invitee
 	 * invitee need to be whitelisted
 	 */
-	function bountyFor(address _invitee)
-		public
-		isActive
-		returns (uint256 bounty)
-	{
+	function bountyFor(
+		address _invitee
+	) public isActive returns (uint256 bounty) {
 		require(canCollectBountyFor(_invitee), "user not elligble for bounty yet");
 		return _bountyFor(_invitee, true);
 	}
 
-	function _bountyFor(address _invitee, bool isSingleBounty)
-		internal
-		returns (uint256 bounty)
-	{
+	function _bountyFor(
+		address _invitee,
+		bool isSingleBounty
+	) internal returns (uint256 bounty) {
 		address invitedBy = users[_invitee].invitedBy;
 		uint256 joinedAt = users[_invitee].joinedAt;
 		Level memory level = levels[users[invitedBy].level];
@@ -291,6 +283,10 @@ contract InvitesFuseV2 is Initializable {
 		if (totalBounties > 0) goodDollar.transfer(msg.sender, totalBounties);
 	}
 
+	function setIdentity(IIdentityV2 _identity) external ownerOrAvatar {
+		identity = _identity;
+	}
+
 	function setLevel(
 		uint256 _lvl,
 		uint256 _toNext,
@@ -309,7 +305,7 @@ contract InvitesFuseV2 is Initializable {
 
 	function end() public ownerOrAvatar isActive {
 		uint256 gdBalance = goodDollar.balanceOf(address(this));
-		goodDollar.transfer(avatar, gdBalance);
+		goodDollar.transfer(msg.sender, gdBalance);
 		payable(msg.sender).transfer(address(this).balance);
 		active = false;
 	}