@gooddollar/goodprotocol 2.1.1 → 2.1.2

package/types/{DistributionHelperTest.ts → contracts/reserve/GenericDistributionHelper copy.sol/GenericDistributionHelper.ts }

@@ -1,142 +1,157 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
+import type {
+  BaseContract,
   BigNumber,
   BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
+  BytesLike,
+  CallOverrides,
   ContractTransaction,
   Overrides,
   PayableOverrides,
-  CallOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
 } from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import type {
+  FunctionFragment,
+  Result,
+  EventFragment,
+} from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
 import type {
   TypedEventFilter,
   TypedEvent,
   TypedListener,
   OnEvent,
-} from "./common";
-
-export type DistributionRecipientStruct = {
-  bps: BigNumberish;
-  chainId: BigNumberish;
-  addr: string;
-  transferType: BigNumberish;
-};
-
-export type DistributionRecipientStructOutput = [
-  number,
-  number,
-  string,
-  number
-] & { bps: number; chainId: number; addr: string; transferType: number };
-
-export type FeeSettingsStruct = {
-  axelarBaseFeeUSD: BigNumberish;
-  bridgeExecuteGas: BigNumberish;
-  targetChainGasPrice: BigNumberish;
-  maxFee: BigNumberish;
-  minBalanceForFees: BigNumberish;
-  percentageToSellForFee: BigNumberish;
-};
-
-export type FeeSettingsStructOutput = [
-  BigNumber,
-  BigNumber,
-  BigNumber,
-  BigNumber,
-  BigNumber,
-  number
-] & {
-  axelarBaseFeeUSD: BigNumber;
-  bridgeExecuteGas: BigNumber;
-  targetChainGasPrice: BigNumber;
-  maxFee: BigNumber;
-  minBalanceForFees: BigNumber;
-  percentageToSellForFee: number;
-};
-
-export interface DistributionHelperTestInterface
-  extends ethers.utils.Interface {
+} from "../../../common";
+
+export declare namespace GenericDistributionHelper {
+  export type DistributionRecipientStruct = {
+    bps: BigNumberish;
+    chainId: BigNumberish;
+    addr: string;
+    transferType: BigNumberish;
+  };
+
+  export type DistributionRecipientStructOutput = [
+    number,
+    number,
+    string,
+    number
+  ] & { bps: number; chainId: number; addr: string; transferType: number };
+
+  export type FeeSettingsStruct = {
+    maxFee: BigNumberish;
+    minBalanceForFees: BigNumberish;
+    percentageToSellForFee: BigNumberish;
+    maxSlippage: BigNumberish;
+  };
+
+  export type FeeSettingsStructOutput = [
+    BigNumber,
+    BigNumber,
+    number,
+    number
+  ] & {
+    maxFee: BigNumber;
+    minBalanceForFees: BigNumber;
+    percentageToSellForFee: number;
+    maxSlippage: number;
+  };
+}
+
+export interface GenericDistributionHelperInterface extends utils.Interface {
   functions: {
-    "CELO_TOKEN()": FunctionFragment;
     "DEFAULT_ADMIN_ROLE()": FunctionFragment;
-    "FUSE_TOKEN()": FunctionFragment;
     "GUARDIAN_ROLE()": FunctionFragment;
+    "ROUTER()": FunctionFragment;
     "STATIC_ORACLE()": FunctionFragment;
-    "USDC_TOKEN()": FunctionFragment;
-    "WETH_TOKEN()": FunctionFragment;
     "addOrUpdateRecipient((uint32,uint32,address,uint8))": FunctionFragment;
     "avatar()": FunctionFragment;
+    "calcGDToSell(uint256)": FunctionFragment;
     "dao()": FunctionFragment;
     "distributionRecipients(uint256)": FunctionFragment;
     "feeSettings()": FunctionFragment;
-    "fuseBridge()": FunctionFragment;
-    "getAxelarFee(uint256)": FunctionFragment;
+    "gasToken()": FunctionFragment;
     "getRoleAdmin(bytes32)": FunctionFragment;
     "getRoleMember(bytes32,uint256)": FunctionFragment;
     "getRoleMemberCount(bytes32)": FunctionFragment;
-    "getTargetChainGasInEth(uint256,uint256)": FunctionFragment;
-    "getTargetChainRefundAddress(uint256)": FunctionFragment;
     "grantRole(bytes32,address)": FunctionFragment;
     "hasRole(bytes32,address)": FunctionFragment;
-    "initialize(address)": FunctionFragment;
+    "initialize(address,address,address,address,address)": FunctionFragment;
     "mpbBridge()": FunctionFragment;
     "nameService()": FunctionFragment;
     "nativeToken()": FunctionFragment;
     "onDistribution(uint256)": FunctionFragment;
     "proxiableUUID()": FunctionFragment;
     "renounceRole(bytes32,address)": FunctionFragment;
+    "reserveToken()": FunctionFragment;
     "revokeRole(bytes32,address)": FunctionFragment;
-    "setFeeSettings((uint128,uint128,uint128,uint128,uint128,uint8))": FunctionFragment;
+    "setFeeSettings((uint128,uint128,uint8,uint8))": FunctionFragment;
     "supportsInterface(bytes4)": FunctionFragment;
-    "updateAddresses()": FunctionFragment;
     "updateAvatar()": FunctionFragment;
     "upgradeTo(address)": FunctionFragment;
     "upgradeToAndCall(address,bytes)": FunctionFragment;
   };
 
-  encodeFunctionData(
-    functionFragment: "CELO_TOKEN",
-    values?: undefined
-  ): string;
+  getFunction(
+    nameOrSignatureOrTopic:
+      | "DEFAULT_ADMIN_ROLE"
+      | "GUARDIAN_ROLE"
+      | "ROUTER"
+      | "STATIC_ORACLE"
+      | "addOrUpdateRecipient"
+      | "avatar"
+      | "calcGDToSell"
+      | "dao"
+      | "distributionRecipients"
+      | "feeSettings"
+      | "gasToken"
+      | "getRoleAdmin"
+      | "getRoleMember"
+      | "getRoleMemberCount"
+      | "grantRole"
+      | "hasRole"
+      | "initialize"
+      | "mpbBridge"
+      | "nameService"
+      | "nativeToken"
+      | "onDistribution"
+      | "proxiableUUID"
+      | "renounceRole"
+      | "reserveToken"
+      | "revokeRole"
+      | "setFeeSettings"
+      | "supportsInterface"
+      | "updateAvatar"
+      | "upgradeTo"
+      | "upgradeToAndCall"
+  ): FunctionFragment;
+
   encodeFunctionData(
     functionFragment: "DEFAULT_ADMIN_ROLE",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "FUSE_TOKEN",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "GUARDIAN_ROLE",
     values?: undefined
   ): string;
+  encodeFunctionData(functionFragment: "ROUTER", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "STATIC_ORACLE",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "USDC_TOKEN",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "WETH_TOKEN",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "addOrUpdateRecipient",
-    values: [DistributionRecipientStruct]
+    values: [GenericDistributionHelper.DistributionRecipientStruct]
   ): string;
   encodeFunctionData(functionFragment: "avatar", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "calcGDToSell",
+    values: [BigNumberish]
+  ): string;
   encodeFunctionData(functionFragment: "dao", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "distributionRecipients",
@@ -146,14 +161,7 @@ export interface DistributionHelperTestInterface
     functionFragment: "feeSettings",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "fuseBridge",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getAxelarFee",
-    values: [BigNumberish]
-  ): string;
+  encodeFunctionData(functionFragment: "gasToken", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "getRoleAdmin",
     values: [BytesLike]
@@ -166,14 +174,6 @@ export interface DistributionHelperTestInterface
     functionFragment: "getRoleMemberCount",
     values: [BytesLike]
   ): string;
-  encodeFunctionData(
-    functionFragment: "getTargetChainGasInEth",
-    values: [BigNumberish, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getTargetChainRefundAddress",
-    values: [BigNumberish]
-  ): string;
   encodeFunctionData(
     functionFragment: "grantRole",
     values: [BytesLike, string]
@@ -182,7 +182,10 @@ export interface DistributionHelperTestInterface
     functionFragment: "hasRole",
     values: [BytesLike, string]
   ): string;
-  encodeFunctionData(functionFragment: "initialize", values: [string]): string;
+  encodeFunctionData(
+    functionFragment: "initialize",
+    values: [string, string, string, string, string]
+  ): string;
   encodeFunctionData(functionFragment: "mpbBridge", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "nameService",
@@ -204,22 +207,22 @@ export interface DistributionHelperTestInterface
     functionFragment: "renounceRole",
     values: [BytesLike, string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "reserveToken",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "revokeRole",
     values: [BytesLike, string]
   ): string;
   encodeFunctionData(
     functionFragment: "setFeeSettings",
-    values: [FeeSettingsStruct]
+    values: [GenericDistributionHelper.FeeSettingsStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "supportsInterface",
     values: [BytesLike]
   ): string;
-  encodeFunctionData(
-    functionFragment: "updateAddresses",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "updateAvatar",
     values?: undefined
@@ -230,41 +233,38 @@ export interface DistributionHelperTestInterface
     values: [string, BytesLike]
   ): string;
 
-  decodeFunctionResult(functionFragment: "CELO_TOKEN", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "DEFAULT_ADMIN_ROLE",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "FUSE_TOKEN", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "GUARDIAN_ROLE",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "ROUTER", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "STATIC_ORACLE",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "USDC_TOKEN", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "WETH_TOKEN", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "addOrUpdateRecipient",
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "avatar", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "dao", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "distributionRecipients",
+    functionFragment: "calcGDToSell",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "dao", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "feeSettings",
+    functionFragment: "distributionRecipients",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "fuseBridge", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "getAxelarFee",
+    functionFragment: "feeSettings",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "gasToken", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "getRoleAdmin",
     data: BytesLike
@@ -277,14 +277,6 @@ export interface DistributionHelperTestInterface
     functionFragment: "getRoleMemberCount",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "getTargetChainGasInEth",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getTargetChainRefundAddress",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "grantRole", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "hasRole", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
@@ -309,17 +301,17 @@ export interface DistributionHelperTestInterface
     functionFragment: "renounceRole",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "revokeRole", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "setFeeSettings",
+    functionFragment: "reserveToken",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "revokeRole", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "supportsInterface",
+    functionFragment: "setFeeSettings",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "updateAddresses",
+    functionFragment: "supportsInterface",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -335,10 +327,11 @@ export interface DistributionHelperTestInterface
   events: {
     "AdminChanged(address,address)": EventFragment;
     "BeaconUpgraded(address)": EventFragment;
-    "Distribution(uint256,uint256,uint256,tuple[])": EventFragment;
+    "BuyNativeFailed(string)": EventFragment;
+    "Distribution(uint256,uint256,uint256,(uint32,uint32,address,uint8)[],uint256,uint256)": EventFragment;
     "Initialized(uint8)": EventFragment;
-    "RecipientAdded(tuple,uint256)": EventFragment;
-    "RecipientUpdated(tuple,uint256)": EventFragment;
+    "RecipientAdded((uint32,uint32,address,uint8),uint256)": EventFragment;
+    "RecipientUpdated((uint32,uint32,address,uint8),uint256)": EventFragment;
     "RoleAdminChanged(bytes32,bytes32,bytes32)": EventFragment;
     "RoleGranted(bytes32,address,address)": EventFragment;
     "RoleRevoked(bytes32,address,address)": EventFragment;
@@ -347,6 +340,7 @@ export interface DistributionHelperTestInterface
 
   getEvent(nameOrSignatureOrTopic: "AdminChanged"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "BeaconUpgraded"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "BuyNativeFailed"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "Distribution"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RecipientAdded"): EventFragment;
@@ -357,80 +351,139 @@ export interface DistributionHelperTestInterface
   getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
 }
 
+export interface AdminChangedEventObject {
+  previousAdmin: string;
+  newAdmin: string;
+}
 export type AdminChangedEvent = TypedEvent<
   [string, string],
-  { previousAdmin: string; newAdmin: string }
+  AdminChangedEventObject
 >;
 
 export type AdminChangedEventFilter = TypedEventFilter<AdminChangedEvent>;
 
-export type BeaconUpgradedEvent = TypedEvent<[string], { beacon: string }>;
+export interface BeaconUpgradedEventObject {
+  beacon: string;
+}
+export type BeaconUpgradedEvent = TypedEvent<
+  [string],
+  BeaconUpgradedEventObject
+>;
 
 export type BeaconUpgradedEventFilter = TypedEventFilter<BeaconUpgradedEvent>;
 
+export interface BuyNativeFailedEventObject {
+  reason: string;
+}
+export type BuyNativeFailedEvent = TypedEvent<
+  [string],
+  BuyNativeFailedEventObject
+>;
+
+export type BuyNativeFailedEventFilter = TypedEventFilter<BuyNativeFailedEvent>;
+
+export interface DistributionEventObject {
+  distributed: BigNumber;
+  startingBalance: BigNumber;
+  incomingAmount: BigNumber;
+  distributionRecipients: GenericDistributionHelper.DistributionRecipientStructOutput[];
+  gdSoldForGas: BigNumber;
+  nativeBoughtForGas: BigNumber;
+}
 export type DistributionEvent = TypedEvent<
-  [BigNumber, BigNumber, BigNumber, DistributionRecipientStructOutput[]],
-  {
-    distributed: BigNumber;
-    startingBalance: BigNumber;
-    incomingAmount: BigNumber;
-    distributionRecipients: DistributionRecipientStructOutput[];
-  }
+  [
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    GenericDistributionHelper.DistributionRecipientStructOutput[],
+    BigNumber,
+    BigNumber
+  ],
+  DistributionEventObject
 >;
 
 export type DistributionEventFilter = TypedEventFilter<DistributionEvent>;
 
-export type InitializedEvent = TypedEvent<[number], { version: number }>;
+export interface InitializedEventObject {
+  version: number;
+}
+export type InitializedEvent = TypedEvent<[number], InitializedEventObject>;
 
 export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
 
+export interface RecipientAddedEventObject {
+  recipient: GenericDistributionHelper.DistributionRecipientStructOutput;
+  index: BigNumber;
+}
 export type RecipientAddedEvent = TypedEvent<
-  [DistributionRecipientStructOutput, BigNumber],
-  { recipient: DistributionRecipientStructOutput; index: BigNumber }
+  [GenericDistributionHelper.DistributionRecipientStructOutput, BigNumber],
+  RecipientAddedEventObject
 >;
 
 export type RecipientAddedEventFilter = TypedEventFilter<RecipientAddedEvent>;
 
+export interface RecipientUpdatedEventObject {
+  recipient: GenericDistributionHelper.DistributionRecipientStructOutput;
+  index: BigNumber;
+}
 export type RecipientUpdatedEvent = TypedEvent<
-  [DistributionRecipientStructOutput, BigNumber],
-  { recipient: DistributionRecipientStructOutput; index: BigNumber }
+  [GenericDistributionHelper.DistributionRecipientStructOutput, BigNumber],
+  RecipientUpdatedEventObject
 >;
 
 export type RecipientUpdatedEventFilter =
   TypedEventFilter<RecipientUpdatedEvent>;
 
+export interface RoleAdminChangedEventObject {
+  role: string;
+  previousAdminRole: string;
+  newAdminRole: string;
+}
 export type RoleAdminChangedEvent = TypedEvent<
   [string, string, string],
-  { role: string; previousAdminRole: string; newAdminRole: string }
+  RoleAdminChangedEventObject
 >;
 
 export type RoleAdminChangedEventFilter =
   TypedEventFilter<RoleAdminChangedEvent>;
 
+export interface RoleGrantedEventObject {
+  role: string;
+  account: string;
+  sender: string;
+}
 export type RoleGrantedEvent = TypedEvent<
   [string, string, string],
-  { role: string; account: string; sender: string }
+  RoleGrantedEventObject
 >;
 
 export type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>;
 
+export interface RoleRevokedEventObject {
+  role: string;
+  account: string;
+  sender: string;
+}
 export type RoleRevokedEvent = TypedEvent<
   [string, string, string],
-  { role: string; account: string; sender: string }
+  RoleRevokedEventObject
 >;
 
 export type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>;
 
-export type UpgradedEvent = TypedEvent<[string], { implementation: string }>;
+export interface UpgradedEventObject {
+  implementation: string;
+}
+export type UpgradedEvent = TypedEvent<[string], UpgradedEventObject>;
 
 export type UpgradedEventFilter = TypedEventFilter<UpgradedEvent>;
 
-export interface DistributionHelperTest extends BaseContract {
+export interface GenericDistributionHelper extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: DistributionHelperTestInterface;
+  interface: GenericDistributionHelperInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -452,27 +505,28 @@ export interface DistributionHelperTest extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    CELO_TOKEN(overrides?: CallOverrides): Promise<[string]>;
-
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>;
 
-    FUSE_TOKEN(overrides?: CallOverrides): Promise<[string]>;
-
     GUARDIAN_ROLE(overrides?: CallOverrides): Promise<[string]>;
 
-    STATIC_ORACLE(overrides?: CallOverrides): Promise<[string]>;
-
-    USDC_TOKEN(overrides?: CallOverrides): Promise<[string]>;
+    ROUTER(overrides?: CallOverrides): Promise<[string]>;
 
-    WETH_TOKEN(overrides?: CallOverrides): Promise<[string]>;
+    STATIC_ORACLE(overrides?: CallOverrides): Promise<[string]>;
 
     addOrUpdateRecipient(
-      _recipient: DistributionRecipientStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      _recipient: GenericDistributionHelper.DistributionRecipientStruct,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
     avatar(overrides?: CallOverrides): Promise<[string]>;
 
+    calcGDToSell(
+      maxAmountToSell: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & { gdToSell: BigNumber; minReceived: BigNumber }
+    >;
+
     dao(overrides?: CallOverrides): Promise<[string]>;
 
     distributionRecipients(
@@ -490,22 +544,15 @@ export interface DistributionHelperTest extends BaseContract {
     feeSettings(
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-        axelarBaseFeeUSD: BigNumber;
-        bridgeExecuteGas: BigNumber;
-        targetChainGasPrice: BigNumber;
+      [BigNumber, BigNumber, number, number] & {
         maxFee: BigNumber;
         minBalanceForFees: BigNumber;
         percentageToSellForFee: number;
+        maxSlippage: number;
       }
     >;
 
-    fuseBridge(overrides?: CallOverrides): Promise<[string]>;
-
-    getAxelarFee(
-      targetChainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { feeInEth: BigNumber }>;
+    gasToken(overrides?: CallOverrides): Promise<[string]>;
 
     getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<[string]>;
 
@@ -520,21 +567,10 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[BigNumber]>;
 
-    getTargetChainGasInEth(
-      gasCostWei: BigNumberish,
-      chainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { quote: BigNumber }>;
-
-    getTargetChainRefundAddress(
-      chainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
     grantRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
     hasRole(
@@ -545,7 +581,11 @@ export interface DistributionHelperTest extends BaseContract {
 
     initialize(
       _ns: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      _oracle: string,
+      _gasToken: string,
+      _reserveToken: string,
+      _router: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
     mpbBridge(overrides?: CallOverrides): Promise<[string]>;
@@ -556,7 +596,7 @@ export interface DistributionHelperTest extends BaseContract {
 
     onDistribution(
       _amount: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
     proxiableUUID(overrides?: CallOverrides): Promise<[string]>;
@@ -564,18 +604,20 @@ export interface DistributionHelperTest extends BaseContract {
     renounceRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
+    reserveToken(overrides?: CallOverrides): Promise<[string]>;
+
     revokeRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
     setFeeSettings(
-      _feeData: FeeSettingsStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      _feeData: GenericDistributionHelper.FeeSettingsStruct,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
     supportsInterface(
@@ -583,47 +625,44 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[boolean]>;
 
-    updateAddresses(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     updateAvatar(
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
     upgradeTo(
       newImplementation: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
     upgradeToAndCall(
       newImplementation: string,
       data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<ContractTransaction>;
   };
 
-  CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
-
   DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
 
-  FUSE_TOKEN(overrides?: CallOverrides): Promise<string>;
-
   GUARDIAN_ROLE(overrides?: CallOverrides): Promise<string>;
 
-  STATIC_ORACLE(overrides?: CallOverrides): Promise<string>;
-
-  USDC_TOKEN(overrides?: CallOverrides): Promise<string>;
+  ROUTER(overrides?: CallOverrides): Promise<string>;
 
-  WETH_TOKEN(overrides?: CallOverrides): Promise<string>;
+  STATIC_ORACLE(overrides?: CallOverrides): Promise<string>;
 
   addOrUpdateRecipient(
-    _recipient: DistributionRecipientStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    _recipient: GenericDistributionHelper.DistributionRecipientStruct,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   avatar(overrides?: CallOverrides): Promise<string>;
 
+  calcGDToSell(
+    maxAmountToSell: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<
+    [BigNumber, BigNumber] & { gdToSell: BigNumber; minReceived: BigNumber }
+  >;
+
   dao(overrides?: CallOverrides): Promise<string>;
 
   distributionRecipients(
@@ -641,22 +680,15 @@ export interface DistributionHelperTest extends BaseContract {
   feeSettings(
     overrides?: CallOverrides
   ): Promise<
-    [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-      axelarBaseFeeUSD: BigNumber;
-      bridgeExecuteGas: BigNumber;
-      targetChainGasPrice: BigNumber;
+    [BigNumber, BigNumber, number, number] & {
       maxFee: BigNumber;
       minBalanceForFees: BigNumber;
       percentageToSellForFee: number;
+      maxSlippage: number;
     }
   >;
 
-  fuseBridge(overrides?: CallOverrides): Promise<string>;
-
-  getAxelarFee(
-    targetChainId: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
+  gasToken(overrides?: CallOverrides): Promise<string>;
 
   getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>;
 
@@ -671,21 +703,10 @@ export interface DistributionHelperTest extends BaseContract {
     overrides?: CallOverrides
   ): Promise<BigNumber>;
 
-  getTargetChainGasInEth(
-    gasCostWei: BigNumberish,
-    chainId: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  getTargetChainRefundAddress(
-    chainId: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
   grantRole(
     role: BytesLike,
     account: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   hasRole(
@@ -696,7 +717,11 @@ export interface DistributionHelperTest extends BaseContract {
 
   initialize(
     _ns: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    _oracle: string,
+    _gasToken: string,
+    _reserveToken: string,
+    _router: string,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   mpbBridge(overrides?: CallOverrides): Promise<string>;
@@ -707,7 +732,7 @@ export interface DistributionHelperTest extends BaseContract {
 
   onDistribution(
     _amount: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   proxiableUUID(overrides?: CallOverrides): Promise<string>;
@@ -715,18 +740,20 @@ export interface DistributionHelperTest extends BaseContract {
   renounceRole(
     role: BytesLike,
     account: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
+  reserveToken(overrides?: CallOverrides): Promise<string>;
+
   revokeRole(
     role: BytesLike,
     account: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   setFeeSettings(
-    _feeData: FeeSettingsStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    _feeData: GenericDistributionHelper.FeeSettingsStruct,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   supportsInterface(
@@ -734,47 +761,44 @@ export interface DistributionHelperTest extends BaseContract {
     overrides?: CallOverrides
   ): Promise<boolean>;
 
-  updateAddresses(
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   updateAvatar(
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   upgradeTo(
     newImplementation: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   upgradeToAndCall(
     newImplementation: string,
     data: BytesLike,
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
-
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
 
-    FUSE_TOKEN(overrides?: CallOverrides): Promise<string>;
-
     GUARDIAN_ROLE(overrides?: CallOverrides): Promise<string>;
 
-    STATIC_ORACLE(overrides?: CallOverrides): Promise<string>;
-
-    USDC_TOKEN(overrides?: CallOverrides): Promise<string>;
+    ROUTER(overrides?: CallOverrides): Promise<string>;
 
-    WETH_TOKEN(overrides?: CallOverrides): Promise<string>;
+    STATIC_ORACLE(overrides?: CallOverrides): Promise<string>;
 
     addOrUpdateRecipient(
-      _recipient: DistributionRecipientStruct,
+      _recipient: GenericDistributionHelper.DistributionRecipientStruct,
       overrides?: CallOverrides
     ): Promise<void>;
 
     avatar(overrides?: CallOverrides): Promise<string>;
 
+    calcGDToSell(
+      maxAmountToSell: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & { gdToSell: BigNumber; minReceived: BigNumber }
+    >;
+
     dao(overrides?: CallOverrides): Promise<string>;
 
     distributionRecipients(
@@ -792,22 +816,15 @@ export interface DistributionHelperTest extends BaseContract {
     feeSettings(
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-        axelarBaseFeeUSD: BigNumber;
-        bridgeExecuteGas: BigNumber;
-        targetChainGasPrice: BigNumber;
+      [BigNumber, BigNumber, number, number] & {
         maxFee: BigNumber;
         minBalanceForFees: BigNumber;
         percentageToSellForFee: number;
+        maxSlippage: number;
       }
     >;
 
-    fuseBridge(overrides?: CallOverrides): Promise<string>;
-
-    getAxelarFee(
-      targetChainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
+    gasToken(overrides?: CallOverrides): Promise<string>;
 
     getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>;
 
@@ -822,17 +839,6 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    getTargetChainGasInEth(
-      gasCostWei: BigNumberish,
-      chainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getTargetChainRefundAddress(
-      chainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
     grantRole(
       role: BytesLike,
       account: string,
@@ -845,7 +851,14 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<boolean>;
 
-    initialize(_ns: string, overrides?: CallOverrides): Promise<void>;
+    initialize(
+      _ns: string,
+      _oracle: string,
+      _gasToken: string,
+      _reserveToken: string,
+      _router: string,
+      overrides?: CallOverrides
+    ): Promise<void>;
 
     mpbBridge(overrides?: CallOverrides): Promise<string>;
 
@@ -866,6 +879,8 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
+    reserveToken(overrides?: CallOverrides): Promise<string>;
+
     revokeRole(
       role: BytesLike,
       account: string,
@@ -873,7 +888,7 @@ export interface DistributionHelperTest extends BaseContract {
     ): Promise<void>;
 
     setFeeSettings(
-      _feeData: FeeSettingsStruct,
+      _feeData: GenericDistributionHelper.FeeSettingsStruct,
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -882,8 +897,6 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<boolean>;
 
-    updateAddresses(overrides?: CallOverrides): Promise<void>;
-
     updateAvatar(overrides?: CallOverrides): Promise<void>;
 
     upgradeTo(
@@ -913,29 +926,36 @@ export interface DistributionHelperTest extends BaseContract {
     ): BeaconUpgradedEventFilter;
     BeaconUpgraded(beacon?: string | null): BeaconUpgradedEventFilter;
 
-    "Distribution(uint256,uint256,uint256,tuple[])"(
+    "BuyNativeFailed(string)"(reason?: null): BuyNativeFailedEventFilter;
+    BuyNativeFailed(reason?: null): BuyNativeFailedEventFilter;
+
+    "Distribution(uint256,uint256,uint256,(uint32,uint32,address,uint8)[],uint256,uint256)"(
       distributed?: null,
       startingBalance?: null,
       incomingAmount?: null,
-      distributionRecipients?: null
+      distributionRecipients?: null,
+      gdSoldForGas?: null,
+      nativeBoughtForGas?: null
     ): DistributionEventFilter;
     Distribution(
       distributed?: null,
       startingBalance?: null,
       incomingAmount?: null,
-      distributionRecipients?: null
+      distributionRecipients?: null,
+      gdSoldForGas?: null,
+      nativeBoughtForGas?: null
     ): DistributionEventFilter;
 
     "Initialized(uint8)"(version?: null): InitializedEventFilter;
     Initialized(version?: null): InitializedEventFilter;
 
-    "RecipientAdded(tuple,uint256)"(
+    "RecipientAdded((uint32,uint32,address,uint8),uint256)"(
       recipient?: null,
       index?: null
     ): RecipientAddedEventFilter;
     RecipientAdded(recipient?: null, index?: null): RecipientAddedEventFilter;
 
-    "RecipientUpdated(tuple,uint256)"(
+    "RecipientUpdated((uint32,uint32,address,uint8),uint256)"(
       recipient?: null,
       index?: null
     ): RecipientUpdatedEventFilter;
@@ -982,27 +1002,26 @@ export interface DistributionHelperTest extends BaseContract {
   };
 
   estimateGas: {
-    CELO_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
-
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
 
-    FUSE_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
-
     GUARDIAN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
 
-    STATIC_ORACLE(overrides?: CallOverrides): Promise<BigNumber>;
-
-    USDC_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
+    ROUTER(overrides?: CallOverrides): Promise<BigNumber>;
 
-    WETH_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
+    STATIC_ORACLE(overrides?: CallOverrides): Promise<BigNumber>;
 
     addOrUpdateRecipient(
-      _recipient: DistributionRecipientStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      _recipient: GenericDistributionHelper.DistributionRecipientStruct,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
     avatar(overrides?: CallOverrides): Promise<BigNumber>;
 
+    calcGDToSell(
+      maxAmountToSell: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     dao(overrides?: CallOverrides): Promise<BigNumber>;
 
     distributionRecipients(
@@ -1012,12 +1031,7 @@ export interface DistributionHelperTest extends BaseContract {
 
     feeSettings(overrides?: CallOverrides): Promise<BigNumber>;
 
-    fuseBridge(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getAxelarFee(
-      targetChainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
+    gasToken(overrides?: CallOverrides): Promise<BigNumber>;
 
     getRoleAdmin(
       role: BytesLike,
@@ -1035,21 +1049,10 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    getTargetChainGasInEth(
-      gasCostWei: BigNumberish,
-      chainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getTargetChainRefundAddress(
-      chainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     grantRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
     hasRole(
@@ -1060,7 +1063,11 @@ export interface DistributionHelperTest extends BaseContract {
 
     initialize(
       _ns: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      _oracle: string,
+      _gasToken: string,
+      _reserveToken: string,
+      _router: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
     mpbBridge(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1071,7 +1078,7 @@ export interface DistributionHelperTest extends BaseContract {
 
     onDistribution(
       _amount: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
     proxiableUUID(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1079,18 +1086,20 @@ export interface DistributionHelperTest extends BaseContract {
     renounceRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
+    reserveToken(overrides?: CallOverrides): Promise<BigNumber>;
+
     revokeRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
     setFeeSettings(
-      _feeData: FeeSettingsStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      _feeData: GenericDistributionHelper.FeeSettingsStruct,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
     supportsInterface(
@@ -1098,50 +1107,43 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    updateAddresses(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    updateAvatar(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
+    updateAvatar(overrides?: Overrides & { from?: string }): Promise<BigNumber>;
 
     upgradeTo(
       newImplementation: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
     upgradeToAndCall(
       newImplementation: string,
       data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    CELO_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     DEFAULT_ADMIN_ROLE(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    FUSE_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     GUARDIAN_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    STATIC_ORACLE(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    USDC_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    ROUTER(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    WETH_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    STATIC_ORACLE(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     addOrUpdateRecipient(
-      _recipient: DistributionRecipientStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      _recipient: GenericDistributionHelper.DistributionRecipientStruct,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
     avatar(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    calcGDToSell(
+      maxAmountToSell: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     dao(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     distributionRecipients(
@@ -1151,12 +1153,7 @@ export interface DistributionHelperTest extends BaseContract {
 
     feeSettings(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    fuseBridge(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getAxelarFee(
-      targetChainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
+    gasToken(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     getRoleAdmin(
       role: BytesLike,
@@ -1174,21 +1171,10 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    getTargetChainGasInEth(
-      gasCostWei: BigNumberish,
-      chainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getTargetChainRefundAddress(
-      chainId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     grantRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
     hasRole(
@@ -1199,7 +1185,11 @@ export interface DistributionHelperTest extends BaseContract {
 
     initialize(
       _ns: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      _oracle: string,
+      _gasToken: string,
+      _reserveToken: string,
+      _router: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
     mpbBridge(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -1210,7 +1200,7 @@ export interface DistributionHelperTest extends BaseContract {
 
     onDistribution(
       _amount: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
     proxiableUUID(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -1218,18 +1208,20 @@ export interface DistributionHelperTest extends BaseContract {
     renounceRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
+    reserveToken(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     revokeRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
     setFeeSettings(
-      _feeData: FeeSettingsStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      _feeData: GenericDistributionHelper.FeeSettingsStruct,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
     supportsInterface(
@@ -1237,23 +1229,19 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    updateAddresses(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     updateAvatar(
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
     upgradeTo(
       newImplementation: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
     upgradeToAndCall(
       newImplementation: string,
       data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<PopulatedTransaction>;
   };
 }