@gooddollar/goodprotocol 2.0.7-beta.2 → 2.0.7-beta.3

package/scripts/upgrades/multichain-temp-fix.ts

@@ -0,0 +1,126 @@
+/***
+ * Disable UBI bridge via multichain
+ * Upgrade Plan:
+ * - deploy new DistHelper
+ * - disable multichain distribution
+ * - create new distribution instead to guardians
+ */
+
+import { network, ethers } from "hardhat";
+import { Contract } from "ethers";
+import { defaultsDeep } from "lodash";
+
+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";
+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 on fork
+  if (network.name === "hardhat") {
+    networkName = "production-mainnet";
+    root = await ethers.getImpersonatedSigner("0x5128E3C1f8846724cc1007Af9b4189713922E4BB");
+  }
+
+  let release: { [key: string]: any } = dao[networkName];
+  let protocolSettings = defaultsDeep({}, ProtocolSettings[networkName], ProtocolSettings["default"]);
+  //make sure safe has enough eth to simulate txs
+  if (network.name === "hardhat") {
+    guardian = await ethers.getImpersonatedSigner(protocolSettings.guardiansSafe);
+    await root.sendTransaction({ value: ethers.constants.WeiPerEther, to: protocolSettings.guardiansSafe });
+  }
+
+  console.log("got signers:", {
+    networkName,
+    root: root.address,
+    guardian: guardian.address,
+    balance: await ethers.provider.getBalance(root.address).then(_ => _.toString()),
+    guardianBalance: await ethers.provider.getBalance(guardian.address).then(_ => _.toString())
+  });
+
+  let networkEnv = networkName.split("-")[0];
+  const fuseNetwork = networkEnv;
+  if (networkEnv === "fuse") networkEnv = "development";
+  const celoNetwork = networkEnv + "-celo";
+
+  let f = await ethers.getContractFactory("GoodFundManager");
+  console.log("bytecode", f.bytecode.length);
+  let newDistHelper = (await ethers.deployContract("DistributionHelper").then(printDeploy)) as Contract;
+
+  if (isProduction) await verifyContract(newDistHelper, "GoodReserveCDai", networkName);
+
+  const proposalContracts = [
+    release.DistributionHelper, //controller -> upgrade disthelper
+    release.DistributionHelper, //set new distribution params
+    release.DistributionHelper //set new distribution params
+  ];
+
+  const proposalEthValues = proposalContracts.map(_ => 0);
+
+  const proposalFunctionSignatures = [
+    "upgradeTo(address)", //upgrade disthelper
+    "addOrUpdateRecipient((uint32,uint32,address,uint8))", // remove multichain
+    "addOrUpdateRecipient((uint32,uint32,address,uint8))" // guardians distribution
+  ];
+
+  const proposalFunctionInputs = [
+    ethers.utils.defaultAbiCoder.encode(["address"], [newDistHelper.address]),
+    ethers.utils.defaultAbiCoder.encode(
+      ["uint32", "uint32", "address", "uint8"],
+      [0, 42220, dao[celoNetwork].UBIScheme, 1]
+    ),
+    ethers.utils.defaultAbiCoder.encode(
+      ["uint32", "uint32", "address", "uint8"],
+      [8182, 42220, release.GuardiansSafe, 3] //ubi to guardians
+    )
+  ];
+
+  if (isProduction) {
+    await executeViaSafe(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      protocolSettings.guardiansSafe,
+      "mainnet"
+    );
+  } else {
+    //simulation or dev envs
+    await executeViaGuardian(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      guardian,
+      networkName
+    );
+  }
+
+  if (!isProduction) {
+    //check simulation results
+    let fm = await ethers.getContractAt("GoodFundManager", release.GoodFundManager);
+    let dh = await ethers.getContractAt("DistributionHelper", release.DistributionHelper);
+
+    console.log(await dh.distributionRecipients(0));
+    console.log(await dh.distributionRecipients(1));
+    console.log(await dh.distributionRecipients(2));
+    let tx = await (await fm.collectInterest(["0x7b7246c78e2f900d17646ff0cb2ec47d6ba10754"], true)).wait();
+    let gd = await ethers.getContractAt("IGoodDollar", "0x67C5870b4A41D4Ebef24d2456547A03F1f3e094B");
+    const safeBalance = await gd.balanceOf("0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec");
+    console.log({ safeBalance }, tx.events);
+  }
+};
+
+export const main = async () => {
+  await upgrade().catch(console.log);
+};
+if (process.argv[1].includes("multichain-temp-fix")) main();

package/types/BuyGDClone.ts

@@ -0,0 +1,277 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import {
+  ethers,
+  EventFilter,
+  Signer,
+  BigNumber,
+  BigNumberish,
+  PopulatedTransaction,
+  BaseContract,
+  ContractTransaction,
+  Overrides,
+  CallOverrides,
+} from "ethers";
+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 interface BuyGDCloneInterface extends ethers.utils.Interface {
+  functions: {
+    "celo()": FunctionFragment;
+    "cusd()": FunctionFragment;
+    "executer()": FunctionFragment;
+    "gd()": FunctionFragment;
+    "initialize(address,address)": FunctionFragment;
+    "owner()": FunctionFragment;
+    "recover(address)": FunctionFragment;
+    "router()": FunctionFragment;
+    "swap(uint256)": FunctionFragment;
+    "swapCusd(uint256)": FunctionFragment;
+  };
+
+  encodeFunctionData(functionFragment: "celo", values?: undefined): string;
+  encodeFunctionData(functionFragment: "cusd", values?: undefined): string;
+  encodeFunctionData(functionFragment: "executer", values?: undefined): string;
+  encodeFunctionData(functionFragment: "gd", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "initialize",
+    values: [string, string]
+  ): string;
+  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
+  encodeFunctionData(functionFragment: "recover", values: [string]): string;
+  encodeFunctionData(functionFragment: "router", values?: undefined): string;
+  encodeFunctionData(functionFragment: "swap", values: [BigNumberish]): string;
+  encodeFunctionData(
+    functionFragment: "swapCusd",
+    values: [BigNumberish]
+  ): string;
+
+  decodeFunctionResult(functionFragment: "celo", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "cusd", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "executer", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "gd", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "recover", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "router", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "swap", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "swapCusd", data: BytesLike): Result;
+
+  events: {
+    "Initialized(uint8)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
+}
+
+export type InitializedEvent = TypedEvent<[number], { version: number }>;
+
+export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
+
+export interface BuyGDClone extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: BuyGDCloneInterface;
+
+  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: {
+    celo(overrides?: CallOverrides): Promise<[string]>;
+
+    cusd(overrides?: CallOverrides): Promise<[string]>;
+
+    executer(overrides?: CallOverrides): Promise<[string]>;
+
+    gd(overrides?: CallOverrides): Promise<[string]>;
+
+    initialize(
+      _owner: string,
+      _executer: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    owner(overrides?: CallOverrides): Promise<[string]>;
+
+    recover(
+      token: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    router(overrides?: CallOverrides): Promise<[string]>;
+
+    swap(
+      _minAmount: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    swapCusd(
+      _minAmount: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  celo(overrides?: CallOverrides): Promise<string>;
+
+  cusd(overrides?: CallOverrides): Promise<string>;
+
+  executer(overrides?: CallOverrides): Promise<string>;
+
+  gd(overrides?: CallOverrides): Promise<string>;
+
+  initialize(
+    _owner: string,
+    _executer: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  owner(overrides?: CallOverrides): Promise<string>;
+
+  recover(
+    token: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  router(overrides?: CallOverrides): Promise<string>;
+
+  swap(
+    _minAmount: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  swapCusd(
+    _minAmount: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    celo(overrides?: CallOverrides): Promise<string>;
+
+    cusd(overrides?: CallOverrides): Promise<string>;
+
+    executer(overrides?: CallOverrides): Promise<string>;
+
+    gd(overrides?: CallOverrides): Promise<string>;
+
+    initialize(
+      _owner: string,
+      _executer: string,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    owner(overrides?: CallOverrides): Promise<string>;
+
+    recover(token: string, overrides?: CallOverrides): Promise<void>;
+
+    router(overrides?: CallOverrides): Promise<string>;
+
+    swap(_minAmount: BigNumberish, overrides?: CallOverrides): Promise<void>;
+
+    swapCusd(
+      _minAmount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
+  };
+
+  filters: {
+    "Initialized(uint8)"(version?: null): InitializedEventFilter;
+    Initialized(version?: null): InitializedEventFilter;
+  };
+
+  estimateGas: {
+    celo(overrides?: CallOverrides): Promise<BigNumber>;
+
+    cusd(overrides?: CallOverrides): Promise<BigNumber>;
+
+    executer(overrides?: CallOverrides): Promise<BigNumber>;
+
+    gd(overrides?: CallOverrides): Promise<BigNumber>;
+
+    initialize(
+      _owner: string,
+      _executer: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    owner(overrides?: CallOverrides): Promise<BigNumber>;
+
+    recover(
+      token: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    router(overrides?: CallOverrides): Promise<BigNumber>;
+
+    swap(
+      _minAmount: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    swapCusd(
+      _minAmount: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    celo(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    cusd(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    executer(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    gd(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    initialize(
+      _owner: string,
+      _executer: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    recover(
+      token: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    router(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    swap(
+      _minAmount: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    swapCusd(
+      _minAmount: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}

package/types/BuyGDCloneFactory.ts

@@ -0,0 +1,143 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import {
+  ethers,
+  EventFilter,
+  Signer,
+  BigNumber,
+  BigNumberish,
+  PopulatedTransaction,
+  BaseContract,
+  ContractTransaction,
+  Overrides,
+  CallOverrides,
+} from "ethers";
+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 interface BuyGDCloneFactoryInterface extends ethers.utils.Interface {
+  functions: {
+    "create(address,address)": FunctionFragment;
+    "predict(address,address)": FunctionFragment;
+  };
+
+  encodeFunctionData(
+    functionFragment: "create",
+    values: [string, string]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "predict",
+    values: [string, string]
+  ): string;
+
+  decodeFunctionResult(functionFragment: "create", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "predict", data: BytesLike): Result;
+
+  events: {};
+}
+
+export interface BuyGDCloneFactory extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: BuyGDCloneFactoryInterface;
+
+  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: {
+    create(
+      owner: string,
+      executer: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    predict(
+      owner: string,
+      executer: string,
+      overrides?: CallOverrides
+    ): Promise<[string]>;
+  };
+
+  create(
+    owner: string,
+    executer: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  predict(
+    owner: string,
+    executer: string,
+    overrides?: CallOverrides
+  ): Promise<string>;
+
+  callStatic: {
+    create(
+      owner: string,
+      executer: string,
+      overrides?: CallOverrides
+    ): Promise<string>;
+
+    predict(
+      owner: string,
+      executer: string,
+      overrides?: CallOverrides
+    ): Promise<string>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    create(
+      owner: string,
+      executer: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    predict(
+      owner: string,
+      executer: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    create(
+      owner: string,
+      executer: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    predict(
+      owner: string,
+      executer: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+  };
+}