@gooddollar/goodprotocol 2.0.4 → 2.0.5-beta.1

package/contracts/fuseFaucet/Faucet.sol

@@ -42,7 +42,7 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	uint32 public maxDailyToppings;
 	uint64 public gasPrice;
 	uint32 public maxPerWeekMultiplier;
-	uint32 public maxSwapAmount;
+	uint32 public maxSwapAmount_unused; // kept because of upgrades layout
 	address public goodDollar_unused; //kept because of upgrades
 	uint64 public maxDailyNewWallets;
 	uint64 public dailyNewWalletsCount;
@@ -64,15 +64,12 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 		startTime = block.timestamp;
 		nameService = _ns;
 		maxPerWeekMultiplier = 2;
-		maxSwapAmount = 1000;
 		maxDailyNewWallets = 5000;
 	}
 
-	function _authorizeUpgrade(address newImplementation)
-		internal
-		override
-		onlyRole(DEFAULT_ADMIN_ROLE)
-	{}
+	function _authorizeUpgrade(
+		address newImplementation
+	) internal override onlyRole(DEFAULT_ADMIN_ROLE) {}
 
 	function getIdentity() public view returns (IIdentityV2) {
 		return IIdentityV2(nameService.getAddress("IDENTITY"));
@@ -194,12 +191,9 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	 * can only be done by admin the amount of times specified in constructor per day
 	 * @param _user The address to transfer to
 	 */
-	function topWallet(address payable _user)
-		public
-		reimburseGas
-		toppingLimit(_user)
-		onlyAuthorized(_user)
-	{
+	function topWallet(
+		address payable _user
+	) public reimburseGas toppingLimit(_user) onlyAuthorized(_user) {
 		_topWallet(_user);
 	}
 
@@ -232,12 +226,14 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 		emit WalletTopped(target, toTop, whitelistedRoot, msg.sender);
 	}
 
+	/**
+		@notice only safe for small amounts, since we dont have slippage check
+	 */
 	function onTokenTransfer(
 		address payable _from,
 		uint256 amount,
 		bytes calldata data
 	) external returns (bool) {
-		require(amount <= maxSwapAmount, "slippage");
 		address uniswapLike = abi.decode(data, (address));
 		Uniswap uniswap = Uniswap(uniswapLike);
 		address[] memory path = new address[](2);
@@ -253,10 +249,9 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 		return gasTopping * gasPrice;
 	}
 
-	function setGasTopping(uint256 _gasUnits)
-		public
-		onlyRole(DEFAULT_ADMIN_ROLE)
-	{
+	function setGasTopping(
+		uint256 _gasUnits
+	) public onlyRole(DEFAULT_ADMIN_ROLE) {
 		gasTopping = _gasUnits;
 		perDayRoughLimit = 2 * gasTopping;
 	}

package/contracts/identity/IdentityV2.sol

@@ -211,7 +211,16 @@ contract IdentityV2 is
 	 * @return The date the address was added
 	 */
 	function lastAuthenticated(address account) external view returns (uint256) {
-		return identities[account].dateAuthenticated;
+		if (identities[account].dateAuthenticated > 0)
+			return identities[account].dateAuthenticated;
+		if (address(oldIdentity) != address(0)) {
+			try oldIdentity.lastAuthenticated(account) returns (uint256 _lastAuth) {
+				return _lastAuth;
+			} catch {
+				return 0;
+			}
+		}
+		return 0;
 	}
 
 	/**

package/contracts/mocks/IdentityMock.sol

@@ -4,55 +4,58 @@ pragma solidity >=0.8;
 import "../Interfaces.sol";
 
 contract IdentityMock is IIdentity {
+	address public immutable owner;
+	address public immutable daoContract;
 
-    address public immutable owner;
-    address public immutable daoContract;
+	constructor(address daoContract_) {
+		owner = msg.sender;
+		daoContract = daoContract_;
+	}
 
-    constructor(address daoContract_) {
-        owner = msg.sender;
-        daoContract = daoContract_;
-    }
+	function isWhitelisted(address user) external view returns (bool) {
+		return true;
+	}
 
-    function isWhitelisted(address user) external view returns (bool) {
-        return true;
-    }
+	function addWhitelistedWithDID(address account, string memory did) external {}
 
-    function addWhitelistedWithDID(address account, string memory did) external {}
+	function removeWhitelisted(address account) external {}
 
-    function removeWhitelisted(address account) external {}
+	function addBlacklisted(address account) external {}
 
-    function addBlacklisted(address account) external {}
+	function removeBlacklisted(address account) external {}
 
-    function removeBlacklisted(address account) external {}
+	function isBlacklisted(address user) external view returns (bool) {
+		return true;
+	}
 
-    function isBlacklisted(address user) external view returns (bool) {
-        return true;
-    }
+	function addIdentityAdmin(address account) external returns (bool) {
+		return true;
+	}
 
-    function addIdentityAdmin(address account) external returns (bool) {
-        return true;
-    }
+	function setAvatar(address _avatar) external {}
 
-    function setAvatar(address _avatar) external {}
+	function isIdentityAdmin(address account) external view returns (bool) {
+		return true;
+	}
 
-    function isIdentityAdmin(address account) external view returns (bool) {
-        return true;
-    }
+	// provided by the immutable "owner"
+	//function owner() external view returns (address);
 
-    // provided by the immutable "owner"
-    //function owner() external view returns (address);
+	function removeContract(address account) external {}
 
-    function removeContract(address account) external {}
+	function isDAOContract(address account) external view returns (bool) {
+		return false;
+	}
 
-    function isDAOContract(address account) external view returns (bool) {
-        return false;
-    }
+	function addrToDID(address account) external view returns (string memory) {
+		return "not implemented";
+	}
 
-    function addrToDID(address account) external view returns (string memory) {
-        return "not implemented";
-    }
+	function didHashToAddress(bytes32 hash) external view returns (address) {
+		return address(0); // not implemented
+	}
 
-    function didHashToAddress(bytes32 hash) external view returns (address) {
-        return address(0); // not implemented
-    }
-}
+	function lastAuthenticated(address account) external view returns (uint256) {
+		return 0;
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.4",
+  "version": "2.0.5-beta.1",
   "description": "GoodDollar Protocol",
   "scripts": {
     "prepack": "npm run minimize",

package/types/Faucet.ts

@@ -45,7 +45,7 @@ export interface FaucetInterface extends ethers.utils.Interface {
     "maxDailyNewWallets()": FunctionFragment;
     "maxDailyToppings()": FunctionFragment;
     "maxPerWeekMultiplier()": FunctionFragment;
-    "maxSwapAmount()": FunctionFragment;
+    "maxSwapAmount_unused()": FunctionFragment;
     "nameService()": FunctionFragment;
     "notFirstTime(address)": FunctionFragment;
     "onTokenTransfer(address,uint256,bytes)": FunctionFragment;
@@ -130,7 +130,7 @@ export interface FaucetInterface extends ethers.utils.Interface {
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "maxSwapAmount",
+    functionFragment: "maxSwapAmount_unused",
     values?: undefined
   ): string;
   encodeFunctionData(
@@ -237,7 +237,7 @@ export interface FaucetInterface extends ethers.utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "maxSwapAmount",
+    functionFragment: "maxSwapAmount_unused",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -440,7 +440,7 @@ export interface Faucet extends BaseContract {
 
     maxPerWeekMultiplier(overrides?: CallOverrides): Promise<[number]>;
 
-    maxSwapAmount(overrides?: CallOverrides): Promise<[number]>;
+    maxSwapAmount_unused(overrides?: CallOverrides): Promise<[number]>;
 
     nameService(overrides?: CallOverrides): Promise<[string]>;
 
@@ -575,7 +575,7 @@ export interface Faucet extends BaseContract {
 
   maxPerWeekMultiplier(overrides?: CallOverrides): Promise<number>;
 
-  maxSwapAmount(overrides?: CallOverrides): Promise<number>;
+  maxSwapAmount_unused(overrides?: CallOverrides): Promise<number>;
 
   nameService(overrides?: CallOverrides): Promise<string>;
 
@@ -710,7 +710,7 @@ export interface Faucet extends BaseContract {
 
     maxPerWeekMultiplier(overrides?: CallOverrides): Promise<number>;
 
-    maxSwapAmount(overrides?: CallOverrides): Promise<number>;
+    maxSwapAmount_unused(overrides?: CallOverrides): Promise<number>;
 
     nameService(overrides?: CallOverrides): Promise<string>;
 
@@ -909,7 +909,7 @@ export interface Faucet extends BaseContract {
 
     maxPerWeekMultiplier(overrides?: CallOverrides): Promise<BigNumber>;
 
-    maxSwapAmount(overrides?: CallOverrides): Promise<BigNumber>;
+    maxSwapAmount_unused(overrides?: CallOverrides): Promise<BigNumber>;
 
     nameService(overrides?: CallOverrides): Promise<BigNumber>;
 
@@ -1051,7 +1051,9 @@ export interface Faucet extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    maxSwapAmount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    maxSwapAmount_unused(
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
 
     nameService(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 

package/types/IIdentity.ts

@@ -35,6 +35,7 @@ export interface IIdentityInterface extends ethers.utils.Interface {
     "isDAOContract(address)": FunctionFragment;
     "isIdentityAdmin(address)": FunctionFragment;
     "isWhitelisted(address)": FunctionFragment;
+    "lastAuthenticated(address)": FunctionFragment;
     "owner()": FunctionFragment;
     "removeBlacklisted(address)": FunctionFragment;
     "removeContract(address)": FunctionFragment;
@@ -75,6 +76,10 @@ export interface IIdentityInterface extends ethers.utils.Interface {
     functionFragment: "isWhitelisted",
     values: [string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "lastAuthenticated",
+    values: [string]
+  ): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "removeBlacklisted",
@@ -123,6 +128,10 @@ export interface IIdentityInterface extends ethers.utils.Interface {
     functionFragment: "isWhitelisted",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "lastAuthenticated",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "removeBlacklisted",
@@ -214,6 +223,11 @@ export interface IIdentity extends BaseContract {
 
     isWhitelisted(user: string, overrides?: CallOverrides): Promise<[boolean]>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
     owner(overrides?: CallOverrides): Promise<[string]>;
 
     removeBlacklisted(
@@ -265,6 +279,11 @@ export interface IIdentity extends BaseContract {
 
   isWhitelisted(user: string, overrides?: CallOverrides): Promise<boolean>;
 
+  lastAuthenticated(
+    account: string,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
   owner(overrides?: CallOverrides): Promise<string>;
 
   removeBlacklisted(
@@ -319,6 +338,11 @@ export interface IIdentity extends BaseContract {
 
     isWhitelisted(user: string, overrides?: CallOverrides): Promise<boolean>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     owner(overrides?: CallOverrides): Promise<string>;
 
     removeBlacklisted(
@@ -379,6 +403,11 @@ export interface IIdentity extends BaseContract {
 
     isWhitelisted(user: string, overrides?: CallOverrides): Promise<BigNumber>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     owner(overrides?: CallOverrides): Promise<BigNumber>;
 
     removeBlacklisted(
@@ -449,6 +478,11 @@ export interface IIdentity extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     removeBlacklisted(

package/types/IIdentityV2.ts

@@ -37,6 +37,7 @@ export interface IIdentityV2Interface extends ethers.utils.Interface {
     "isDAOContract(address)": FunctionFragment;
     "isIdentityAdmin(address)": FunctionFragment;
     "isWhitelisted(address)": FunctionFragment;
+    "lastAuthenticated(address)": FunctionFragment;
     "owner()": FunctionFragment;
     "removeBlacklisted(address)": FunctionFragment;
     "removeContract(address)": FunctionFragment;
@@ -85,6 +86,10 @@ export interface IIdentityV2Interface extends ethers.utils.Interface {
     functionFragment: "isWhitelisted",
     values: [string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "lastAuthenticated",
+    values: [string]
+  ): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "removeBlacklisted",
@@ -141,6 +146,10 @@ export interface IIdentityV2Interface extends ethers.utils.Interface {
     functionFragment: "isWhitelisted",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "lastAuthenticated",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "removeBlacklisted",
@@ -245,6 +254,11 @@ export interface IIdentityV2 extends BaseContract {
 
     isWhitelisted(user: string, overrides?: CallOverrides): Promise<[boolean]>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
     owner(overrides?: CallOverrides): Promise<[string]>;
 
     removeBlacklisted(
@@ -309,6 +323,11 @@ export interface IIdentityV2 extends BaseContract {
 
   isWhitelisted(user: string, overrides?: CallOverrides): Promise<boolean>;
 
+  lastAuthenticated(
+    account: string,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
   owner(overrides?: CallOverrides): Promise<string>;
 
   removeBlacklisted(
@@ -376,6 +395,11 @@ export interface IIdentityV2 extends BaseContract {
 
     isWhitelisted(user: string, overrides?: CallOverrides): Promise<boolean>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     owner(overrides?: CallOverrides): Promise<string>;
 
     removeBlacklisted(
@@ -449,6 +473,11 @@ export interface IIdentityV2 extends BaseContract {
 
     isWhitelisted(user: string, overrides?: CallOverrides): Promise<BigNumber>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     owner(overrides?: CallOverrides): Promise<BigNumber>;
 
     removeBlacklisted(
@@ -532,6 +561,11 @@ export interface IIdentityV2 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     removeBlacklisted(

package/types/IdentityMock.ts

@@ -36,6 +36,7 @@ export interface IdentityMockInterface extends ethers.utils.Interface {
     "isDAOContract(address)": FunctionFragment;
     "isIdentityAdmin(address)": FunctionFragment;
     "isWhitelisted(address)": FunctionFragment;
+    "lastAuthenticated(address)": FunctionFragment;
     "owner()": FunctionFragment;
     "removeBlacklisted(address)": FunctionFragment;
     "removeContract(address)": FunctionFragment;
@@ -80,6 +81,10 @@ export interface IdentityMockInterface extends ethers.utils.Interface {
     functionFragment: "isWhitelisted",
     values: [string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "lastAuthenticated",
+    values: [string]
+  ): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "removeBlacklisted",
@@ -132,6 +137,10 @@ export interface IdentityMockInterface extends ethers.utils.Interface {
     functionFragment: "isWhitelisted",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "lastAuthenticated",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "removeBlacklisted",
@@ -225,6 +234,11 @@ export interface IdentityMock extends BaseContract {
 
     isWhitelisted(user: string, overrides?: CallOverrides): Promise<[boolean]>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
     owner(overrides?: CallOverrides): Promise<[string]>;
 
     removeBlacklisted(
@@ -278,6 +292,11 @@ export interface IdentityMock extends BaseContract {
 
   isWhitelisted(user: string, overrides?: CallOverrides): Promise<boolean>;
 
+  lastAuthenticated(
+    account: string,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
   owner(overrides?: CallOverrides): Promise<string>;
 
   removeBlacklisted(
@@ -334,6 +353,11 @@ export interface IdentityMock extends BaseContract {
 
     isWhitelisted(user: string, overrides?: CallOverrides): Promise<boolean>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     owner(overrides?: CallOverrides): Promise<string>;
 
     removeBlacklisted(
@@ -396,6 +420,11 @@ export interface IdentityMock extends BaseContract {
 
     isWhitelisted(user: string, overrides?: CallOverrides): Promise<BigNumber>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     owner(overrides?: CallOverrides): Promise<BigNumber>;
 
     removeBlacklisted(
@@ -468,6 +497,11 @@ export interface IdentityMock extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    lastAuthenticated(
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     removeBlacklisted(