@gooddollar/goodprotocol 1.0.29-beta.4 → 1.0.29

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

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

package/contracts/Interfaces.sol

@@ -77,12 +77,6 @@ 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 {
@@ -270,29 +264,9 @@ 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/governance/GReputation.sol

@@ -107,27 +107,17 @@ contract GReputation is Reputation {
 		);
 	}
 
+	/// @notice internal function that overrides Reputation.sol with consideration to delegation
+	/// @param _user the address to mint for
+	/// @param _amount the amount of rep to mint
+	/// @return the actual amount minted
 	function _mint(address _user, uint256 _amount)
 		internal
 		override
 		returns (uint256)
 	{
-		return _mint(_user, _amount, false);
-	}
-
-	/// @notice internal function that overrides Reputation.sol with consideration to delegation
-	/// @param _user the address to mint for
-	/// @param _amount the amount of rep to mint
-	/// @return the actual amount minted
-	function _mint(
-		address _user,
-		uint256 _amount,
-		bool ignoreRepTarget
-	) internal returns (uint256) {
 		address repTarget = reputationRecipients[_user];
-		repTarget = ignoreRepTarget == false && repTarget != address(0)
-			? repTarget
-			: _user;
+		repTarget = repTarget != address(0) ? repTarget : _user;
 
 		super._mint(repTarget, _amount);
 
@@ -424,10 +414,7 @@ contract GReputation is Reputation {
 		//if initiial state then set real balance
 		if (idHash == ROOT_STATE) {
 			uint256 curTotalSupply = totalSupplyLocalAt(block.number);
-			// on proof for ROOT_HASH we force to ignore the repTarget, so it is the same wallet address receiving the reputation (prevent double voting power on snapshot)
-			// also it should behave the same as blockchain sync proof which also doesnt use repTarget, but updates the same address as in the proof
-			_mint(_user, _balance, true);
-
+			_mint(_user, _balance);
 			updateValueAtNow(totalSupplyHistory, curTotalSupply); // we undo the totalsupply, as we alredy set the totalsupply of the airdrop
 		}
 

package/contracts/governance/GoodDollarStaking.sol

@@ -17,10 +17,6 @@ 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
@@ -275,7 +271,7 @@ contract GoodDollarStaking is
 	 * @return gdRewards recieved G$ rewards
 	 */
 	function withdrawRewards()
-		external
+		public
 		returns (uint256 goodRewards, uint256 gdRewards)
 	{
 		uint256 gdRewardsShares = amountToShares(earned(msg.sender));
@@ -367,11 +363,6 @@ 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)
@@ -474,19 +465,14 @@ contract GoodDollarStaking is
 		emit GOODRewardsSet(2 ether * 1e6);
 
 		//this will make sure rewards are set at 0, so no withdraw issue will happen.
-		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");
-		}
+		//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");
 
 		//this will set this contract as the GDAO_STAKING contract and give us minting rights on the reputation token
 		(ok, ) = dao.genericCall(

package/contracts/ubi/UBIScheme.sol

@@ -71,8 +71,7 @@ contract UBIScheme is DAOUpgradeableContract {
 	//dont use first claim, and give ubi as usual
 	bool public useFirstClaimPool;
 
-	//minimum amount of users to divide the pool for, renamed from defaultDailyUbi
-	uint256 public minActiveUsers;
+	uint256 public defaultDailyUbi;
 
 	// A pool of GD to give to activated users,
 	// since they will enter the UBI pool
@@ -100,14 +99,14 @@ contract UBIScheme is DAOUpgradeableContract {
 	// Total claims per user stat
 	mapping(address => uint256) public totalClaimsPerUser;
 
-	bool public paused;
-
 	// Emits when a withdraw has been succeded
 	event WithdrawFromDao(uint256 prevBalance, uint256 newBalance);
 
 	// Emits when a user is activated
 	event ActivatedUser(address indexed account);
 
+	bool public paused;
+
 	// Emits when a fish has been succeded
 	event InactiveUserFished(
 		address indexed caller,
@@ -158,8 +157,8 @@ contract UBIScheme is DAOUpgradeableContract {
 		iterationGasLimit = 150000;
 		periodStart = (block.timestamp / (1 days)) * 1 days + 12 hours; //set start time to GMT noon
 		startOfCycle = periodStart;
-		useFirstClaimPool = address(_firstClaimPool) != address(0);
-		minActiveUsers = 1000;
+		useFirstClaimPool = true;
+		defaultDailyUbi = 5000;
 	}
 
 	function setUseFirstClaimPool(bool _use) public {
@@ -286,20 +285,17 @@ contract UBIScheme is DAOUpgradeableContract {
 			Funds storage funds = dailyUBIHistory[currentDay];
 			funds.hasWithdrawn = shouldWithdrawFromDAO;
 			funds.openAmount = currentBalance;
-			dailyUbi = dailyCyclePool / max(activeUsersCount, minActiveUsers);
-			//update minActiveUsers as claimers grow
-			minActiveUsers = max(activeUsersCount / 2, minActiveUsers);
-
+			if (activeUsersCount > 0) {
+				dailyUbi = dailyCyclePool / activeUsersCount;
+			} else if (useFirstClaimPool == false) {
+				dailyUbi = defaultDailyUbi;
+			}
 			emit UBICalculated(currentDay, dailyUbi, block.number);
 		}
 
 		return dailyUbi;
 	}
 
-	function max(uint256 a, uint256 b) private pure returns (uint256) {
-		return a >= b ? a : b;
-	}
-
 	/**
 	 *@dev Sets the currentDay variable to amount of days
 	 * since start of contract.
@@ -360,14 +356,12 @@ contract UBIScheme is DAOUpgradeableContract {
 	 * and emits an event in case of claimed.
 	 * In case that `isFirstTime` is true, it awards the user.
 	 * @param _account the account which recieves the funds
-	 * @param _target the recipient of funds
 	 * @param _amount the amount to transfer
 	 * @param _isClaimed true for claimed
 	 * @param _isFirstTime true for new user or fished user
 	 */
 	function _transferTokens(
 		address _account,
-		address _target,
 		uint256 _amount,
 		bool _isClaimed,
 		bool _isFirstTime
@@ -383,7 +377,7 @@ contract UBIScheme is DAOUpgradeableContract {
 
 		// awards a new user or a fished user
 		if (_isFirstTime) {
-			uint256 awardAmount = firstClaimPool.awardUser(_target);
+			uint256 awardAmount = firstClaimPool.awardUser(_account);
 			claimDay[currentDay].claimAmount += awardAmount;
 			emit UBIClaimed(_account, awardAmount);
 		} else {
@@ -392,7 +386,7 @@ contract UBIScheme is DAOUpgradeableContract {
 				emit UBIClaimed(_account, _amount);
 			}
 			IGoodDollar token = nativeToken();
-			require(token.transfer(_target, _amount), "claim transfer failed");
+			require(token.transfer(_account, _amount), "claim transfer failed");
 		}
 	}
 
@@ -409,9 +403,11 @@ contract UBIScheme is DAOUpgradeableContract {
 		{
 			_dailyCyclePool = currentBalance / cycleLength;
 		}
-
-		_dailyUbi = _dailyCyclePool / max(activeUsersCount, minActiveUsers);
-
+		if (activeUsersCount > 0) {
+			_dailyUbi = _dailyCyclePool / activeUsersCount;
+		} else if (useFirstClaimPool == false) {
+			_dailyUbi = defaultDailyUbi;
+		}
 		return _dailyUbi;
 	}
 
@@ -451,10 +447,9 @@ contract UBIScheme is DAOUpgradeableContract {
 	 * calculats the amount the account can claims, and transfers the amount to the account.
 	 * Emits the address of account and amount claimed.
 	 * @param _account The claimer account
-	 * @param _target recipient of funds
 	 * @return A bool indicating if UBI was claimed
 	 */
-	function _claim(address _account, address _target) internal returns (bool) {
+	function _claim(address _account) internal returns (bool) {
 		// calculats the formula up today ie on day 0 there are no active users, on day 1 any user
 		// (new or active) will trigger the calculation with the active users count of the day before
 		// and so on. the new or inactive users that will become active today, will not take into account
@@ -467,16 +462,16 @@ contract UBIScheme is DAOUpgradeableContract {
 			!fishedUsersAddresses[_account] &&
 			!hasClaimed(_account)
 		) {
-			_transferTokens(_account, _target, newDistribution, true, false);
+			_transferTokens(_account, newDistribution, true, false);
 			return true;
 		} else if (!isNotNewUser(_account) || fishedUsersAddresses[_account]) {
 			// a unregistered or fished user
 			activeUsersCount += 1;
 			fishedUsersAddresses[_account] = false;
 			if (useFirstClaimPool) {
-				_transferTokens(_account, _target, 0, false, true);
+				_transferTokens(_account, 0, false, true);
 			} else {
-				_transferTokens(_account, _target, newDistribution, true, false);
+				_transferTokens(_account, newDistribution, true, false);
 			}
 			emit ActivatedUser(_account);
 			return true;
@@ -491,13 +486,14 @@ contract UBIScheme is DAOUpgradeableContract {
 	 * @return A bool indicating if UBI was claimed
 	 */
 	function claim() public requireStarted returns (bool) {
-		address whitelistedRoot = IIdentityV2(nameService.getAddress("IDENTITY"))
-			.getWhitelistedRoot(msg.sender);
-		require(whitelistedRoot != address(0), "UBIScheme: not whitelisted");
-		bool didClaim = _claim(whitelistedRoot, msg.sender);
+		require(
+			IIdentity(nameService.getAddress("IDENTITY")).isWhitelisted(msg.sender),
+			"UBIScheme: not whitelisted"
+		);
+		bool didClaim = _claim(msg.sender);
 		address claimerDistribution = nameService.getAddress("GDAO_CLAIMERS");
 		if (didClaim && claimerDistribution != address(0)) {
-			ClaimersDistribution(claimerDistribution).updateClaim(whitelistedRoot);
+			ClaimersDistribution(claimerDistribution).updateClaim(msg.sender);
 		}
 		return didClaim;
 	}
@@ -528,7 +524,7 @@ contract UBIScheme is DAOUpgradeableContract {
 		if (activeUsersCount > 0) {
 			activeUsersCount -= 1;
 		}
-		_transferTokens(msg.sender, msg.sender, newDistribution, false, false);
+		_transferTokens(msg.sender, newDistribution, false, false);
 		emit InactiveUserFished(msg.sender, _account, newDistribution);
 		return true;
 	}
@@ -576,19 +572,18 @@ contract UBIScheme is DAOUpgradeableContract {
 		paused = _pause;
 	}
 
-	// function upgrade() public {
-	// 	_onlyAvatar();
-	// 	paused = true;
-	// 	activeUsersCount = 50000; //estimated
-	// 	dailyUbi = 0; //required so distributionformula will trigger
-	// 	cycleLength = 30;
-	// 	currentCycleLength = 0; //this will trigger a new cycle calculation in distribution formula
-	// 	startOfCycle = block.timestamp - 91 days; //this will trigger a new calculation in distributionFormula
-	// 	periodStart = 1646136000;
-	// 	maxDailyUBI = 50000;
-	// 	distributionFormula();
-	// 	emit CycleLengthSet(cycleLength);
-	// }
+	function upgrade() public {
+		_onlyAvatar();
+		paused = true;
+		activeUsersCount = 50000; //estimated
+		dailyUbi = 0; //required so distributionformula will trigger
+		cycleLength = 30;
+		currentCycleLength = 0; //this will trigger a new cycle calculation in distribution formula
+		startOfCycle = block.timestamp - 91 days; //this will trigger a new calculation in distributionFormula
+		periodStart = 1646136000;
+		distributionFormula();
+		emit CycleLengthSet(cycleLength);
+	}
 
 	function setActiveUserCount(uint256 _activeUserCount) public {
 		_onlyAvatar();

package/contracts/utils/AdminWallet.sol

@@ -4,10 +4,10 @@ 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/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 
 import "../Interfaces.sol";
-import "../utils/NameService.sol";
 
 /* @title Admin wallet contract allowing whitelisting and topping up of
  * addresses
@@ -15,6 +15,7 @@ import "../utils/NameService.sol";
 contract AdminWallet is
 	Initializable,
 	UUPSUpgradeable,
+	OwnableUpgradeable,
 	AccessControlUpgradeable
 {
 	bytes32 public constant WALLET_ADMIN_ROLE = keccak256("WALLET_ADMIN_ROLE");
@@ -27,13 +28,10 @@ contract AdminWallet is
 	uint256 public toppingTimes;
 	uint256 public gasPrice;
 
-	NameService public nameService;
+	IIdentity public identity;
 
 	mapping(uint256 => mapping(address => uint256)) toppings;
 
-	uint64 public maxDailyNewWallets;
-	uint64 public day;
-
 	event AdminsAdded(address payable[] indexed admins);
 	event AdminsRemoved(address[] indexed admins);
 	event WalletTopped(address indexed user, uint256 amount);
@@ -49,29 +47,17 @@ contract AdminWallet is
 	 */
 	function initialize(
 		address payable[] memory _admins,
-		NameService _ns,
 		address _owner,
-		uint256 _gasPrice
+		IIdentity _identity
 	) public initializer {
 		__AccessControl_init_unchained();
+		__Ownable_init_unchained();
 		_setupRole(DEFAULT_ADMIN_ROLE, _owner);
-		_setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
-
-		_setDefaults(600000, 9e6, 3, _gasPrice);
-		nameService = _ns;
+		_setDefaults(600000, 9e6, 3, 1e10);
+		identity = _identity;
 		if (_admins.length > 0) {
 			addAdmins(_admins);
 		}
-		if (msg.sender != _owner) revokeRole(DEFAULT_ADMIN_ROLE, msg.sender);
-	}
-
-	modifier onlyOwner() {
-		require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender), "not owner");
-		_;
-	}
-
-	function getIdentity() public view returns (IIdentityV2) {
-		return IIdentityV2(nameService.getAddress("IDENTITY"));
 	}
 
 	function setDefaults(
@@ -185,45 +171,28 @@ contract AdminWallet is
 		onlyAdmin
 		reimburseGas
 	{
-		getIdentity().addWhitelistedWithDID(_user, _did);
-	}
-
-	/* @dev Function to add given address to whitelist of identity contract
-	 * can only be done by admins of wallet and if wallet is an IdentityAdmin
-	 */
-	function whitelist(
-		address _user,
-		string memory _did,
-		uint256 orgChain,
-		uint256 dateAuthenticated
-	) public onlyAdmin reimburseGas {
-		getIdentity().addWhitelistedWithDIDAndChain(
-			_user,
-			_did,
-			orgChain,
-			dateAuthenticated
-		);
+		identity.addWhitelistedWithDID(_user, _did);
 	}
 
 	/* @dev Function to remove given address from whitelist of identity contract
 	 * can only be done by admins of wallet and if wallet is an IdentityAdmin
 	 */
 	function removeWhitelist(address _user) public onlyAdmin reimburseGas {
-		getIdentity().removeWhitelisted(_user);
+		identity.removeWhitelisted(_user);
 	}
 
 	/* @dev Function to add given address to blacklist of identity contract
 	 * can only be done by admins of wallet and if wallet is an IdentityAdmin
 	 */
 	function blacklist(address _user) public onlyAdmin reimburseGas {
-		getIdentity().addBlacklisted(_user);
+		identity.addBlacklisted(_user);
 	}
 
 	/* @dev Function to remove given address from blacklist of identity contract
 	 * can only be done by admins of wallet and if wallet is an IdentityAdmin
 	 */
 	function removeBlacklist(address _user) public onlyAdmin reimburseGas {
-		getIdentity().removeBlacklisted(_user);
+		identity.removeBlacklisted(_user);
 	}
 
 	/* @dev Function to top given address with amount of G$ given in constructor

package/contracts/utils/GoodDollarMintBurnWrapper.sol

@@ -129,11 +129,11 @@ contract GoodDollarMintBurnWrapper is
 		uint256 maxIn; // single limit of each mint
 		uint256 capIn; // total limit of all mint
 		uint256 totalIn; // total minted minus burned
-		uint128 dailyCapIn; //cap per day
+		uint128 dailyCapIn; //cap per day (rewards sendOrMint only)
 		uint128 mintedToday; //total minted today
 		uint128 lastUpdate; //last update of dailyCap
-		uint128 totalRewards; // total rewards sent (sent + minted)
-		uint32 bpsPerDayIn; //basis points relative to token supply daily limit
+		uint128 totalRewards; // total rewards sent (sent + minted) (rewards sendOrMint only)
+		uint32 bpsPerDayIn; //basis points relative to token supply daily limit (rewards sendOrMint only)
 		uint128 lastDayReset; //last day we reset the daily limits
 	}
 
@@ -204,16 +204,6 @@ contract GoodDollarMintBurnWrapper is
 		_setupRole(DEFAULT_ADMIN_ROLE, _admin);
 	}
 
-	function upgrade1() external {
-		if (updateFrequency == 0) {
-			updateFrequency = 90 days;
-		}
-	}
-
-	function upgrade2() external {
-		IGoodDollar(token).renounceMinter(); //moving to mint via Controller
-	}
-
 	function decimals() external view returns (uint8) {
 		return ERC20(token).decimals();
 	}

package/hardhat.config.ts

@@ -60,8 +60,8 @@ const hhconfig: HardhatUserConfig = {
         network: "celo",
         chainId: 42220,
         urls: {
-          apiURL: "https://api.celoscan.io/api",
-          browserURL: "https://celoscan.io/"
+          apiURL: "https://api.celoscan.io",
+          browserURL: "https://celoscan.io"
         }
       }
     ]
@@ -129,20 +129,20 @@ const hhconfig: HardhatUserConfig = {
       url: "https://rpc.fuse.io/",
       chainId: 122,
       gas: 6000000,
-      gasPrice: 1000000000
+      gasPrice: 10000000000
     },
     fuseexplorer: {
       accounts: { mnemonic },
       url: "https://explorer-node.fuse.io/",
       chainId: 122,
       gas: 6000000,
-      gasPrice: 1000000000
+      gasPrice: 10000000000
     },
     fusespark: {
       accounts: { mnemonic },
       url: "https://rpc.fusespark.io/",
       gas: 3000000,
-      gasPrice: 1000000000,
+      gasPrice: 10000000000,
       chainId: 123
     },
     "fuse-mainnet": {
@@ -157,7 +157,7 @@ const hhconfig: HardhatUserConfig = {
       url: "https://rpc.fuse.io/",
       chainId: 122,
       gas: 6000000,
-      gasPrice: 1000000000
+      gasPrice: 10000000000
     },
     "staging-mainnet": {
       accounts: { mnemonic },
@@ -170,7 +170,7 @@ const hhconfig: HardhatUserConfig = {
       accounts: [deployerPrivateKey],
       url: "https://rpc.fuse.io/",
       gas: 3000000,
-      gasPrice: 1000000000,
+      gasPrice: 10000000000,
       chainId: 122
     },
     "production-mainnet": {
@@ -193,20 +193,6 @@ const hhconfig: HardhatUserConfig = {
       gas: 3000000,
       gasPrice: 500000000,
       chainId: 42220
-    },
-    "staging-celo": {
-      accounts: { mnemonic },
-      url: "https://forno.celo.org",
-      gas: 3000000,
-      gasPrice: 150000000,
-      chainId: 42220
-    },
-    "development-celo": {
-      accounts: { mnemonic },
-      url: "https://forno.celo.org",
-      gas: 3000000,
-      gasPrice: 150000000,
-      chainId: 42220
     }
   },
   mocha: {

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.29-beta.4",
+  "version": "1.0.29",
   "description": "GoodDollar Protocol",
   "scripts": {
-    "prepack": "npm run minimize",
     "build": "scripts/build.sh deploy",
     "coverage:report": "export COVERALLS_REPO_TOKEN='qiXNelh1HXMAsoPah9yRD2yG2WlqrDfLh' && cat ../coverage/lcov.info coverage/lcov.info | coveralls",
     "coverage": "export CODE_COVERAGE=true; hardhat --max-memory 6096 coverage",
@@ -56,7 +55,7 @@
   },
   "homepage": "https://gooddollar.org",
   "dependencies": {
-    "@gooddollar/goodcontracts": "^2.6.4",
+    "@gooddollar/goodcontracts": "^2.6.2",
     "@jsier/retrier": "^1.2.4",
     "@openzeppelin/contracts": "^4.5.0",
     "@openzeppelin/contracts-upgradeable": "^4.3.2",