add: support builders season3 voting contract in faucet

Author: sirpy

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 {

scripts/bulkWhitelist.ts

@@ -1,4 +1,16 @@
 import farmed from "../farming.json";
+import farmed2 from "../farming2.json";
+import farmed3 from "../farming3.json";
+import farmed4 from "../farming4.json";
+import farmed5 from "../farming5.json";
+import farmed6 from "../farming6.json";
+import farmed7 from "../farming7.json";
+import farmed8 from "../farming8.json";
+import farmed9 from "../farming9.json";
+import farmed10 from "../farming10.json";
+import farmed11 from "../farming11.json";
+import farmed12 from "../farming12.json";
+
 import { ethers, network } from "hardhat";
 import { chunk } from "lodash";
 import contracts from "../releases/deployment.json";
@@ -7,16 +19,78 @@ const main = async () => {
   const signer = (await ethers.getSigners())[0];
 
   console.log("signer", signer.address);
+  if (signer.address !== "0x88c11F1fFF51a7D3843Bdf1D9d16eafAda01e0f0") {
+    console.error("Please use the correct signer with the ADMIN_KEY environment variable");
+    return;
+  }
   const whitelist = await ethers.getContractAt("BulkWhitelist", contracts[network.name].BulkWhitelist);
-  const chunks = chunk(farmed, 300);
+  const notReVerified = farmed12.filter(
+    addr =>
+      !(
+        farmed11.includes(addr) ||
+        farmed10.includes(addr) ||
+        farmed9.includes(addr) ||
+        farmed8.includes(addr) ||
+        farmed7.includes(addr) ||
+        farmed6.includes(addr) ||
+        farmed5.includes(addr) ||
+        farmed.includes(addr) ||
+        farmed2.includes(addr) ||
+        farmed3.includes(addr) ||
+        farmed4.includes(addr)
+      )
+  );
+  console.log(`not re-verified count out of ${farmed12.length}:`, notReVerified.length);
+  const chunks = chunk(notReVerified, 100).slice(0);
+  let nonce = await signer.getTransactionCount();
+  let batchSize = 2;
+  let gasLimit = 6000000;
+  let txs = [];
+  console.log("starting nonce:", nonce);
+  switch (network.name) {
+    case "production-celo":
+      batchSize = 10; // to avoid tx replacement
+      break;
+    case "production-xdc":
+      batchSize = 20;
+      gasLimit = 10000000;
+
+      break;
+    case "production":
+      batchSize = 10;
+      break;
+  }
   for (let batch of chunks) {
-    console.log("whitelisting batch of", batch.length, batch[0], batch[batch.length - 1]);
-    const res = await (await whitelist.connect(signer).removeWhitelisted(batch, { gasLimit: 25000000 })).wait();
-    console.log("tx:", res.transactionHash);
+    console.log("remove whitelisting batch of", batch.length, batch[0], batch[batch.length - 1], { nonce });
+    if (batchSize > 1) {
+      txs.push(
+        whitelist
+          .connect(signer)
+          .removeWhitelisted(batch, { gasLimit, nonce: nonce++ })
+          .then(_ => _.wait())
+      );
+      if (txs.length < batchSize && batch.length === 100) continue;
+      console.log("queued txs:", txs.length);
+      const results = await Promise.allSettled(txs);
+      const success = results.filter(r => r.status === "fulfilled").map(_ => _.value);
+      console.log(
+        `completed txs: ${success.length}/${txs.length}`,
+        success.map(r => r.transactionHash)
+      );
+      nonce = await signer.getTransactionCount();
+
+      txs = [];
+    } else {
+      const res = await (await whitelist.connect(signer).removeWhitelisted(batch, { gasLimit })).wait();
+      console.log("tx:", res.transactionHash);
+    }
   }
 };
 
 const checkReVerified = async () => {
+  // get intersection of farmed and farmed2
+  const reVerified = farmed3.filter(addr => farmed.includes(addr) || farmed2.includes(addr));
+  console.log("re-verified count:", reVerified.length);
   const chunks = chunk(farmed, 300);
   let total = 0;
   for (let batch of chunks) {
@@ -27,5 +101,5 @@ const checkReVerified = async () => {
   }
   console.log(`total: ${total}/${farmed.length}`);
 };
-checkReVerified();
-// main().catch(console.log);
+// checkReVerified();
+main().catch(console.log);