@gooddollar/goodprotocol 2.0.5-beta.7 → 2.0.5-beta.9

package/scripts/analytics/whitelistsyncIssue.ts

@@ -0,0 +1,87 @@
+import { range, chunk, uniq } from "lodash";
+import { ethers } from "hardhat";
+import { Contract, Provider, setMulticallAddress } from "ethers-multicall";
+import fs from "fs";
+import { Retrier } from "@jsier/retrier";
+
+setMulticallAddress(122, "0x3CE6158b7278Bf6792e014FA7B4f3c6c46fe9410");
+setMulticallAddress(42220, "0x75F59534dd892c1f8a7B172D639FA854D529ada3");
+const celoProvider = new ethers.providers.JsonRpcBatchProvider("https://forno.celo.org");
+const ethcallProvider = new Provider(celoProvider, 42220);
+const ethcallFuseProvider = new Provider(new ethers.providers.JsonRpcProvider("https://rpc.fuse.io"), 122);
+
+const ONE_DAY = 24 * 60 * 60;
+/**
+ * find accounts that where whitelisted on celo with diff authentication date than on fuse
+ */
+const main = async () => {
+  const identity = await ethers.getContractAt("IdentityV2", "0xC361A6E67822a0EDc17D899227dd9FC50BD62F42");
+  const abi = identity.interface.format(ethers.utils.FormatTypes.full);
+  const multiIdentity = new Contract(identity.address, abi as string[]);
+  const multiIdentityFuse = new Contract("0x2F9C28de9e6d44b71B91b8BA337A5D82e308E7BE", abi as string[]);
+
+  const celoStartBlock = 18003118;
+  const step = 10000;
+  const celoLastBlock = await ethers.provider.getBlockNumber();
+  const notFuse = [],
+    notCelo = [],
+    toFixCelo = [],
+    toFixFuse = [],
+    notBoth = [];
+  for (let i = 0; celoStartBlock + step * i < celoLastBlock; i++) {
+    try {
+      const options = { limit: 3, delay: 2000 };
+      const retrier = new Retrier(options);
+
+      const lastBlock = celoStartBlock + step * (i + 1) + 1;
+      await retrier.resolve(async attempt => {
+        const events = await identity
+          .connect(celoProvider)
+          .queryFilter(
+            identity.filters["WhitelistedAdded"](),
+            celoStartBlock + step * i,
+            Math.min(celoLastBlock, lastBlock)
+          );
+        console.log("found events:", events.length);
+        const whitelisted = events.map(_ => _.args?.account);
+        let found = 0;
+        const ps = chunk(whitelisted, 400).map(async addrChunk => {
+          const results = await ethcallProvider.all(addrChunk.map(addr => multiIdentity.lastAuthenticated(addr)));
+          const resultsFuse = await ethcallFuseProvider.all(
+            addrChunk.map(addr => multiIdentityFuse.lastAuthenticated(addr))
+          );
+          results.forEach((v, i) => {
+            const diff = v.toNumber() - resultsFuse[i].toNumber();
+            if (v.eq(0) || diff > 3600) {
+              found++;
+              // console.log("diff:", { i, addr: whitelisted[i], celo: v, fuse: resultsFuse[i] });
+              if (v.eq(0) && resultsFuse[i].eq(0)) {
+                // notBoth.push(addrChunk[i]);
+              } else if (v.eq(0)) {
+                notCelo.push(addrChunk[i]);
+              } else if (resultsFuse[i].eq(0)) {
+                notFuse.push([addrChunk[i], v.toNumber()]);
+              } else if (diff > 0) {
+                // console.log("mismatch:", addrChunk[i], { diff });
+                toFixCelo.push([addrChunk[i], resultsFuse[i].toNumber()]);
+              } else {
+                toFixFuse.push([addrChunk[i], v.toNumber()]);
+              }
+            }
+          });
+        });
+        await Promise.all(ps);
+        console.log("done day:", { i, attempt, found });
+      });
+    } catch (e) {
+      console.log("failed day:", i, e.message.slice(0, 100));
+    }
+  }
+  fs.writeFileSync("whitelistissue.json", JSON.stringify({ toFixCelo, toFixFuse, notCelo, notFuse }));
+  console.log({ toFixFuse: toFixFuse.length, toFixCelo: toFixCelo.length, notCelo, notFuse });
+};
+
+const fix = async () => {
+  const { toFix, notFuse } = JSON.parse(fs.readFileSync("whitelistissue.json").toString());
+};
+main();

package/scripts/multichain-deploy/helpers.ts

@@ -159,7 +159,8 @@ export const executeViaGuardian = async (
       results.push(tx);
     } else {
       const simulationResult = await ctrl.callStatic.genericCall(contract, encoded, release.Avatar, ethValues[i], {
-        from: await guardian.getAddress()
+        from: await guardian.getAddress(),
+        value: ethValues[i]
       });
       console.log("executing genericCall:", {
         sigHash,
@@ -211,7 +212,7 @@ export const executeViaSafe = async (
     safeSigner = safeSignerOrNetwork as any;
   }
   const chainId = await safeSigner.getChainId();
-  console.log("safeSigner:", safeSigner.address, { chainId });
+  console.log("safeSigner:", safeSigner.address, { chainId, safeAddress });
   let txServiceUrl;
   switch (chainId) {
     case 1:
@@ -251,7 +252,7 @@ export const executeViaSafe = async (
     const encoded = ethers.utils.solidityPack(["bytes4", "bytes"], [sigHash, functionInputs[i]]);
     if (contract === ctrl.address) {
       const simulationResult =
-        isSimulation === false &&
+        isSimulation === true &&
         (await ctrl.callStatic[functionSigs[i]](...functionInputs[i], {
           from: safeAddress,
           value: ethValues[i]
@@ -276,15 +277,16 @@ export const executeViaSafe = async (
       });
 
       const simulationResult =
-        isSimulation === false &&
+        isSimulation === true &&
         (await ctrl.callStatic.genericCall(contract, encoded, release.Avatar, ethValues[i], {
-          from: safeAddress
+          from: safeAddress,
+          value: ethValues[i]
         }));
       console.log("executing genericCall simulation result:", {
         sigHash,
         simulationResult
       });
-      if (isSimulation === false && simulationResult[0] === false) throw new Error("simulation failed:" + contract);
+      if (isSimulation === true && simulationResult[0] === false) throw new Error("simulation failed:" + contract);
       const genericEncode = ctrl.interface.encodeFunctionData("genericCall", [
         contract,
         encoded,

package/scripts/proposals/gip-14_1.ts

@@ -15,21 +15,19 @@ import ProtocolSettings from "../../releases/deploy-settings.json";
 import dao from "../../releases/deployment.json";
 
 const { name: networkName } = network;
+const isForkSimulation = networkName === "localhost";
 
 export const step1 = async () => {
   const isProduction = networkName.includes("production");
   let [root, ...signers] = await ethers.getSigners();
 
-  if (isProduction) verifyProductionSigner(root);
-
   let networkEnv = networkName.split("-")[0];
-  const isForkSimulation = networkName === "localhost";
   if (isForkSimulation) networkEnv = "production";
   const fuseNetwork = networkEnv;
 
   if (networkEnv === "fuse") networkEnv = "development";
   const celoNetwork = networkEnv + "-celo";
-  const mainnetNetwork = `${networkName === "localhost" ? "production" : networkName}-mainnet`; //simulate production on localhost requires running hardhat node in fork mode
+  const mainnetNetwork = `${networkName === "localhost" ? "production" : networkName.split("-")[0]}-mainnet`; //simulate production on localhost requires running hardhat node in fork mode
 
   let protocolSettings = defaultsDeep({}, ProtocolSettings[networkName], ProtocolSettings["default"]);
 
@@ -133,8 +131,6 @@ export const step2 = async () => {
   const isProduction = networkName.includes("production");
   let [root, ...signers] = await ethers.getSigners();
 
-  if (isProduction) verifyProductionSigner(root);
-
   let networkEnv = networkName.split("-")[0];
   const isForkSimulation = networkName === "localhost";
   if (isForkSimulation) networkEnv = "production";
@@ -208,7 +204,7 @@ export const step2 = async () => {
       fuseProposalEthValues,
       fuseProposalFunctionSignatures,
       fuseProposalFunctionInputs,
-      protocolSettings.guardiansSafe,
+      dao[fuseNetwork].GuardiansSafe,
       "fuse"
     );
   } else {
@@ -237,7 +233,7 @@ export const main = async () => {
   console.log("running step:", { stepNumber });
   switch (stepNumber) {
     case "1":
-      await reset("https://cloudflare-eth.com");
+      isForkSimulation && (await reset("https://cloudflare-eth.com"));
       await step1();
       break;
 
@@ -245,7 +241,7 @@ export const main = async () => {
     //npx hardhat node --fork https://rpc.fuse.io
     //then run npx hardhat run scripts/proposals/gip-14_1.ts --network localhost
     case "2":
-      await reset("https://rpc.fuse.io");
+      isForkSimulation && (await reset("https://rpc.fuse.io"));
       await step2();
       break;
   }

package/types/IdentityFix.ts

@@ -0,0 +1,141 @@
+/* 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 IdentityFixInterface extends ethers.utils.Interface {
+  functions: {
+    "end()": FunctionFragment;
+    "fix(address[],uint256[])": FunctionFragment;
+    "identity()": FunctionFragment;
+  };
+
+  encodeFunctionData(functionFragment: "end", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "fix",
+    values: [string[], BigNumberish[]]
+  ): string;
+  encodeFunctionData(functionFragment: "identity", values?: undefined): string;
+
+  decodeFunctionResult(functionFragment: "end", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "fix", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "identity", data: BytesLike): Result;
+
+  events: {};
+}
+
+export interface IdentityFix extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: IdentityFixInterface;
+
+  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: {
+    end(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    fix(
+      addrs: string[],
+      timestamps: BigNumberish[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    identity(overrides?: CallOverrides): Promise<[string]>;
+  };
+
+  end(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  fix(
+    addrs: string[],
+    timestamps: BigNumberish[],
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  identity(overrides?: CallOverrides): Promise<string>;
+
+  callStatic: {
+    end(overrides?: CallOverrides): Promise<void>;
+
+    fix(
+      addrs: string[],
+      timestamps: BigNumberish[],
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    identity(overrides?: CallOverrides): Promise<string>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    end(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    fix(
+      addrs: string[],
+      timestamps: BigNumberish[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    identity(overrides?: CallOverrides): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    end(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    fix(
+      addrs: string[],
+      timestamps: BigNumberish[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    identity(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+  };
+}

package/types/IdentityV2.ts

@@ -38,6 +38,7 @@ export interface IdentityV2Interface extends ethers.utils.Interface {
     "addWhitelistedWithDIDAndChain(address,string,uint256,uint256)": FunctionFragment;
     "addrToDID(address)": FunctionFragment;
     "authenticate(address)": FunctionFragment;
+    "authenticateWithTimestamp(address,uint256)": FunctionFragment;
     "authenticationPeriod()": FunctionFragment;
     "avatar()": FunctionFragment;
     "connectAccount(address,bytes,uint256)": FunctionFragment;
@@ -118,6 +119,10 @@ export interface IdentityV2Interface extends ethers.utils.Interface {
     functionFragment: "authenticate",
     values: [string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "authenticateWithTimestamp",
+    values: [string, BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "authenticationPeriod",
     values?: undefined
@@ -299,6 +304,10 @@ export interface IdentityV2Interface extends ethers.utils.Interface {
     functionFragment: "authenticate",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "authenticateWithTimestamp",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "authenticationPeriod",
     data: BytesLike
@@ -619,6 +628,12 @@ export interface IdentityV2 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    authenticateWithTimestamp(
+      account: string,
+      timestamp: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     authenticationPeriod(overrides?: CallOverrides): Promise<[BigNumber]>;
 
     avatar(overrides?: CallOverrides): Promise<[string]>;
@@ -843,6 +858,12 @@ export interface IdentityV2 extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  authenticateWithTimestamp(
+    account: string,
+    timestamp: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   authenticationPeriod(overrides?: CallOverrides): Promise<BigNumber>;
 
   avatar(overrides?: CallOverrides): Promise<string>;
@@ -1040,6 +1061,12 @@ export interface IdentityV2 extends BaseContract {
 
     authenticate(account: string, overrides?: CallOverrides): Promise<void>;
 
+    authenticateWithTimestamp(
+      account: string,
+      timestamp: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     authenticationPeriod(overrides?: CallOverrides): Promise<BigNumber>;
 
     avatar(overrides?: CallOverrides): Promise<string>;
@@ -1338,6 +1365,12 @@ export interface IdentityV2 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    authenticateWithTimestamp(
+      account: string,
+      timestamp: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     authenticationPeriod(overrides?: CallOverrides): Promise<BigNumber>;
 
     avatar(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1562,6 +1595,12 @@ export interface IdentityV2 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    authenticateWithTimestamp(
+      account: string,
+      timestamp: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     authenticationPeriod(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;