@gooddollar/goodprotocol 2.1.1 → 2.1.2

package/scripts/proposals/gip-25-xdc-upgrade-ubi.ts

@@ -15,6 +15,7 @@
 // deploy distribution helper
 // transfer usdc to xdc reserve
 // update celo reserve parameters accordingly
+// upgrade celo's distribution helper to genericdistributionhelper (simulate it is working)
 
 import { network, ethers, upgrades } from "hardhat";
 import { reset } from "@nomicfoundation/hardhat-network-helpers";
@@ -30,12 +31,14 @@ import {
 
 import dao from "../../releases/deployment.json";
 import { Controller, IdentityV3, IGoodDollar, IMessagePassingBridge, UBISchemeV2 } from "../../types";
+import { upgrade } from "./gip-15";
 let { name: networkName } = network;
 const isSimulation = network.name === "hardhat" || network.name === "fork" || network.name === "localhost";
 const bridgeUpgradeImpl = {
-  "production-celo": "0x7bDaF2Fb332761b2a6A565a43ccB0ACfC36d2C3D",
-  production: "0x6f252280eB53df085eAD27BBe55d615741A8268D",
-  "production-mainnet": "0x7baFe060A37E31E707b8B28a90a36731ee99aFBa"
+  "production-celo": "0xF3eAB7018d74E7Df95A5d8dC70987C0539bDF48f",
+  production: "0xFB62aA509a7B260b6697B671C969a184d6c39E90",
+  "production-mainnet": "0x12ab702f015D3302f3cc0c4AbA0626A127D06A07",
+  "production-xdc": "0xe4CFA18A3d0a7d77fAA42961ee943c9221d61937"
 };
 export const upgradeCeloStep1 = async (network, checksOnly) => {
   let [root] = await ethers.getSigners();
@@ -177,6 +180,297 @@ export const upgradeCeloStep1 = async (network, checksOnly) => {
     console.log("UBI claim from connected account tx:", claimTx.events);
   }
 };
+export const upgradeCeloFix = async (network, checksOnly) => {
+  let [root] = await ethers.getSigners();
+
+  const isProduction = networkName.includes("production");
+
+  if (isProduction) verifyProductionSigner(root);
+
+  let networkEnv = networkName;
+  let guardian = root;
+  if (isSimulation) {
+    networkEnv = network;
+  }
+
+  let release: { [key: string]: any } = dao[networkEnv];
+
+  console.log("signer:", root.address, { networkEnv, isSimulation, isProduction, release });
+
+  if (isSimulation) {
+    networkEnv = network;
+    guardian = await ethers.getImpersonatedSigner(release.GuardiansSafe);
+
+    await root.sendTransaction({
+      value: ethers.utils.parseEther("1"),
+      to: release.GuardiansSafe
+    });
+  }
+
+  const bridgeImpl = bridgeUpgradeImpl[networkEnv];
+  const toBurn = "5515965554075495700269228267";
+  const proposalActions = [
+    [release.MpbBridge, "upgradeTo(address)", ethers.utils.defaultAbiCoder.encode(["address"], [bridgeImpl]), "0"], //upgrade bridge
+    [release.GoodDollar, "burn(uint256)", ethers.utils.defaultAbiCoder.encode(["uint256"], [toBurn.toString()]), "0"] //burn locked supply on celo bridge
+  ];
+
+  console.log({
+    networkEnv,
+    guardian: guardian.address,
+    isSimulation,
+    isProduction,
+    release
+  });
+
+  const proposalContracts = proposalActions.map(a => a[0]);
+  const proposalFunctionSignatures = proposalActions.map(a => a[1]);
+  const proposalFunctionInputs = proposalActions.map(a => a[2]);
+  const proposalEthValues = proposalActions.map(a => a[3]);
+  if (isProduction && !checksOnly) {
+    await executeViaSafe(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      release.GuardiansSafe,
+      "celo",
+      { nonce: 5 }
+    );
+  } else if (!checksOnly) {
+    await executeViaGuardian(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      guardian,
+      networkEnv
+    );
+  }
+};
+export const upgradeXdcFix = async (network, checksOnly) => {
+  let [root] = await ethers.getSigners();
+
+  const isProduction = networkName.includes("production");
+
+  if (isProduction) verifyProductionSigner(root);
+
+  let networkEnv = networkName;
+  let guardian = root;
+  if (isSimulation) {
+    networkEnv = network;
+  }
+
+  let release: { [key: string]: any } = dao[networkEnv];
+
+  console.log("signer:", root.address, { networkEnv, isSimulation, isProduction, release });
+
+  if (isSimulation) {
+    networkEnv = network;
+    guardian = await ethers.getImpersonatedSigner(release.GuardiansSafe);
+
+    await root.sendTransaction({
+      value: ethers.utils.parseEther("1"),
+      to: release.GuardiansSafe
+    });
+  }
+
+  const bridgeImpl = bridgeUpgradeImpl[networkEnv];
+  const proposalActions = [
+    [release.MpbBridge, "upgradeTo(address)", ethers.utils.defaultAbiCoder.encode(["address"], [bridgeImpl]), "0"] //upgrade bridge
+  ];
+
+  console.log({
+    networkEnv,
+    guardian: guardian.address,
+    isSimulation,
+    isProduction,
+    release
+  });
+
+  const proposalContracts = proposalActions.map(a => a[0]);
+  const proposalFunctionSignatures = proposalActions.map(a => a[1]);
+  const proposalFunctionInputs = proposalActions.map(a => a[2]);
+  const proposalEthValues = proposalActions.map(a => a[3]);
+  if (isProduction && !checksOnly) {
+    await executeViaSafe(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      release.GuardiansSafe,
+      "xdc"
+    );
+  } else if (!checksOnly) {
+    await executeViaGuardian(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      guardian,
+      networkEnv
+    );
+  }
+};
+export const upgradeFuseFix = async (network, checksOnly) => {
+  let [root] = await ethers.getSigners();
+
+  const isProduction = networkName.includes("production");
+
+  if (isProduction) verifyProductionSigner(root);
+
+  let networkEnv = networkName;
+  let guardian = root;
+  if (isSimulation) {
+    networkEnv = network;
+  }
+
+  let release: { [key: string]: any } = dao[networkEnv];
+
+  console.log("signer:", root.address, { networkEnv, isSimulation, isProduction, release });
+
+  if (isSimulation) {
+    networkEnv = network;
+    guardian = await ethers.getImpersonatedSigner(release.GuardiansSafe);
+
+    await root.sendTransaction({
+      value: ethers.utils.parseEther("1"),
+      to: release.GuardiansSafe
+    });
+  }
+
+  const bridgeImpl = bridgeUpgradeImpl[networkEnv];
+  const proposalActions = [
+    [release.MpbBridge, "upgradeTo(address)", ethers.utils.defaultAbiCoder.encode(["address"], [bridgeImpl]), "0"] //upgrade bridge
+  ];
+
+  console.log({
+    networkEnv,
+    guardian: guardian.address,
+    isSimulation,
+    isProduction,
+    release
+  });
+
+  const proposalContracts = proposalActions.map(a => a[0]);
+  const proposalFunctionSignatures = proposalActions.map(a => a[1]);
+  const proposalFunctionInputs = proposalActions.map(a => a[2]);
+  const proposalEthValues = proposalActions.map(a => a[3]);
+  if (isProduction && !checksOnly) {
+    await executeViaSafe(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      release.GuardiansSafe,
+      "fuse"
+    );
+  } else if (!checksOnly) {
+    await executeViaGuardian(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      guardian,
+      networkEnv
+    );
+  }
+};
+export const upgradeEthFix = async (network, checksOnly) => {
+  let [root] = await ethers.getSigners();
+
+  const isProduction = networkName.includes("production");
+
+  if (isProduction) verifyProductionSigner(root);
+
+  let networkEnv = networkName;
+  let guardian = root;
+  if (isSimulation) {
+    networkEnv = network;
+  }
+
+  let release: { [key: string]: any } = dao[networkEnv];
+
+  console.log("signer:", root.address, { networkEnv, isSimulation, isProduction, release });
+
+  if (isSimulation) {
+    networkEnv = network;
+    guardian = await ethers.getImpersonatedSigner(release.GuardiansSafe);
+
+    await root.sendTransaction({
+      value: ethers.utils.parseEther("1"),
+      to: release.GuardiansSafe
+    });
+  }
+
+  const bridgeImpl = bridgeUpgradeImpl[networkEnv];
+  const upgradeCall = ethers.utils.keccak256(ethers.utils.toUtf8Bytes("upgrade()")).substring(0, 10);
+
+  const proposalActions = [
+    [
+      release.MpbBridge,
+      "upgradeToAndCall(address,bytes)",
+      ethers.utils.defaultAbiCoder.encode(["address", "bytes"], [bridgeImpl, upgradeCall]),
+      "0"
+    ] //upgrade bridge
+  ];
+
+  console.log({
+    networkEnv,
+    guardian: guardian.address,
+    isSimulation,
+    isProduction,
+    release
+  });
+
+  const proposalContracts = proposalActions.map(a => a[0]);
+  const proposalFunctionSignatures = proposalActions.map(a => a[1]);
+  const proposalFunctionInputs = proposalActions.map(a => a[2]);
+  const proposalEthValues = proposalActions.map(a => a[3]);
+  if (isProduction && !checksOnly) {
+    await executeViaSafe(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      release.GuardiansSafe,
+      "mainnet",
+      { nonce: 15 }
+    );
+  } else if (!checksOnly) {
+    await executeViaGuardian(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      guardian,
+      networkEnv
+    );
+  }
+
+  if (isSimulation || !isProduction) {
+    const ctrl = (await ethers.getContractAt("Controller", release.Controller)) as Controller;
+    const isMinterScheme = await ctrl.getSchemePermissions(release.MpbBridge, release.Avatar);
+    console.log("Bridge minter permissions on avatar:", isMinterScheme);
+    // check xdc chainid in bridge
+    const mpb = (await ethers.getContractAt("IMessagePassingBridge", release.MpbBridge)) as IMessagePassingBridge;
+    console.log("xdc lz chainid:", await mpb.toLzChainId(50));
+  }
+};
+
+export const verifyUpgradeCeloStep1 = async networkEnv => {
+  let release: { [key: string]: any } = dao[networkEnv];
+  const ctrl = (await ethers.getContractAt("Controller", release.Controller)) as Controller;
+  const isMinterScheme = await ctrl.getSchemePermissions(release.MpbBridge, release.Avatar);
+  console.log("Bridge minter permissions on avatar:", isMinterScheme);
+  // check xdc chainid in bridge
+  const mpb = (await ethers.getContractAt("IMessagePassingBridge", release.MpbBridge)) as IMessagePassingBridge;
+  console.log("xdc lz chainid:", await mpb.toLzChainId(50));
+  const gd = await ethers.getContractAt("IGoodDollar", release.GoodDollar);
+  const supplyAfter = await gd.totalSupply();
+  const bridgeBalanceAfter = await gd.balanceOf(release.MpbBridge);
+  const avatarBalanceAfter = await gd.balanceOf(release.Avatar);
+  console.log({ bridgeBalanceAfter, avatarBalanceAfter, supplyAfter });
+};
 
 export const upgradeFuseStep1 = async (network, checksOnly) => {
   let [root] = await ethers.getSigners();
@@ -444,4 +738,9 @@ export const main = async () => {
   }
 };
 
-main().catch(console.log);
+// upgradeCeloFix("production-celo", false).catch(console.log);
+// upgradeEthFix("production-mainnet", false).catch(console.log);
+upgradeFuseFix("production", false).catch(console.log);
+// upgradeXdcFix("production-xdc", false).catch(console.log);
+// verifyUpgradeCeloStep1("production-celo");
+// main().catch(console.log);

package/types/{ERC1967Upgrade.ts → @openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.ts}

@@ -1,28 +1,17 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import type { BaseContract, Signer, utils } from "ethers";
+import type { EventFragment } from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
 import type {
   TypedEventFilter,
   TypedEvent,
   TypedListener,
   OnEvent,
-} from "./common";
+} from "../../../../common";
 
-export interface ERC1967UpgradeInterface extends ethers.utils.Interface {
+export interface ERC1967ProxyInterface extends utils.Interface {
   functions: {};
 
   events: {
@@ -36,27 +25,40 @@ export interface ERC1967UpgradeInterface extends ethers.utils.Interface {
   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 type UpgradedEvent = TypedEvent<[string], { implementation: string }>;
+export interface UpgradedEventObject {
+  implementation: string;
+}
+export type UpgradedEvent = TypedEvent<[string], UpgradedEventObject>;
 
 export type UpgradedEventFilter = TypedEventFilter<UpgradedEvent>;
 
-export interface ERC1967Upgrade extends BaseContract {
+export interface ERC1967Proxy extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: ERC1967UpgradeInterface;
+  interface: ERC1967ProxyInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,

package/types/@openzeppelin/contracts/proxy/ERC1967/index.ts

@@ -1,4 +1,5 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+export type { ERC1967Proxy } from "./ERC1967Proxy";
 export type { ERC1967Upgrade } from "./ERC1967Upgrade";

package/types/@uniswap/index.ts

@@ -1,5 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+import type * as v2Periphery from "./v2-periphery";
+export type { v2Periphery };
 import type * as v3Core from "./v3-core";
 export type { v3Core };

package/types/@uniswap/v2-periphery/contracts/index.ts

@@ -0,0 +1,5 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type * as interfaces from "./interfaces";
+export type { interfaces };

package/types/@uniswap/v2-periphery/contracts/interfaces/IWETH.ts

@@ -0,0 +1,159 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PayableOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import type { FunctionFragment, Result } from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "../../../../common";
+
+export interface IWETHInterface extends utils.Interface {
+  functions: {
+    "deposit()": FunctionFragment;
+    "transfer(address,uint256)": FunctionFragment;
+    "withdraw(uint256)": FunctionFragment;
+  };
+
+  getFunction(
+    nameOrSignatureOrTopic: "deposit" | "transfer" | "withdraw"
+  ): FunctionFragment;
+
+  encodeFunctionData(functionFragment: "deposit", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "transfer",
+    values: [string, BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "withdraw",
+    values: [BigNumberish]
+  ): string;
+
+  decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "transfer", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
+
+  events: {};
+}
+
+export interface IWETH extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: IWETHInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {
+    deposit(
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<ContractTransaction>;
+
+    transfer(
+      to: string,
+      value: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>;
+
+    withdraw(
+      arg0: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>;
+  };
+
+  deposit(
+    overrides?: PayableOverrides & { from?: string }
+  ): Promise<ContractTransaction>;
+
+  transfer(
+    to: string,
+    value: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>;
+
+  withdraw(
+    arg0: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    deposit(overrides?: CallOverrides): Promise<void>;
+
+    transfer(
+      to: string,
+      value: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<boolean>;
+
+    withdraw(arg0: BigNumberish, overrides?: CallOverrides): Promise<void>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    deposit(
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<BigNumber>;
+
+    transfer(
+      to: string,
+      value: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>;
+
+    withdraw(
+      arg0: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    deposit(
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<PopulatedTransaction>;
+
+    transfer(
+      to: string,
+      value: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>;
+
+    withdraw(
+      arg0: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>;
+  };
+}

package/types/@uniswap/v2-periphery/contracts/interfaces/index.ts

@@ -0,0 +1,4 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export type { IWETH } from "./IWETH";

package/types/@uniswap/v2-periphery/index.ts

@@ -0,0 +1,5 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type * as contracts from "./contracts";
+export type { contracts };