@gooddollar/goodprotocol 2.2.0-beta.1 → 2.2.1

package/contracts/MentoInterfaces.sol

@@ -218,6 +218,8 @@ interface IBancorExchangeProvider {
 
 	/* ------- Functions ------- */
 
+	function AVATAR() external view returns (address);
+
 	/**
 	 * @notice Retrieves the pool with the specified exchangeId.
 	 * @param exchangeId The id of the pool to be retrieved.
@@ -245,6 +247,11 @@ interface IBancorExchangeProvider {
 		PoolExchange calldata exchange
 	) external returns (bytes32 exchangeId);
 
+	function updateExchange(
+		bytes32 exchangeId,
+		PoolExchange calldata exchange
+	) external returns (bool updated);
+
 	/**
 	 * @notice Delete a PoolExchange.
 	 * @param exchangeId The PoolExchange to be created.
@@ -533,39 +540,41 @@ interface IGoodDollarExchangeProvider {
  */
 
 interface ITradingLimits {
-  /**
-   * @dev The State struct contains the current state of a trading limit config.
-   * @param lastUpdated0 The timestamp of the last reset of netflow0.
-   * @param lastUpdated1 The timestamp of the last reset of netflow1.
-   * @param netflow0 The current netflow of the asset for limit0.
-   * @param netflow1 The current netflow of the asset for limit1.
-   * @param netflowGlobal The current netflow of the asset for limitGlobal.
-   */
-  struct State {
-    uint32 lastUpdated0;
-    uint32 lastUpdated1;
-    int48 netflow0;
-    int48 netflow1;
-    int48 netflowGlobal;
-  }
-
-  /**
-   * @dev The Config struct contains the configuration of trading limits.
-   * @param timestep0 The time window in seconds for limit0.
-   * @param timestep1 The time window in seconds for limit1.
-   * @param limit0 The limit0 for the asset.
-   * @param limit1 The limit1 for the asset.
-   * @param limitGlobal The global limit for the asset.
-   * @param flags A bitfield of flags to enable/disable the individual limits.
-   */
-  struct Config {
-    uint32 timestep0;
-    uint32 timestep1;
-    int48 limit0;
-    int48 limit1;
-    int48 limitGlobal;
-    uint8 flags;
-  }
+	/**
+	 * @dev The State struct contains the current state of a trading limit config.
+	 * @param lastUpdated0 The timestamp of the last reset of netflow0.
+	 * @param lastUpdated1 The timestamp of the last reset of netflow1.
+	 * @param netflow0 The current netflow of the asset for limit0.
+	 * @param netflow1 The current netflow of the asset for limit1.
+	 * @param netflowGlobal The current netflow of the asset for limitGlobal.
+	 */
+	struct State {
+		uint32 lastUpdated0;
+		uint32 lastUpdated1;
+		int48 netflow0;
+		int48 netflow1;
+		int48 netflowGlobal;
+	}
+
+	/**
+	 * @dev The Config struct contains the configuration of trading limits.
+	 * @param timestep0 The time window in seconds for limit0.
+	 * @param timestep1 The time window in seconds for limit1.
+	 * @param limit0 The limit0 for the asset.
+	 * @param limit1 The limit1 for the asset.
+	 * @param limitGlobal The global limit for the asset.
+	 * @param flags A bitfield of flags to enable/disable the individual limits.
+	 */
+	struct Config {
+		uint32 timestep0;
+		uint32 timestep1;
+		int48 limit0In;
+		int48 limit0Out;
+		int48 limit1In;
+		int48 limit1Out;
+		int48 limitGlobal;
+		uint8 flags;
+	}
 }
 
 /*
@@ -573,174 +582,209 @@ interface ITradingLimits {
  * @notice The broker is responsible for executing swaps and keeping track of trading limits.
  */
 interface IBroker {
-  /**
-   * @notice Emitted when a swap occurs.
-   * @param exchangeProvider The exchange provider used.
-   * @param exchangeId The id of the exchange used.
-   * @param trader The user that initiated the swap.
-   * @param tokenIn The address of the token that was sold.
-   * @param tokenOut The address of the token that was bought.
-   * @param amountIn The amount of token sold.
-   * @param amountOut The amount of token bought.
-   */
-  event Swap(
-    address exchangeProvider,
-    bytes32 indexed exchangeId,
-    address indexed trader,
-    address indexed tokenIn,
-    address tokenOut,
-    uint256 amountIn,
-    uint256 amountOut
-  );
-
-  /**
-   * @notice Emitted when a new trading limit is configured.
-   * @param exchangeId the exchangeId to target.
-   * @param token the token to target.
-   * @param config the new trading limits config.
-   */
-  event TradingLimitConfigured(bytes32 exchangeId, address token, ITradingLimits.Config config);
-
-  /**
-   * @notice Allows the contract to be upgradable via the proxy.
-   * @param _exchangeProviders The addresses of the ExchangeProvider contracts.
-   * @param _reserves The address of the Reserve contract.
-   */
-  function initialize(address[] calldata _exchangeProviders, address[] calldata _reserves) external;
-
-  /**
-   * @notice Set the reserves for the exchange providers.
-   * @param _exchangeProviders The addresses of the ExchangeProvider contracts.
-   * @param _reserves The addresses of the Reserve contracts.
-   */
-  function setReserves(address[] calldata _exchangeProviders, address[] calldata _reserves) external;
-
-  /**
-   * @notice Add an exchange provider to the list of providers.
-   * @param exchangeProvider The address of the exchange provider to add.
-   * @param reserve The address of the reserve used by the exchange provider.
-   * @return index The index of the newly added specified exchange provider.
-   */
-  function addExchangeProvider(address exchangeProvider, address reserve) external returns (uint256 index);
-
-  /**
-   * @notice Remove an exchange provider from the list of providers.
-   * @param exchangeProvider The address of the exchange provider to remove.
-   * @param index The index of the exchange provider being removed.
-   */
-  function removeExchangeProvider(address exchangeProvider, uint256 index) external;
-
-  /**
-   * @notice Calculate amountIn of tokenIn needed for a given amountOut of tokenOut.
-   * @param exchangeProvider the address of the exchange provider for the pair.
-   * @param exchangeId The id of the exchange to use.
-   * @param tokenIn The token to be sold.
-   * @param tokenOut The token to be bought.
-   * @param amountOut The amount of tokenOut to be bought.
-   * @return amountIn The amount of tokenIn to be sold.
-   */
-  function getAmountIn(
-    address exchangeProvider,
-    bytes32 exchangeId,
-    address tokenIn,
-    address tokenOut,
-    uint256 amountOut
-  ) external view returns (uint256 amountIn);
-
-  /**
-   * @notice Calculate amountOut of tokenOut received for a given amountIn of tokenIn.
-   * @param exchangeProvider the address of the exchange provider for the pair.
-   * @param exchangeId The id of the exchange to use.
-   * @param tokenIn The token to be sold.
-   * @param tokenOut The token to be bought.
-   * @param amountIn The amount of tokenIn to be sold.
-   * @return amountOut The amount of tokenOut to be bought.
-   */
-  function getAmountOut(
-    address exchangeProvider,
-    bytes32 exchangeId,
-    address tokenIn,
-    address tokenOut,
-    uint256 amountIn
-  ) external view returns (uint256 amountOut);
-
-  /**
-   * @notice Execute a token swap with fixed amountIn.
-   * @param exchangeProvider the address of the exchange provider for the pair.
-   * @param exchangeId The id of the exchange to use.
-   * @param tokenIn The token to be sold.
-   * @param tokenOut The token to be bought.
-   * @param amountIn The amount of tokenIn to be sold.
-   * @param amountOutMin Minimum amountOut to be received - controls slippage.
-   * @return amountOut The amount of tokenOut to be bought.
-   */
-  function swapIn(
-    address exchangeProvider,
-    bytes32 exchangeId,
-    address tokenIn,
-    address tokenOut,
-    uint256 amountIn,
-    uint256 amountOutMin
-  ) external returns (uint256 amountOut);
-
-  /**
-   * @notice Execute a token swap with fixed amountOut.
-   * @param exchangeProvider the address of the exchange provider for the pair.
-   * @param exchangeId The id of the exchange to use.
-   * @param tokenIn The token to be sold.
-   * @param tokenOut The token to be bought.
-   * @param amountOut The amount of tokenOut to be bought.
-   * @param amountInMax Maximum amount of tokenIn that can be traded.
-   * @return amountIn The amount of tokenIn to be sold.
-   */
-  function swapOut(
-    address exchangeProvider,
-    bytes32 exchangeId,
-    address tokenIn,
-    address tokenOut,
-    uint256 amountOut,
-    uint256 amountInMax
-  ) external returns (uint256 amountIn);
-
-  /**
-   * @notice Permissionless way to burn stables from msg.sender directly.
-   * @param token The token getting burned.
-   * @param amount The amount of the token getting burned.
-   * @return True if transaction succeeds.
-   */
-  function burnStableTokens(address token, uint256 amount) external returns (bool);
-
-  /**
-   * @notice Configure trading limits for an (exchangeId, token) tuple.
-   * @dev Will revert if the configuration is not valid according to the TradingLimits library.
-   * Resets existing state according to the TradingLimits library logic.
-   * Can only be called by owner.
-   * @param exchangeId the exchangeId to target.
-   * @param token the token to target.
-   * @param config the new trading limits config.
-   */
-  function configureTradingLimit(bytes32 exchangeId, address token, ITradingLimits.Config calldata config) external;
-
-  /**
-   * @notice Get the list of registered exchange providers.
-   * @dev This can be used by UI or clients to discover all pairs.
-   * @return exchangeProviders the addresses of all exchange providers.
-   */
-  function getExchangeProviders() external view returns (address[] memory);
-
-  /**
-   * @notice Get the address of the exchange provider at a given index.
-   * @dev Auto-generated getter for the exchangeProviders array.
-   * @param index The index of the exchange provider.
-   * @return exchangeProvider The address of the exchange provider.
-   */
-  function exchangeProviders(uint256 index) external view returns (address exchangeProvider);
-
-  /**
-   * @notice Check if a given address is an exchange provider.
-   * @dev Auto-generated getter for the isExchangeProvider mapping.
-   * @param exchangeProvider The address to check.
-   * @return isExchangeProvider True if the address is an exchange provider, false otherwise.
-   */
-  function isExchangeProvider(address exchangeProvider) external view returns (bool);
+	/**
+	 * @notice Emitted when a swap occurs.
+	 * @param exchangeProvider The exchange provider used.
+	 * @param exchangeId The id of the exchange used.
+	 * @param trader The user that initiated the swap.
+	 * @param tokenIn The address of the token that was sold.
+	 * @param tokenOut The address of the token that was bought.
+	 * @param amountIn The amount of token sold.
+	 * @param amountOut The amount of token bought.
+	 */
+	event Swap(
+		address exchangeProvider,
+		bytes32 indexed exchangeId,
+		address indexed trader,
+		address indexed tokenIn,
+		address tokenOut,
+		uint256 amountIn,
+		uint256 amountOut
+	);
+
+	/**
+	 * @notice Emitted when a new trading limit is configured.
+	 * @param exchangeId the exchangeId to target.
+	 * @param token the token to target.
+	 * @param config the new trading limits config.
+	 */
+	event TradingLimitConfigured(
+		bytes32 exchangeId,
+		address token,
+		ITradingLimits.Config config
+	);
+
+	/**
+	 * @notice Allows the contract to be upgradable via the proxy.
+	 * @param _exchangeProviders The addresses of the ExchangeProvider contracts.
+	 * @param _reserves The address of the Reserve contract.
+	 */
+	function initialize(
+		address[] calldata _exchangeProviders,
+		address[] calldata _reserves
+	) external;
+
+	/**
+	 * @notice Set the reserves for the exchange providers.
+	 * @param _exchangeProviders The addresses of the ExchangeProvider contracts.
+	 * @param _reserves The addresses of the Reserve contracts.
+	 */
+	function setReserves(
+		address[] calldata _exchangeProviders,
+		address[] calldata _reserves
+	) external;
+
+	/**
+	 * @notice Add an exchange provider to the list of providers.
+	 * @param exchangeProvider The address of the exchange provider to add.
+	 * @param reserve The address of the reserve used by the exchange provider.
+	 * @return index The index of the newly added specified exchange provider.
+	 */
+	function addExchangeProvider(
+		address exchangeProvider,
+		address reserve
+	) external returns (uint256 index);
+
+	/**
+	 * @notice Remove an exchange provider from the list of providers.
+	 * @param exchangeProvider The address of the exchange provider to remove.
+	 * @param index The index of the exchange provider being removed.
+	 */
+	function removeExchangeProvider(
+		address exchangeProvider,
+		uint256 index
+	) external;
+
+	/**
+	 * @notice Calculate amountIn of tokenIn needed for a given amountOut of tokenOut.
+	 * @param exchangeProvider the address of the exchange provider for the pair.
+	 * @param exchangeId The id of the exchange to use.
+	 * @param tokenIn The token to be sold.
+	 * @param tokenOut The token to be bought.
+	 * @param amountOut The amount of tokenOut to be bought.
+	 * @return amountIn The amount of tokenIn to be sold.
+	 */
+	function getAmountIn(
+		address exchangeProvider,
+		bytes32 exchangeId,
+		address tokenIn,
+		address tokenOut,
+		uint256 amountOut
+	) external view returns (uint256 amountIn);
+
+	/**
+	 * @notice Calculate amountOut of tokenOut received for a given amountIn of tokenIn.
+	 * @param exchangeProvider the address of the exchange provider for the pair.
+	 * @param exchangeId The id of the exchange to use.
+	 * @param tokenIn The token to be sold.
+	 * @param tokenOut The token to be bought.
+	 * @param amountIn The amount of tokenIn to be sold.
+	 * @return amountOut The amount of tokenOut to be bought.
+	 */
+	function getAmountOut(
+		address exchangeProvider,
+		bytes32 exchangeId,
+		address tokenIn,
+		address tokenOut,
+		uint256 amountIn
+	) external view returns (uint256 amountOut);
+
+	/**
+	 * @notice Execute a token swap with fixed amountIn.
+	 * @param exchangeProvider the address of the exchange provider for the pair.
+	 * @param exchangeId The id of the exchange to use.
+	 * @param tokenIn The token to be sold.
+	 * @param tokenOut The token to be bought.
+	 * @param amountIn The amount of tokenIn to be sold.
+	 * @param amountOutMin Minimum amountOut to be received - controls slippage.
+	 * @return amountOut The amount of tokenOut to be bought.
+	 */
+	function swapIn(
+		address exchangeProvider,
+		bytes32 exchangeId,
+		address tokenIn,
+		address tokenOut,
+		uint256 amountIn,
+		uint256 amountOutMin
+	) external returns (uint256 amountOut);
+
+	/**
+	 * @notice Execute a token swap with fixed amountOut.
+	 * @param exchangeProvider the address of the exchange provider for the pair.
+	 * @param exchangeId The id of the exchange to use.
+	 * @param tokenIn The token to be sold.
+	 * @param tokenOut The token to be bought.
+	 * @param amountOut The amount of tokenOut to be bought.
+	 * @param amountInMax Maximum amount of tokenIn that can be traded.
+	 * @return amountIn The amount of tokenIn to be sold.
+	 */
+	function swapOut(
+		address exchangeProvider,
+		bytes32 exchangeId,
+		address tokenIn,
+		address tokenOut,
+		uint256 amountOut,
+		uint256 amountInMax
+	) external returns (uint256 amountIn);
+
+	/**
+	 * @notice Permissionless way to burn stables from msg.sender directly.
+	 * @param token The token getting burned.
+	 * @param amount The amount of the token getting burned.
+	 * @return True if transaction succeeds.
+	 */
+	function burnStableTokens(
+		address token,
+		uint256 amount
+	) external returns (bool);
+
+	/**
+	 * @notice Configure trading limits for an (exchangeId, token) tuple.
+	 * @dev Will revert if the configuration is not valid according to the TradingLimits library.
+	 * Resets existing state according to the TradingLimits library logic.
+	 * Can only be called by owner.
+	 * @param exchangeId the exchangeId to target.
+	 * @param token the token to target.
+	 * @param config the new trading limits config.
+	 */
+	function configureTradingLimit(
+		bytes32 exchangeId,
+		address token,
+		ITradingLimits.Config calldata config
+	) external;
+
+	/**
+	 * @notice Get the list of registered exchange providers.
+	 * @dev This can be used by UI or clients to discover all pairs.
+	 * @return exchangeProviders the addresses of all exchange providers.
+	 */
+	function getExchangeProviders() external view returns (address[] memory);
+
+	/**
+	 * @notice Get the address of the exchange provider at a given index.
+	 * @dev Auto-generated getter for the exchangeProviders array.
+	 * @param index The index of the exchange provider.
+	 * @return exchangeProvider The address of the exchange provider.
+	 */
+	function exchangeProviders(
+		uint256 index
+	) external view returns (address exchangeProvider);
+
+	/**
+	 * @notice Check if a given address is an exchange provider.
+	 * @dev Auto-generated getter for the isExchangeProvider mapping.
+	 * @param exchangeProvider The address to check.
+	 * @return isExchangeProvider True if the address is an exchange provider, false otherwise.
+	 */
+	function isExchangeProvider(
+		address exchangeProvider
+	) external view returns (bool);
+
+	function tradingLimitsState(
+		bytes32 eid
+	) external view returns (ITradingLimits.State memory);
+
+	function tradingLimitsConfig(
+		bytes32 eid
+	) external view returns (ITradingLimits.Config memory);
 }

package/contracts/fuseFaucet/Faucet.sol

@@ -8,6 +8,17 @@ import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol"
 import "../Interfaces.sol";
 import "../utils/NameService.sol";
 
+/// Voters interface + structs
+interface Voters {
+	/// @notice The voter structure
+	struct Voter {
+		address account;
+		uint96 votingPower;
+	}
+
+	function voters(address _account) external view returns (Voter memory);
+}
+
 /**
  * @title FuseFaucet contract that can top up users wallets
  */
@@ -241,8 +252,10 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 
 		// Check voting balance if contract is set
 		if (votingContract != address(0)) {
-			try ERC20(votingContract).balanceOf(_user) returns (uint256 balance) {
-				if (balance > 0) {
+			try Voters(votingContract).voters(_user) returns (
+				Voters.Voter memory voter
+			) {
+				if (voter.votingPower > 0) {
 					return baseAmount * 2; // Double amount for voters
 				}
 			} catch {

package/contracts/identity/IdentityV3.sol

@@ -58,6 +58,9 @@ contract IdentityV3 is
 	event ContractAdded(address indexed account);
 	event ContractRemoved(address indexed account);
 
+	event AccountConnected(address indexed connected, address indexed to);
+	event AccountDisconnected(address indexed disconnected, address indexed from);
+
 	function initialize(
 		address _owner,
 		IIdentity _oldIdentity
@@ -419,6 +422,7 @@ contract IdentityV3 is
 		require(connectedAccounts[account] == address(0x0), "already connected");
 
 		connectedAccounts[account] = msg.sender;
+		emit AccountConnected(account, msg.sender);
 	}
 
 	/**
@@ -431,6 +435,7 @@ contract IdentityV3 is
 			"unauthorized"
 		);
 		delete connectedAccounts[connected];
+		emit AccountDisconnected(connected, msg.sender);
 	}
 
 	/**

package/contracts/identity/IdentityV4.sol

@@ -84,6 +84,13 @@ contract IdentityV4 is
 		reverifyDaysOptions.push(180);
 	}
 
+	/**
+	 * @dev Returns the longest time (in days) that can pass before an authentication needs to be renewed for `account`
+	 */
+	function authenticationPeriod() external view returns (uint256) {
+		return reverifyDaysOptions[reverifyDaysOptions.length - 1];
+	}
+
 	/**
 	 * @dev used to initialize after deployment once nameservice is available
 	 */
@@ -111,6 +118,10 @@ contract IdentityV4 is
 		// replace storage array
 		delete reverifyDaysOptions;
 		for (uint256 i = 0; i < options.length; i++) {
+			require(
+				i == 0 || options[i] > options[i - 1],
+				"options not in ascending order"
+			);
 			reverifyDaysOptions.push(options[i]);
 		}
 	}
@@ -137,9 +148,15 @@ contract IdentityV4 is
 		uint256 timestamp
 	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		require(identities[account].status == 1, "not whitelisted");
+
 		uint daysSinceAuthentication = (timestamp -
 			identities[account].dateAuthenticated) / 1 days;
 
+		// temp exclusion post upgrade for previously authenticted users to start with authcount at last step
+		// can be removed in the future
+		if (identities[account].dateAuthenticated < 1772697574) {
+			identities[account].authCount = uint32(reverifyDaysOptions.length - 1);
+		}
 		// should happen before updating dateAuthenticated
 		if (shouldReverify(account, daysSinceAuthentication)) {
 			identities[account].authCount += 1;
@@ -219,9 +236,14 @@ contract IdentityV4 is
 		address account,
 		uint daysSinceAuth
 	) public view returns (bool) {
-		if (identities[account].authCount >= reverifyDaysOptions.length)
-			return false;
-		uint reverifyAfterDays = reverifyDaysOptions[identities[account].authCount];
+		uint32 authCount = identities[account].authCount;
+
+		// temp exclusion post upgrade for previously authenticted users to start with authcount at last step
+		// can be removed in the future
+		if (identities[account].dateAuthenticated < 1772697574) {
+			authCount = uint32(reverifyDaysOptions.length - 1);
+		}
+		uint reverifyAfterDays = reverifyDaysOptions[authCount];
 		if (daysSinceAuth >= reverifyAfterDays) return true;
 
 		return false;