@gooddollar/goodprotocol 2.1.4 → 2.2.0

package/scripts/governance/goodCheckpointSorted.ts

@@ -1,300 +0,0 @@
-/**
- * this version is for testing purposes only, to test greputation initial rootstate with the fixed merkle v2
- * which uses sorted pairs so no position is required and it uses double hash for preimage attack
- * future blockchain state hashes should be recalculated and created using similar method done here
- */
-import { get, range, chunk, flatten, mergeWith, sortBy, uniq } from "lodash";
-import fs from "fs";
-import { MerkleTree } from "merkletreejs";
-import PromisePool from "async-promise-pool";
-import { ethers as Ethers } from "hardhat";
-import { BigNumber } from "ethers";
-
-const quantile = (sorted, q) => {
-  const pos = (sorted.length - 1) * q;
-  const base = Math.floor(pos);
-
-  let sum = BigNumber.from(0);
-  for (let i = 0; i < base; i++) sum = sum.add(sorted[i]);
-
-  return sum;
-};
-
-export const airdrop = (ethers: typeof Ethers) => {
-  const fuseProvider = new ethers.providers.JsonRpcProvider("https://rpc.fuse.io");
-
-  const zxfastProvider = new ethers.providers.JsonRpcProvider("https://eth-eu.0xfast.com/rpc/free");
-
-  const cfProvider = new ethers.providers.InfuraProvider(1, "143f9cf968fe4c3da0db77ff525e0da4");
-  const goodActiveVotes = async (network = "fuse") => {
-    let balances = [];
-
-    const EPOCH = 60 * 60 * 24;
-    const pool = new PromisePool({ concurrency: 30 });
-    const epochs = range(1646844945, (Date.now() / 1000).toFixed(0), EPOCH);
-    const graphName = network === "fuse" ? "gooddollarfuse2" : "goodsubgraphs";
-    const graphUrl = `https://api.thegraph.com/subgraphs/name/gooddollar/${graphName}`;
-
-    const graphQuery = async (start, skip, step = EPOCH) => {
-      const query = `{
-          goodBalances(first: 1000 skip:${skip} where: { memberSince_gte: ${start} memberSince_lt:${start + step} }) {
-            id
-            coreBalance
-            totalVotes
-            activeVotes
-            blockchainsBalance
-          }
-        }`;
-      try {
-        const { data = {}, errors } = await fetch(graphUrl, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify({ query })
-        }).then(_ => _.json());
-        errors && console.log({ errors });
-        if (errors?.[0]?.message === "The `skip` argument must be between 0 and 5000, but is 6000") {
-          throw new Error("skip");
-        }
-        if (data?.goodBalances?.length === 1000) {
-          return data.goodBalances.concat(await graphQuery(start, skip + 1000, step));
-        }
-        return data.goodBalances || [];
-      } catch (error) {
-        if (error.message === "skip") throw error;
-        console.log({ query, error });
-        return [];
-      }
-    };
-
-    const poolAdd = (start, step) => {
-      pool.add(async () => {
-        try {
-          const goodBalances = await graphQuery(start, 0, step);
-          balances = balances.concat(goodBalances);
-          console.log({ curDate: start, step, records: goodBalances.length });
-        } catch (e) {
-          if (e.message === "skip") {
-            const newstep = Number((step / 4).toFixed(0));
-            console.log("creating sub epochs", {
-              start,
-              end: start + step,
-              newstep
-            });
-
-            const subepochs = range(start, start + step, newstep);
-            subepochs.forEach(e => poolAdd(e, newstep));
-          }
-        }
-      });
-    };
-    epochs.forEach(e => {
-      poolAdd(e, EPOCH);
-    });
-
-    await pool.all();
-    console.log(`total ${network} GOOD Holders:`, balances.length, {
-      uniques: uniq(balances.map(_ => _.id)).length,
-      delegatees: uniq(balances.filter(_ => Number(_.coreBalance) < Number(_.totalVotes)).map(_ => _.id)).length,
-      sample: balances.slice(0, 5)
-    });
-
-    const treeData = {};
-
-    console.log("calculating leaves hashes...");
-    balances.forEach(record => {
-      treeData[record.id] = {
-        address: record.id,
-        rep: record.activeVotes,
-        hash: ethers.utils.keccak256(
-          ethers.utils.keccak256(
-            ethers.utils.defaultAbiCoder.encode(["address", "uint256"], [record.id, record.activeVotes])
-          )
-        )
-      };
-    });
-    fs.writeFileSync(
-      `goodCheckpoints/goodCheckpoint_${network}.json`,
-      JSON.stringify({ treeData, balances, until: Date.now() })
-    );
-    console.log(balances.filter(_ => Number(_.coreBalance) < Number(_.totalVotes)));
-  };
-
-  const collectAirdropData = async () => {
-    const calcGoodMints = async () => {
-      const step = 10000;
-      const START_BLOCK = 14344739;
-
-      const LAST_BLOCK = await good.provider.getBlockNumber();
-      console.log({ LAST_BLOCK });
-      const blocks = range(START_BLOCK, LAST_BLOCK, step);
-      const allLogs = [];
-      for (let blockChunk of chunk(blocks, 10)) {
-        // Get the filter (the second null could be omitted)
-        const ps = blockChunk.map(async (bc: number) => {
-          const logs = await good.queryFilter(good.filters.Mint(), bc, Math.min(bc + step - 1, LAST_BLOCK)).catch(e => {
-            console.log("block transfer logs failed retrying...", bc);
-            return good.queryFilter(good.filters.Mint(), bc, Math.min(bc + step - 1, LAST_BLOCK));
-          });
-          const claimedLogs = await good
-            .queryFilter(good.filters.StateHashProof(), bc, Math.min(bc + step - 1, LAST_BLOCK))
-            .catch(e => {
-              console.log("block transfer logs failed retrying...", bc);
-              return good.queryFilter(good.filters.StateHashProof(), bc, Math.min(bc + step - 1, LAST_BLOCK));
-            });
-          console.log("found logs:", claimedLogs.length, logs.length, bc);
-          return logs.concat(claimedLogs);
-        });
-        let chunkLogs = flatten(await Promise.all(ps));
-        console.log("chunk logs: ", chunkLogs.length, { blockChunk });
-        allLogs.push(chunkLogs);
-      }
-      const logs = flatten(allLogs);
-
-      const mints = {};
-      const claims = {};
-      const result = {};
-      console.log("logs found:", logs.length);
-      let totalMints = ethers.constants.Zero;
-      logs.forEach(l => {
-        if (l.event === "Mint") {
-          mints[l.args._to.toLowerCase()] = (mints[l.args._to.toLowerCase()] || BigNumber.from("0")).add(
-            l.args._amount
-          );
-          totalMints = totalMints.add(l.args._amount);
-        } else claims[l.args.user.toLowerCase()] = l.args.repBalance.toString();
-      });
-      Object.entries(mints).forEach(([k, v]) => (result[k] = { claim: "0", ...result[k], mint: v.toString() }));
-      Object.entries(claims).forEach(([k, v]) => (result[k] = { mint: "0", ...result[k], claim: v.toString() }));
-      console.log({ result, totalMints: totalMints.toString() });
-      fs.writeFileSync("goodCheckpointMainnet.json", JSON.stringify(result));
-    };
-
-    // await goodActiveVotes();
-    await goodActiveVotes("mainnet");
-    // await calcGoodMints();
-  };
-
-  const buildMerkleTree = async () => {
-    const buildTree = async (network = "fuse") => {
-      const good = await ethers
-        .getContractAt("GReputation", "0x603B8C0F110E037b51A381CBCacAbb8d6c6E4543")
-        .then(_ => _.connect(network === "fuse" ? fuseProvider : cfProvider));
-
-      const checkpoint = JSON.parse(fs.readFileSync(`goodCheckpoints/goodCheckpoint_${network}.json`).toString());
-
-      const treeData = checkpoint.treeData;
-
-      let toTree: Array<[string, BigNumber]> = Object.entries(treeData).map(([k, v]) => {
-        return [k, BigNumber.from((v as any).rep)];
-      });
-
-      toTree = toTree.sort((a, b) => (a[1].gte(b[1]) ? 1 : -1)).reverse();
-      //     console.log({ toTree });
-      //     const topContracts = toTree.filter(_ => _[2] === true);
-      const totalReputation = toTree.reduce((c, a) => c.add(a[1]), BigNumber.from(0));
-      const totalSupply = (await good.totalSupply()).toString();
-      console.log({
-        totalSupply,
-        totalReputation: totalReputation.toString(),
-        numberOfAccounts: toTree.length
-      });
-
-      const sorted = toTree.map(_ => _[1]);
-      console.log(toTree.slice(0, 10).map(_ => [_[0], _[1]]));
-      //     fs.writeFileSync(`${folder}/reptree.json`, JSON.stringify(toTree));
-      console.log("Reputation Distribution");
-      [0.001, 0.01, 0.1, 0.5].forEach(q => {
-        const quantileRep = quantile(sorted, q);
-        console.log({
-          precentile: q * 100 + "%",
-          addresses: (sorted.length * q).toFixed(0),
-          quantileRep,
-          rep: Number(quantileRep.div(1e10).toString()) / Number(totalReputation.div(1e10).toString())
-        });
-      });
-      const items = Object.values(treeData);
-      const elements = items.map((e: any) => e.hash);
-      console.log("creating merkletree sorted...", elements.length);
-      //NOTICE: we use a non sorted merkletree to save generation time, this requires also a different proof verification algorithm which
-      //is not in the default openzeppelin library
-      const merkleTree = new MerkleTree(elements, ethers.utils.keccak256, {
-        sortPairs: true
-      });
-
-      // get the merkle root
-      // returns 32 byte buffer
-      const merkleRoot = merkleTree.getHexRoot();
-      console.log("Merkle Root:", merkleRoot);
-
-      // generate merkle proof
-      // returns array of 32 byte buffers
-      const proof = merkleTree.getHexProof(elements[0]);
-      const validProof = merkleTree.verify(proof, elements[0], merkleRoot);
-
-      const lastProof = merkleTree.getHexProof(elements[elements.length - 1]);
-      const lastValidProof = merkleTree.verify(lastProof, elements[elements.length - 1], merkleRoot);
-
-      //check for possible address preimage
-      const danger = (merkleTree.getHexLayers() as any).map(_ => _.find(_ => _.startsWith("0x000000")));
-
-      console.log({
-        danger,
-        merkleRoot,
-        proof,
-        validProof,
-        lastProof,
-        lastValidProof,
-        proofFor: items[0],
-        lastProofFor: items[items.length - 1],
-        index: elements.length,
-        leaf: elements[elements.length - 1].toString("hex")
-      });
-
-      checkpoint.merkleRoot = merkleRoot;
-      checkpoint.totalSupply = totalSupply;
-      fs.writeFileSync("goodCheckpoints/goodCheckpoint_fuse.json", JSON.stringify(checkpoint));
-    };
-
-    await buildTree();
-    await buildTree("mainnet");
-  };
-
-  const getProof = addr => {
-    const { treeData, merkleRoot } = JSON.parse(fs.readFileSync("airdrop/airdrop.json").toString());
-
-    let entries = Object.entries(treeData as Tree);
-    let elements = entries.map(e => Buffer.from(e[1].hash.slice(2), "hex"));
-
-    console.log("creating merkletree sorted pairs...", elements.length);
-    const merkleTree = new MerkleTree(elements, ethers.utils.keccak256, {
-      sortPairs: true
-    });
-
-    const calcMerkleRoot = merkleTree.getHexRoot();
-    console.log("merkleroots:", {
-      fromFile: merkleRoot,
-      calculated: calcMerkleRoot
-    });
-
-    const addrData = treeData[addr] || treeData[addr.toLowerCase()];
-    const proofFor = Buffer.from(addrData.hash.slice(2), "hex");
-
-    const proof = merkleTree.getHexProof(proofFor);
-    const proofIndex = elements.findIndex(_ => "0x" + _.toString("hex") === addrData.hash) + 1;
-
-    console.log({ proofIndex, proof, [addr]: addrData });
-    console.log("checkProof:", merkleTree.verify(proof, proofFor, calcMerkleRoot));
-  };
-
-  return { buildMerkleTree, collectAirdropData, getProof };
-};
-
-const _timer = async (name, promise) => {
-  const start = Date.now();
-  const res = await promise;
-  const milis = Date.now() - start;
-  console.log(`done task ${name} in ${milis / 1000} seconds`);
-  return res;
-};

package/scripts/keeper/fishInactive.ts

@@ -1,47 +0,0 @@
-import { range, chunk } from "lodash";
-import { ethers as Ethers } from "hardhat";
-
-const ONE_DAY = 24 * 60 * 60;
-
-const main = async () => {
-  const signer = (await Ethers.getSigners())[0];
-  console.log("signer:", signer.address);
-  const ubiScheme = new Ethers.Contract("0xD7aC544F8A570C4d8764c3AAbCF6870CBD960D0D", [
-    "function fishMulti(address[] tofish)"
-  ]).connect(signer);
-  const twoWeeksAgo = parseInt((Date.now() / 1000).toFixed(0)) - 24 * 60 * 60 * 14;
-
-  const daysAgo: number[] = range(0, 180, 1);
-  let curDay = twoWeeksAgo;
-  for (let day of daysAgo) {
-    const query = `
-      { 
-        walletStats(first:1000, where: { lastClaimed_lt: ${curDay},lastClaimed_gt: ${
-      curDay - 24 * 60 * 60
-    } isActiveUser: true }) {
-        id        
-      }
-    }
-  `;
-
-    console.log("fetching inactive users since:", { curDay, day }, JSON.stringify({ query }));
-    const { walletStats } = await fetch("https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse", {
-      method: "post",
-      body: JSON.stringify({ query }),
-      headers: { "Content-Type": "application/json" }
-    }).then(_ => _.json());
-
-    console.log("got inactive wallets:", walletStats.length);
-    const accounts = walletStats.map(_ => _.id);
-    for (let tofish of chunk(accounts, 50)) {
-      const tx = await ubiScheme.fishMulti(tofish, { gasLimit: 2000000 });
-      console.log("fishing tx:", tx, tofish);
-      const res = await tx.wait();
-      console.log("fishing tx result:", res);
-    }
-
-    curDay = curDay - ONE_DAY;
-  }
-};
-
-main();

package/scripts/minimize.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-# Notes:
-#  - Shchema: https://github.com/trufflesuite/truffle/tree/develop/packages/truffle-contract-schema
-#  - bytecode vs deployedBytecode: https://ethereum.stackexchange.com/questions/32234/difference-between-bytecode-and-runtime-bytecode
-# FILES=`find $1 -name '*.json' ! -name '*.dbg.json'`
-mkdir artifacts/abis && true
-find $1 -name "*.json" ! -name '*.*.json' |while read fname; do
-  echo "$fname"
-  #[ -z "${i%%*.min.json}" ] && continue # already minified
-  f=${fname##*/}
-  m=./artifacts/abis/${f%%.json}.min.json
-  echo "Minimizing contract json artifact: $fname"
-  echo "Original size: $(wc -c "$fname")"
-  ./node_modules/node-jq/bin/jq -c 'del(.bytecode,.deployedBytecode,.ast,.legacyAST,.source,.deployedSourceMap,.userdoc,.sourcePath)' $fname > $m
-  echo "Minimized size: $(wc -c "$m")"
-done

package/scripts/multichain-deploy/0_proxyFactory-deploy.ts

@@ -1,131 +0,0 @@
-import hre from "hardhat";
-import { network, ethers } from "hardhat";
-
-import { verifyContract, verifyOnEtherscan, verifyProductionSigner } from "./helpers";
-import releaser from "../../scripts/releaser";
-import dao from "../../releases/deployment.json";
-import { keccak256, parseUnits, toUtf8Bytes } from "ethers/lib/utils";
-
-const { name } = network;
-const celoProxyByteCode =
-  "0x608060405234801561001057600080fd5b5060405161002060208201610044565b601f1982820381018352601f90910116604052805160209190910120600055610051565b6105c680610d8383390190565b610d23806100606000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106c9565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106e5565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105c68061072883390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b50506000910152565b600082516106db8184602087016106a5565b9190910192915050565b60018060a01b038316815260406020820152600082518060408401526107128160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220700964e1863e921cf409e58babd7df4199472bb8aeeac1315f61421b99f6fd5864736f6c63430008100033a264697066735822122015cbe254261934ea1f570e1c22223384888b3a09d774864acb6e95dfb8d4915e64736f6c63430008100033608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220700964e1863e921cf409e58babd7df4199472bb8aeeac1315f61421b99f6fd5864736f6c63430008100033";
-export const deployUniversalProxyFactory = async () => {
-  const f = await ethers.getContractFactory("ProxyFactory1967");
-
-  const isProduction = name.includes("production");
-  const deployTx = {
-    nonce: 0,
-    gasPrice: 50e9,
-    gasLimit: 2891002,
-    data: celoProxyByteCode
-  };
-
-  let signer = {
-    v: 27,
-    r: "0x2222222222222222222222222222222222222222222222222222222222222222",
-    s: "0x2222222222222222222222222222222222222222222222222222222222222222"
-  };
-  //modify tx data a little so we get different contract address for different envs
-  if (name.includes("development-base")) {
-    deployTx.gasPrice = 7e7;
-  }
-  if (name.includes("staging")) {
-    deployTx.gasLimit = 892000;
-  } else if (name.includes("production")) {
-    // deployTx.gasLimit = 890000; // was used on celo
-    deployTx.gasLimit = 1500000; //xdc needs more gas
-  }
-
-  const rawTx = ethers.utils.serializeTransaction(deployTx);
-  const txHash = ethers.utils.keccak256(rawTx);
-  const deployer = ethers.utils.recoverAddress(txHash, signer);
-  let [funder] = await ethers.getSigners();
-
-  const curBalance = await ethers.provider.getBalance(deployer);
-  const deployCost = ethers.BigNumber.from(deployTx.gasPrice).mul(deployTx.gasLimit);
-
-  let tx = {};
-  if (curBalance.lt(deployCost)) {
-    tx = await (
-      await funder.sendTransaction({
-        to: deployer,
-        value: deployCost.sub(curBalance)
-      })
-    ).wait();
-  }
-
-  if (isProduction) verifyProductionSigner(funder);
-
-  console.log({
-    fundingTx: tx.transactionHash,
-    deployer,
-    funder: funder.address,
-    deployerBalance: ethers.utils.formatUnits(await ethers.provider.getBalance(deployer))
-  });
-  const signedTx = ethers.utils.serializeTransaction(deployTx, signer);
-  const proxyTx = await ethers.provider.sendTransaction(signedTx);
-  console.log({ proxyTx });
-  const result = await proxyTx.wait();
-  return ethers.getContractAt("ProxyFactory1967", result.contractAddress);
-};
-
-export const deployProxy = async (defaultAdmin = null) => {
-  let release: { [key: string]: any } = dao[network.name] || {};
-
-  if (network.name.match(/production|staging|fuse|development/) && release.ProxyFactory) {
-    throw new Error("ProxyFactory already exists for env");
-  }
-  // let [root] = await ethers.getSigners();
-  // //generic call permissions
-  // let schemeMock = root;
-
-  // console.log("got signers:", {
-  //   network,
-  //   root: root.address,
-  //   schemeMock: schemeMock.address,
-  //   balance: await ethers.provider
-  //     .getBalance(root.address)
-  //     .then(_ => _.toString())
-  // });
-
-  // const proxyFactory = await (
-  //   await ethers.getContractFactory("ProxyFactory1967")
-  // ).deploy();
-
-  const proxyFactory = await deployUniversalProxyFactory();
-
-  release = {
-    ProxyFactory: proxyFactory.address
-  };
-  await releaser(release, network.name, "deployment", false);
-};
-
-const deployProxyMethod2 = async (defaultAdmin = null) => {
-  let [signer] = await ethers.getSigners();
-  console.log("deploying proxyfactory with signer", {
-    address: signer.address,
-    balance: await ethers.provider.getBalance(signer.address).then(_ => _.toString())
-  });
-  const artifact = await hre.artifacts.readArtifact("ProxyFactory1967");
-  const result = await hre.deployments.deterministic("ProxyFactory", {
-    skipIfAlreadyDeployed: true,
-    salt: keccak256(toUtf8Bytes("ProxyFactory")),
-    contract: artifact,
-    from: signer.address
-  });
-  const deployed = await result.deploy();
-  console.log(result, deployed);
-  const release = {
-    ProxyFactory: deployed.address
-  };
-  await releaser(release, network.name, "deployment", false);
-  await verifyContract(deployed.address, artifact.sourceName + ":" + artifact.contractName);
-};
-export const main = async (networkName = name) => {
-  await deployProxy();
-  // await deployProxyMethod2();
-};
-
-if (process.argv[1].includes("proxyFactory-deploy")) {
-  main();
-}