Add GenericSchemeMultiCall (#602)

* Add GenericSchemeMultiCall * Update Competition.spec.ts * test * Arc v47 * DxDaoSchemeConstraint indexing * check address not null sc
daostack · Oct 19, 2020 · f97f738 · f97f738
1 parent 43fd105
commit f97f738
Show file tree

Hide file tree

Showing 30 changed files with 1,008 additions and 80 deletions.
diff --git a/daos/private/testdao16.json b/daos/private/testdao16.json
@@ -1,5 +1,5 @@
 {
-  "name": "Fulsome Patternmaker",
+  "name": "Bilious Snakes",
   "Avatar": "0xE7A2C59e134ee81D4035Ae6DB2254f79308e334f",
   "DAOToken": "0xcDbe8b52A6c60A5f101d4A0F1f049f19a9e1D35F",
   "Reputation": "0x93cdbf39fB9e13BD253CA5819247D52fbabf0F2f",
@@ -10,6 +10,12 @@
       "alias": "ContributionRewardExt",
       "address": "0xEC5d4F247aF81A843612eb1371CBCfa88b762119",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "alias": "GenericSchemeMultiCall",
+      "address": "0x22d5C8BdD4346b390014a07109a8F830094d4abf",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "StandAloneContracts": [
@@ -27,6 +33,21 @@
       "name": "Competition",
       "address": "0xDDb64fE46a91D46ee29420539FC25FD07c5FEa3E",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "address": "0x22d5C8BdD4346b390014a07109a8F830094d4abf",
+      "arcVersion": "0.0.1-rc.47"
+    },
+    {
+      "name": "ActionMock",
+      "address": "0x7414e38377D6DAf6045626EC8a8ABB8a1BC4B97a",
+      "arcVersion": "0.0.1-rc.16"
+    },
+    {
+      "name": "DxDaoSchemeConstraints",
+      "address": "0xB9bdBAEc07751F6d54d19A6B9995708873F3DE18",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "arcVersion": "0.0.1-rc.16"

diff --git a/daos/private/testdao19.json b/daos/private/testdao19.json
@@ -1,32 +1,53 @@
 {
-  "name": "Mannered Artist",
-  "Avatar": "0xf88E4C158298323a85dD7678eD60DBfF6DA71007",
-  "DAOToken": "0xa09Cd74C747bf9DDB9154B1C75e271Dd12E45224",
-  "Reputation": "0x5E06A0d7BA9728E3B3140857B26fFD6626D66793",
-  "Controller": "0x3d6cF0d60B392e781d0cB8dcA333A2B197548198",
+  "name": "Taciturn Potato",
+  "Avatar": "0xAf6F348C0af707B0D9C23fb4e07ceDA5d9AaC465",
+  "DAOToken": "0x6258F90A25c4fB7B8ee6331903767edD49De44e0",
+  "Reputation": "0x76016A8076aA1CD967b946708C01A8274b75Fe4C",
+  "Controller": "0x34dF74e75eA20E9fC3E066bA39Ad54f23BB05E12",
   "Schemes": [
     {
       "name": "ContributionRewardExt",
       "alias": "ContributionRewardExt",
-      "address": "0x405fC0EE23C7fcd0a41A864505Fe8c969ca3eF6A",
+      "address": "0xb3212b66C337F83D277172D891Daf31776FF9D79",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "alias": "GenericSchemeMultiCall",
+      "address": "0x7322258910EeA3A9918b6bB64472fC15969e9d79",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "StandAloneContracts": [
     {
       "name": "Wallet",
-      "address": "0xfd30B6e495CC375Bd98d01BD959F741Dd2772d64",
+      "address": "0x4d46f75Be6E98dBA8E8384802a68d550DeB69770",
       "arcVersion": "0.0.1-rc.19"
     },
     {
       "name": "ContributionRewardExt",
-      "address": "0x405fC0EE23C7fcd0a41A864505Fe8c969ca3eF6A",
+      "address": "0xb3212b66C337F83D277172D891Daf31776FF9D79",
       "arcVersion": "0.0.1-rc.43"
     },
     {
       "name": "Competition",
-      "address": "0x4A1D2A5060C782049Ef966d9412f1239E95183b7",
+      "address": "0xf454f24A62E5Be73aA877Aa824b78F8F2a31d236",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "address": "0x7322258910EeA3A9918b6bB64472fC15969e9d79",
+      "arcVersion": "0.0.1-rc.47"
+    },
+    {
+      "name": "ActionMock",
+      "address": "0xf1486cC376555A5035cFa85A761279c9876Daddc",
+      "arcVersion": "0.0.1-rc.19"
+    },
+    {
+      "name": "DxDaoSchemeConstraints",
+      "address": "0xF3Ecf410c2f4EF71691F63E409300f85c16c4f33",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "arcVersion": "0.0.1-rc.19"

diff --git a/daos/private/testdao32.json b/daos/private/testdao32.json
@@ -1,38 +1,59 @@
 {
-  "name": "Egregious Captain",
-  "Avatar": "0x98CcB5051fD767e2E89567bCCCA4Efc532250544",
-  "DAOToken": "0x30dB4905b474aff3e1EAfc60394ece85dC524A92",
-  "Reputation": "0x4992595a747d772bF291f64112735064BFc8878f",
-  "Controller": "0x5294fd6B7ee619548598ab1Ca24ED49064AaCf4c",
+  "name": "Efficacious Stick figures",
+  "Avatar": "0x6621372fFA1B23808886b1fb1BbB6F235603eEB0",
+  "DAOToken": "0x8ffD5653a0a4d6FEcF912d8aF214C0a3063306c2",
+  "Reputation": "0x587C9DF9Fd5252D223DA0F455Bc7858AADc4678d",
+  "Controller": "0xC1aB3C464eD71C7aC04332f482E13Ae1eFDc0286",
   "Schemes": [
     {
       "name": "GenericScheme",
       "alias": "GenericSchemeAlias",
-      "address": "0x353B67029c2B8D94E0a89Bfacd18B2e41152B661",
+      "address": "0xbbAD47bfdBfF3d1219baFb4E674483fACAAfb3FA",
       "arcVersion": "0.0.1-rc.32"
     },
     {
       "name": "ContributionRewardExt",
       "alias": "ContributionRewardExt",
-      "address": "0x5023deB3F76D484102c9650933541a90B528CBFF",
+      "address": "0x7B12b7697B09ea345290D7f123F184eB98bD703B",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "alias": "GenericSchemeMultiCall",
+      "address": "0xE1Fa62693b945288ddEe43eDf714c497d3D7c5fe",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "StandAloneContracts": [
     {
       "name": "Wallet",
-      "address": "0xbe74Dd781E1A3fAb6554A4934132649A5b858541",
+      "address": "0x6884D17Fac0FBd05382cF562E86DE82c79e26117",
       "arcVersion": "0.0.1-rc.32"
     },
     {
       "name": "ContributionRewardExt",
-      "address": "0x5023deB3F76D484102c9650933541a90B528CBFF",
+      "address": "0x7B12b7697B09ea345290D7f123F184eB98bD703B",
       "arcVersion": "0.0.1-rc.43"
     },
     {
       "name": "Competition",
-      "address": "0xCb7126eC611fab65A1Fbd1253fd947634A4623Fa",
+      "address": "0xb7e4CC5689ad2907596154D72dC8d8a0bf6CC8c0",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "address": "0xE1Fa62693b945288ddEe43eDf714c497d3D7c5fe",
+      "arcVersion": "0.0.1-rc.47"
+    },
+    {
+      "name": "ActionMock",
+      "address": "0x94247cc867ED6277b901AFED817F3b13962814eD",
+      "arcVersion": "0.0.1-rc.32"
+    },
+    {
+      "name": "DxDaoSchemeConstraints",
+      "address": "0xe39613CE5124f16E5904B51390d17F384F8515ec",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "arcVersion": "0.0.1-rc.32"

diff --git a/daos/private/testdao33.json b/daos/private/testdao33.json
@@ -1,38 +1,59 @@
 {
-  "name": "Feckless Cookies",
-  "Avatar": "0x2268317B403ADEc49Fde9241a977335aba406A55",
-  "DAOToken": "0x78B7beA9fB68616E4520DC2F522833616f6413d5",
-  "Reputation": "0x0819C56Db86FbC6Cb3e0ef63F7DF0c4d5e60d915",
-  "Controller": "0x26bc7F1d9642BB480B01dE689deA64b97Fdd332B",
+  "name": "Munificent Director",
+  "Avatar": "0x57F909211c361AE0A11E269b74Dca470078c6e67",
+  "DAOToken": "0xE9A11C4C015D142D090CFF82dEd1Deea5B824185",
+  "Reputation": "0xCf9dB88B2bef5f498de16327b051C10A17bC6132",
+  "Controller": "0x63ad03B017A26782A53B1c4cD1DDF4b3273c8d03",
   "Schemes": [
     {
       "name": "GenericScheme",
       "alias": "GenericSchemeAlias",
-      "address": "0x6884D17Fac0FBd05382cF562E86DE82c79e26117",
+      "address": "0x9dcf3D406e850BB65240107e5FA02d6116EF9393",
       "arcVersion": "0.0.1-rc.33"
     },
     {
       "name": "ContributionRewardExt",
       "alias": "ContributionRewardExt",
-      "address": "0xFa117aD3aEC87df869C456d91f6731950Cfef6ee",
+      "address": "0xf56Ca75Ac4EB296978Cf3773caA5d52FC57a9FE8",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "alias": "GenericSchemeMultiCall",
+      "address": "0xBbA961069d46ae92006b7985fAA1e90e33c09D98",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "StandAloneContracts": [
     {
       "name": "Wallet",
-      "address": "0x44b2C55F5CAe26D328F047a547d766E6BE836eb9",
+      "address": "0x3DEe4593fBc3DC789DF5828E5E10f7b4E3cb5C01",
       "arcVersion": "0.0.1-rc.33"
     },
     {
       "name": "ContributionRewardExt",
-      "address": "0xFa117aD3aEC87df869C456d91f6731950Cfef6ee",
+      "address": "0xf56Ca75Ac4EB296978Cf3773caA5d52FC57a9FE8",
       "arcVersion": "0.0.1-rc.43"
     },
     {
       "name": "Competition",
-      "address": "0x017383Ddb609fdbf85B80910A34936a733DA0913",
+      "address": "0x2a45Bac91F4f06cE3A1a2a5b7138540b33E02883",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "address": "0xBbA961069d46ae92006b7985fAA1e90e33c09D98",
+      "arcVersion": "0.0.1-rc.47"
+    },
+    {
+      "name": "ActionMock",
+      "address": "0xFF5bA3B4efA9175BC3F096d615A34E69c6C479AC",
+      "arcVersion": "0.0.1-rc.33"
+    },
+    {
+      "name": "DxDaoSchemeConstraints",
+      "address": "0xe011485b54301995924F87Dd56dA2f0f1f289065",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "arcVersion": "0.0.1-rc.33"

diff --git a/daos/private/testdao41.json b/daos/private/testdao41.json
@@ -1,38 +1,59 @@
 {
-  "name": "Luminous Mermaid eggs",
-  "Avatar": "0x1EaddB8b4095320cf44cEE3448ac73eeCD9A2D6D",
-  "DAOToken": "0x375f4ecc738EE3175FA00F5bC13a47DC15AbeBd7",
-  "Reputation": "0xcBDFAB17efb4F1b5cd3B05615D7e32415fa80d10",
-  "Controller": "0x923F16917b0929CC08F5Fa35113F3e207aEE4fB3",
+  "name": "Effulgent Wheelwright",
+  "Avatar": "0xde1837963BCa0cBDE1214c6ca83Ac8dCde7Cfe63",
+  "DAOToken": "0x66688d72B4d3834Ed24b448D2894dA0D83e18f28",
+  "Reputation": "0xa26d9ccFA2978Bb87F9De3705Ed0c1a126046E45",
+  "Controller": "0x22061A7615a05C2867fF0B54FC5696D877Df62EA",
   "Schemes": [
     {
       "name": "GenericScheme",
       "alias": "GenericSchemeAlias",
-      "address": "0x158CBa029dE5D141f0e6e264de7b4F22C1c6A700",
+      "address": "0x877720eBA2E76941066C50469111A248c51e5bF6",
       "arcVersion": "0.0.1-rc.41"
     },
     {
       "name": "ContributionRewardExt",
       "alias": "ContributionRewardExt",
-      "address": "0x3f63362ef1a187dcec09C5C951DB47be3FddBF11",
+      "address": "0xd9218bb2a7Ff0131555A9b6F179fF5103a27a286",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "alias": "GenericSchemeMultiCall",
+      "address": "0x6A5d6554EC6a0bbDe9671488db2620B877B77FB3",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "StandAloneContracts": [
     {
       "name": "Wallet",
-      "address": "0x12eb8682598481A2AEb01F86B3d9DBF00291Ef7D",
+      "address": "0x66b97486811e4d8275387404dCe9cc2057630109",
       "arcVersion": "0.0.1-rc.41"
     },
     {
       "name": "ContributionRewardExt",
-      "address": "0x3f63362ef1a187dcec09C5C951DB47be3FddBF11",
+      "address": "0xd9218bb2a7Ff0131555A9b6F179fF5103a27a286",
       "arcVersion": "0.0.1-rc.43"
     },
     {
       "name": "Competition",
-      "address": "0xd5484bb1F891023ABC512902d6F5949E3AC063e4",
+      "address": "0xFe0bcF750d4042480943CC8bA818CA3482DDf691",
       "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "address": "0x6A5d6554EC6a0bbDe9671488db2620B877B77FB3",
+      "arcVersion": "0.0.1-rc.47"
+    },
+    {
+      "name": "ActionMock",
+      "address": "0xf897334C5084bC212ac2c29d8762F2DD1b96cd0D",
+      "arcVersion": "0.0.1-rc.41"
+    },
+    {
+      "name": "DxDaoSchemeConstraints",
+      "address": "0x7331E275619166F9abAfE6a78D6923Ce29b2B64A",
+      "arcVersion": "0.0.1-rc.47"
     }
   ],
   "arcVersion": "0.0.1-rc.41"

diff --git a/daos/private/testdao45.json b/daos/private/testdao45.json
@@ -0,0 +1,50 @@
+{
+  "name": "Querulous Stick figures",
+  "Avatar": "0xf1124a684B3f087f2E951d0B9c5bF8015de532d1",
+  "DAOToken": "0x3932D64B07199aC13Eb5B2A5a19E0C32fd760C3d",
+  "Reputation": "0x541dc9116b17bD2dB1B67D0D36A2565f45026b51",
+  "Controller": "0x12f90A95Dd3923bf69344fa30B9927ac9Dd79C84",
+  "Schemes": [
+    {
+      "name": "GenericScheme",
+      "alias": "GenericSchemeAlias",
+      "address": "0xbB890Efc11F5e5A1C8537b3Fa7DD5792659eB9e1",
+      "arcVersion": "0.0.1-rc.45"
+    },
+    {
+      "name": "ContributionRewardExt",
+      "alias": "ContributionRewardExt",
+      "address": "0xf04CcE283D79025e621753DfDF25aec03EAeB108",
+      "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "GenericSchemeMultiCall",
+      "alias": "GenericSchemeMultiCall",
+      "address": "0xd1B5002Da809021b0830624fe9C1d87392301AE4",
+      "arcVersion": "0.0.1-rc.46"
+    }
+  ],
+  "StandAloneContracts": [
+    {
+      "name": "Wallet",
+      "address": "0xe014640DD824Ce61F9532B6ebaac5B91E9891eeD",
+      "arcVersion": "0.0.1-rc.45"
+    },
+    {
+      "name": "ContributionRewardExt",
+      "address": "0xf04CcE283D79025e621753DfDF25aec03EAeB108",
+      "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "Competition",
+      "address": "0x5Abd8fa661B2e6C494Ea4Af9760F2d5B9D0Dd78E",
+      "arcVersion": "0.0.1-rc.43"
+    },
+    {
+      "name": "DxDaoSchemeConstraints",
+      "address": "0xBBC181f0e156aA31475327bFbAE76a02aD959c97",
+      "arcVersion": "0.0.1-rc.46"
+    }
+  ],
+  "arcVersion": "0.0.1-rc.45"
+}