@gooddollar/goodprotocol 2.0.22 → 2.0.24

package/scripts/fv.ts

@@ -1,11 +1,12 @@
 import fetch from "cross-fetch";
 import fs from "fs";
-import { chunk } from "lodash";
-import { bulkIsWhitelisted } from "./utils";
+import { chunk, uniqBy } from "lodash";
+import { bulkIsWhitelisted, bulkLastAuth } from "./utils";
 
 const main = async () => {
   const data = JSON.parse(fs.readFileSync("fvtriplets.txt").toString());
-  const triplets = chunk(data, 3);
+  const triplets = uniqBy(chunk(data, 3), _ => _.join("_"));
+
   const accounts = triplets.map(_ => _[0]);
   const whitelisted = await bulkIsWhitelisted(accounts);
   const failed = triplets.filter(_ => whitelisted.includes(_[0]) === false);
@@ -39,10 +40,62 @@ const main = async () => {
           encoding: "base64"
         }
       );
-    } else console.log("not found", a);
+    } else
+      console.log("not found", a, !!i1.auditTrailBase64, !!i2.auditTrailBase64);
   });
 
   await Promise.all(ps);
 };
 
-main();
+const deleteIdentifiers = async () => {
+  const data = JSON.parse(fs.readFileSync("todeletefvtriplets.txt").toString());
+  const triplets = uniqBy(chunk(data, 3), _ => _.join("_"));
+  const accounts = triplets.map(_ => _[0]);
+  const whitelisted = await bulkIsWhitelisted(accounts);
+  const lastAuth = await bulkLastAuth(accounts);
+  const failed = triplets.filter(
+    _ =>
+      whitelisted.includes(_[0]) === false && lastAuth.includes(_[0]) === true
+  );
+
+  let ps = [];
+  console.log({ failed });
+
+  for (let record of failed) {
+    ps.push(
+      fetch("https://goodserver.gooddollar.org/admin/verify/face/delete", {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({
+          password,
+          enrollmentIdentifier: record[1]
+        })
+      })
+        .then(_ => _.json())
+        .catch(_ => record[1])
+    );
+    ps.push(
+      fetch("https://goodserver.gooddollar.org/admin/verify/face/delete", {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({
+          password,
+          enrollmentIdentifier: record[2]
+        })
+      })
+        .then(_ => _.json())
+        .catch(_ => record[2])
+    );
+    if (ps.length % 10 === 0) {
+      console.log("waiting...", ps.length);
+      const r = await Promise.all(ps);
+      console.log(r);
+      ps = [];
+    }
+  }
+  const res = await Promise.all(ps);
+  console.log(res);
+};
+
+deleteIdentifiers();
+// main();

package/scripts/proposals/updateDistHelper.ts

@@ -0,0 +1,180 @@
+/***
+ * Upgrade dist helper to have better axelar base fee
+ * Update the axelarbasefee
+ * Send UBI G$s to the bridge for liquidity
+ */
+
+import { network, ethers } from "hardhat";
+import { Contract } from "ethers";
+import { defaultsDeep } from "lodash";
+import prompt from "prompt";
+import { reset } from "@nomicfoundation/hardhat-network-helpers";
+
+import {
+  printDeploy,
+  executeViaGuardian,
+  executeViaSafe,
+  verifyProductionSigner
+} from "../multichain-deploy/helpers";
+
+import ProtocolSettings from "../../releases/deploy-settings.json";
+
+import dao from "../../releases/deployment.json";
+import { verifyContract } from "../multichain-deploy/helpers";
+import { IStaticOracle } from "../../types";
+let { name: networkName } = network;
+
+export const upgrade = async () => {
+  const isProduction = networkName.includes("production");
+  let [root, ...signers] = await ethers.getSigners();
+
+  // if (isProduction) verifyProductionSigner(root);
+
+  let guardian = root;
+
+  //simulate produciton on fork
+  if (
+    network.name === "localhost" ||
+    network.name === "hardhat" ||
+    network.name === "fork"
+  ) {
+    networkName = "production-mainnet";
+  }
+
+  let release: { [key: string]: any } = dao[networkName];
+  let protocolSettings = defaultsDeep(
+    {},
+    ProtocolSettings[networkName],
+    ProtocolSettings["default"]
+  );
+
+  //simulate on fork, make sure safe has enough eth to simulate txs
+  if (
+    network.name === "localhost" ||
+    network.name === "hardhat" ||
+    network.name === "fork"
+  ) {
+    guardian = await ethers.getImpersonatedSigner(
+      protocolSettings.guardiansSafe
+    );
+    networkName = "production-mainnet";
+
+    await root.sendTransaction({
+      value: ethers.constants.WeiPerEther.mul(3),
+      to: protocolSettings.guardiansSafe
+    });
+  }
+
+  const rootBalance = await ethers.provider
+    .getBalance(root.address)
+    .then(_ => _.toString());
+  const guardianBalance = await ethers.provider
+    .getBalance(guardian.address)
+    .then(_ => _.toString());
+
+  const gd = await ethers.getContractAt("IGoodDollar", release["GoodDollar"]);
+
+  const NEWBRIDGE = "0xa3247276DbCC76Dd7705273f766eB3E8a5ecF4a5";
+  const GUARDIANS_BALANCE = await gd.balanceOf(protocolSettings.guardiansSafe);
+
+  if (GUARDIANS_BALANCE.eq(0)) throw new Error("guardian has no G$ balance");
+
+  const bridgeDeployed = await ethers.provider
+    .getCode(NEWBRIDGE)
+    .then(_ => _ != "0x");
+  if (!bridgeDeployed) throw new Error("bridge not deployed yet");
+
+  console.log("got signers:", {
+    networkName,
+    root: root.address,
+    guardian: guardian.address,
+    balance: rootBalance,
+    guardianBalance: guardianBalance
+  });
+
+  console.log("executing proposals");
+
+  const proposalContracts = [
+    release.DistributionHelper, //controller -> upgrade disthelper
+    release.DistributionHelper, //update axelar fee
+    protocolSettings.guardiansSafe + "_" + release.GoodDollar //transfer G$s from guardians to bridge
+  ];
+
+  const proposalEthValues = proposalContracts.map(_ => 0);
+
+  const proposalFunctionSignatures = [
+    "upgradeTo(address)", //upgrade disthelper
+    "setFeeSettings((uint128,uint128,uint128,uint128,uint128,uint8))",
+    "transfer(address,uint256)" // transfer G$s from guardians to bridge
+  ];
+
+  const proposalFunctionInputs = [
+    ethers.utils.defaultAbiCoder.encode(
+      ["address"],
+      ["0xa339B7F4E95A93d2c6569cb139AD034C3b9cAA77"]
+    ),
+    //uint128 axelarBaseFeeUSD;uint128 bridgeExecuteGas;uint128 targetChainGasPrice;uint128 maxFee;uint128 minBalanceForFees;uint8 percentageToSellForFee;
+    //0.2 AXL base fee, 400000 bridge execute, 5 gwei gas price, 5e15 eth max fee, min balance 1e16, percentage 5%
+    ethers.utils.defaultAbiCoder.encode(
+      ["uint128", "uint128", "uint128", "uint128", "uint128", "uint8"],
+      [
+        "200000000000000000",
+        "400000",
+        "5000000000",
+        "5000000000000000",
+        "10000000000000000",
+        "5"
+      ]
+    ),
+    ethers.utils.defaultAbiCoder.encode(
+      ["address", "uint256"],
+      [NEWBRIDGE, GUARDIANS_BALANCE] // transfer G$ to bridge
+    )
+  ];
+
+  if (isProduction) {
+    await executeViaSafe(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      protocolSettings.guardiansSafe,
+      "mainnet"
+    );
+  } else {
+    //simulation or dev envs
+    await executeViaGuardian(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      guardian,
+      networkName
+    );
+  }
+
+  //perform sanity checks on fork, for production we need to wait until everything executed
+  if (!isProduction) {
+    let fm = await ethers.getContractAt(
+      "GoodFundManager",
+      release.GoodFundManager
+    );
+    let dh = await ethers.getContractAt(
+      "DistributionHelper",
+      release.DistributionHelper
+    );
+
+    console.log(
+      "gd balances: guardians:",
+      await gd.balanceOf(guardian.address),
+      " bridge:",
+      await gd.balanceOf(NEWBRIDGE)
+    );
+  }
+};
+
+export const main = async () => {
+  await upgrade();
+};
+
+main().catch(console.log);

package/scripts/utils.ts

@@ -5,11 +5,34 @@ import { ethers } from "hardhat";
 export const bulkIsWhitelisted = async (accounts: Array<String>) => {
   setMulticallAddress(122, "0x3CE6158b7278Bf6792e014FA7B4f3c6c46fe9410");
   setMulticallAddress(42220, "0x75F59534dd892c1f8a7B172D639FA854D529ada3");
-  const celoProvider = new ethers.providers.JsonRpcProvider("https://forno.celo.org");
+  const celoProvider = new ethers.providers.JsonRpcProvider(
+    "https://forno.celo.org"
+  );
   const ethcallProvider = new Provider(celoProvider, 42220);
-  const identityContract = new Contract("0xC361A6E67822a0EDc17D899227dd9FC50BD62F42", Identity.abi);
+  const identityContract = new Contract(
+    "0xC361A6E67822a0EDc17D899227dd9FC50BD62F42",
+    Identity.abi
+  );
   const calls = accounts.map(d => identityContract.isWhitelisted(d));
   const result = await ethcallProvider.all(calls);
   const whitelisted = accounts.filter((v, i) => result[i]);
   return whitelisted;
 };
+
+export const bulkLastAuth = async (accounts: Array<String>) => {
+  setMulticallAddress(122, "0x3CE6158b7278Bf6792e014FA7B4f3c6c46fe9410");
+  setMulticallAddress(42220, "0x75F59534dd892c1f8a7B172D639FA854D529ada3");
+  const celoProvider = new ethers.providers.JsonRpcProvider(
+    "https://forno.celo.org"
+  );
+  const ethcallProvider = new Provider(celoProvider, 42220);
+  const identityContract = new Contract(
+    "0xC361A6E67822a0EDc17D899227dd9FC50BD62F42",
+    Identity.abi
+  );
+  const calls = accounts.map(d => identityContract.lastAuthenticated(d));
+  const result = await ethcallProvider.all(calls);
+  console.log({ result });
+  const whitelisted = accounts.filter((v, i) => parseInt(result[i]));
+  return whitelisted;
+};

package/test/reserve/DistributionHelper.test.ts

@@ -89,7 +89,7 @@ describe("DistributionHelper", () => {
       "setFeeSettings",
       [
         {
-          axelarBaseFeeUSD: "100000000000000000",
+          axelarBaseFee: "100000000000000000",
           bridgeExecuteGas: 400000,
           targetChainGasPrice: 5e9,
           maxFee: "5000000000000000",

package/types/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.ts

@@ -43,7 +43,7 @@ export declare namespace DistributionHelper {
   ] & { bps: number; chainId: number; addr: string; transferType: number };
 
   export type FeeSettingsStruct = {
-    axelarBaseFeeUSD: BigNumberish;
+    axelarBaseFee: BigNumberish;
     bridgeExecuteGas: BigNumberish;
     targetChainGasPrice: BigNumberish;
     maxFee: BigNumberish;
@@ -59,7 +59,7 @@ export declare namespace DistributionHelper {
     BigNumber,
     number
   ] & {
-    axelarBaseFeeUSD: BigNumber;
+    axelarBaseFee: BigNumber;
     bridgeExecuteGas: BigNumber;
     targetChainGasPrice: BigNumber;
     maxFee: BigNumber;
@@ -70,6 +70,7 @@ export declare namespace DistributionHelper {
 
 export interface DistributionHelperTestInterface extends utils.Interface {
   functions: {
+    "AXL_TOKEN()": FunctionFragment;
     "CELO_TOKEN()": FunctionFragment;
     "DEFAULT_ADMIN_ROLE()": FunctionFragment;
     "FUSE_TOKEN()": FunctionFragment;
@@ -109,6 +110,7 @@ export interface DistributionHelperTestInterface extends utils.Interface {
 
   getFunction(
     nameOrSignatureOrTopic:
+      | "AXL_TOKEN"
       | "CELO_TOKEN"
       | "DEFAULT_ADMIN_ROLE"
       | "FUSE_TOKEN"
@@ -146,6 +148,7 @@ export interface DistributionHelperTestInterface extends utils.Interface {
       | "upgradeToAndCall"
   ): FunctionFragment;
 
+  encodeFunctionData(functionFragment: "AXL_TOKEN", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "CELO_TOKEN",
     values?: undefined
@@ -272,6 +275,7 @@ export interface DistributionHelperTestInterface extends utils.Interface {
     values: [string, BytesLike]
   ): string;
 
+  decodeFunctionResult(functionFragment: "AXL_TOKEN", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "CELO_TOKEN", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "DEFAULT_ADMIN_ROLE",
@@ -539,6 +543,8 @@ export interface DistributionHelperTest extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<[string]>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<[string]>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>;
@@ -578,7 +584,7 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-        axelarBaseFeeUSD: BigNumber;
+        axelarBaseFee: BigNumber;
         bridgeExecuteGas: BigNumber;
         targetChainGasPrice: BigNumber;
         maxFee: BigNumber;
@@ -690,6 +696,8 @@ export interface DistributionHelperTest extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
+  AXL_TOKEN(overrides?: CallOverrides): Promise<string>;
+
   CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
 
   DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
@@ -729,7 +737,7 @@ export interface DistributionHelperTest extends BaseContract {
     overrides?: CallOverrides
   ): Promise<
     [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-      axelarBaseFeeUSD: BigNumber;
+      axelarBaseFee: BigNumber;
       bridgeExecuteGas: BigNumber;
       targetChainGasPrice: BigNumber;
       maxFee: BigNumber;
@@ -841,6 +849,8 @@ export interface DistributionHelperTest extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<string>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
@@ -880,7 +890,7 @@ export interface DistributionHelperTest extends BaseContract {
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-        axelarBaseFeeUSD: BigNumber;
+        axelarBaseFee: BigNumber;
         bridgeExecuteGas: BigNumber;
         targetChainGasPrice: BigNumber;
         maxFee: BigNumber;
@@ -1069,6 +1079,8 @@ export interface DistributionHelperTest extends BaseContract {
   };
 
   estimateGas: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1204,6 +1216,8 @@ export interface DistributionHelperTest extends BaseContract {
   };
 
   populateTransaction: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     DEFAULT_ADMIN_ROLE(

package/types/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.ts

@@ -43,7 +43,7 @@ export declare namespace DistributionHelper {
   ] & { bps: number; chainId: number; addr: string; transferType: number };
 
   export type FeeSettingsStruct = {
-    axelarBaseFeeUSD: BigNumberish;
+    axelarBaseFee: BigNumberish;
     bridgeExecuteGas: BigNumberish;
     targetChainGasPrice: BigNumberish;
     maxFee: BigNumberish;
@@ -59,7 +59,7 @@ export declare namespace DistributionHelper {
     BigNumber,
     number
   ] & {
-    axelarBaseFeeUSD: BigNumber;
+    axelarBaseFee: BigNumber;
     bridgeExecuteGas: BigNumber;
     targetChainGasPrice: BigNumber;
     maxFee: BigNumber;
@@ -70,6 +70,7 @@ export declare namespace DistributionHelper {
 
 export interface DistributionHelperTestHelperInterface extends utils.Interface {
   functions: {
+    "AXL_TOKEN()": FunctionFragment;
     "CELO_TOKEN()": FunctionFragment;
     "DEFAULT_ADMIN_ROLE()": FunctionFragment;
     "FUSE_TOKEN()": FunctionFragment;
@@ -111,6 +112,7 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
 
   getFunction(
     nameOrSignatureOrTopic:
+      | "AXL_TOKEN"
       | "CELO_TOKEN"
       | "DEFAULT_ADMIN_ROLE"
       | "FUSE_TOKEN"
@@ -150,6 +152,7 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
       | "upgradeToAndCall"
   ): FunctionFragment;
 
+  encodeFunctionData(functionFragment: "AXL_TOKEN", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "CELO_TOKEN",
     values?: undefined
@@ -281,6 +284,7 @@ export interface DistributionHelperTestHelperInterface extends utils.Interface {
     values: [string, BytesLike]
   ): string;
 
+  decodeFunctionResult(functionFragment: "AXL_TOKEN", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "CELO_TOKEN", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "DEFAULT_ADMIN_ROLE",
@@ -550,6 +554,8 @@ export interface DistributionHelperTestHelper extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<[string]>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<[string]>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>;
@@ -589,7 +595,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-        axelarBaseFeeUSD: BigNumber;
+        axelarBaseFee: BigNumber;
         bridgeExecuteGas: BigNumber;
         targetChainGasPrice: BigNumber;
         maxFee: BigNumber;
@@ -712,6 +718,8 @@ export interface DistributionHelperTestHelper extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
+  AXL_TOKEN(overrides?: CallOverrides): Promise<string>;
+
   CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
 
   DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
@@ -751,7 +759,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
     overrides?: CallOverrides
   ): Promise<
     [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-      axelarBaseFeeUSD: BigNumber;
+      axelarBaseFee: BigNumber;
       bridgeExecuteGas: BigNumber;
       targetChainGasPrice: BigNumber;
       maxFee: BigNumber;
@@ -874,6 +882,8 @@ export interface DistributionHelperTestHelper extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<string>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
@@ -913,7 +923,7 @@ export interface DistributionHelperTestHelper extends BaseContract {
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-        axelarBaseFeeUSD: BigNumber;
+        axelarBaseFee: BigNumber;
         bridgeExecuteGas: BigNumber;
         targetChainGasPrice: BigNumber;
         maxFee: BigNumber;
@@ -1110,6 +1120,8 @@ export interface DistributionHelperTestHelper extends BaseContract {
   };
 
   estimateGas: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1256,6 +1268,8 @@ export interface DistributionHelperTestHelper extends BaseContract {
   };
 
   populateTransaction: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     DEFAULT_ADMIN_ROLE(

package/types/contracts/reserve/DistributionHelper.ts

@@ -43,7 +43,7 @@ export declare namespace DistributionHelper {
   ] & { bps: number; chainId: number; addr: string; transferType: number };
 
   export type FeeSettingsStruct = {
-    axelarBaseFeeUSD: BigNumberish;
+    axelarBaseFee: BigNumberish;
     bridgeExecuteGas: BigNumberish;
     targetChainGasPrice: BigNumberish;
     maxFee: BigNumberish;
@@ -59,7 +59,7 @@ export declare namespace DistributionHelper {
     BigNumber,
     number
   ] & {
-    axelarBaseFeeUSD: BigNumber;
+    axelarBaseFee: BigNumber;
     bridgeExecuteGas: BigNumber;
     targetChainGasPrice: BigNumber;
     maxFee: BigNumber;
@@ -70,6 +70,7 @@ export declare namespace DistributionHelper {
 
 export interface DistributionHelperInterface extends utils.Interface {
   functions: {
+    "AXL_TOKEN()": FunctionFragment;
     "CELO_TOKEN()": FunctionFragment;
     "DEFAULT_ADMIN_ROLE()": FunctionFragment;
     "FUSE_TOKEN()": FunctionFragment;
@@ -109,6 +110,7 @@ export interface DistributionHelperInterface extends utils.Interface {
 
   getFunction(
     nameOrSignatureOrTopic:
+      | "AXL_TOKEN"
       | "CELO_TOKEN"
       | "DEFAULT_ADMIN_ROLE"
       | "FUSE_TOKEN"
@@ -146,6 +148,7 @@ export interface DistributionHelperInterface extends utils.Interface {
       | "upgradeToAndCall"
   ): FunctionFragment;
 
+  encodeFunctionData(functionFragment: "AXL_TOKEN", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "CELO_TOKEN",
     values?: undefined
@@ -272,6 +275,7 @@ export interface DistributionHelperInterface extends utils.Interface {
     values: [string, BytesLike]
   ): string;
 
+  decodeFunctionResult(functionFragment: "AXL_TOKEN", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "CELO_TOKEN", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "DEFAULT_ADMIN_ROLE",
@@ -539,6 +543,8 @@ export interface DistributionHelper extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<[string]>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<[string]>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>;
@@ -578,7 +584,7 @@ export interface DistributionHelper extends BaseContract {
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-        axelarBaseFeeUSD: BigNumber;
+        axelarBaseFee: BigNumber;
         bridgeExecuteGas: BigNumber;
         targetChainGasPrice: BigNumber;
         maxFee: BigNumber;
@@ -690,6 +696,8 @@ export interface DistributionHelper extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
+  AXL_TOKEN(overrides?: CallOverrides): Promise<string>;
+
   CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
 
   DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
@@ -729,7 +737,7 @@ export interface DistributionHelper extends BaseContract {
     overrides?: CallOverrides
   ): Promise<
     [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-      axelarBaseFeeUSD: BigNumber;
+      axelarBaseFee: BigNumber;
       bridgeExecuteGas: BigNumber;
       targetChainGasPrice: BigNumber;
       maxFee: BigNumber;
@@ -841,6 +849,8 @@ export interface DistributionHelper extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<string>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<string>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
@@ -880,7 +890,7 @@ export interface DistributionHelper extends BaseContract {
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, number] & {
-        axelarBaseFeeUSD: BigNumber;
+        axelarBaseFee: BigNumber;
         bridgeExecuteGas: BigNumber;
         targetChainGasPrice: BigNumber;
         maxFee: BigNumber;
@@ -1069,6 +1079,8 @@ export interface DistributionHelper extends BaseContract {
   };
 
   estimateGas: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
 
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1204,6 +1216,8 @@ export interface DistributionHelper extends BaseContract {
   };
 
   populateTransaction: {
+    AXL_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     CELO_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     DEFAULT_ADMIN_ROLE(