@gooddollar/goodprotocol 1.0.7-beta.0 → 1.0.7

package/scripts/verify.ts

@@ -1,54 +1,67 @@
-import fs from "fs"
-import { isArray } from "lodash"
+import fs from "fs";
+import { isArray } from "lodash";
 import type EthersT from "ethers";
-import type HreT from "hardhat"
-import { HardhatEthersHelpers } from "@nomiclabs/hardhat-ethers/types"
-import { execSync } from "child_process"
-type Ethers = typeof EthersT.ethers & HardhatEthersHelpers
-type HRE = typeof HreT
+import type HreT from "hardhat";
+import { HardhatEthersHelpers } from "@nomiclabs/hardhat-ethers/types";
+import { execSync } from "child_process";
+type Ethers = typeof EthersT.ethers & HardhatEthersHelpers;
+type HRE = typeof HreT;
 
-let ethers:Ethers
+let ethers: Ethers;
 export const verify = async (hre: HRE) => {
-    console.log("truffle compiling....")
-    const Verify = require("truffle-plugin-verify") //not imported because of bug    
-    const truffleOutput = execSync("npx truffle compile").toString("utf8")
-    console.log({truffleOutput})
-    ethers = hre.ethers
-    const deployed = JSON.parse(fs.readFileSync("releases/deployment.json").toString())
-    const contracts = deployed[hre.network.name]
-    
-    const contractPairs = (await Promise.all(Object.entries(contracts).map(async (entry) => {
-        if(isArray(entry[1]))
-            return
-        const addr = await getImplementationAddress(entry[1])
-        return entry[0]+'@'+addr
-    }))).filter(_ => _)
+  console.log("truffle compiling....");
+  const Verify = require("truffle-plugin-verify"); //not imported because of bug
+  const truffleOutput = execSync("npx truffle compile").toString("utf8");
+  console.log({ truffleOutput });
+  ethers = hre.ethers;
+  const deployed = JSON.parse(
+    fs.readFileSync("releases/deployment.json").toString()
+  );
+  const contracts = deployed[hre.network.name];
 
-    contractPairs.unshift()
+  const contractPairs = (
+    await Promise.all(
+      Object.entries(contracts).map(async entry => {
+        if (isArray(entry[1])) return;
+        if (
+          typeof entry[1] !== "string" ||
+          (entry[1] as string).startsWith("0x") === false
+        )
+          return;
+        const addr = await getImplementationAddress(entry[1]);
+        return entry[0] + "@" + addr;
+      })
+    )
+  ).filter(_ => _);
 
-    const config = {
-        debug: false,
-        network_id: hre.network.config.chainId,
-        api_keys: { 
-            etherscan: hre.config.etherscan.apiKey
-        },
-        working_directory: ".",
-        contracts_build_directory: "build/contracts",
-        '_':contractPairs
-    }
-    return Verify(config)
+  contractPairs.unshift();
+
+  const config = {
+    debug: false,
+    network_id: hre.network.config.chainId,
+    api_keys: {
+      etherscan: hre.config.etherscan.apiKey
+    },
+    working_directory: ".",
+    contracts_build_directory: "build/contracts",
+    _: contractPairs
+  };
+  return Verify(config);
 };
 
-const getImplementationAddress = async (addr) => {
-    let proxy = await ethers.provider.getStorageAt(addr,"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc")
-    let res = addr
-    if(proxy != ethers.constants.HashZero)
-        res = "0x"+proxy.slice(-40)
-    else { 
-        const code = await ethers.getDefaultProvider().getCode(addr)
-        if(code.startsWith("0x363d3d373d3d3d363d73"))
-            res = "0x"+code.slice(22,62)
-    }    
-    console.log("impl address for:",addr,res)
-    return res
-}
+const getImplementationAddress = async addr => {
+  console.log("finding impl for:", addr);
+  let proxy = await ethers.provider.getStorageAt(
+    addr,
+    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"
+  );
+  let res = addr;
+  if (proxy != ethers.constants.HashZero) res = "0x" + proxy.slice(-40);
+  else {
+    const code = await ethers.getDefaultProvider().getCode(addr);
+    if (code.startsWith("0x363d3d373d3d3d363d73"))
+      res = "0x" + code.slice(22, 62);
+  }
+  console.log("impl address for:", addr, res);
+  return res;
+};

package/truffle-config.js

@@ -70,6 +70,18 @@ module.exports = {
       timeoutBlocks: 200, // # of blocks before a deployment times out  (minimum/default: 50)
       skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
     },
+    ropsten: {
+      provider: () =>
+        new HDWalletProvider(
+          mnemonic,
+          `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`
+        ),
+      network_id: 3, // Ropsten's id
+      gas: 5000000, // Ropsten has a lower block limit than mainnet
+      confirmations: 2, // # of confs to wait between deployments. (default: 0)
+      timeoutBlocks: 200, // # of blocks before a deployment times out  (minimum/default: 50)
+      skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
+    },
     fuse: {
       provider: () => new HDWalletProvider(mnemonic, `https://rpc.fuse.io`),
       network_id: 122, // Ropsten's id