@gooddollar/goodprotocol 2.0.32 → 2.0.33-beta.0

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

package/artifacts/contracts/utils/ProtoclUpgradeV4Mento.sol/MentoExchange.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

package/artifacts/contracts/utils/ProtoclUpgradeV4Mento.sol/ProtocolUpgradeV4Mento.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/062ade5e006c401d527c0476deb5617e.json"
+  "buildInfo": "../../../build-info/2e6863520a39a73cd85ee982bcf04d12.json"
 }

package/contracts/fuseFaucet/SuperfluidFacuet.sol

@@ -17,8 +17,6 @@ contract SuperfluidFaucet is
 	using SafeMathUpgradeable for uint256;
 
 	bytes32 public constant ADMIN_ROLE = keccak256("ADMIN_ROLE");
-	uint public constant GAS_TOPPING_AMOUNT = 350000;
-	uint public constant FIRST_GAS_TOPPING_AMOUNT = 15e5;
 
 	uint256 public _deprecated;
 	uint256 public maxValuePerPeriod;
@@ -31,6 +29,9 @@ contract SuperfluidFaucet is
 
 	mapping(address => RecipientInfo) public recipientInfo;
 
+	uint public gasToppingAmount;
+	uint public firstGasToppingAmount;
+
 	event WalletTopped(address recipient, uint256 amount);
 	event SettingsUpdated(uint256 maxValuePerPeriod, uint256 toppingPeriod);
 
@@ -51,7 +52,9 @@ contract SuperfluidFaucet is
 		_setupRole(ADMIN_ROLE, msg.sender);
 		_grantRole(ADMIN_ROLE, _admin);
 		maxValuePerPeriod = _maxValuePerPeriod;
-		toppingPeriod = _toppingPeriod;
+		toppingPeriod = _toppingPeriod * 1 days;
+		gasToppingAmount = 500000;
+		firstGasToppingAmount = 20e5;
 	}
 
 	function updateSettings(
@@ -59,7 +62,7 @@ contract SuperfluidFaucet is
 		uint256 _toppingPeriod
 	) external onlyRole(ADMIN_ROLE) {
 		maxValuePerPeriod = _maxValuePerPeriod;
-		toppingPeriod = _toppingPeriod;
+		toppingPeriod = _toppingPeriod * 1 days;
 		emit SettingsUpdated(_maxValuePerPeriod, _toppingPeriod);
 	}
 
@@ -78,6 +81,11 @@ contract SuperfluidFaucet is
 
 		uint256 currentPeriod = block.timestamp / toppingPeriod;
 
+		// fix bug where period was divid by 30 and not by 30days, (for non effected users lsatWithdrawlPeriod will be < 57947235 for sure)
+		if (info.lastWithdrawalPeriod > 0 && info.lastWithdrawalPeriod > 57947235) {
+			if (currentPeriod > (info.lastWithdrawalPeriod * 30) / toppingPeriod)
+				return true;
+		}
 		if (currentPeriod > info.lastWithdrawalPeriod) {
 			return true; // New period, reset counters
 		}
@@ -97,15 +105,22 @@ contract SuperfluidFaucet is
 		return canTop(recipient, blockFee);
 	}
 
+	function updateGasToppingAmounts(
+		uint _gasToppingAmount,
+		uint _firstGasToppingAmount
+	) external onlyRole(ADMIN_ROLE) {
+		gasToppingAmount = _gasToppingAmount;
+		firstGasToppingAmount = _firstGasToppingAmount;
+	}
+
 	function getToppingValue(
 		bool firstTime,
 		uint baseFee
-	) public pure returns (uint) {
+	) public view returns (uint) {
 		//top wallet with current base fee + 10% for priority fee and l1 fees
 		return
-			((firstTime ? FIRST_GAS_TOPPING_AMOUNT : GAS_TOPPING_AMOUNT) *
-				baseFee *
-				110) / 100;
+			((firstTime ? firstGasToppingAmount : gasToppingAmount) * baseFee * 110) /
+			100;
 	}
 
 	function topWallet(address payable recipient) external onlyRole(ADMIN_ROLE) {
@@ -115,6 +130,12 @@ contract SuperfluidFaucet is
 		uint amount = getToppingValue(firstTime, block.basefee);
 		uint256 currentPeriod = block.timestamp / toppingPeriod;
 
+		// fix bug where period was divid by 30 and not by 30days, (for non effected users lsatWithdrawlPeriod will be < 57947235 for sure)
+		if (info.lastWithdrawalPeriod > 0 && info.lastWithdrawalPeriod > 57947235) {
+			info.lastWithdrawalPeriod =
+				(info.lastWithdrawalPeriod * 30) /
+				toppingPeriod;
+		}
 		if (currentPeriod > info.lastWithdrawalPeriod) {
 			info.totalWithdrawnThisPeriod = 0;
 			info.lastWithdrawalPeriod = currentPeriod;

package/contracts/utils/BuyFromReserveHelper.sol

@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+import "../MentoInterfaces.sol";
+import "@openzeppelin/contracts/access/AccessControl.sol";
+import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
+
+contract BuyFromReserveHelper is AccessControl, ReentrancyGuard {
+	using SafeERC20 for IERC20;
+
+	bytes32 public constant ADMIN_ROLE = keccak256("ADMIN_ROLE");
+	bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
+
+	address public safe;
+	address public exchangeProvider;
+	bytes32 public exchangeId;
+	IERC20 public tokenIn;
+	IERC20 public tokenOut;
+	IBroker public broker;
+
+	event SafeUpdated(address indexed newSafe);
+	event SettingsUpdated(
+		address indexed exchangeProvider,
+		bytes32 indexed exchangeId
+	);
+	event GDBought(address indexed buyer, uint256 amountIn, uint256 amountOut);
+
+	constructor(
+		address _safe,
+		address _tokenIn,
+		address _tokenOut,
+		address _broker,
+		address _exchangeProvider,
+		bytes32 _exchangeId
+	) {
+		require(_safe != address(0), "Safe address cannot be zero");
+		require(_tokenIn != address(0), "TokenIn address cannot be zero");
+		require(_tokenOut != address(0), "TokenOut address cannot be zero");
+		require(_broker != address(0), "Broker address cannot be zero");
+		require(_exchangeProvider != address(0), "ExchangeProvider cannot be zero");
+		require(_exchangeId != bytes32(0), "ExchangeId cannot be zero");
+
+		safe = _safe;
+		tokenIn = IERC20(_tokenIn);
+		tokenOut = IERC20(_tokenOut);
+		broker = IBroker(_broker);
+		exchangeProvider = _exchangeProvider;
+		exchangeId = _exchangeId;
+
+		_setupRole(DEFAULT_ADMIN_ROLE, _safe);
+		_setupRole(EXECUTOR_ROLE, msg.sender);
+	}
+
+	function updateSafe(address _newSafe) external {
+		require(msg.sender == safe, "Only safe can update");
+		require(_newSafe != address(0), "New safe address cannot be zero");
+
+		// Update admin role
+		_revokeRole(DEFAULT_ADMIN_ROLE, safe);
+		_setupRole(DEFAULT_ADMIN_ROLE, _newSafe);
+
+		safe = _newSafe;
+		emit SafeUpdated(_newSafe);
+	}
+
+	function updateSettings(
+		address _exchangeProvider,
+		bytes32 _exchangeId,
+		address _tokenIn,
+		address _tokenOut,
+		address _broker
+	) external onlyRole(DEFAULT_ADMIN_ROLE) {
+		require(_exchangeProvider != address(0), "ExchangeProvider cannot be zero");
+		require(_exchangeId != bytes32(0), "ExchangeId cannot be zero");
+		require(_tokenIn != address(0), "TokenIn address cannot be zero");
+		require(_tokenOut != address(0), "TokenOut address cannot be zero");
+		require(_broker != address(0), "Broker address cannot be zero");
+
+		exchangeProvider = _exchangeProvider;
+		exchangeId = _exchangeId;
+		tokenIn = IERC20(_tokenIn);
+		tokenOut = IERC20(_tokenOut);
+		broker = IBroker(_broker);
+
+		emit SettingsUpdated(_exchangeProvider, _exchangeId);
+	}
+
+	function buyGdFromBroker(
+		uint256 amountInNominal,
+		uint256 minReturnNominal
+	) external onlyRole(EXECUTOR_ROLE) nonReentrant {
+		require(amountInNominal > 0, "Amount must be greater than zero");
+		require(minReturnNominal > 0, "Minimum return must be greater than zero");
+
+		uint256 amountIn = amountInNominal * 1e18;
+		uint256 minReturn = minReturnNominal * 1e18;
+
+		// assume minimum price for 0.00005 for G$ for safety check
+		require((amountIn * 1e18) / 5e13 >= minReturn, "minReturn seems too low");
+
+		// Transfer tokenIn from the safe to this contract
+		tokenIn.safeTransferFrom(safe, address(this), amountIn);
+
+		// Reset any existing approval
+		tokenIn.safeApprove(address(broker), 0);
+		// Approve the broker to spend tokenIn
+		tokenIn.safeApprove(address(broker), amountIn);
+
+		// Call the broker to buy tokenOut (G$)
+		uint256 amountOut = broker.swapIn(
+			exchangeProvider,
+			exchangeId,
+			address(tokenIn),
+			address(tokenOut),
+			amountIn,
+			minReturn
+		);
+
+		// Verify minimum return
+		require(amountOut >= minReturn, "Insufficient return amount");
+
+		// Transfer bought tokens to safe
+		tokenOut.safeTransfer(safe, amountOut);
+
+		emit GDBought(msg.sender, amountIn, amountOut);
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.32",
+  "version": "2.0.33-beta.0",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": ">=16.x"

package/releases/deployment.json

@@ -442,7 +442,8 @@
     "MentoReserve": "0x94A3240f484A04F5e3d524f528d02694c109463b",
     "MentoBroker": "0x88de45906D4F5a57315c133620cfa484cB297541",
     "MentoUpgradeHelper": "0xc413cC6C58f0c290e89ddAeC83c2590017985eb7",
-    "CeloDistributionHelper": "0x6B845eFfAf36c374e8E7cf543Efa680f2F71F098"
+    "CeloDistributionHelper": "0x6B845eFfAf36c374e8E7cf543Efa680f2F71F098",
+    "CUSDExchangeId": "0xba77f5c7bb3317643c6d81d1ef3f9913561741d92095f88efa402faf2cbe9124"
   },
   "gnosis": { "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8" },
   "development-celo": {

package/types/contracts/fuseFaucet/SuperfluidFacuet.sol/SuperfluidFaucet.ts

@@ -31,11 +31,11 @@ export interface SuperfluidFaucetInterface extends utils.Interface {
   functions: {
     "ADMIN_ROLE()": FunctionFragment;
     "DEFAULT_ADMIN_ROLE()": FunctionFragment;
-    "FIRST_GAS_TOPPING_AMOUNT()": FunctionFragment;
-    "GAS_TOPPING_AMOUNT()": FunctionFragment;
     "_deprecated()": FunctionFragment;
     "canTop(address)": FunctionFragment;
     "canTop(address,uint256)": FunctionFragment;
+    "firstGasToppingAmount()": FunctionFragment;
+    "gasToppingAmount()": FunctionFragment;
     "getRoleAdmin(bytes32)": FunctionFragment;
     "getToppingValue(bool,uint256)": FunctionFragment;
     "grantRole(bytes32,address)": FunctionFragment;
@@ -49,6 +49,7 @@ export interface SuperfluidFaucetInterface extends utils.Interface {
     "supportsInterface(bytes4)": FunctionFragment;
     "topWallet(address)": FunctionFragment;
     "toppingPeriod()": FunctionFragment;
+    "updateGasToppingAmounts(uint256,uint256)": FunctionFragment;
     "updateSettings(uint256,uint256)": FunctionFragment;
     "upgradeTo(address)": FunctionFragment;
     "upgradeToAndCall(address,bytes)": FunctionFragment;
@@ -59,11 +60,11 @@ export interface SuperfluidFaucetInterface extends utils.Interface {
     nameOrSignatureOrTopic:
       | "ADMIN_ROLE"
       | "DEFAULT_ADMIN_ROLE"
-      | "FIRST_GAS_TOPPING_AMOUNT"
-      | "GAS_TOPPING_AMOUNT"
       | "_deprecated"
       | "canTop(address)"
       | "canTop(address,uint256)"
+      | "firstGasToppingAmount"
+      | "gasToppingAmount"
       | "getRoleAdmin"
       | "getToppingValue"
       | "grantRole"
@@ -77,6 +78,7 @@ export interface SuperfluidFaucetInterface extends utils.Interface {
       | "supportsInterface"
       | "topWallet"
       | "toppingPeriod"
+      | "updateGasToppingAmounts"
       | "updateSettings"
       | "upgradeTo"
       | "upgradeToAndCall"
@@ -91,14 +93,6 @@ export interface SuperfluidFaucetInterface extends utils.Interface {
     functionFragment: "DEFAULT_ADMIN_ROLE",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "FIRST_GAS_TOPPING_AMOUNT",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "GAS_TOPPING_AMOUNT",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "_deprecated",
     values?: undefined
@@ -111,6 +105,14 @@ export interface SuperfluidFaucetInterface extends utils.Interface {
     functionFragment: "canTop(address,uint256)",
     values: [string, BigNumberish]
   ): string;
+  encodeFunctionData(
+    functionFragment: "firstGasToppingAmount",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "gasToppingAmount",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "getRoleAdmin",
     values: [BytesLike]
@@ -160,6 +162,10 @@ export interface SuperfluidFaucetInterface extends utils.Interface {
     functionFragment: "toppingPeriod",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "updateGasToppingAmounts",
+    values: [BigNumberish, BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "updateSettings",
     values: [BigNumberish, BigNumberish]
@@ -177,23 +183,23 @@ export interface SuperfluidFaucetInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "FIRST_GAS_TOPPING_AMOUNT",
+    functionFragment: "_deprecated",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "GAS_TOPPING_AMOUNT",
+    functionFragment: "canTop(address)",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "_deprecated",
+    functionFragment: "canTop(address,uint256)",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "canTop(address)",
+    functionFragment: "firstGasToppingAmount",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "canTop(address,uint256)",
+    functionFragment: "gasToppingAmount",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -233,6 +239,10 @@ export interface SuperfluidFaucetInterface extends utils.Interface {
     functionFragment: "toppingPeriod",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "updateGasToppingAmounts",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "updateSettings",
     data: BytesLike
@@ -392,10 +402,6 @@ export interface SuperfluidFaucet extends BaseContract {
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>;
 
-    FIRST_GAS_TOPPING_AMOUNT(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    GAS_TOPPING_AMOUNT(overrides?: CallOverrides): Promise<[BigNumber]>;
-
     _deprecated(overrides?: CallOverrides): Promise<[BigNumber]>;
 
     "canTop(address)"(
@@ -409,6 +415,10 @@ export interface SuperfluidFaucet extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[boolean]>;
 
+    firstGasToppingAmount(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    gasToppingAmount(overrides?: CallOverrides): Promise<[BigNumber]>;
+
     getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<[string]>;
 
     getToppingValue(
@@ -474,6 +484,12 @@ export interface SuperfluidFaucet extends BaseContract {
 
     toppingPeriod(overrides?: CallOverrides): Promise<[BigNumber]>;
 
+    updateGasToppingAmounts(
+      _gasToppingAmount: BigNumberish,
+      _firstGasToppingAmount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>;
+
     updateSettings(
       _maxValuePerPeriod: BigNumberish,
       _toppingPeriod: BigNumberish,
@@ -500,10 +516,6 @@ export interface SuperfluidFaucet extends BaseContract {
 
   DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
 
-  FIRST_GAS_TOPPING_AMOUNT(overrides?: CallOverrides): Promise<BigNumber>;
-
-  GAS_TOPPING_AMOUNT(overrides?: CallOverrides): Promise<BigNumber>;
-
   _deprecated(overrides?: CallOverrides): Promise<BigNumber>;
 
   "canTop(address)"(
@@ -517,6 +529,10 @@ export interface SuperfluidFaucet extends BaseContract {
     overrides?: CallOverrides
   ): Promise<boolean>;
 
+  firstGasToppingAmount(overrides?: CallOverrides): Promise<BigNumber>;
+
+  gasToppingAmount(overrides?: CallOverrides): Promise<BigNumber>;
+
   getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>;
 
   getToppingValue(
@@ -582,6 +598,12 @@ export interface SuperfluidFaucet extends BaseContract {
 
   toppingPeriod(overrides?: CallOverrides): Promise<BigNumber>;
 
+  updateGasToppingAmounts(
+    _gasToppingAmount: BigNumberish,
+    _firstGasToppingAmount: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>;
+
   updateSettings(
     _maxValuePerPeriod: BigNumberish,
     _toppingPeriod: BigNumberish,
@@ -608,10 +630,6 @@ export interface SuperfluidFaucet extends BaseContract {
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
 
-    FIRST_GAS_TOPPING_AMOUNT(overrides?: CallOverrides): Promise<BigNumber>;
-
-    GAS_TOPPING_AMOUNT(overrides?: CallOverrides): Promise<BigNumber>;
-
     _deprecated(overrides?: CallOverrides): Promise<BigNumber>;
 
     "canTop(address)"(
@@ -625,6 +643,10 @@ export interface SuperfluidFaucet extends BaseContract {
       overrides?: CallOverrides
     ): Promise<boolean>;
 
+    firstGasToppingAmount(overrides?: CallOverrides): Promise<BigNumber>;
+
+    gasToppingAmount(overrides?: CallOverrides): Promise<BigNumber>;
+
     getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>;
 
     getToppingValue(
@@ -687,6 +709,12 @@ export interface SuperfluidFaucet extends BaseContract {
 
     toppingPeriod(overrides?: CallOverrides): Promise<BigNumber>;
 
+    updateGasToppingAmounts(
+      _gasToppingAmount: BigNumberish,
+      _firstGasToppingAmount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     updateSettings(
       _maxValuePerPeriod: BigNumberish,
       _toppingPeriod: BigNumberish,
@@ -782,10 +810,6 @@ export interface SuperfluidFaucet extends BaseContract {
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
 
-    FIRST_GAS_TOPPING_AMOUNT(overrides?: CallOverrides): Promise<BigNumber>;
-
-    GAS_TOPPING_AMOUNT(overrides?: CallOverrides): Promise<BigNumber>;
-
     _deprecated(overrides?: CallOverrides): Promise<BigNumber>;
 
     "canTop(address)"(
@@ -799,6 +823,10 @@ export interface SuperfluidFaucet extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    firstGasToppingAmount(overrides?: CallOverrides): Promise<BigNumber>;
+
+    gasToppingAmount(overrides?: CallOverrides): Promise<BigNumber>;
+
     getRoleAdmin(
       role: BytesLike,
       overrides?: CallOverrides
@@ -859,6 +887,12 @@ export interface SuperfluidFaucet extends BaseContract {
 
     toppingPeriod(overrides?: CallOverrides): Promise<BigNumber>;
 
+    updateGasToppingAmounts(
+      _gasToppingAmount: BigNumberish,
+      _firstGasToppingAmount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>;
+
     updateSettings(
       _maxValuePerPeriod: BigNumberish,
       _toppingPeriod: BigNumberish,
@@ -886,14 +920,6 @@ export interface SuperfluidFaucet extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    FIRST_GAS_TOPPING_AMOUNT(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    GAS_TOPPING_AMOUNT(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     _deprecated(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     "canTop(address)"(
@@ -907,6 +933,12 @@ export interface SuperfluidFaucet extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    firstGasToppingAmount(
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    gasToppingAmount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     getRoleAdmin(
       role: BytesLike,
       overrides?: CallOverrides
@@ -970,6 +1002,12 @@ export interface SuperfluidFaucet extends BaseContract {
 
     toppingPeriod(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    updateGasToppingAmounts(
+      _gasToppingAmount: BigNumberish,
+      _firstGasToppingAmount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>;
+
     updateSettings(
       _maxValuePerPeriod: BigNumberish,
       _toppingPeriod: BigNumberish,