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

package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/IdentityFix.sol/IdentityFix.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+}

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

@@ -0,0 +1,60 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "IdentityFix",
+  "sourceName": "contracts/utils/IdentityFix.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "contract IdentityV2",
+          "name": "_identity",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [],
+      "name": "end",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address[]",
+          "name": "addrs",
+          "type": "address[]"
+        },
+        {
+          "internalType": "uint256[]",
+          "name": "timestamps",
+          "type": "uint256[]"
+        }
+      ],
+      "name": "fix",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "identity",
+      "outputs": [
+        {
+          "internalType": "contract IdentityV2",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161073d38038061073d83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6106aa806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806329fae3d0146100465780632c159a1a1461005b578063efbe1c1c1461008a575b600080fd5b6100596100543660046104ed565b610092565b005b60005461006e906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b61005961025e565b600054604080516306abfd8f60e21b815290516001600160a01b03909216916391d14854918391631aaff63c916004808201926020929091908290030181865afa1580156100e4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010891906105bb565b336040518363ffffffff1660e01b81526004016101269291906105d4565b602060405180830381865afa158015610143573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061016791906105eb565b61018c5760405162461bcd60e51b815260040161018390610614565b60405180910390fd5b60005b82518110156102595760005483516001600160a01b03909116906396a1ef79908590849081106101c1576101c1610637565b60200260200101518484815181106101db576101db610637565b60200260200101516040518363ffffffff1660e01b81526004016102149291906001600160a01b03929092168252602082015260400190565b600060405180830381600087803b15801561022e57600080fd5b505af1158015610242573d6000803e3d6000fd5b5050505080806102519061064d565b91505061018f565b505050565b600054604080516306abfd8f60e21b815290516001600160a01b03909216916391d14854918391631aaff63c916004808201926020929091908290030181865afa1580156102b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d491906105bb565b336040518363ffffffff1660e01b81526004016102f29291906105d4565b602060405180830381865afa15801561030f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061033391906105eb565b61034f5760405162461bcd60e51b815260040161018390610614565b600054604080516306abfd8f60e21b815290516001600160a01b03909216916336568abe918391631aaff63c916004808201926020929091908290030181865afa1580156103a1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c591906105bb565b306040518363ffffffff1660e01b81526004016103e39291906105d4565b600060405180830381600087803b1580156103fd57600080fd5b505af1158015610411573d6000803e3d6000fd5b503392505050ff5b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561045757610457610419565b604052919050565b60006001600160401b0382111561047857610478610419565b5060051b60200190565b600082601f83011261049357600080fd5b813560206104a86104a38361045f565b61042f565b82815260059290921b840181019181810190868411156104c757600080fd5b8286015b848110156104e257803583529183019183016104cb565b509695505050505050565b6000806040838503121561050057600080fd5b82356001600160401b038082111561051757600080fd5b818501915085601f83011261052b57600080fd5b8135602061053b6104a38361045f565b82815260059290921b8401810191818101908984111561055a57600080fd5b948201945b8386101561058e5785356001600160a01b038116811461057f5760008081fd5b8252948201949082019061055f565b965050860135925050808211156105a457600080fd5b506105b185828601610482565b9150509250929050565b6000602082840312156105cd57600080fd5b5051919050565b9182526001600160a01b0316602082015260400190565b6000602082840312156105fd57600080fd5b8151801515811461060d57600080fd5b9392505050565b6020808252600990820152683737ba1030b236b4b760b91b604082015260600190565b634e487b7160e01b600052603260045260246000fd5b60006001820161066d57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212204c995a27d0c67f0032088a13fe46b5d6da56b59dad80c97861520bc6ef69293064736f6c63430008100033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806329fae3d0146100465780632c159a1a1461005b578063efbe1c1c1461008a575b600080fd5b6100596100543660046104ed565b610092565b005b60005461006e906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b61005961025e565b600054604080516306abfd8f60e21b815290516001600160a01b03909216916391d14854918391631aaff63c916004808201926020929091908290030181865afa1580156100e4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010891906105bb565b336040518363ffffffff1660e01b81526004016101269291906105d4565b602060405180830381865afa158015610143573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061016791906105eb565b61018c5760405162461bcd60e51b815260040161018390610614565b60405180910390fd5b60005b82518110156102595760005483516001600160a01b03909116906396a1ef79908590849081106101c1576101c1610637565b60200260200101518484815181106101db576101db610637565b60200260200101516040518363ffffffff1660e01b81526004016102149291906001600160a01b03929092168252602082015260400190565b600060405180830381600087803b15801561022e57600080fd5b505af1158015610242573d6000803e3d6000fd5b5050505080806102519061064d565b91505061018f565b505050565b600054604080516306abfd8f60e21b815290516001600160a01b03909216916391d14854918391631aaff63c916004808201926020929091908290030181865afa1580156102b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d491906105bb565b336040518363ffffffff1660e01b81526004016102f29291906105d4565b602060405180830381865afa15801561030f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061033391906105eb565b61034f5760405162461bcd60e51b815260040161018390610614565b600054604080516306abfd8f60e21b815290516001600160a01b03909216916336568abe918391631aaff63c916004808201926020929091908290030181865afa1580156103a1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c591906105bb565b306040518363ffffffff1660e01b81526004016103e39291906105d4565b600060405180830381600087803b1580156103fd57600080fd5b505af1158015610411573d6000803e3d6000fd5b503392505050ff5b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561045757610457610419565b604052919050565b60006001600160401b0382111561047857610478610419565b5060051b60200190565b600082601f83011261049357600080fd5b813560206104a86104a38361045f565b61042f565b82815260059290921b840181019181810190868411156104c757600080fd5b8286015b848110156104e257803583529183019183016104cb565b509695505050505050565b6000806040838503121561050057600080fd5b82356001600160401b038082111561051757600080fd5b818501915085601f83011261052b57600080fd5b8135602061053b6104a38361045f565b82815260059290921b8401810191818101908984111561055a57600080fd5b948201945b8386101561058e5785356001600160a01b038116811461057f5760008081fd5b8252948201949082019061055f565b965050860135925050808211156105a457600080fd5b506105b185828601610482565b9150509250929050565b6000602082840312156105cd57600080fd5b5051919050565b9182526001600160a01b0316602082015260400190565b6000602082840312156105fd57600080fd5b8151801515811461060d57600080fd5b9392505050565b6020808252600990820152683737ba1030b236b4b760b91b604082015260600190565b634e487b7160e01b600052603260045260246000fd5b60006001820161066d57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212204c995a27d0c67f0032088a13fe46b5d6da56b59dad80c97861520bc6ef69293064736f6c63430008100033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/68cb43ee97229bfd7d32f64b68276b7f.json"
+  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
 }

package/contracts/fuseFaucet/Faucet.sol

@@ -47,6 +47,7 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	uint64 public maxDailyNewWallets;
 	uint64 public dailyNewWalletsCount;
 	uint32 public version;
+	uint8 public minTopping; //percentage of topping amount, that user can request to top
 
 	function initialize(
 		NameService _ns,
@@ -65,6 +66,7 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 		nameService = _ns;
 		maxPerWeekMultiplier = 2;
 		maxDailyNewWallets = 5000;
+		minTopping = 15;
 	}
 
 	function _authorizeUpgrade(
@@ -75,13 +77,6 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 		return IIdentityV2(nameService.getAddress("IDENTITY"));
 	}
 
-	function upgrade() public {
-		require(version == 0, "already upgraded");
-		if (maxDailyNewWallets == 0) maxDailyNewWallets = 5000;
-		version++;
-		setGasTopping(gasTopping / gasPrice);
-	}
-
 	modifier reimburseGas() {
 		uint256 _gasRefund = gasleft();
 		_;
@@ -157,6 +152,8 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 
 	function canTop(address _user) external view returns (bool) {
 		if (getToppingAmount() < address(_user).balance) return false;
+		uint256 toTop = getToppingAmount() - address(_user).balance;
+		if ((toTop * 100) / getToppingAmount() < minTopping) return false;
 
 		address whitelistedRoot = getIdentity().getWhitelistedRoot(_user);
 		_user = whitelistedRoot == address(0) ? _user : whitelistedRoot;
@@ -206,8 +203,8 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 			? _wallet
 			: payable(whitelistedRoot);
 
-		require(getToppingAmount() > address(_wallet).balance);
 		uint256 toTop = getToppingAmount() - address(_wallet).balance;
+		require((toTop * 100) / getToppingAmount() >= minTopping, "low toTop");
 
 		uint256 dayOfWeek = currentDay % 7;
 
@@ -259,4 +256,8 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	function setGasPrice(uint64 _price) external onlyRole(DEFAULT_ADMIN_ROLE) {
 		gasPrice = _price;
 	}
+
+	function setMinTopping(uint8 _minTop) external onlyRole(DEFAULT_ADMIN_ROLE) {
+		minTopping = _minTop;
+	}
 }

package/contracts/fuseFaucet/FuseFaucetV2.sol

@@ -46,6 +46,7 @@ contract FuseFaucetV2 is Initializable {
 	address public relayer;
 	address public owner;
 	uint32 public version;
+	uint8 public minTopping;
 
 	function initialize(
 		NameService _ns,
@@ -53,15 +54,17 @@ contract FuseFaucetV2 is Initializable {
 		address _relayer,
 		uint64 gweiTopping
 	) public initializer {
-		if (relayer != address(0)) relayer = _relayer;
+		relayer = _relayer;
 		gasPrice = _gasPrice;
-		setGasTopping(gweiTopping);
+		gasTopping = gweiTopping; //1m gwei
+		perDayRoughLimit = 2 * gasTopping;
 		maxDailyToppings = 3;
 		startTime = block.timestamp;
 		nameService = _ns;
 		maxPerWeekMultiplier = 2;
 		maxSwapAmount = 1000;
 		maxDailyNewWallets = 5000;
+		minTopping = 15;
 	}
 
 	modifier upgrader(uint32 _newversion) {
@@ -175,6 +178,8 @@ contract FuseFaucetV2 is Initializable {
 
 	function canTop(address _user) external view returns (bool) {
 		if (getToppingAmount() < address(_user).balance) return false;
+		uint256 toTop = getToppingAmount() - address(_user).balance;
+		if ((toTop * 100) / getToppingAmount() < minTopping) return false;
 
 		address whitelistedRoot = getIdentity().getWhitelistedRoot(_user);
 		_user = whitelistedRoot == address(0) ? _user : whitelistedRoot;
@@ -209,12 +214,9 @@ contract FuseFaucetV2 is Initializable {
 	 * 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);
 	}
 
@@ -227,8 +229,9 @@ contract FuseFaucetV2 is Initializable {
 			? _wallet
 			: payable(whitelistedRoot);
 
-		require(getToppingAmount() > address(_wallet).balance);
+		// require(getToppingAmount() > address(_wallet).balance);
 		uint256 toTop = getToppingAmount() - address(_wallet).balance;
+		require((toTop * 100) / getToppingAmount() >= minTopping, "low toTop");
 
 		uint256 dayOfWeek = currentDay % 7;
 
@@ -276,4 +279,8 @@ contract FuseFaucetV2 is Initializable {
 	function setGasPrice(uint64 _price) external onlyOwner {
 		gasPrice = _price;
 	}
+
+	function setMinTopping(uint8 _minTop) external onlyOwner {
+		minTopping = _minTop;
+	}
 }

package/contracts/identity/IdentityV2.sol

@@ -57,10 +57,10 @@ contract IdentityV2 is
 	event ContractAdded(address indexed account);
 	event ContractRemoved(address indexed account);
 
-	function initialize(address _owner, IIdentity _oldIdentity)
-		public
-		initializer
-	{
+	function initialize(
+		address _owner,
+		IIdentity _oldIdentity
+	) public initializer {
 		__AccessControl_init_unchained();
 		__Pausable_init_unchained();
 		__EIP712_init_unchained("Identity", "1.0.0");
@@ -107,14 +107,24 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to change its auth date
 	 */
-	function authenticate(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function authenticate(address account) public {
+		return authenticateWithTimestamp(account, block.timestamp);
+	}
+
+	/**
+	 * @dev Sets the authentication date of `account`
+	 * to the current time.
+	 * Can only be called by Identity Administrators.
+	 * @param account address to change its auth date
+	 * @param timestamp the authentication timestamp
+	 */
+	function authenticateWithTimestamp(
+		address account,
+		uint256 timestamp
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		require(identities[account].status == 1, "not whitelisted");
-		identities[account].dateAuthenticated = block.timestamp;
-		emit WhitelistedAuthenticated(account, block.timestamp);
+		identities[account].dateAuthenticated = timestamp;
+		emit WhitelistedAuthenticated(account, timestamp);
 	}
 
 	/**
@@ -122,11 +132,9 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to add as whitelisted
 	 */
-	function addWhitelisted(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function addWhitelisted(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		_addWhitelisted(account, _chainId());
 	}
 
@@ -154,11 +162,10 @@ contract IdentityV2 is
 	 * @param account The address to add
 	 * @param did the ID to add account under
 	 */
-	function addWhitelistedWithDID(address account, string memory did)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function addWhitelistedWithDID(
+		address account,
+		string memory did
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		_addWhitelistedWithDID(account, did, _chainId());
 	}
 
@@ -167,11 +174,9 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to remove as whitelisted
 	 */
-	function removeWhitelisted(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function removeWhitelisted(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		_removeWhitelisted(account);
 	}
 
@@ -228,11 +233,9 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to add as blacklisted
 	 */
-	function addBlacklisted(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function addBlacklisted(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		identities[account].status = 255;
 		emit BlacklistAdded(account);
 	}
@@ -242,11 +245,9 @@ contract IdentityV2 is
 	 * Can only be called by Identity Administrators.
 	 * @param account address to remove as blacklisted
 	 */
-	function removeBlacklisted(address account)
-		external
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function removeBlacklisted(
+		address account
+	) external onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		if (
 			address(oldIdentity) != address(0) && oldIdentity.isBlacklisted(account)
 		) oldIdentity.removeBlacklisted(account);
@@ -259,11 +260,9 @@ contract IdentityV2 is
 	 * @dev Function to add a Contract to list of contracts
 	 * @param account The address to add
 	 */
-	function addContract(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function addContract(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		require(isContract(account), "Given address is not a contract");
 		_addWhitelisted(account, _chainId());
 		identities[account].status = 2; //this must come after _addWhitelisted
@@ -275,11 +274,9 @@ contract IdentityV2 is
 	 * @dev Function to remove a Contract from list of contracts
 	 * @param account The address to add
 	 */
-	function removeContract(address account)
-		public
-		onlyRole(IDENTITY_ADMIN_ROLE)
-		whenNotPaused
-	{
+	function removeContract(
+		address account
+	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
 		if (
 			address(oldIdentity) != address(0) && oldIdentity.isDAOContract(account)
 		) {
@@ -472,11 +469,9 @@ contract IdentityV2 is
 	 @param account address to get its identity
 	 @return whitelisted the identity or address 0 if _account not connected or not identity
 	 **/
-	function getWhitelistedRoot(address account)
-		external
-		view
-		returns (address whitelisted)
-	{
+	function getWhitelistedRoot(
+		address account
+	) external view returns (address whitelisted) {
 		if (isWhitelisted(account)) return account;
 		if (isWhitelisted(connectedAccounts[account]))
 			return connectedAccounts[account];
@@ -533,11 +528,9 @@ contract IdentityV2 is
 	 @param account to get DID for
 	 @return did of the account
 	 */
-	function addrToDID(address account)
-		external
-		view
-		returns (string memory did)
-	{
+	function addrToDID(
+		address account
+	) external view returns (string memory did) {
 		did = identities[account].did;
 		bytes32 pHash = keccak256(bytes(did));
 
@@ -555,11 +548,9 @@ contract IdentityV2 is
 		return "";
 	}
 
-	function getWhitelistedOnChainId(address account)
-		external
-		view
-		returns (uint256 chainId)
-	{
+	function getWhitelistedOnChainId(
+		address account
+	) external view returns (uint256 chainId) {
 		chainId = identities[account].whitelistedOnChainId;
 		return chainId > 0 ? chainId : _chainId();
 	}