@gooddollar/goodprotocol 2.0.5-beta.4 → 2.0.5-beta.6

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

@@ -74,8 +74,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5060405161033c38038061033c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102a9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220991cc50bfd4afa043c3f835b990e1e7516ce1f40e33547fc4835375457850ac164736f6c63430008100033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220991cc50bfd4afa043c3f835b990e1e7516ce1f40e33547fc4835375457850ac164736f6c63430008100033",
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161033c38038061033c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102a9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212206c73c2a622a13a1420388daec412af012e94d78e840b29507bd279ce90dd324d64736f6c63430008100033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212206c73c2a622a13a1420388daec412af012e94d78e840b29507bd279ce90dd324d64736f6c63430008100033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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/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;
 	}

package/contracts/invite/InvitesV2.sol

@@ -100,11 +100,9 @@ contract InvitesV2 is DAOUpgradeableContract {
 		levelExpirationEnabled = false;
 	}
 
-	function _authorizeUpgrade(address newImplementation)
-		internal
-		override
-		ownerOrAvatar
-	{}
+	function _authorizeUpgrade(
+		address newImplementation
+	) internal override ownerOrAvatar {}
 
 	function getIdentity() public view returns (IIdentityV2) {
 		return IIdentityV2(nameService.getAddress("IDENTITY"));
@@ -149,11 +147,9 @@ contract InvitesV2 is DAOUpgradeableContract {
 		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(getIdentity()).staticcall(
 			abi.encodeWithSignature("getWhitelistedOnChainId(address)", _invitee)
 		);
@@ -181,19 +177,15 @@ contract InvitesV2 is DAOUpgradeableContract {
 			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;
@@ -230,19 +222,17 @@ contract InvitesV2 is DAOUpgradeableContract {
 	 * @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];
@@ -317,7 +307,7 @@ contract InvitesV2 is DAOUpgradeableContract {
 
 	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;
 	}

package/contracts/token/superfluid/UUPSProxy.sol

@@ -3,7 +3,7 @@
 // File contracts/upgradability/UUPSUtils.sol
 
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.16;
+pragma solidity >=0.8;
 
 /**
  * @title UUPS (Universal Upgradeable Proxy Standard) Shared Library

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.5-beta.4",
+  "version": "2.0.5-beta.6",
   "description": "GoodDollar Protocol",
   "scripts": {
     "prepack": "npm run minimize",
@@ -79,7 +79,7 @@
     "@gnosis.pm/safe-core-sdk-types": "^1.7.0",
     "@gnosis.pm/safe-ethers-lib": "^1.7.0",
     "@gnosis.pm/safe-service-client": "^1.4.0",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.6",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@nomiclabs/hardhat-ethers": "^2.2.1",
     "@nomiclabs/hardhat-etherscan": "^3.1.0",
     "@nomiclabs/hardhat-waffle": "^2.0.3",

package/releases/deployment.json

@@ -439,7 +439,8 @@
         "GuardiansSafe": "0x5878123fe880881f1Ecc92D5fd31e5D3F5Fba2e9",
         "IdentityOld": "0xFa8d865A962ca8456dF331D78806152d3aC5B84F",
         "MultichainRouter": "0x735aBE48e8782948a37C7765ECb76b98CdE97B0F",
-        "GoodDollarMintBurnWrapper": "0x031b2B7C7854dd8EE9C4A644D7e54aD17F56e3cB"
+        "GoodDollarMintBurnWrapper": "0x031b2B7C7854dd8EE9C4A644D7e54aD17F56e3cB",
+        "CommunitySafe": "0x5Eb5f5fE13d1D5e6440DbD5913412299Bc5B5564"
     },
     "pre-production-celo": {
         "ProxyFactory": "0x99C22e78A579e2176311c736C4c9F0b0D5A47806",
@@ -477,7 +478,8 @@
         "Faucet": "0x4F93Fa058b03953C851eFaA2e4FC5C34afDFAb84",
         "Invites": "0x36829D1Cda92FFF5782d5d48991620664FC857d3",
         "UBIScheme": "0x43d72Ff17701B2DA814620735C39C620Ce0ea4A1",
-        "OneTimePayments": "0xB27D247f5C2a61D2Cb6b6E67FEE51d839447e97d"
+        "OneTimePayments": "0xB27D247f5C2a61D2Cb6b6E67FEE51d839447e97d",
+        "SwapHelper": "0xE45CaB86609a16dFaDec112FDd61E4EA80EdaA8D"
     },
     "gnosis": {
         "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"

package/scripts/multichain-deploy/helpers.ts

@@ -143,6 +143,7 @@ export const executeViaGuardian = async (
   let release: { [key: string]: any } = dao[network || networkName];
   const ctrl = await (await ethers.getContractAt("Controller", release.Controller)).connect(guardian);
 
+  const results = [];
   for (let i = 0; i < contracts.length; i++) {
     const contract = contracts[i];
     console.log("executing:", contracts[i], functionSigs[i], functionInputs[i]);
@@ -151,7 +152,11 @@ export const executeViaGuardian = async (
     if (contract === ctrl.address) {
       console.log("executing directly on controller:", sigHash, encoded);
 
-      await guardian.sendTransaction({ to: contract, data: encoded }).then(printDeploy);
+      const tx = await guardian
+        .sendTransaction({ to: contract, data: encoded })
+        .then(printDeploy)
+        .then(_ => _.wait());
+      results.push(tx);
     } else {
       const simulationResult = await ctrl.callStatic.genericCall(contract, encoded, release.Avatar, ethValues[i], {
         from: await guardian.getAddress()
@@ -162,9 +167,15 @@ export const executeViaGuardian = async (
         simulationResult
       });
       if (simulationResult[0] === false) throw new Error("simulation failed:" + contract);
-      await ctrl.genericCall(contract, encoded, release.Avatar, ethValues[i]).then(printDeploy);
+      const tx = await ctrl
+        .genericCall(contract, encoded, release.Avatar, ethValues[i])
+        .then(printDeploy)
+        .then(_ => _.wait());
+      // console.log("generic call events:", tx.events);
+      results.push(tx);
     }
   }
+  return results;
 };
 
 export const executeViaSafe = async (