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

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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.json"
 }

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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/61417d1e32653307199728de1d531678.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/package.json

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

package/test/faucet/Faucet.test.ts

@@ -1,158 +1,194 @@
 import hre, { ethers, upgrades } from "hardhat";
 import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
 import { expect } from "chai";
-import { Faucet, IGoodDollar, IIdentity } from "../../types";
+import { Faucet, FuseFaucetV2, IGoodDollar, IIdentity } from "../../types";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
 import { createDAO } from "../helpers";
 
 const BN = ethers.BigNumber;
-
-describe("Faucet", () => {
-  let faucet: Faucet, founder: SignerWithAddress;
-  let user1 = ethers.Wallet.createRandom().connect(ethers.provider);
-  let user2 = ethers.Wallet.createRandom().connect(ethers.provider);
-  let signers;
-
-  let avatar, gd: IGoodDollar, Controller, id: IIdentity;
-
-  before(async () => {
-    [founder, ...signers] = await ethers.getSigners();
-
-    const FuseFaucetF = await ethers.getContractFactory("Faucet");
-
-    let { daoCreator, controller, avatar: av, gd: gooddollar, identity, nameService } = await loadFixture(createDAO);
-
-    Controller = controller;
-    avatar = av;
-
-    // await daoCreator.setSchemes(
-    //   avatar,
-    //   [identity],
-    //   [ethers.constants.HashZero],
-    //   ["0x0000001F"],
-    //   ""
-    // );
-    //NameService _ns,
-    // uint64 _gasPrice,
-    // address relayer,
-    // address owner
-    faucet = (await upgrades.deployProxy(
-      FuseFaucetF,
-      [nameService.address, 1e10, signers[0].address, founder.address],
-      {
-        kind: "uups"
-      }
-    )) as Faucet;
-
-    gd = (await ethers.getContractAt("IGoodDollar", gooddollar, founder)) as IGoodDollar;
-    id = (await ethers.getContractAt("IIdentity", identity, founder)) as IIdentity;
-
-    await founder.sendTransaction({
-      value: ethers.utils.parseEther("1"),
-      to: faucet.address
+["FuseFaucetV2", "Faucet"].forEach(factory => {
+  describe(factory, () => {
+    let faucet: FuseFaucetV2 | Faucet, founder: SignerWithAddress, fuseFaucet: FuseFaucetV2, faucets;
+    let user1 = ethers.Wallet.createRandom().connect(ethers.provider);
+    let user2 = ethers.Wallet.createRandom().connect(ethers.provider);
+    let signers;
+
+    let avatar, gd: IGoodDollar, Controller, id: IIdentity;
+
+    const cleanFixture = async () => {};
+    before(async () => {
+      [founder, ...signers] = await ethers.getSigners();
+
+      const FuseFaucetF = await ethers.getContractFactory(factory);
+
+      let { daoCreator, controller, avatar: av, gd: gooddollar, identity, nameService } = await loadFixture(createDAO);
+
+      Controller = controller;
+      avatar = av;
+
+      // await daoCreator.setSchemes(
+      //   avatar,
+      //   [identity],
+      //   [ethers.constants.HashZero],
+      //   ["0x0000001F"],
+      //   ""
+      // );
+
+      // faucet = (await upgrades.deployProxy(
+      //   FuseFaucetF,
+      //   [nameService.address, 1e10, signers[0].address, founder.address],
+      //   {
+      //     kind: "uups"
+      //   }
+      // )) as Faucet;
+
+      faucet = (await upgrades.deployProxy(
+        await ethers.getContractFactory("FuseFaucetV2"),
+        [nameService.address, 1e10, signers[0].address, 1000000],
+        {
+          kind: "transparent"
+        }
+      )) as FuseFaucetV2;
+
+      gd = (await ethers.getContractAt("IGoodDollar", gooddollar, founder)) as IGoodDollar;
+      id = (await ethers.getContractAt("IIdentity", identity, founder)) as IIdentity;
+
+      await founder.sendTransaction({
+        value: ethers.utils.parseEther("1"),
+        to: faucet.address
+      });
+      faucets = [fuseFaucet, faucet];
+      await loadFixture(cleanFixture);
     });
-  });
 
-  it("should have balance", async () => {
-    const balance = await ethers.provider.getBalance(faucet.address);
-    expect(balance).to.equal(ethers.utils.parseEther("1"));
-  });
-
-  it("should not unauthorized to top new user", async () => {
-    expect(await faucet.canTop(user1.address)).to.true;
-    await expect(faucet.topWallet(user1.address)).revertedWith("not authorized");
-  });
+    it("should have balance", async () => {
+      const balance = await ethers.provider.getBalance(faucet.address);
+      expect(balance).to.equal(ethers.utils.parseEther("1"));
+    });
 
-  it("should let new user top once", async () => {
-    expect(await faucet.canTop(user1.address)).to.true;
-    const tx = await (await faucet.connect(signers[0]).topWallet(user1.address)).wait();
-    const balance = await ethers.provider.getBalance(user1.address);
-    expect(balance).to.equal(await faucet.getToppingAmount());
-  });
+    it("should not unauthorized to top new user", async () => {
+      expect(await faucet.canTop(user1.address)).to.true;
+      await expect(faucet.topWallet(user1.address)).revertedWith("not authorized");
+    });
 
-  it("should not let new user top more than once", async () => {
-    await user1.sendTransaction({
-      to: ethers.constants.AddressZero,
-      value: ethers.utils.parseUnits("400000", "gwei")
+    it("should let new user top once", async () => {
+      expect(await faucet.canTop(user1.address)).to.true;
+      const tx = await (await faucet.connect(signers[0]).topWallet(user1.address)).wait();
+      const balance = await ethers.provider.getBalance(user1.address);
+      expect(balance).to.equal(await faucet.getToppingAmount());
     });
-    expect(await faucet.canTop(user1.address)).to.false;
-    await expect(faucet.connect(signers[0]).topWallet(user1.address)).to.revertedWith(
-      "User not whitelisted or not first time"
-    );
-  });
 
-  it("should not refund gas when reverted", async () => {
-    const balance = await ethers.provider.getBalance(founder.address);
-    const faucetBalance = await ethers.provider.getBalance(faucet.address);
-    expect(await faucet.canTop(user1.address)).to.false;
-    await expect(faucet.topWallet(user1.address)).to.revertedWith("User not whitelisted or not first time");
-    const balanceAfter = await ethers.provider.getBalance(founder.address);
-    const faucetBalanceAfter = await ethers.provider.getBalance(faucet.address);
-    expect(faucetBalanceAfter).to.eq(faucetBalance);
-    expect(balanceAfter).to.lt(balance);
-  });
+    it("should not let new user top more than once", async () => {
+      await user1.sendTransaction({
+        to: ethers.constants.AddressZero,
+        value: ethers.utils.parseUnits("400000", "gwei")
+      });
+      expect(await faucet.canTop(user1.address)).to.false;
+      await expect(faucet.connect(signers[0]).topWallet(user1.address)).to.revertedWith(
+        "User not whitelisted or not first time"
+      );
+    });
 
-  it("should let user top again once identified", async () => {
-    await id.addWhitelistedWithDID(user1.address, "did:1");
-    expect(await faucet.canTop(user1.address)).to.true;
-    const tx = await (await faucet.topWallet(user1.address)).wait();
-    console.log(tx.gasUsed.toString());
-    const balance = await ethers.provider.getBalance(user1.address);
-    expect(balance).to.equal(await faucet.getToppingAmount());
-  });
+    it("should not refund gas when reverted", async () => {
+      const balance = await ethers.provider.getBalance(founder.address);
+      const faucetBalance = await ethers.provider.getBalance(faucet.address);
+      expect(await faucet.canTop(user1.address)).to.false;
+      await expect(faucet.topWallet(user1.address)).to.revertedWith("User not whitelisted or not first time");
+      const balanceAfter = await ethers.provider.getBalance(founder.address);
+      const faucetBalanceAfter = await ethers.provider.getBalance(faucet.address);
+      expect(faucetBalanceAfter).to.eq(faucetBalance);
+      expect(balanceAfter).to.lt(balance);
+    });
 
-  it("should not let identified user top over daily limit", async () => {
-    await user1.sendTransaction({
-      to: ethers.constants.AddressZero,
-      value: ethers.utils.parseUnits("400000", "gwei")
+    it("should let user top again once identified", async () => {
+      await user1.sendTransaction({
+        to: ethers.constants.AddressZero,
+        value: (await ethers.provider.getBalance(user1.address)).sub(ethers.utils.parseUnits("100000", "gwei"))
+      });
+      await id.addWhitelistedWithDID(user1.address, "did:1");
+      expect(await faucet.canTop(user1.address)).to.true;
+      const tx = await (await faucet.topWallet(user1.address)).wait();
+      console.log(tx.gasUsed.toString());
+      const balance = await ethers.provider.getBalance(user1.address);
+      expect(balance).to.equal(await faucet.getToppingAmount());
     });
-    const tx = await (await faucet.topWallet(user1.address)).wait();
-    await user1.sendTransaction({
-      to: ethers.constants.AddressZero,
-      value: ethers.utils.parseUnits("400000", "gwei")
+
+    it("should not let identified user top over daily limit", async () => {
+      await user1.sendTransaction({
+        to: ethers.constants.AddressZero,
+        value: (await ethers.provider.getBalance(user1.address)).sub(ethers.utils.parseUnits("100000", "gwei"))
+      });
+      const tx = await (await faucet.topWallet(user1.address)).wait();
+      await user1.sendTransaction({
+        to: ethers.constants.AddressZero,
+        value: ethers.utils.parseUnits("400000", "gwei")
+      });
+      expect(await faucet.canTop(user1.address)).to.false;
+      await expect(faucet.topWallet(user1.address)).to.revertedWith("max daily toppings");
     });
-    expect(await faucet.canTop(user1.address)).to.false;
-    await expect(faucet.topWallet(user1.address)).to.revertedWith("max daily toppings");
-  });
 
-  // it("should not top if wallet not half empty", async () => {
-  //   expect(await faucet.canTop(founder.address)).to.false;
-  //   await expect(faucet.topWallet(founder.address)).to.revertedWith(
-  //     "User balance above minimum"
-  //   );
-  // });
-
-  it("should not let user top over weekly limit", async () => {
-    const toppingAmount = await faucet.getToppingAmount();
-    for (let i = 0; i < 5; i++) {
-      await ethers.provider.send("evm_increaseTime", [60 * 60 * 24]);
-      await (await faucet.topWallet(user1.address)).wait();
+    // it("should not top if wallet not half empty", async () => {
+    //   expect(await faucet.canTop(founder.address)).to.false;
+    //   await expect(faucet.topWallet(founder.address)).to.revertedWith(
+    //     "User balance above minimum"
+    //   );
+    // });
+
+    it("should not let user top over weekly limit", async () => {
+      const toppingAmount = await faucet.getToppingAmount();
       await user1.sendTransaction({
         to: ethers.constants.AddressZero,
         value: toppingAmount.mul(80).div(100)
       });
-    }
-    await ethers.provider.send("evm_increaseTime", [60 * 60 * 24]);
+      for (let i = 0; i < 2; i++) {
+        await ethers.provider.send("evm_increaseTime", [60 * 60 * 24]);
+        await (await faucet.topWallet(user1.address)).wait();
+        await user1.sendTransaction({
+          to: ethers.constants.AddressZero,
+          value: toppingAmount.mul(80).div(100)
+        });
+        console.log(toppingAmount.toString(), { i });
+      }
+      // await ethers.provider.send("evm_increaseTime", [60 * 60 * 24]);
 
-    expect(await faucet.canTop(user1.address)).to.false;
-    await expect(faucet.topWallet(user1.address)).to.revertedWith(
-      "User wallet has been topped too many times this week"
-    );
+      await expect(faucet.topWallet(user1.address)).to.revertedWith(
+        "User wallet has been topped too many times this week"
+      );
+      expect(await faucet.canTop(user1.address)).to.false;
 
-    //should be able to top again after some days passed
-    await ethers.provider.send("evm_increaseTime", [60 * 60 * 24 * 3]);
-    await ethers.provider.send("evm_mine", []);
+      //should be able to top again after some days passed
+      await ethers.provider.send("evm_increaseTime", [60 * 60 * 24 * 5]);
+      await ethers.provider.send("evm_mine", []);
 
-    expect(await faucet.canTop(user1.address)).to.true;
-  });
+      expect(await faucet.canTop(user1.address)).to.true;
+    });
+
+    it("should not top below minTopping", async () => {
+      await id.addWhitelistedWithDID(user2.address, "did:2");
 
-  it("should reimburse gas costs", async () => {
-    const balance = await ethers.provider.getBalance(founder.address);
-    const tx = await (await faucet.connect(signers[0]).topWallet(user2.address, { gasPrice: 1e9 })).wait();
-    // const gasCosts = tx.gasUsed.mul(1e9);
-    // const afterRefund = gasCosts.sub(await faucet["gasRefund()"]());
-    const balanceAfter = await ethers.provider.getBalance(founder.address);
-    const diff = balance.sub(balanceAfter).toNumber();
-    expect(diff).to.lt(10000);
+      const toppingAmount = await faucet.getToppingAmount();
+      console.log(toppingAmount.toString(), "topping amount");
+      const minTopping = await faucet.minTopping();
+      const balance = await ethers.provider.getBalance(founder.address);
+      await founder.sendTransaction({ to: user2.address, value: toppingAmount.mul(100 - minTopping + 1).div(100) });
+
+      expect(await faucet.canTop(user2.address)).to.be.false;
+      await expect(faucet.topWallet(user2.address)).to.revertedWith("low toTop");
+      await user2.sendTransaction({ to: founder.address, value: toppingAmount.mul(2).div(100) });
+      expect(await faucet.canTop(user2.address)).to.be.true;
+      await expect(faucet.topWallet(user2.address)).not.reverted;
+    });
+
+    it("should reimburse gas costs", async () => {
+      const tempUser = ethers.Wallet.createRandom().connect(ethers.provider);
+
+      const balance = await ethers.provider.getBalance(founder.address);
+      const tx = await (await faucet.connect(signers[0]).topWallet(tempUser.address, { gasPrice: 1e9 })).wait();
+      // const gasCosts = tx.gasUsed.mul(1e9);
+      // const afterRefund = gasCosts.sub(await faucet["gasRefund()"]());
+      const balanceAfter = await ethers.provider.getBalance(founder.address);
+      const diff = balance.sub(balanceAfter).toNumber();
+      expect(diff).to.lt(10000);
+    });
   });
 });