From 6bff4ba76fbad4edfbcc2212a49636c4bc2d423d Mon Sep 17 00:00:00 2001 From: benk10 Date: Mon, 23 Dec 2019 12:21:55 +0200 Subject: [PATCH] Support migration v36-2 (rinkeby v36 contracts) (#435) * Support migration v36-2 (rinkeby v36 contracts) * Update docker ganche --- daos/private/testdao16.json | 2 +- daos/private/testdao19.json | 2 +- daos/private/testdao32.json | 2 +- daos/private/testdao33.json | 2 +- daos/private/testdao36.json | 2 +- docker-compose.yml | 2 +- ops/mappings.json | 42 ++++++++++++++ package-lock.json | 113 ++++++++++++++++++++++++++++++++++-- package.json | 4 +- 9 files changed, 159 insertions(+), 12 deletions(-) diff --git a/daos/private/testdao16.json b/daos/private/testdao16.json index f2d4ecb8..55350cd1 100644 --- a/daos/private/testdao16.json +++ b/daos/private/testdao16.json @@ -1,5 +1,5 @@ { - "name": "Strident Panel beater", + "name": "Incendiary Inker", "Avatar": "0xE7A2C59e134ee81D4035Ae6DB2254f79308e334f", "DAOToken": "0xcDbe8b52A6c60A5f101d4A0F1f049f19a9e1D35F", "Reputation": "0x93cdbf39fB9e13BD253CA5819247D52fbabf0F2f", diff --git a/daos/private/testdao19.json b/daos/private/testdao19.json index 980b2c1f..11cc05e5 100644 --- a/daos/private/testdao19.json +++ b/daos/private/testdao19.json @@ -1,5 +1,5 @@ { - "name": "Arcadian Artisan", + "name": "Bilious Scenographer", "Avatar": "0xf88E4C158298323a85dD7678eD60DBfF6DA71007", "DAOToken": "0xa09Cd74C747bf9DDB9154B1C75e271Dd12E45224", "Reputation": "0x5E06A0d7BA9728E3B3140857B26fFD6626D66793", diff --git a/daos/private/testdao32.json b/daos/private/testdao32.json index 0ab521d4..2cd02d0b 100644 --- a/daos/private/testdao32.json +++ b/daos/private/testdao32.json @@ -1,5 +1,5 @@ { - "name": "Garrulous Ninja", + "name": "Feckless Engineering", "Avatar": "0x98CcB5051fD767e2E89567bCCCA4Efc532250544", "DAOToken": "0x30dB4905b474aff3e1EAfc60394ece85dC524A92", "Reputation": "0x4992595a747d772bF291f64112735064BFc8878f", diff --git a/daos/private/testdao33.json b/daos/private/testdao33.json index e9cbdfcc..7768c5e0 100644 --- a/daos/private/testdao33.json +++ b/daos/private/testdao33.json @@ -1,5 +1,5 @@ { - "name": "Effulgent Soaper", + "name": "Judicious Mermaid eggs", "Avatar": "0x2268317B403ADEc49Fde9241a977335aba406A55", "DAOToken": "0x78B7beA9fB68616E4520DC2F522833616f6413d5", "Reputation": "0x0819C56Db86FbC6Cb3e0ef63F7DF0c4d5e60d915", diff --git a/daos/private/testdao36.json b/daos/private/testdao36.json index 5eaf7068..c9d8a217 100644 --- a/daos/private/testdao36.json +++ b/daos/private/testdao36.json @@ -1,5 +1,5 @@ { - "name": "Parsimonious Designer", + "name": "Egregious Animator", "Avatar": "0x46e342972535e15776Cf31f9407975f3E8A4078c", "DAOToken": "0x1f1DFd38F0cc6C1c7d2516d9aA9f99a4192C7249", "Reputation": "0x3AFEebAb0eA2D0A31BB882d3C1a6B6f0C8dE4859", diff --git a/docker-compose.yml b/docker-compose.yml index bfc9f05d..a6ac44d2 100644 --- 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.36-v1' + image: 'daostack/migration:0.0.1-rc.36-v2' ports: - '8545:8545' diff --git a/ops/mappings.json b/ops/mappings.json index 465a5112..e72ce3f0 100644 --- a/ops/mappings.json +++ b/ops/mappings.json @@ -957,6 +957,48 @@ "dao": "base", "mapping": "DAOTracker", "arcVersion": "0.0.1-rc.34" + }, + { + "name": "GenesisProtocol", + "contractName": "GenesisProtocol", + "dao": "base", + "mapping": "GenesisProtocol", + "arcVersion": "0.0.1-rc.36" + }, + { + "name": "ContributionReward", + "contractName": "ContributionReward", + "dao": "base", + "mapping": "ContributionReward", + "arcVersion": "0.0.1-rc.36" + }, + { + "name": "SchemeRegistrar", + "contractName": "SchemeRegistrar", + "dao": "base", + "mapping": "SchemeRegistrar", + "arcVersion": "0.0.1-rc.36" + }, + { + "name": "DAORegistry", + "contractName": "DAORegistry", + "dao": "base", + "mapping": "DAORegistry", + "arcVersion": "0.0.1-rc.36" + }, + { + "name": "DAOTracker", + "contractName": "DAOTracker", + "dao": "base", + "mapping": "DAOTracker", + "arcVersion": "0.0.1-rc.36" + }, + { + "name": "Redeemer", + "contractName": "Redeemer", + "dao": "base", + "mapping": "Redeemer", + "arcVersion": "0.0.1-rc.36" } ] }, diff --git a/package-lock.json b/package-lock.json index bb466cce..dfd726d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@daostack/subgraph", - "version": "0.0.36-5", + "version": "0.0.36-6", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -228,9 +228,9 @@ } }, "@daostack/migration": { - "version": "0.0.1-rc.36-v1", - "resolved": "https://registry.npmjs.org/@daostack/migration/-/migration-0.0.1-rc.36-v1.tgz", - "integrity": "sha512-sBPkckEeRDT5GoOyXrBR/p/3pwkBRmggnw2EQ0FtxGoFEy8JMm5NmeoPM0Kb0mlO0IZskye3X3GOZ5d6mAdMxw==", + "version": "0.0.1-rc.36-v2", + "resolved": "https://registry.npmjs.org/@daostack/migration/-/migration-0.0.1-rc.36-v2.tgz", + "integrity": "sha512-B1b9YwCQ4vtT/9T2cQOgCUUMpebR6n5X5gwzbADtQzwOfnWZ2FxE/Vc+4Xc55DMs4aRPBgLjNTzSfvLSxBdJ0w==", "dev": true, "requires": { "@daostack/arc": "0.0.1-rc.36", @@ -5766,6 +5766,18 @@ "multihashes": "~0.4.14" } }, + "concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" + } + }, "err-code": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz", @@ -5860,6 +5872,93 @@ "nodeify": "^1.0.1" } }, + "ndjson": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz", + "integrity": "sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg=", + "dev": true, + "requires": { + "json-stringify-safe": "^5.0.1", + "minimist": "^1.2.0", + "split2": "^2.1.0", + "through2": "^2.0.3" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + } + } + }, + "split2": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", + "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", + "dev": true, + "requires": { + "through2": "^2.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + } + } + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -11433,6 +11532,12 @@ "mime-types": "~2.1.24" } }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true + }, "typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", diff --git a/package.json b/package.json index 86e70d62..ed752de3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@daostack/subgraph", - "version": "0.0.36-5", + "version": "0.0.36-6", "author": "DAOstack (https://www.daostack.io)", "license": "GPL-3.0", "description": "A caching layer for daostack using The Graph", @@ -32,7 +32,7 @@ "test:watch": "npm run test -- --watch" }, "devDependencies": { - "@daostack/migration": "0.0.1-rc.36-v1", + "@daostack/migration": "0.0.1-rc.36-v2", "@types/jest": "^23.3.7", "@types/mocha": "^5.2.5", "babel-eslint": "^10.0.1",