@gooddollar/goodprotocol 2.0.34-beta.4 → 2.1.1

package/types/{contracts/mocks/CeloDistributionHelperTest.sol/DistributionHelperTestHelper.ts → DistributionHelper.ts}

@@ -1,87 +1,90 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import type {
-  BaseContract,
+
+import {
+  ethers,
+  EventFilter,
+  Signer,
   BigNumber,
   BigNumberish,
-  BytesLike,
-  CallOverrides,
+  PopulatedTransaction,
+  BaseContract,
   ContractTransaction,
   Overrides,
   PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
+  CallOverrides,
 } from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
+import { BytesLike } from "@ethersproject/bytes";
+import { Listener, Provider } from "@ethersproject/providers";
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
 import type {
   TypedEventFilter,
   TypedEvent,
   TypedListener,
   OnEvent,
-} from "../../../common";
-
-export declare namespace CeloDistributionHelper {
-  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 = {
-    bridgeExecuteGas: BigNumberish;
-    targetChainGasPrice: BigNumberish;
-    maxFee: BigNumberish;
-    minBalanceForFees: BigNumberish;
-    percentageToSellForFee: BigNumberish;
-  };
-
-  export type FeeSettingsStructOutput = [
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    number
-  ] & {
-    bridgeExecuteGas: BigNumber;
-    targetChainGasPrice: BigNumber;
-    maxFee: BigNumber;
-    minBalanceForFees: BigNumber;
-    percentageToSellForFee: number;
-  };
-}
-
-export interface DistributionHelperTestHelperInterface extends utils.Interface {
+} 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 DistributionHelperInterface extends ethers.utils.Interface {
   functions: {
-    "CELO()": FunctionFragment;
-    "CUSD()": FunctionFragment;
+    "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;
     "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;
@@ -92,75 +95,47 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
     "proxiableUUID()": FunctionFragment;
     "renounceRole(bytes32,address)": FunctionFragment;
     "revokeRole(bytes32,address)": FunctionFragment;
-    "setBridges(address)": FunctionFragment;
-    "setFeeSettings((uint128,uint128,uint128,uint128,uint8))": FunctionFragment;
-    "setOracle(address)": FunctionFragment;
+    "setFeeSettings((uint128,uint128,uint128,uint128,uint128,uint8))": FunctionFragment;
     "supportsInterface(bytes4)": FunctionFragment;
+    "updateAddresses()": FunctionFragment;
     "updateAvatar()": FunctionFragment;
     "upgradeTo(address)": FunctionFragment;
     "upgradeToAndCall(address,bytes)": FunctionFragment;
   };
 
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "CELO"
-      | "CUSD"
-      | "DEFAULT_ADMIN_ROLE"
-      | "GUARDIAN_ROLE"
-      | "ROUTER"
-      | "STATIC_ORACLE"
-      | "addOrUpdateRecipient"
-      | "avatar"
-      | "calcGDToSell"
-      | "dao"
-      | "distributionRecipients"
-      | "feeSettings"
-      | "getRoleAdmin"
-      | "getRoleMember"
-      | "getRoleMemberCount"
-      | "grantRole"
-      | "hasRole"
-      | "initialize"
-      | "mpbBridge"
-      | "nameService"
-      | "nativeToken"
-      | "onDistribution"
-      | "proxiableUUID"
-      | "renounceRole"
-      | "revokeRole"
-      | "setBridges"
-      | "setFeeSettings"
-      | "setOracle"
-      | "supportsInterface"
-      | "updateAvatar"
-      | "upgradeTo"
-      | "upgradeToAndCall"
-  ): FunctionFragment;
-
-  encodeFunctionData(functionFragment: "CELO", values?: undefined): string;
-  encodeFunctionData(functionFragment: "CUSD", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "CELO_TOKEN",
+    values?: undefined
+  ): string;
   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: "addOrUpdateRecipient",
-    values: [CeloDistributionHelper.DistributionRecipientStruct]
+    functionFragment: "USDC_TOKEN",
+    values?: undefined
   ): string;
-  encodeFunctionData(functionFragment: "avatar", values?: undefined): string;
   encodeFunctionData(
-    functionFragment: "calcGDToSell",
-    values: [BigNumberish]
+    functionFragment: "WETH_TOKEN",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "addOrUpdateRecipient",
+    values: [DistributionRecipientStruct]
   ): string;
+  encodeFunctionData(functionFragment: "avatar", values?: undefined): string;
   encodeFunctionData(functionFragment: "dao", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "distributionRecipients",
@@ -170,6 +145,14 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
     functionFragment: "feeSettings",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "fuseBridge",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "getAxelarFee",
+    values: [BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "getRoleAdmin",
     values: [BytesLike]
@@ -182,6 +165,14 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
     functionFragment: "getRoleMemberCount",
     values: [BytesLike]
   ): string;
+  encodeFunctionData(
+    functionFragment: "getTargetChainGasInEth",
+    values: [BigNumberish, BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "getTargetChainRefundAddress",
+    values: [BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "grantRole",
     values: [BytesLike, string]
@@ -216,16 +207,18 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
     functionFragment: "revokeRole",
     values: [BytesLike, string]
   ): string;
-  encodeFunctionData(functionFragment: "setBridges", values: [string]): string;
   encodeFunctionData(
     functionFragment: "setFeeSettings",
-    values: [CeloDistributionHelper.FeeSettingsStruct]
+    values: [FeeSettingsStruct]
   ): string;
-  encodeFunctionData(functionFragment: "setOracle", values: [string]): string;
   encodeFunctionData(
     functionFragment: "supportsInterface",
     values: [BytesLike]
   ): string;
+  encodeFunctionData(
+    functionFragment: "updateAddresses",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "updateAvatar",
     values?: undefined
@@ -236,30 +229,27 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
     values: [string, BytesLike]
   ): string;
 
-  decodeFunctionResult(functionFragment: "CELO", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "CUSD", data: BytesLike): Result;
+  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: "calcGDToSell",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "dao", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "distributionRecipients",
@@ -269,6 +259,11 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
     functionFragment: "feeSettings",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "fuseBridge", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "getAxelarFee",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "getRoleAdmin",
     data: BytesLike
@@ -281,6 +276,14 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
     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;
@@ -306,16 +309,18 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "revokeRole", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setBridges", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "setFeeSettings",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "setOracle", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "supportsInterface",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "updateAddresses",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "updateAvatar",
     data: BytesLike
@@ -329,10 +334,10 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
   events: {
     "AdminChanged(address,address)": EventFragment;
     "BeaconUpgraded(address)": EventFragment;
-    "Distribution(uint256,uint256,uint256,(uint32,uint32,address,uint8)[],uint256,uint256)": EventFragment;
+    "Distribution(uint256,uint256,uint256,tuple[])": EventFragment;
     "Initialized(uint8)": EventFragment;
-    "RecipientAdded((uint32,uint32,address,uint8),uint256)": EventFragment;
-    "RecipientUpdated((uint32,uint32,address,uint8),uint256)": EventFragment;
+    "RecipientAdded(tuple,uint256)": EventFragment;
+    "RecipientUpdated(tuple,uint256)": EventFragment;
     "RoleAdminChanged(bytes32,bytes32,bytes32)": EventFragment;
     "RoleGranted(bytes32,address,address)": EventFragment;
     "RoleRevoked(bytes32,address,address)": EventFragment;
@@ -351,129 +356,80 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
 }
 
-export interface AdminChangedEventObject {
-  previousAdmin: string;
-  newAdmin: string;
-}
 export type AdminChangedEvent = TypedEvent<
   [string, string],
-  AdminChangedEventObject
+  { previousAdmin: string; newAdmin: string }
 >;
 
 export type AdminChangedEventFilter = TypedEventFilter<AdminChangedEvent>;
 
-export interface BeaconUpgradedEventObject {
-  beacon: string;
-}
-export type BeaconUpgradedEvent = TypedEvent<
-  [string],
-  BeaconUpgradedEventObject
->;
+export type BeaconUpgradedEvent = TypedEvent<[string], { beacon: string }>;
 
 export type BeaconUpgradedEventFilter = TypedEventFilter<BeaconUpgradedEvent>;
 
-export interface DistributionEventObject {
-  distributed: BigNumber;
-  startingBalance: BigNumber;
-  incomingAmount: BigNumber;
-  distributionRecipients: CeloDistributionHelper.DistributionRecipientStructOutput[];
-  gdSoldForGas: BigNumber;
-  nativeBoughtForGas: BigNumber;
-}
 export type DistributionEvent = TypedEvent<
-  [
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    CeloDistributionHelper.DistributionRecipientStructOutput[],
-    BigNumber,
-    BigNumber
-  ],
-  DistributionEventObject
+  [BigNumber, BigNumber, BigNumber, DistributionRecipientStructOutput[]],
+  {
+    distributed: BigNumber;
+    startingBalance: BigNumber;
+    incomingAmount: BigNumber;
+    distributionRecipients: DistributionRecipientStructOutput[];
+  }
 >;
 
 export type DistributionEventFilter = TypedEventFilter<DistributionEvent>;
 
-export interface InitializedEventObject {
-  version: number;
-}
-export type InitializedEvent = TypedEvent<[number], InitializedEventObject>;
+export type InitializedEvent = TypedEvent<[number], { version: number }>;
 
 export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
 
-export interface RecipientAddedEventObject {
-  recipient: CeloDistributionHelper.DistributionRecipientStructOutput;
-  index: BigNumber;
-}
 export type RecipientAddedEvent = TypedEvent<
-  [CeloDistributionHelper.DistributionRecipientStructOutput, BigNumber],
-  RecipientAddedEventObject
+  [DistributionRecipientStructOutput, BigNumber],
+  { recipient: DistributionRecipientStructOutput; index: BigNumber }
 >;
 
 export type RecipientAddedEventFilter = TypedEventFilter<RecipientAddedEvent>;
 
-export interface RecipientUpdatedEventObject {
-  recipient: CeloDistributionHelper.DistributionRecipientStructOutput;
-  index: BigNumber;
-}
 export type RecipientUpdatedEvent = TypedEvent<
-  [CeloDistributionHelper.DistributionRecipientStructOutput, BigNumber],
-  RecipientUpdatedEventObject
+  [DistributionRecipientStructOutput, BigNumber],
+  { recipient: DistributionRecipientStructOutput; index: BigNumber }
 >;
 
 export type RecipientUpdatedEventFilter =
   TypedEventFilter<RecipientUpdatedEvent>;
 
-export interface RoleAdminChangedEventObject {
-  role: string;
-  previousAdminRole: string;
-  newAdminRole: string;
-}
 export type RoleAdminChangedEvent = TypedEvent<
   [string, string, string],
-  RoleAdminChangedEventObject
+  { role: string; previousAdminRole: string; newAdminRole: string }
 >;
 
 export type RoleAdminChangedEventFilter =
   TypedEventFilter<RoleAdminChangedEvent>;
 
-export interface RoleGrantedEventObject {
-  role: string;
-  account: string;
-  sender: string;
-}
 export type RoleGrantedEvent = TypedEvent<
   [string, string, string],
-  RoleGrantedEventObject
+  { role: string; account: string; sender: string }
 >;
 
 export type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>;
 
-export interface RoleRevokedEventObject {
-  role: string;
-  account: string;
-  sender: string;
-}
 export type RoleRevokedEvent = TypedEvent<
   [string, string, string],
-  RoleRevokedEventObject
+  { role: string; account: string; sender: string }
 >;
 
 export type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>;
 
-export interface UpgradedEventObject {
-  implementation: string;
-}
-export type UpgradedEvent = TypedEvent<[string], UpgradedEventObject>;
+export type UpgradedEvent = TypedEvent<[string], { implementation: string }>;
 
 export type UpgradedEventFilter = TypedEventFilter<UpgradedEvent>;
 
-export interface DistributionHelperTestHelper extends BaseContract {
+export interface DistributionHelper extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: DistributionHelperTestHelperInterface;
+  interface: DistributionHelperInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -495,30 +451,27 @@ export interface DistributionHelperTestHelper extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    CELO(overrides?: CallOverrides): Promise<[string]>;
-
-    CUSD(overrides?: CallOverrides): Promise<[string]>;
+    CELO_TOKEN(overrides?: CallOverrides): Promise<[string]>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>;
 
-    GUARDIAN_ROLE(overrides?: CallOverrides): Promise<[string]>;
+    FUSE_TOKEN(overrides?: CallOverrides): Promise<[string]>;
 
-    ROUTER(overrides?: CallOverrides): Promise<[string]>;
+    GUARDIAN_ROLE(overrides?: CallOverrides): Promise<[string]>;
 
     STATIC_ORACLE(overrides?: CallOverrides): Promise<[string]>;
 
+    USDC_TOKEN(overrides?: CallOverrides): Promise<[string]>;
+
+    WETH_TOKEN(overrides?: CallOverrides): Promise<[string]>;
+
     addOrUpdateRecipient(
-      _recipient: CeloDistributionHelper.DistributionRecipientStruct,
-      overrides?: Overrides & { from?: string }
+      _recipient: DistributionRecipientStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     avatar(overrides?: CallOverrides): Promise<[string]>;
 
-    calcGDToSell(
-      maxAmountToSell: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { gdToSell: BigNumber }>;
-
     dao(overrides?: CallOverrides): Promise<[string]>;
 
     distributionRecipients(
@@ -536,7 +489,8 @@ export interface DistributionHelperTestHelper extends BaseContract {
     feeSettings(
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber, number] & {
+      [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
+        axelarBaseFeeUSD: BigNumber;
         bridgeExecuteGas: BigNumber;
         targetChainGasPrice: BigNumber;
         maxFee: BigNumber;
@@ -545,6 +499,13 @@ export interface DistributionHelperTestHelper extends BaseContract {
       }
     >;
 
+    fuseBridge(overrides?: CallOverrides): Promise<[string]>;
+
+    getAxelarFee(
+      targetChainId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber] & { feeInEth: BigNumber }>;
+
     getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<[string]>;
 
     getRoleMember(
@@ -558,10 +519,21 @@ export interface DistributionHelperTestHelper 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 }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     hasRole(
@@ -572,7 +544,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
     initialize(
       _ns: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     mpbBridge(overrides?: CallOverrides): Promise<[string]>;
@@ -583,7 +555,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
     onDistribution(
       _amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     proxiableUUID(overrides?: CallOverrides): Promise<[string]>;
@@ -591,28 +563,18 @@ export interface DistributionHelperTestHelper extends BaseContract {
     renounceRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     revokeRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    setBridges(
-      _mpbBridge: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     setFeeSettings(
-      _feeData: CeloDistributionHelper.FeeSettingsStruct,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    setOracle(
-      oracle: string,
-      overrides?: Overrides & { from?: string }
+      _feeData: FeeSettingsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     supportsInterface(
@@ -620,46 +582,47 @@ export interface DistributionHelperTestHelper extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[boolean]>;
 
+    updateAddresses(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     updateAvatar(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     upgradeTo(
       newImplementation: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     upgradeToAndCall(
       newImplementation: string,
       data: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
   };
 
-  CELO(overrides?: CallOverrides): Promise<string>;
-
-  CUSD(overrides?: CallOverrides): Promise<string>;
+  CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
 
   DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
 
-  GUARDIAN_ROLE(overrides?: CallOverrides): Promise<string>;
+  FUSE_TOKEN(overrides?: CallOverrides): Promise<string>;
 
-  ROUTER(overrides?: CallOverrides): Promise<string>;
+  GUARDIAN_ROLE(overrides?: CallOverrides): Promise<string>;
 
   STATIC_ORACLE(overrides?: CallOverrides): Promise<string>;
 
+  USDC_TOKEN(overrides?: CallOverrides): Promise<string>;
+
+  WETH_TOKEN(overrides?: CallOverrides): Promise<string>;
+
   addOrUpdateRecipient(
-    _recipient: CeloDistributionHelper.DistributionRecipientStruct,
-    overrides?: Overrides & { from?: string }
+    _recipient: DistributionRecipientStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   avatar(overrides?: CallOverrides): Promise<string>;
 
-  calcGDToSell(
-    maxAmountToSell: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
   dao(overrides?: CallOverrides): Promise<string>;
 
   distributionRecipients(
@@ -677,7 +640,8 @@ export interface DistributionHelperTestHelper extends BaseContract {
   feeSettings(
     overrides?: CallOverrides
   ): Promise<
-    [BigNumber, BigNumber, BigNumber, BigNumber, number] & {
+    [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
+      axelarBaseFeeUSD: BigNumber;
       bridgeExecuteGas: BigNumber;
       targetChainGasPrice: BigNumber;
       maxFee: BigNumber;
@@ -686,6 +650,13 @@ export interface DistributionHelperTestHelper extends BaseContract {
     }
   >;
 
+  fuseBridge(overrides?: CallOverrides): Promise<string>;
+
+  getAxelarFee(
+    targetChainId: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
   getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>;
 
   getRoleMember(
@@ -699,10 +670,21 @@ export interface DistributionHelperTestHelper 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 }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   hasRole(
@@ -713,7 +695,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
   initialize(
     _ns: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   mpbBridge(overrides?: CallOverrides): Promise<string>;
@@ -724,7 +706,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
   onDistribution(
     _amount: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   proxiableUUID(overrides?: CallOverrides): Promise<string>;
@@ -732,28 +714,18 @@ export interface DistributionHelperTestHelper extends BaseContract {
   renounceRole(
     role: BytesLike,
     account: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   revokeRole(
     role: BytesLike,
     account: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  setBridges(
-    _mpbBridge: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   setFeeSettings(
-    _feeData: CeloDistributionHelper.FeeSettingsStruct,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  setOracle(
-    oracle: string,
-    overrides?: Overrides & { from?: string }
+    _feeData: FeeSettingsStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   supportsInterface(
@@ -761,46 +733,47 @@ export interface DistributionHelperTestHelper extends BaseContract {
     overrides?: CallOverrides
   ): Promise<boolean>;
 
+  updateAddresses(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   updateAvatar(
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   upgradeTo(
     newImplementation: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   upgradeToAndCall(
     newImplementation: string,
     data: BytesLike,
-    overrides?: PayableOverrides & { from?: string }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    CELO(overrides?: CallOverrides): Promise<string>;
-
-    CUSD(overrides?: CallOverrides): Promise<string>;
+    CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
 
-    GUARDIAN_ROLE(overrides?: CallOverrides): Promise<string>;
+    FUSE_TOKEN(overrides?: CallOverrides): Promise<string>;
 
-    ROUTER(overrides?: CallOverrides): Promise<string>;
+    GUARDIAN_ROLE(overrides?: CallOverrides): Promise<string>;
 
     STATIC_ORACLE(overrides?: CallOverrides): Promise<string>;
 
+    USDC_TOKEN(overrides?: CallOverrides): Promise<string>;
+
+    WETH_TOKEN(overrides?: CallOverrides): Promise<string>;
+
     addOrUpdateRecipient(
-      _recipient: CeloDistributionHelper.DistributionRecipientStruct,
+      _recipient: DistributionRecipientStruct,
       overrides?: CallOverrides
     ): Promise<void>;
 
     avatar(overrides?: CallOverrides): Promise<string>;
 
-    calcGDToSell(
-      maxAmountToSell: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     dao(overrides?: CallOverrides): Promise<string>;
 
     distributionRecipients(
@@ -818,7 +791,8 @@ export interface DistributionHelperTestHelper extends BaseContract {
     feeSettings(
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber, number] & {
+      [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
+        axelarBaseFeeUSD: BigNumber;
         bridgeExecuteGas: BigNumber;
         targetChainGasPrice: BigNumber;
         maxFee: BigNumber;
@@ -827,6 +801,13 @@ export interface DistributionHelperTestHelper extends BaseContract {
       }
     >;
 
+    fuseBridge(overrides?: CallOverrides): Promise<string>;
+
+    getAxelarFee(
+      targetChainId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>;
 
     getRoleMember(
@@ -840,6 +821,17 @@ export interface DistributionHelperTestHelper 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,
@@ -879,20 +871,18 @@ export interface DistributionHelperTestHelper extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    setBridges(_mpbBridge: string, overrides?: CallOverrides): Promise<void>;
-
     setFeeSettings(
-      _feeData: CeloDistributionHelper.FeeSettingsStruct,
+      _feeData: FeeSettingsStruct,
       overrides?: CallOverrides
     ): Promise<void>;
 
-    setOracle(oracle: string, overrides?: CallOverrides): Promise<void>;
-
     supportsInterface(
       interfaceId: BytesLike,
       overrides?: CallOverrides
     ): Promise<boolean>;
 
+    updateAddresses(overrides?: CallOverrides): Promise<void>;
+
     updateAvatar(overrides?: CallOverrides): Promise<void>;
 
     upgradeTo(
@@ -922,33 +912,29 @@ export interface DistributionHelperTestHelper extends BaseContract {
     ): BeaconUpgradedEventFilter;
     BeaconUpgraded(beacon?: string | null): BeaconUpgradedEventFilter;
 
-    "Distribution(uint256,uint256,uint256,(uint32,uint32,address,uint8)[],uint256,uint256)"(
+    "Distribution(uint256,uint256,uint256,tuple[])"(
       distributed?: null,
       startingBalance?: null,
       incomingAmount?: null,
-      distributionRecipients?: null,
-      gdSoldForGas?: null,
-      nativeBoughtForGas?: null
+      distributionRecipients?: null
     ): DistributionEventFilter;
     Distribution(
       distributed?: null,
       startingBalance?: null,
       incomingAmount?: null,
-      distributionRecipients?: null,
-      gdSoldForGas?: null,
-      nativeBoughtForGas?: null
+      distributionRecipients?: null
     ): DistributionEventFilter;
 
     "Initialized(uint8)"(version?: null): InitializedEventFilter;
     Initialized(version?: null): InitializedEventFilter;
 
-    "RecipientAdded((uint32,uint32,address,uint8),uint256)"(
+    "RecipientAdded(tuple,uint256)"(
       recipient?: null,
       index?: null
     ): RecipientAddedEventFilter;
     RecipientAdded(recipient?: null, index?: null): RecipientAddedEventFilter;
 
-    "RecipientUpdated((uint32,uint32,address,uint8),uint256)"(
+    "RecipientUpdated(tuple,uint256)"(
       recipient?: null,
       index?: null
     ): RecipientUpdatedEventFilter;
@@ -995,30 +981,27 @@ export interface DistributionHelperTestHelper extends BaseContract {
   };
 
   estimateGas: {
-    CELO(overrides?: CallOverrides): Promise<BigNumber>;
-
-    CUSD(overrides?: CallOverrides): Promise<BigNumber>;
+    CELO_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
 
-    GUARDIAN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
+    FUSE_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
 
-    ROUTER(overrides?: CallOverrides): Promise<BigNumber>;
+    GUARDIAN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
 
     STATIC_ORACLE(overrides?: CallOverrides): Promise<BigNumber>;
 
+    USDC_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
+
+    WETH_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
+
     addOrUpdateRecipient(
-      _recipient: CeloDistributionHelper.DistributionRecipientStruct,
-      overrides?: Overrides & { from?: string }
+      _recipient: DistributionRecipientStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     avatar(overrides?: CallOverrides): Promise<BigNumber>;
 
-    calcGDToSell(
-      maxAmountToSell: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
     dao(overrides?: CallOverrides): Promise<BigNumber>;
 
     distributionRecipients(
@@ -1028,6 +1011,13 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
     feeSettings(overrides?: CallOverrides): Promise<BigNumber>;
 
+    fuseBridge(overrides?: CallOverrides): Promise<BigNumber>;
+
+    getAxelarFee(
+      targetChainId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     getRoleAdmin(
       role: BytesLike,
       overrides?: CallOverrides
@@ -1044,10 +1034,21 @@ export interface DistributionHelperTestHelper 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 }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     hasRole(
@@ -1058,7 +1059,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
     initialize(
       _ns: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     mpbBridge(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1069,7 +1070,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
     onDistribution(
       _amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     proxiableUUID(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1077,28 +1078,18 @@ export interface DistributionHelperTestHelper extends BaseContract {
     renounceRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     revokeRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    setBridges(
-      _mpbBridge: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     setFeeSettings(
-      _feeData: CeloDistributionHelper.FeeSettingsStruct,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    setOracle(
-      oracle: string,
-      overrides?: Overrides & { from?: string }
+      _feeData: FeeSettingsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     supportsInterface(
@@ -1106,47 +1097,50 @@ export interface DistributionHelperTestHelper extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    updateAvatar(overrides?: Overrides & { from?: string }): Promise<BigNumber>;
+    updateAddresses(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    updateAvatar(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
 
     upgradeTo(
       newImplementation: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     upgradeToAndCall(
       newImplementation: string,
       data: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    CELO(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    CUSD(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    CELO_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     DEFAULT_ADMIN_ROLE(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    GUARDIAN_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    FUSE_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    ROUTER(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    GUARDIAN_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     STATIC_ORACLE(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    USDC_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    WETH_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     addOrUpdateRecipient(
-      _recipient: CeloDistributionHelper.DistributionRecipientStruct,
-      overrides?: Overrides & { from?: string }
+      _recipient: DistributionRecipientStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     avatar(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    calcGDToSell(
-      maxAmountToSell: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     dao(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     distributionRecipients(
@@ -1156,6 +1150,13 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
     feeSettings(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    fuseBridge(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    getAxelarFee(
+      targetChainId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     getRoleAdmin(
       role: BytesLike,
       overrides?: CallOverrides
@@ -1172,10 +1173,21 @@ export interface DistributionHelperTestHelper 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 }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     hasRole(
@@ -1186,7 +1198,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
     initialize(
       _ns: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     mpbBridge(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -1197,7 +1209,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
 
     onDistribution(
       _amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     proxiableUUID(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -1205,28 +1217,18 @@ export interface DistributionHelperTestHelper extends BaseContract {
     renounceRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     revokeRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    setBridges(
-      _mpbBridge: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     setFeeSettings(
-      _feeData: CeloDistributionHelper.FeeSettingsStruct,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    setOracle(
-      oracle: string,
-      overrides?: Overrides & { from?: string }
+      _feeData: FeeSettingsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     supportsInterface(
@@ -1234,19 +1236,23 @@ export interface DistributionHelperTestHelper extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    updateAddresses(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     updateAvatar(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     upgradeTo(
       newImplementation: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     upgradeToAndCall(
       newImplementation: string,
       data: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
   };
 }