Use v41-3 migrration to support kovan

daostack · Apr 1, 2020 · 046f2b5 · 046f2b5
1 parent ec5db32
commit 046f2b5
Show file tree

Hide file tree

Showing 10 changed files with 3,701 additions and 2,813 deletions.
diff --git a/daos/private/testdao16.json b/daos/private/testdao16.json
@@ -1,5 +1,5 @@
 {
-  "name": "Insolent Musician",
+  "name": "Inveterate Nibblets",
   "Avatar": "0xE7A2C59e134ee81D4035Ae6DB2254f79308e334f",
   "DAOToken": "0xcDbe8b52A6c60A5f101d4A0F1f049f19a9e1D35F",
   "Reputation": "0x93cdbf39fB9e13BD253CA5819247D52fbabf0F2f",

diff --git a/daos/private/testdao19.json b/daos/private/testdao19.json
@@ -1,5 +1,5 @@
 {
-  "name": "Adamant Apples",
+  "name": "Irksome Stylist",
   "Avatar": "0xf88E4C158298323a85dD7678eD60DBfF6DA71007",
   "DAOToken": "0xa09Cd74C747bf9DDB9154B1C75e271Dd12E45224",
   "Reputation": "0x5E06A0d7BA9728E3B3140857B26fFD6626D66793",

diff --git a/daos/private/testdao32.json b/daos/private/testdao32.json
@@ -1,5 +1,5 @@
 {
-  "name": "Munificent Circus",
+  "name": "Quiescent Stylist",
   "Avatar": "0x98CcB5051fD767e2E89567bCCCA4Efc532250544",
   "DAOToken": "0x30dB4905b474aff3e1EAfc60394ece85dC524A92",
   "Reputation": "0x4992595a747d772bF291f64112735064BFc8878f",

diff --git a/daos/private/testdao33.json b/daos/private/testdao33.json
@@ -1,5 +1,5 @@
 {
-  "name": "Meretricious Trampoline",
+  "name": "Intransigent Sawfiler",
   "Avatar": "0x2268317B403ADEc49Fde9241a977335aba406A55",
   "DAOToken": "0x78B7beA9fB68616E4520DC2F522833616f6413d5",
   "Reputation": "0x0819C56Db86FbC6Cb3e0ef63F7DF0c4d5e60d915",

diff --git a/daos/private/testdao41.json b/daos/private/testdao41.json
@@ -1,5 +1,5 @@
 {
-  "name": "Invidious Pancake",
+  "name": "Tremulous Mermaid eggs",
   "Avatar": "0x5951c93dCb47068fcbe1AcE235B2ea625d9823a5",
   "DAOToken": "0x820FbBC729B157f91CA5C2659aF2971C766e6A4b",
   "Reputation": "0xADb82bc43A7e402f40E1F166FC238c849791A928",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,6 +31,6 @@ services:
     environment:
       POSTGRES_PASSWORD: letmein
   ganache:
-    image: 'daostack/migration:0.0.1-rc.41-v1'
+    image: 'daostack/migration:0.0.1-rc.41-v3'
     ports:
       - '8545:8545'
diff --git a/ops/generate-subgraph.js b/ops/generate-subgraph.js
@@ -17,7 +17,7 @@ async function generateSubgraph(opts={}) {
   opts.subgraphLocation = opts.subgraphLocation || defaultSubgraphLocation;
   const addresses = JSON.parse(fs.readFileSync(migrationFile, "utf-8"));
   const missingAddresses = {};
-  if (network === 'xdai' || network === 'sokol' ) {
+  if (network === 'xdai' || network === 'sokol') {
    mappings.push(  //workaround :(
      {name: 'UGenericScheme',
       contractName: 'UGenericScheme',
@@ -27,6 +27,16 @@ async function generateSubgraph(opts={}) {
       addresses[network].base['0.0.1-rc.39']['UGenericScheme'] = "0xA92A766d62318B9c06Eb548753bD34acbD7C5f3c" //dummy
   }
 
+  if (network === 'kovan') {
+    mappings.push(  //workaround :(
+      {name: 'UGenericScheme',
+       contractName: 'UGenericScheme',
+       dao: 'base',
+       mapping: 'UGenericScheme',
+       arcVersion: '0.0.1-rc.41' });
+       addresses[network].base['0.0.1-rc.41']['UGenericScheme'] = "0xA92A766d62318B9c06Eb548753bD34acbD7C5f3c" //dummy
+   }
+
   // Filter out 0.0.1-rc.18 & 0.0.1-rc.17
   const latestMappings = mappings.filter(mapping =>
     !(mapping.arcVersion === "0.0.1-rc.18" ||

diff --git a/ops/mappings.json b/ops/mappings.json
@@ -663,68 +663,47 @@
   },
   "kovan": {
     "mappings": [
-      {
-        "name": "DAOToken",
-        "contractName": "DAOToken",
-        "dao": "dao",
-        "mapping": "DAOToken",
-        "arcVersion": "0.0.1-rc.19"
-      },
-      {
-        "name": "Reputation",
-        "contractName": "Reputation",
-        "dao": "dao",
-        "mapping": "Reputation",
-        "arcVersion": "0.0.1-rc.19"
-      },
       {
         "name": "GenesisProtocol",
         "contractName": "GenesisProtocol",
         "dao": "base",
         "mapping": "GenesisProtocol",
-        "arcVersion": "0.0.1-rc.19"
+        "arcVersion": "0.0.1-rc.41"
       },
       {
         "name": "ContributionReward",
         "contractName": "ContributionReward",
         "dao": "base",
         "mapping": "ContributionReward",
-        "arcVersion": "0.0.1-rc.19"
-      },
-      {
-        "name": "UGenericScheme",
-        "contractName": "GenericScheme",
-        "dao": "base",
-        "mapping": "UGenericScheme",
-        "arcVersion": "0.0.1-rc.19"
+        "arcVersion": "0.0.1-rc.41"
       },
       {
         "name": "SchemeRegistrar",
         "contractName": "SchemeRegistrar",
         "dao": "base",
         "mapping": "SchemeRegistrar",
-        "arcVersion": "0.0.1-rc.19"
+        "arcVersion": "0.0.1-rc.41"
       },
       {
-        "name": "Avatar",
-        "contractName": "Avatar",
-        "dao": "dao",
-        "mapping": "Avatar",
-        "arcVersion": "0.0.1-rc.19"
+        "name": "DAORegistry",
+        "contractName": "DAORegistry",
+        "dao": "base",
+        "mapping": "DAORegistry",
+        "arcVersion": "0.0.1-rc.41"
       },
       {
-        "name": "UController",
-        "contractName": "UController",
+        "name": "DAOTracker",
+        "contractName": "DAOTracker",
         "dao": "base",
-        "mapping": "UController",
-        "arcVersion": "0.0.1-rc.19"
+        "mapping": "DAOTracker",
+        "arcVersion": "0.0.1-rc.41"
       },
       {
-        "name": "DAORegistry",
-        "contractName": "DAORegistry",
+        "name": "Redeemer",
+        "contractName": "Redeemer",
         "dao": "base",
-        "mapping": "DAORegistry",
-        "arcVersion": "0.0.1-rc.19"
+        "mapping": "Redeemer",
+        "arcVersion": "0.0.1-rc.41"
       }
     ]
   },