@gooddollar/goodprotocol 1.0.29-beta.3 → 1.0.29-beta.5

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

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

package/contracts/Interfaces.sol

@@ -276,6 +276,8 @@ interface IIdentity {
 
 	function addrToDID(address account) external view returns (string memory);
 
+	function didHashToAddress(bytes32 hash) external view returns (address);
+
 	event WhitelistedAdded(address user);
 }
 

package/contracts/fuseFaucet/Faucet.sol

@@ -9,8 +9,7 @@ import "../Interfaces.sol";
 import "../utils/NameService.sol";
 
 /**
- * @title DonationStaking contract that receives funds in ETH/DAI
- * and stake them in the SimpleStaking contract
+ * @title FuseFaucet contract that can top up users wallets
  */
 contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	bytes32 public constant RELAYER_ROLE = keccak256("relayer");
@@ -99,7 +98,8 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 		require(
 			getIdentity().getWhitelistedRoot(toTop) != address(0) ||
 				getIdentity().getWhitelistedRoot(msg.sender) != address(0) ||
-				hasRole(RELAYER_ROLE, msg.sender)
+				hasRole(RELAYER_ROLE, msg.sender),
+			"not authorized"
 		);
 		_;
 	}
@@ -155,6 +155,8 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	}
 
 	function canTop(address _user) external view returns (bool) {
+		if (toppingAmount < address(_user).balance) return false;
+
 		address whitelistedRoot = getIdentity().getWhitelistedRoot(_user);
 		_user = whitelistedRoot == address(0) ? _user : whitelistedRoot;
 

package/contracts/fuseFaucet/FuseFaucet.sol

@@ -6,8 +6,7 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "../Interfaces.sol";
 
 /**
- * @title DonationStaking contract that receives funds in ETH/DAI
- * and stake them in the SimpleStaking contract
+ * @title FuseFaucet contract that can top up users wallets
  */
 contract FuseFaucet is Initializable {
 	event WalletTopped(address indexed user, uint256 amount);

package/contracts/governance/GReputation.sol

@@ -99,25 +99,36 @@ contract GReputation is Reputation {
 
 	function _canMint() internal view override {
 		require(
-			_msgSender() == nameService.getAddress("GDAO_CLAIMERS") ||
-				_msgSender() == nameService.getAddress("GDAO_STAKING") ||
-				_msgSender() == nameService.getAddress("GDAO_STAKERS") ||
-				hasRole(MINTER_ROLE, _msgSender()),
+			hasRole(MINTER_ROLE, _msgSender()) ||
+				(address(nameService) != address(0) &&
+					(_msgSender() == nameService.getAddress("GDAO_CLAIMERS") ||
+						_msgSender() == nameService.getAddress("GDAO_STAKING") ||
+						_msgSender() == nameService.getAddress("GDAO_STAKERS"))),
 			"GReputation: need minter role or be GDAO contract"
 		);
 	}
 
-	/// @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 = repTarget != address(0) ? repTarget : _user;
+		repTarget = ignoreRepTarget == false && repTarget != address(0)
+			? repTarget
+			: _user;
 
 		super._mint(repTarget, _amount);
 
@@ -414,7 +425,10 @@ contract GReputation is Reputation {
 		//if initiial state then set real balance
 		if (idHash == ROOT_STATE) {
 			uint256 curTotalSupply = totalSupplyLocalAt(block.number);
-			_mint(_user, _balance);
+			// 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);
+
 			updateValueAtNow(totalSupplyHistory, curTotalSupply); // we undo the totalsupply, as we alredy set the totalsupply of the airdrop
 		}
 

package/contracts/identity/IdentityV2.sol

@@ -4,6 +4,7 @@ pragma solidity >=0.8.0;
 import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
 import "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
+import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 
 import "../utils/DAOUpgradeableContract.sol";
 import "../utils/NameService.sol";
@@ -160,7 +161,7 @@ contract IdentityV2 is
 
 	/* @dev Renounces message sender from whitelisted
 	 */
-	function renounceWhitelisted() external whenNotPaused {
+	function renounceWhitelisted() external whenNotPaused onlyWhitelisted {
 		_removeWhitelisted(msg.sender);
 	}
 
@@ -217,7 +218,7 @@ contract IdentityV2 is
 		whenNotPaused
 	{
 		if (address(oldIdentity) != address(0))
-			try oldIdentity.removeBlacklisted(account) {} catch {}
+			oldIdentity.removeBlacklisted(account);
 
 		identities[account].status = 0;
 		emit BlacklistRemoved(account);
@@ -233,7 +234,7 @@ contract IdentityV2 is
 	{
 		require(isContract(account), "Given address is not a contract");
 		_addWhitelisted(account, _chainId());
-		identities[account].status = 2;
+		identities[account].status = 2; //this must come after _addWhitelisted
 
 		emit ContractAdded(account);
 	}
@@ -246,6 +247,9 @@ contract IdentityV2 is
 		onlyRole(IDENTITY_ADMIN_ROLE)
 		whenNotPaused
 	{
+		if (address(oldIdentity) != address(0)) {
+			oldIdentity.removeContract(account);
+		}
 		_removeWhitelisted(account);
 
 		emit ContractRemoved(account);
@@ -271,6 +275,7 @@ contract IdentityV2 is
 	 * @param account the address to add
 	 */
 	function _addWhitelisted(address account, uint256 orgChain) internal {
+		require(identities[account].status == 0, "already has status");
 		whitelistedCount += 1;
 		identities[account].status = 1;
 		identities[account].dateAdded = block.timestamp;
@@ -307,25 +312,25 @@ contract IdentityV2 is
 	 * @param account the address to add
 	 */
 	function _removeWhitelisted(address account) internal {
-		whitelistedCount -= 1;
+		if (identities[account].status == 1 || identities[account].status == 2) {
+			whitelistedCount -= 1;
 
-		if (isContract(account)) {
-			whitelistedContracts -= 1;
-			if (address(oldIdentity) != address(0)) {
-				try oldIdentity.removeContract(account) {} catch {}
+			if (isContract(account)) {
+				whitelistedContracts -= 1;
 			}
-		}
-		if (address(oldIdentity) != address(0)) {
-			try oldIdentity.removeWhitelisted(account) {} catch {}
-		}
 
-		string memory did = identities[account].did;
-		bytes32 pHash = keccak256(bytes(did));
+			string memory did = identities[account].did;
+			bytes32 pHash = keccak256(bytes(did));
 
-		delete identities[account];
-		delete didHashToAddress[pHash];
+			delete identities[account];
+			delete didHashToAddress[pHash];
+
+			emit WhitelistedRemoved(account);
+		}
 
-		emit WhitelistedRemoved(account);
+		if (address(oldIdentity) != address(0)) {
+			oldIdentity.removeWhitelisted(account);
+		}
 	}
 
 	/// @notice helper function to get current chain id
@@ -349,6 +354,7 @@ contract IdentityV2 is
 				return false;
 			}
 		}
+		return false;
 	}
 
 	/* @dev Function to see if given address is a contract
@@ -376,7 +382,9 @@ contract IdentityV2 is
 		require(
 			SignatureChecker.isValidSignatureNow(
 				_account,
-				keccak256(abi.encode(msg.sender, _account)),
+				ECDSA.toEthSignedMessageHash(
+					keccak256(abi.encode(msg.sender, _account))
+				),
 				signature
 			),
 			"invalid signature"
@@ -384,6 +392,14 @@ contract IdentityV2 is
 		connectedAccounts[_account] = msg.sender;
 	}
 
+	function disconnectAccount(address _connected) external {
+		require(
+			connectedAccounts[_connected] == msg.sender || msg.sender == _connected,
+			"unauthorized"
+		);
+		delete connectedAccounts[_connected];
+	}
+
 	function getWhitelistedRoot(address _account)
 		external
 		view
@@ -401,14 +417,41 @@ contract IdentityV2 is
 		else _unpause();
 	}
 
-	function setDID(string calldata did) external onlyWhitelisted {
+	function setDID(address account, string calldata did)
+		external
+		onlyRole(IDENTITY_ADMIN_ROLE)
+	{
+		_setDID(account, did);
+	}
+
+	function setDID(string calldata did) external {
+		_setDID(msg.sender, did);
+	}
+
+	function _setDID(address account, string memory did) internal {
+		require(isWhitelisted(account), "not whitelisted");
+		require(bytes(did).length > 0, "did empty");
 		bytes32 pHash = keccak256(bytes(did));
 		require(didHashToAddress[pHash] == address(0), "DID already registered");
 
-		bytes32 oldHash = keccak256(bytes(identities[msg.sender].did));
+		if (address(oldIdentity) != address(0)) {
+			address oldDIDOwner;
+			try oldIdentity.didHashToAddress(pHash) returns (address _didOwner) {
+				oldDIDOwner = _didOwner;
+			} catch {}
+			//if owner not the same and doesnt have a new did set then revert
+			require(
+				oldDIDOwner == address(0) ||
+					oldDIDOwner == account ||
+					bytes(identities[oldDIDOwner].did).length > 0,
+				"DID already registered oldIdentity"
+			);
+		}
+
+		bytes32 oldHash = keccak256(bytes(identities[account].did));
 		delete didHashToAddress[oldHash];
-		identities[msg.sender].did = did;
-		didHashToAddress[pHash] = msg.sender;
+		identities[account].did = did;
+		didHashToAddress[pHash] = account;
 	}
 
 	function addrToDID(address account)
@@ -416,13 +459,21 @@ contract IdentityV2 is
 		view
 		returns (string memory did)
 	{
-		did = identities[msg.sender].did;
-		if (bytes(did).length > 0) return did;
-		try oldIdentity.addrToDID(account) returns (string memory _did) {
-			return _did;
-		} catch {
-			return "";
+		did = identities[account].did;
+		bytes32 pHash = keccak256(bytes(did));
+
+		//if did was set in this contract return it, otherwise check oldidentity
+		if (didHashToAddress[pHash] == account) return did;
+
+		if (address(oldIdentity) != address(0)) {
+			try oldIdentity.addrToDID(account) returns (string memory _did) {
+				return _did;
+			} catch {
+				return "";
+			}
 		}
+
+		return "";
 	}
 
 	/**

package/contracts/invite/InvitesV1.sol

@@ -2,7 +2,6 @@
 
 pragma solidity >=0.8;
 
-
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/math/SafeMathUpgradeable.sol";
 import "../Interfaces.sol";
@@ -75,16 +74,8 @@ contract InvitesV1 is Initializable {
 		_;
 	}
 
-	modifier onlyAvatar() {
-		require(
-			msg.sender == avatar,
-			"Only DAO avatar can perform this action"
-		);
-		_;
-	}
-
 	modifier isActive() {
-		require(active);
+		require(active, "not active");
 		_;
 	}
 
@@ -110,8 +101,7 @@ contract InvitesV1 is Initializable {
 
 	function join(bytes32 _myCode, bytes32 _inviterCode) public isActive {
 		require(
-			codeToUser[_myCode] == address(0) ||
-				codeToUser[_myCode] == msg.sender,
+			codeToUser[_myCode] == address(0) || codeToUser[_myCode] == msg.sender,
 			"invite code already in use"
 		);
 		User storage user = users[msg.sender]; // this is not expensive as user is new
@@ -143,9 +133,7 @@ contract InvitesV1 is Initializable {
 		bool isLevelExpired = levelExpirationEnabled == true &&
 			daysToComplete > 0 &&
 			daysToComplete <
-			users[_invitee].joinedAt.sub(users[invitedBy].levelStarted).div(
-				1 days
-			);
+			users[_invitee].joinedAt.sub(users[invitedBy].levelStarted).div(1 days);
 
 		return
 			invitedBy != address(0) &&
@@ -189,11 +177,7 @@ contract InvitesV1 is Initializable {
 		return result;
 	}
 
-	function getPendingBounties(address _inviter)
-		public
-		view
-		returns (uint256)
-	{
+	function getPendingBounties(address _inviter) public view returns (uint256) {
 		address[] memory pending = users[_inviter].pending;
 		uint256 total = 0;
 		for (uint256 i; i < pending.length; i++) {
@@ -213,10 +197,7 @@ contract InvitesV1 is Initializable {
 		isActive
 		returns (uint256 bounty)
 	{
-		require(
-			canCollectBountyFor(_invitee),
-			"user not elligble for bounty yet"
-		);
+		require(canCollectBountyFor(_invitee), "user not elligble for bounty yet");
 		return _bountyFor(_invitee, true);
 	}
 

package/contracts/invite/InvitesV2.sol

@@ -7,6 +7,7 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/math/SafeMathUpgradeable.sol";
 import "../Interfaces.sol";
 import "../utils/NameService.sol";
+import "../utils/DAOUpgradeableContract.sol";
 
 // import "hardhat/console.sol";
 
@@ -15,7 +16,7 @@ import "../utils/NameService.sol";
  * 1.1 adds invitee bonus
  * 2 uses uups upgradeable - not compatible upgrade for v1
  */
-contract InvitesV2 is Initializable, UUPSUpgradeable {
+contract InvitesV2 is DAOUpgradeableContract {
 	using SafeMathUpgradeable for uint256;
 
 	struct Stats {
@@ -48,12 +49,10 @@ contract InvitesV2 is Initializable, UUPSUpgradeable {
 
 	mapping(bytes32 => address) public codeToUser;
 	mapping(address => User) public users;
-	address payable public avatar;
 
 	mapping(uint256 => Level) public levels;
 
 	address public owner;
-	NameService public nameService;
 	cERC20 public goodDollar;
 	bool public active;
 	Stats public stats;
@@ -77,30 +76,23 @@ contract InvitesV2 is Initializable, UUPSUpgradeable {
 		_;
 	}
 
-	modifier onlyAvatar() {
-		require(msg.sender == avatar, "Only DAO avatar can perform this action");
-		_;
-	}
-
 	modifier isActive() {
-		require(active);
+		require(active, "not active");
 		_;
 	}
 
 	function initialize(
-		address payable _avatar,
-		address _ns,
+		INameService _ns,
 		address _gd,
 		uint256 _level0Bounty,
 		address _owner
 	) public initializer {
+		setDAO(_ns);
 		owner = _owner;
-		nameService = NameService(_ns);
 		active = true;
 		Level storage lvl = levels[0];
 		lvl.bounty = _level0Bounty;
 		goodDollar = cERC20(_gd);
-		avatar = _avatar;
 		levelExpirationEnabled = false;
 	}
 
@@ -299,7 +291,7 @@ contract InvitesV2 is Initializable, UUPSUpgradeable {
 	function end() public ownerOrAvatar isActive {
 		uint256 gdBalance = goodDollar.balanceOf(address(this));
 		goodDollar.transfer(avatar, gdBalance);
-		avatar.transfer(address(this).balance);
+		payable(msg.sender).transfer(address(this).balance);
 		active = false;
 	}
 
@@ -309,8 +301,9 @@ contract InvitesV2 is Initializable, UUPSUpgradeable {
 	 * 1.3.0 - allow to set inviter later
 	 * 1.4.0 - improve gas for bounty collection
 	 * 1.5.0 - more gas improvements
+	 * 2 uses uups upgradeable - not compatible upgrade for v1
 	 */
 	function version() public pure returns (string memory) {
-		return "1.5.0";
+		return "2.0";
 	}
 }

package/contracts/mocks/UpgradableMocks.sol

@@ -34,8 +34,9 @@ contract UpgradableMock3 is DAOUpgradeableContract {
 	function decimals() public pure returns (uint256) {
 		return 3;
 	}
+
 	function initialize(INameService _ns) public initializer {
-    setDAO(_ns);
+		setDAO(_ns);
 	}
 }
 
@@ -43,7 +44,8 @@ contract UpgradableMock4 is DAOUpgradeableContract {
 	function decimals() public pure returns (uint256) {
 		return 4;
 	}
+
 	function initialize(INameService _ns) public initializer {
-    setDAO(_ns);
+		setDAO(_ns);
 	}
-}
+}

package/contracts/token/ERC20PresetMinterPauserUpgradeable.sol

@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: MIT
+// we use a custom file and not openzeppelin directly since the DAOStack Controller expects `mint` to return bool
+// we also add the erc20 permit
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+
+/**
+ * @dev {ERC20} token, including:
+ *
+ *  - ability for holders to burn (destroy) their tokens
+ *  - a minter role that allows for token minting (creation)
+ *  - a pauser role that allows to stop all token transfers
+ *
+ * This contract uses {AccessControl} to lock permissioned functions using the
+ * different roles - head to its documentation for details.
+ *
+ * The account that deploys the contract will be granted the minter and pauser
+ * roles, as well as the default admin role, which will let it grant both minter
+ * and pauser roles to other accounts.
+ */
+contract ERC20PresetMinterPauserUpgradeable is
+	Initializable,
+	ContextUpgradeable,
+	AccessControlEnumerableUpgradeable,
+	ERC20PermitUpgradeable,
+	ERC20BurnableUpgradeable,
+	ERC20PausableUpgradeable
+{
+	function initialize(string memory name, string memory symbol)
+		public
+		virtual
+		initializer
+	{
+		__ERC20PresetMinterPauser_init(name, symbol);
+	}
+
+	bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
+	bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");
+
+	/**
+	 * @dev Grants `DEFAULT_ADMIN_ROLE`, `MINTER_ROLE` and `PAUSER_ROLE` to the
+	 * account that deploys the contract.
+	 *
+	 * See {ERC20-constructor}.
+	 */
+	function __ERC20PresetMinterPauser_init(
+		string memory name,
+		string memory symbol
+	) internal initializer {
+		__Context_init_unchained();
+		__ERC165_init_unchained();
+		__AccessControl_init_unchained();
+		__AccessControlEnumerable_init_unchained();
+		__ERC20_init_unchained(name, symbol);
+		__ERC20Burnable_init_unchained();
+		__Pausable_init_unchained();
+		__ERC20Pausable_init_unchained();
+		__ERC20PresetMinterPauser_init_unchained(name, symbol);
+		__ERC20Permit_init_unchained(name);
+	}
+
+	function __ERC20PresetMinterPauser_init_unchained(
+		string memory name,
+		string memory symbol
+	) internal initializer {
+		_setupRole(DEFAULT_ADMIN_ROLE, _msgSender());
+
+		_setupRole(MINTER_ROLE, _msgSender());
+		_setupRole(PAUSER_ROLE, _msgSender());
+	}
+
+	/**
+	 * @dev Creates `amount` new tokens for `to`.
+	 *
+	 * See {ERC20-_mint}.
+	 *
+	 * Requirements:
+	 *
+	 * - the caller must have the `MINTER_ROLE`.
+	 */
+	function mint(address to, uint256 amount) public virtual returns (bool) {
+		require(
+			hasRole(MINTER_ROLE, _msgSender()),
+			"ERC20PresetMinterPauser: must have minter role to mint"
+		);
+		_mint(to, amount);
+		return true;
+	}
+
+	/**
+	 * @dev Pauses all token transfers.
+	 *
+	 * See {ERC20Pausable} and {Pausable-_pause}.
+	 *
+	 * Requirements:
+	 *
+	 * - the caller must have the `PAUSER_ROLE`.
+	 */
+	function pause() public virtual {
+		require(
+			hasRole(PAUSER_ROLE, _msgSender()),
+			"ERC20PresetMinterPauser: must have pauser role to pause"
+		);
+		_pause();
+	}
+
+	/**
+	 * @dev Unpauses all token transfers.
+	 *
+	 * See {ERC20Pausable} and {Pausable-_unpause}.
+	 *
+	 * Requirements:
+	 *
+	 * - the caller must have the `PAUSER_ROLE`.
+	 */
+	function unpause() public virtual {
+		require(
+			hasRole(PAUSER_ROLE, _msgSender()),
+			"ERC20PresetMinterPauser: must have pauser role to unpause"
+		);
+		_unpause();
+	}
+
+	function _beforeTokenTransfer(
+		address from,
+		address to,
+		uint256 amount
+	) internal virtual override(ERC20Upgradeable, ERC20PausableUpgradeable) {
+		super._beforeTokenTransfer(from, to, amount);
+	}
+
+	uint256[50] private __gap;
+}