@gooddollar/goodprotocol 1.0.29-beta.4 → 1.0.29

package/releases/deploy-settings.json

@@ -1,13 +1,8 @@
 {
   "default": {
     "governance": {
-      "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
-      "gdaoTotalSupply": "24000000000000000000000000",
       "proposalVotingPeriod": 241920
     },
-    "guardiansSafe": null,
-    "walletAdminsCount": 10,
-    "gasPrice": 100000000,
     "compound": {},
     "aave": {},
     "expansionRatio": {
@@ -25,14 +20,6 @@
     "GoodAaveStaking": {
       "stkAaveClaimCost": 50000,
       "CollectInterestGasCost": 250000
-    },
-    "savings": {
-      "blockAPY": "1000000007735630000",
-      "daysUntilUpgrade": "7",
-      "blocksPerYear": "6307200"
-    },
-    "ubi": {
-      "maxInactiveDays": 14
     }
   },
   "develop": {
@@ -60,9 +47,7 @@
       "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
       "gdaoTotalSupply": "24000000000000000000000000",
       "proposalVotingPeriod": 241920
-    },
-    "walletAdminsCount": 10,
-    "gasPrice": 1000000000
+    }
   },
   "dapptest-mainnet": {
     "gdxAirdrop": "0x707f775d730a9b17ee62c21e00188da4dff26602a58c338269cd115f30acbe2f",
@@ -99,9 +84,6 @@
       "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
       "gdaoTotalSupply": "24000000000000000000000000",
       "proposalVotingPeriod": 241920
-    },
-    "savings": {
-      "daysUntilUpgrade": "7"
     }
   },
   "fuse-mainnet": {
@@ -211,9 +193,6 @@
       "gdaoTotalSupply": "96000000000000000000000000",
       "proposalVotingPeriod": 241920,
       "guardian": "0x914dA3B2508634998d244059dAb5488D9bA1814f"
-    },
-    "savings": {
-      "daysUntilUpgrade": 30
     }
   },
   "production-mainnet": {
@@ -245,19 +224,5 @@
       "eth_usd": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419"
     },
     "uniswapRouter": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D"
-  },
-  "staging-celo": {
-    "guardiansSafe": "0xdF3e980a175904a26A7BA627048a789Ae6A141cD",
-    "gasPrice": 150000000
-  },
-  "production-celo": {
-    "governance": {
-      "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
-      "gdaoTotalSupply": "96000000000000000000000000",
-      "proposalVotingPeriod": 241920,
-      "guardian": "0x914dA3B2508634998d244059dAb5488D9bA1814f"
-    },
-    "gasPrice": 150000000,
-    "guardiansSafe": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6"
   }
 }

package/releases/deployment.json

@@ -198,77 +198,74 @@
         "FeeFormula": "0x416B5A5e12235De6838D62Fd053e7Ce59E944426"
     },
     "dapptest": {
-        "NameService": "0xb239f127ec7e3972e7D119A28C7133EA2Da1E48B",
-        "GReputation": "0xB002b01194a459a8177eff2E962455F92ac389cc",
-        "CompoundVotingMachine": "0xa5cA8E6C1071A32fe951aA5b1c9580624dA91e9d",
-        "ClaimersDistribution": "0xFb1a81A9907deE3719C6caB552dAD568097eF990",
-        "GovernanceStaking": "0x8ac87219a0F5639BC01b470F87BA2b26356CB2B9",
-        "UBIScheme": "0x209C0bD29eBbc2b29cc7D14749B1C0405FBe752c",
-        "ProtocolUpgradeFuse": "0xdF46e54aAadC1d55198A4a8b4674D7a4c927097A",
-        "HomeBridge": "0xb932C8342106776E73E39D695F3FFC3A9624eCE0",
-        "AdminWallet": "0xd9fEc8238711935D6c8d79Bef2B9546ef23FC046",
-        "Identity": "0xb185E9f6531BA9877741022C92CE858cDCc5760E",
-        "GoodDollar": "0xd04Fe2BB71024dAae0FB7Eb72983ffE2287EE6c6",
-        "Controller": "0x2fd807D24be2c4F06Edf4351AF78c4b6984A15c1",
-        "Avatar": "0x2E571dc3F27343Bcd3c7d69aA213543EE3551812",
-        "FirstClaimPool": "0x3C1Cb427D20F15563aDa8C249E71db76d7183B6c",
-        "BancorFormula": "0x0fe4223AD99dF788A6Dcad148eB4086E6389cEB6",
+        "NameService": "0x9059f66843F564f7870f7135fB039EB2034a23a3",
+        "GReputation": "0x90dE2F86DBdB2110a798326e880c83bc8779d149",
+        "CompoundVotingMachine": "0x2EF9f88EEB737655FF01F9b5017f1e3399726AF1",
+        "ClaimersDistribution": "0x035A59F228e776Cc396a8F5E1cEF989E235B0035",
+        "GovernanceStaking": "0xC65cCB966873969179B6b0bA53D67D14Bbf1204C",
+        "UBIScheme": "0xBb02F06762FBc51aD222915e6855f7482a93F9Cd",
+        "ProtocolUpgradeFuse": "0xBb976201B607f16dc76586dB8Ca5EF6C50C41c22",
+        "HomeBridge": "0x180FAF09AdD6a27554b11a131DCe6f6A3ddF4cBf",
+        "AdminWallet": "0xB8357F7f41125d4b24AD052c1b7288BeF5C43446",
+        "Identity": "0x63766F0efAa46a86E9055bB46e41ff7bc64CBEA2",
+        "GoodDollar": "0x94a9D2532DA2d9153336159907604A01c3E91C11",
+        "Controller": "0x0B57Fd12F7A95c322aD176D23765507ce09892Cb",
+        "Avatar": "0xf6Ee31185AC05C2b558fF2a561C600AF3E9486dd",
+        "FirstClaimPool": "0xC20654dB7F9483f10c91dc94924dC8F04F79bfd5",
+        "BancorFormula": "0x6852Adb5Fce1D73c08A9b3Aa7edE9A03437ac2fE",
         "DAI": "0x0000000000000000000000000000000000000000",
         "cDAI": "0x0000000000000000000000000000000000000000",
         "COMP": "0x0000000000000000000000000000000000000000",
         "networkId": 4447,
         "network": "dapptest",
-        "FeeFormula": "0x193521C8934bCF3473453AF4321911E7A89E0E12",
-        "OneTimePayments": "0x22a9B82A6c3D2BFB68F324B2e8367f346Dd6f32a",
-        "Invites": "0x547382C0D1b23f707918D3c83A77317B71Aa8470",
-        "FuseFaucet": "0x7C8BaafA542c57fF9B2B90612bf8aB9E86e22C09",
-        "ProxyFactory": "0xaC47e91215fb80462139756f43438402998E4A3a",
-        "Faucet": "0x7bEf5612eC11446539C55ffD43B625b3472Cb7df",
-        "GoodDollarMintBurnWrapper": "0x214a2cCD52eC9c1A0e0E4719C3c5115aa297A9c5",
-        "GoodDollarStaking": "0x29be9D4e2aEe72C6Edbd6231f276A544296cc4F9"
+        "FeeFormula": "0x24ef01de6baE76eE73Da210940A296F739d87952",
+        "OneTimePayments": "0xB10982193B39Eda3428d6AaeBbd7986f2A2Baa1a",
+        "Invites": "0x74156A1F9736307b7AD34e3691f3A5B54A0B3Eb8",
+        "FuseFaucet": "0x0Db32f0b116773fDD78C2e1b5E6609CC502e6784",
+        "ProxyFactory": "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90"
     },
     "dapptest-mainnet": {
-        "NameService": "0xA2c7592B4247006E41E8a0886Db287f6BA3DC049",
-        "GReputation": "0xEce03a3bCE02D078fE865f3325fd494a6824825F",
-        "CompoundVotingMachine": "0xb22B8BF2513009a3DE34c660e1E47ad088BE80e3",
-        "GoodMarketMaker": "0x57397a279Ac60DE40064B1ff19bc81bBB8F9f3bD",
-        "GoodReserveCDai": "0x142D861B73c5C844DAC197b8d39Aeb2e4A3E71b3",
-        "ExchangeHelper": "0x0a0007808320f9370320600aeEe6C86215dd4F34",
-        "GoodFundManager": "0xe72EF6746EB1aD74b75fe7c416569043322AaC5d",
-        "StakersDistribution": "0xf9AF73432e5c668Cf19fc344eD6F6C43BCf96282",
-        "ProtocolUpgrade": "0x4951A1C579039EbfCBA0BE33D2cd3A6D30b0f802",
-        "CompoundStakingFactory": "0xb007167714e2940013EC3bb551584130B7497E22",
-        "AaveStakingFactory": "0x6b39b761b1b64C8C095BF0e3Bb0c6a74705b4788",
-        "ForeignBridge": "0xa4E00CB342B36eC9fDc4B50b3d527c3643D4C49e",
-        "Contribution": "0x2A590C461Db46bca129E8dBe5C3998A8fF402e76",
+        "NameService": "0xe528aaCA8E7cD3ce503bB4a2dEadFD4088229E1F",
+        "GReputation": "0x77423AE3ce64482ef3BB601a2EA42cf30349735A",
+        "CompoundVotingMachine": "0x6804DB9596c651A1CA24bBB821712A8899932d76",
+        "GoodMarketMaker": "0xa36ADAE77B1f6f87eD60aafEF9c080c38Ca30D0F",
+        "GoodReserveCDai": "0x411CEb987F801CdEa5a301a0CCfa4a5Df37f3f7F",
+        "ExchangeHelper": "0x1333788523bEA7C7cBdd0684Bd1ee75E940fF0Eb",
+        "GoodFundManager": "0x50589243cb1d8eEF751f4BAb253Aabef6e434c0d",
+        "StakersDistribution": "0x214c3C71191AB9bD868a5f408A61c540c787662F",
+        "ProtocolUpgrade": "0x1Fb0D426927Dab092Def63b73E1397b3F29E7b33",
+        "CompoundStakingFactory": "0xe4FEed16F54b4244C174b408Ba3B5F1f19DD1E4D",
+        "AaveStakingFactory": "0xe7213b68DC25bf30bC7f1DE9BAead075c66979F9",
+        "ForeignBridge": "0x570ADc5880D778aE5935f199aa590091586CDf75",
+        "Contribution": "0x24F2D7c50357C7B1156Ca85945D3A901c88651cB",
         "StakingContracts": [
             [
-                "0x0ACd281Ae4afcfD9Be74F196b3B9577DAcC2ba62",
+                "0xc782Ee4B0d6204Ff77471884bB95d2D2f8D60fE6",
                 13888
             ]
         ],
-        "DonationsStaking": "0x2F5557fE53429e50511f836AE65A9E89AEF57e93",
-        "Identity": "0xA9e6Bfa2BF53dE88FEb19761D9b2eE2e821bF1Bf",
-        "GoodDollar": "0x74C33AFBa5a1fA6473dadA1b1976b105a4ab391A",
-        "Controller": "0xe5B6b170AB9a28C516b375465D11D77683A26550",
-        "Avatar": "0xa5875EdD032eFbe7773084ae23C588daC243bc01",
+        "DonationsStaking": "0x4bfd12E943f25621d4FA368Ca7a5c0E7F6488000",
+        "Identity": "0xb2377aAE57F2072F52FBc38696BE573af2ce5bd9",
+        "GoodDollar": "0x5Bbaf48c102373B55079F941c40822C96E715d62",
+        "Controller": "0x67d49FAF26CA6A34D483B6BDFA45824EdA64D509",
+        "Avatar": "0xE9ED26a450aC15ea88b5801E5940B58F2f778b03",
         "FirstClaimPool": "0xe3963EF7CC3044B64842d0AAe7F2Bf1543D341Ec",
-        "BancorFormula": "0x742489F22807ebB4C36ca6cD95c3e1C044B7B6c8",
-        "DAI": "0x33E45b187da34826aBCEDA1039231Be46f1b05Af",
-        "cDAI": "0xA21DDc1f17dF41589BC6A5209292AED2dF61Cc94",
-        "COMP": "0x0c626FC4A447b01554518550e30600136864640B",
+        "BancorFormula": "0x30474Ce2DE03045B8D0AE76F8a30DbfC8f000cea",
+        "DAI": "0xadf7b0f46EB35C748438F3e215F064E01cc7f5dF",
+        "cDAI": "0x0037272a7048132b10Dd8970AC964Bab2fDB3F62",
+        "COMP": "0xE8E9B139c6477D4EaD599bE5f2bB9335533D14f7",
         "networkId": 4447,
         "network": "dapptest-mainnet",
-        "FeeFormula": "0x3fdc08D815cc4ED3B7F69Ee246716f2C8bCD6b07",
+        "FeeFormula": "0x8B87065fdfe4A130108E50f74ae7F85cD20A5967",
         "ProxyFactory": "0xF47e3B0A1952A81F1afc41172762CB7CE8700133",
-        "UniswapV2SwapHelper": "0x2e8880cAdC08E9B438c6052F5ce3869FBd6cE513",
-        "ETHUsdOracle": "0x2F54D1563963fC04770E85AF819c89Dc807f6a06",
-        "DAIEthOracle": "0x158d291D8b47F056751cfF47d1eEcd19FDF9B6f8",
-        "DAIUsdOracle": "0x70E5370b8981Abc6e14C91F4AcE823954EFC8eA3",
-        "COMPUsdOracle": "0x9338CA7d556248055f5751d85cDA7aD6eF254433",
-        "USDCUsdOracle": "0x4000F8820522AC96C4221b299876e3e53bCc8525",
-        "AAVEUsdOracle": "0x9c65f85425c619A6cB6D29fF8d57ef696323d188",
-        "GasPriceOracle": "0x7Cf4be31f546c04787886358b9486ca3d62B9acf"
+        "UniswapV2SwapHelper": "0xB4059a6808Af368A69d12FBbD104Bb6B9c37e629",
+        "ETHUsdOracle": "0x79613D7834Ad35EE8dC3F9298030eaADc2A8c250",
+        "DAIEthOracle": "0x6397866132887b206EEA19f910730443E71a8CfB",
+        "DAIUsdOracle": "0xC2E1FC63cE06C279c5De18D7119C7cA123B42C1c",
+        "COMPUsdOracle": "0x9301981F27950e6546033EADD046C86754263f2D",
+        "USDCUsdOracle": "0x89Be7D874a17cD0295B2d86436a920593b5f4480",
+        "AAVEUsdOracle": "0xDFF3455E08AB33B1599D1c5B5A1D65de63d3FCd0",
+        "GasPriceOracle": "0xFAE6fA2097792Edfd7429A282F21ec2D955279D9"
     },
     "staging-mainnet": {
         "NameService": "0xC87FAb8A8CDD346079ca6177e47408Ba18066104",
@@ -336,7 +333,7 @@
         "cDAI": "0x0000000000000000000000000000000000000000",
         "COMP": "0x0000000000000000000000000000000000000000",
         "GoodDollarMintBurnWrapper": "0x08CaFF2331040c9998a91B50eEee85c4AE953ece",
-        "GoodDollarStaking": "0xff64BD8b7d730737B39AE831abbc7Afbee13BD8b"
+        "GoodDollarStaking": "0x66846F27F86f02b079e9176C7aCc10Cc32d839b2"
     },
     "test": {
         "ProxyFactory": "0x36dE29DB57062A583436Ae071e141404dFE2311C",
@@ -555,7 +552,6 @@
     "production-celo": {
         "ProxyFactory": "0x99C22e78A579e2176311c736C4c9F0b0D5A47806",
         "GoodDollar": "0xf2283840cE37DAe0a06B40a9A80603977f36fA3F",
-        "FeeFormula": "0xb25de92ce16127ebf6659a7a30a9f395c7bbf182",
         "Avatar": "0xCD5e8a81B1e02c1837A674f87dF327C14f4e5748",
         "Controller": "0x3D0bacBdC06A28971855275D511e6249bE67112d",
         "Identity": "0x96B81f82A29e78C5ba9E2034Ce8490fd641a24eb",
@@ -566,46 +562,5 @@
         "networkId": 42220,
         "GoodDollarMintBurnWrapper": "0x5566b6E4962BA83e05a426Ad89031ec18e9CadD3",
         "MultichainRouter": "0xf27Ee99622C3C9b264583dACB2cCE056e194494f"
-    },
-    "development-celo": {
-        "ProxyFactory": "0xA441cd89b0964B51d23201d65E037DA7aF8F74E9",
-        "GoodDollar": "0xAB89A70d1Af04ED8badf915Ba1f5b28E9F322624",
-        "Avatar": "0xE0e3BFb1A1850bdFe36ED1563CC2abB6A8B6De78",
-        "Controller": "0x6717A1948328C8eCCb5C933Fae90e0631C2486fE",
-        "Identity": "0xec97ee6d70C626044224998192B96fEF05949De1",
-        "NameService": "0x266E5a0931E52229CC241376bC701Ab6199Aec4D",
-        "GReputation": "0x6614823763EAd52aCc4952b9634624439B738683",
-        "AdminWallet": "0xb7b543bfd9e2E0AD1d0aA68f56c883Dd377E3D24",
-        "Faucet": "0x256AFcfEcB5C7f62CE46b54492Bb8ac38163672f",
-        "Invites": "0xdC8F0da3f29A3C419a8EEf36665ba2a3EF737B8f",
-        "GoodDollarMintBurnWrapper": "0x3fa553a5a044D5c4f5C70878148568410305f953",
-        "UBIScheme": "0x2d42e6220af2485d1e6E5B4d3661A74671AA9a79",
-        "ClaimersDistribution": "0x80018e6Dd79f6B892Fca6b592746136a3aa5ef6d",
-        "CompoundVotingMachine": "0x00e44d746F3931cAB775099F4C6451f893BB9378",
-        "network": "development-celo",
-        "networkId": 42220,
-        "GoodDollarStaking": "0x0b13807334C1618D71E5FCe792f40A22007c433A"
-    },
-    "staging-celo": {
-        "ProxyFactory": "0x7e8292481EA8EbEb49e486B7e99c00C50fBa2689",
-        "GoodDollar": "0x33265D74abd5ae87cA02A4Fb0C30B7405C8b0682",
-        "Avatar": "0x2FD18f9de3F581Ca492A485D2b32E361EeAE2e63",
-        "Controller": "0xa229BdD05436362484b10586dAa79a316e3080C5",
-        "Identity": "0xc82d50c667F389906aCA4B72D577fA56Bf7F8910",
-        "NameService": "0x8d0b621796445454180e7DD25f96B1782848338B",
-        "GReputation": "0x759a03326df90b740f6b8b6D31e12a3F95D64C28",
-        "FeeFormula": "0xcf08461E5bAd9C508D482329Eae0f1b4c4D4c489",
-        "DAOCreator": "0xA614d2641c21FEa4c73A2D6e71C6ad341349808B",
-        "AddFounders": "0x558fA360988601601ac410678963Bf785156076D",
-        "AdminWallet": "0x822590F8baf606b1e18dC1FA8Ca39D5C66C20981",
-        "Faucet": "0x9803B5811260Bfd1F5b0b0c9eC9aD4bF96D7ea94",
-        "Invites": "0x4E094c2e35e57c90667AbD6D8FE25CE63F4ae00B",
-        "GoodDollarMintBurnWrapper": "0x156Fd9563973EFB94a297B76CFac32CdC92a8d1A",
-        "UBIScheme": "0x04f2Cf8865e2ddfEf0047FdfA7A1b05ade614288",
-        "ClaimersDistribution": "0x83186CE77ef296BA6561096447938AE05D1F026e",
-        "CompoundVotingMachine": "0xEdde78b850a08B6b8AB3E84f61cD6dC70Cc7f156",
-        "network": "staging-celo",
-        "networkId": 42220,
-        "GoodDollarStaking": "0x1eF9D3Ed46D4B82E7e8089BDdd00a493e9930f46"
     }
 }

package/scripts/analytics/gdinflow.ts

@@ -0,0 +1,56 @@
+import { maxBy, range, sortBy, uniq, sum, flatten, countBy } from "lodash";
+import fetch from "node-fetch";
+import PromisePool from "async-promise-pool";
+import fs from "fs";
+import { ethers } from "hardhat";
+import { keccak256 } from "web3-utils";
+
+const main = async () => {
+  const uniques = {};
+  let addresses = [];
+  let token = "0x495d133B938596C9984d462F007B676bDc57eCEC";
+  let startblock = 18710000;
+  let stepSize = 5000;
+  for (const address of addresses) {
+    let result = [];
+    let curPage = 1;
+    let maxResult;
+    let reachedStartBlock = false;
+    do {
+      const pages = range(curPage, curPage + 5, 1);
+      curPage += 5;
+      const ps = pages.map(p => {
+        const url = `https://explorer.fuse.io/api?module=account&action=tokentx&address=${address}&contractaddress=${token}&page=${p}&offset=${stepSize}`;
+        console.log({ url });
+        return fetch(url)
+          .then(_ => _.json())
+          .then(_ => _.result);
+      });
+
+      const results = await Promise.all(ps);
+      result = result.concat(...results);
+      maxResult = maxBy(results, "length");
+      reachedStartBlock = result.find(_ => Number(_.blockNumber) <= startblock);
+      maxResult && console.log(maxResult.length, result.length);
+    } while (maxResult.length === stepSize && !reachedStartBlock);
+    const incomingTxs = result
+      .filter(
+        _ =>
+          [
+            "0xca2f09c3ccfd7ad5cb9276918bd1868f2b922ea0",
+            "0xd253a5203817225e9768c05e5996d642fb96ba86"
+          ].includes(_.from) === false
+      )
+      .filter(_ => _.to === address.toLowerCase());
+    const totalEarned = sum(incomingTxs.map(_ => Number(_.value))) / 100;
+    const senders = uniq(incomingTxs.map(_ => _.from));
+    console.log({ address, totalEarned, uniq: senders.length, senders });
+    uniques[address] = senders;
+  }
+  const intersection = countBy(flatten(Object.values(uniques)), _ => _);
+  console.log(sortBy(Object.entries(intersection), _ => _[1]).reverse());
+  console.log(JSON.stringify(Object.keys(intersection).map(_ => keccak256(_))));
+  console.log(JSON.stringify(addresses.map(_ => keccak256(_))));
+};
+
+main().catch(e => console.log(e));

package/scripts/analytics/tokenInOutStats.ts

@@ -0,0 +1,50 @@
+import { maxBy, range, sortBy } from "lodash";
+import fetch from "node-fetch";
+import PromisePool from "async-promise-pool";
+import fs from "fs";
+import { ethers } from "hardhat";
+
+const main = async () => {
+  let address = "0xCa2F09c3ccFD7aD5cB9276918Bd1868f2b922ea0";
+  let token = "0x495d133B938596C9984d462F007B676bDc57eCEC";
+  let startblock = 14710000;
+  let stepSize = 5000;
+  let result = [];
+  let incoming = 0;
+  let outgoing = 0;
+  let ins = [];
+  let curPage = 1;
+  let maxResult;
+  let reachedStartBlock = false;
+  do {
+    const pages = range(curPage, curPage + 5, 1);
+    curPage += 5;
+    const ps = pages.map(p => {
+      const url = `https://explorer.fuse.io/api?module=account&action=tokentx&address=${address}&contractaddress=${token}&page=${p}&offset=${stepSize}`;
+      console.log({ url });
+      return fetch(url)
+        .then(_ => _.json())
+        .then(_ => _.result);
+    });
+
+    const results = await Promise.all(ps);
+    result = result.concat(...results);
+    maxResult = maxBy(results, "length");
+    reachedStartBlock = result.find(_ => Number(_.blockNumber) <= startblock);
+    maxResult && console.log(maxResult.length, result.length);
+  } while (maxResult.length === stepSize && !reachedStartBlock);
+  result.forEach(r => {
+    if (r.from === address.toLowerCase()) outgoing += Number(r.value);
+    else {
+      incoming += Number(r.value);
+      ins.push(r);
+    }
+  });
+  fs.writeFileSync(
+    "tokenInOut.json",
+    JSON.stringify({ incoming, outgoing, ins })
+  );
+
+};
+
+main().catch(e => console.log(e));

package/scripts/deployFullDAO.ts

@@ -6,11 +6,13 @@ import { network, ethers, upgrades } from "hardhat";
 import { Contract } from "ethers";
 import { range } from "lodash";
 import DAOCreatorABI from "@gooddollar/goodcontracts/build/contracts/DaoCreatorGoodDollar.json";
+import IdentityABI from "@gooddollar/goodcontracts/build/contracts/Identity.json";
 import FeeFormulaABI from "@gooddollar/goodcontracts/build/contracts/FeeFormula.json";
 import AddFoundersABI from "@gooddollar/goodcontracts/build/contracts/AddFoundersGoodDollar.json";
 import ContributionCalculation from "@gooddollar/goodcontracts/stakingModel/build/contracts/ContributionCalculation.json";
 import FirstClaimPool from "@gooddollar/goodcontracts/stakingModel/build/contracts/FirstClaimPool.json";
 import BridgeMock from "@gooddollar/goodcontracts/stakingModel/build/contracts/BridgeMock.json";
+import AdminWalletABI from "@gooddollar/goodcontracts/build/contracts/AdminWallet.json";
 import OTPABI from "@gooddollar/goodcontracts/build/contracts/OneTimePayments.json";
 import HomeBridgeABI from "@gooddollar/goodcontracts/build/contracts/DeployHomeBridge.json";
 import ForeignBridgeABI from "@gooddollar/goodcontracts/build/contracts/DeployForeignBridge.json";
@@ -63,14 +65,11 @@ export const createDAO = async () => {
     root
   );
 
-  // const IdentityFactory = new ethers.ContractFactory(
-  //   IdentityABI.abi,
-  //   IdentityABI.bytecode,
-  //   root
-  // );
-
-  const IdentityFactory = await ethers.getContractFactory("IdentityV2");
-
+  const IdentityFactory = new ethers.ContractFactory(
+    IdentityABI.abi,
+    IdentityABI.bytecode,
+    root
+  );
   const FeeFormulaFactory = new ethers.ContractFactory(
     FeeFormulaABI.abi,
     FeeFormulaABI.bytecode,
@@ -96,15 +95,9 @@ export const createDAO = async () => {
   //   "0x6F1BAbfF5E119d61F0c6d8653d84E8B284B87091"
   // );
 
-  // const Identity = (await IdentityFactory.deploy().then(
-  //   printDeploy
-  // )) as Contract;
-
-  const Identity = await upgrades.deployProxy(
-    IdentityFactory,
-    [root.address, ethers.constants.AddressZero],
-    { kind: "uups" }
-  );
+  const Identity = (await IdentityFactory.deploy().then(
+    printDeploy
+  )) as Contract;
   // const Identity = await ethers.getContractAt(
   //   IdentityABI.abi,
   //   release.Identity
@@ -118,8 +111,8 @@ export const createDAO = async () => {
     printDeploy
   )) as Contract;
 
-  // await Identity.setAuthenticationPeriod(365).then(printDeploy);
-  // console.log("setAuthPeriod");
+  await Identity.setAuthenticationPeriod(365).then(printDeploy);
+  console.log("setAuthPeriod");
   await daoCreator
     .forgeOrg(
       "GoodDollar",
@@ -151,7 +144,7 @@ export const createDAO = async () => {
   //   root
   // );
 
-  // await Identity.setAvatar(Avatar.address).then(printDeploy);
+  await Identity.setAvatar(Avatar.address).then(printDeploy);
 
   console.log("Done deploying DAO, setting schemes permissions");
 
@@ -208,7 +201,9 @@ export const createDAO = async () => {
       gd
     );
     schemes.push(sidechain.OneTimePayments.address);
+    const adminWallet = await deployAdminWallet(Identity.address);
     Object.entries(sidechain).forEach(([k, v]) => (release[k] = v.address));
+    release["AdminWallet"] = adminWallet.address;
   }
 
   await releaser(release, network.name);
@@ -247,17 +242,7 @@ export const createDAO = async () => {
     UpgradeScheme: ethers.constants.AddressZero
   };
 
-  console.log("deploying v2...");
   const v2 = await deployV2(network.name, false, olddao);
-  console.log("deploying adminWallet...");
-  const adminWallet = await deployAdminWallet(Identity.address, v2.NameService);
-  console.log("setting up identity:", {
-    ns: v2.NameService,
-    identity: Identity.address
-  });
-  await Identity.initDAO(v2.NameService);
-  release["AdminWallet"] = adminWallet.address;
-
   release = { ...v2, ...release };
   await releaser(release, network.name);
   // await pressAnyKey();
@@ -344,7 +329,6 @@ const deployBridge = async (Avatar, gd, setSchemes, isMainnet) => {
 };
 
 const deployMainnet = async (Avatar, Identity) => {
-  console.log("deploying mainnet...");
   const [root] = await ethers.getSigners();
 
   const cdaiFactory = await ethers.getContractFactory("cDAIMock");
@@ -431,7 +415,6 @@ export const deploySidechain = async (
   identity,
   gd
 ) => {
-  console.log("deploying sidechain...");
   const root = (await ethers.getSigners())[0];
   const fcFactory = new ethers.ContractFactory(
     FirstClaimPool.abi,
@@ -519,7 +502,7 @@ export const deploySidechain = async (
   };
 };
 
-const deployAdminWallet = async (identity, ns) => {
+const deployAdminWallet = async identity => {
   const root = (await ethers.getSigners())[0];
   const hdNode = ethers.utils.HDNode.fromMnemonic(process.env.ADMIN_MNEMONIC);
   const admins = range(0, 50).map(i =>
@@ -529,9 +512,8 @@ const deployAdminWallet = async (identity, ns) => {
   const adminWallet = (await upgrades
     .deployProxy(await ethers.getContractFactory("AdminWallet"), [
       admins.slice(0, 20).map(_ => _.address),
-      ns,
       root.address,
-      1e9
+      identity
     ])
     .then(printDeploy)) as Contract;
 
@@ -548,10 +530,8 @@ const deployAdminWallet = async (identity, ns) => {
   //   )
   //   .then(printDeploy)) as Contract;
 
-  const id = await ethers.getContractAt("IdentityV2", identity);
-  await id
-    .grantRole(await id.IDENTITY_ADMIN_ROLE(), adminWallet.address)
-    .then(printDeploy);
+  const id = await ethers.getContractAt("IIdentity", identity);
+  await id.addIdentityAdmin(adminWallet.address).then(printDeploy);
   await root
     .sendTransaction({
       to: adminWallet.address,