From 22bd2d7aa14f0b0d5a495a518a16f5959c91c958 Mon Sep 17 00:00:00 2001 From: orenyodfat Date: Tue, 5 May 2020 21:48:20 +0300 Subject: [PATCH 01/10] show only register schemes in pluging manager (#1661) * show only register schemes in pluging manager * remove subscription --- .../Create/SchemeForms/CreateSchemeRegistrarProposal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx index 0de9e24e1..b23c39181 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx @@ -578,7 +578,7 @@ const SubscribedCreateSchemeRegistrarProposal = withSubscription({ checkForUpdate: ["daoAvatarAddress"], createObservable: (props: IExternalProps) => { const arc = getArc(); - return arc.dao(props.daoAvatarAddress).schemes(); + return arc.dao(props.daoAvatarAddress).schemes({ where: { isRegistered: true } }, { fetchAllData: true }); }, }); From f22a514ebb53f34c559789007f535e016e2b3da5 Mon Sep 17 00:00:00 2001 From: Tibet Sprague Date: Tue, 5 May 2020 14:19:21 -0700 Subject: [PATCH 02/10] Can't vote if didn't have reputation in DAO when proposal was created (#1634) * Can't vote if didn't have reputation in DAO when proposal was created Fixes https://github.com/daostack/alchemy/issues/1593 Depends on https://github.com/daostack/arc.js/pull/451 * use arc.js 0.2.68 * update package-lock.json * @daostack/arc.js * documentation * fix gh-issue #1655 * Update CHANGELOG.md * fix changelog * add comment * tweaks to comment * fix votingDisabled Co-authored-by: Oren Sokolowsky Co-authored-by: orenyodfat Co-authored-by: Doug Kent --- CHANGELOG.md | 12 +- docs/development.md | 18 +- docs/fetchingandsubscribingdata.md | 2 +- package-lock.json | 1246 +++++++++-------- package.json | 2 +- scripts/fetchContracts.ts | 2 +- scripts/populate.ts | 2 +- src/actions/arcActions.ts | 2 +- src/arc.ts | 2 +- src/components/Account/AccountBalances.tsx | 2 +- src/components/Account/AccountPopup.tsx | 2 +- src/components/Account/AccountProfilePage.tsx | 2 +- src/components/Dao/DaoContainer.tsx | 2 +- src/components/Dao/DaoHistoryPage.tsx | 2 +- src/components/Dao/DaoLandingPage.tsx | 2 +- src/components/Dao/DaoMember.tsx | 2 +- src/components/Dao/DaoMembersPage.tsx | 2 +- src/components/Dao/DaoSchemesPage.tsx | 2 +- src/components/Dao/ProposalSchemeCard.tsx | 4 +- src/components/Dao/SimpleSchemeCard.tsx | 2 +- src/components/Dao/UnknownSchemeCard.tsx | 2 +- src/components/Daos/DaoCard.tsx | 2 +- src/components/Daos/DaosPage.tsx | 2 +- src/components/Feed/DaoFeedItem.tsx | 2 +- src/components/Feed/ProposalFeedItem.tsx | 2 +- src/components/Feed/UserFeedItem.tsx | 2 +- src/components/Proposal/ActionButton.tsx | 2 +- .../Proposal/Create/CreateProposalPage.tsx | 2 +- .../CreateContributionRewardProposal.tsx | 2 +- .../CreateKnownGenericSchemeProposal.tsx | 2 +- .../CreateSchemeRegistrarProposal.tsx | 2 +- .../CreateUnknownGenericSchemeProposal.tsx | 2 +- .../Create/SchemeForms/TagsSelector.tsx | 4 +- src/components/Proposal/ProposalCard.tsx | 2 +- src/components/Proposal/ProposalData.tsx | 4 +- .../Proposal/ProposalDetailsPage.tsx | 2 +- .../Proposal/ProposalHistoryRow.tsx | 2 +- src/components/Proposal/ProposalStatus.tsx | 2 +- .../ProposalSummary/ProposalSummary.tsx | 2 +- .../ProposalSummary/ProposalSummaryCO2ken.tsx | 2 +- .../ProposalSummaryContributionReward.tsx | 2 +- .../ProposalSummary/ProposalSummaryDutchX.tsx | 2 +- .../ProposalSummaryKnownGenericScheme.tsx | 2 +- .../ProposalSummarySchemeRegistrar.tsx | 2 +- .../ProposalSummaryStandardBounties.tsx | 2 +- .../ProposalSummaryUnknownGenericScheme.tsx | 2 +- src/components/Proposal/RedemptionsString.tsx | 2 +- src/components/Proposal/RedemptionsTip.tsx | 2 +- src/components/Proposal/RewardsString.tsx | 2 +- .../Proposal/Staking/BoostAmount.tsx | 2 +- .../Proposal/Staking/StakeButtons.tsx | 2 +- .../Proposal/Staking/StakeGraph.tsx | 2 +- .../Proposal/Voting/VoteBreakdown.tsx | 2 +- .../Proposal/Voting/VoteButtons.tsx | 32 +- src/components/Proposal/Voting/VoteGraph.tsx | 2 +- .../Proposal/Voting/VotersModal.tsx | 2 +- .../Redemptions/RedemptionsButton.tsx | 2 +- .../Redemptions/RedemptionsMenu.tsx | 2 +- .../Redemptions/RedemptionsPage.tsx | 2 +- .../Competition/Card.tsx | 2 +- .../Competition/CountdownText.tsx | 2 +- .../Competition/CreateProposal.tsx | 2 +- .../Competition/CreateSubmission.tsx | 2 +- .../Competition/Details.tsx | 2 +- .../Competition/List.tsx | 2 +- .../Competition/StatusBlob.tsx | 2 +- .../Competition/SubmissionDetails.tsx | 2 +- .../Competition/utils.ts | 2 +- .../DetailsPageRouter.tsx | 2 +- .../rewardersProps.ts | 2 +- src/components/Scheme/ReputationFromToken.tsx | 2 +- src/components/Scheme/SchemeContainer.tsx | 2 +- src/components/Scheme/SchemeInfoPage.tsx | 2 +- .../Scheme/SchemeOpenBountyPage.tsx | 2 +- src/components/Scheme/SchemeProposalsPage.tsx | 2 +- src/components/Shared/PreTransactionModal.tsx | 2 +- src/components/Shared/ProposalCountdown.tsx | 2 +- src/components/Shared/UserSearchField.tsx | 2 +- src/layouts/AppContainer.tsx | 2 +- src/layouts/Header.tsx | 2 +- src/layouts/SidebarMenu.tsx | 2 +- src/lib/daoHelpers.ts | 2 +- src/lib/proposalHelpers.ts | 2 +- src/lib/schemeUtils.ts | 2 +- src/lib/util.ts | 2 +- test/integration/proposal-competition.ts | 2 +- test/integration/utils.ts | 2 +- 87 files changed, 782 insertions(+), 698 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae010b08f..f31b28a5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,19 @@ +## 0.10.7 + - Features Added + + - Bugs Fixed + - Display a proper msg for daos members with no reputation at the moment of a proposal creation + - Fix summing up the number of schemes open proposals + ## 0.10.6 - Features Added - new DAO landing page - show warnings if subgraph is not updating - added help text in the Plugin Editor popup - - Bugs Fixed - - Make sure proposer name doesn't overlap avatar on proposal history rows + - Bugs Fixed + - Make sure proposer name doesn't overlap avatar on proposal history rows + ## 0.10.5 - Features Added diff --git a/docs/development.md b/docs/development.md index e6b80103d..51fe0bd55 100644 --- a/docs/development.md +++ b/docs/development.md @@ -41,27 +41,27 @@ See [docker](./docker.md) for details about the docker containers. # Helpful scripts -# Developing @daostack/client in tandem with alchemy with npm link +# Developing @daostack/arc.js in tandem with alchemy with npm link ## The setup -Download and install the client package and use `npm link` for local development +Download and install the arc.js package and use `npm link` for local development ```sh -# get the dev branch from the client repository -git clone https://github.com/daostack/client.git#dev -cd client +# get the dev branch from the arc.js repository +git clone https://github.com/daostack/arc.js.git#dev +cd arc.js npm install npm run build npm link cd ../alchemy # cd to the alchemy directory -npm link @daostack/client +npm link @daostack/arc.js ``` -Now you should find a link to your local `client` directory in `node_modules/@daostack/client` +Now you should find a link to your local `arc.js` directory in `node_modules/@daostack/arc.js` ## The development cycle -The alchemy webpack process uses the compiled `.js` files in `@daostack/client/dist`. -That means that when you make changes in the typescript `.ts` files in the client library, they will not be picked up until they are compiled to new `dist/*.js` files. You can do that by running: +The alchemy webpack process uses the compiled `.js` files in `@daostack/arc.js/dist`. +That means that when you make changes in the typescript `.ts` files in the arc.js library, they will not be picked up until they are compiled to new `dist/*.js` files. You can do that by running: ```sh npm run build:watch ``` diff --git a/docs/fetchingandsubscribingdata.md b/docs/fetchingandsubscribingdata.md index 44a3972d0..93a92e2eb 100644 --- a/docs/fetchingandsubscribingdata.md +++ b/docs/fetchingandsubscribingdata.md @@ -17,5 +17,5 @@ So the approach we are taking in Alchemy is the following. Fetch the data that is used by many subcomponents in a single query, before those components are rendered. When those subcomponents are rendered, they will be able to get their data directly from the cache, and so will avoid a server request in step 2. An example of that pattern is found in the `DaoHistoryPage.tsx` *To avoid the cost of step 4:* -The line `arcSettings.graphqlSubscribeToQueries = false;` overrides the client default behavior to open a subscription for each query. So, by default, step 4 is skipped. Instead, we insert, in strategic places, subscriptions to relatively big queries, that will update the cache only for the data that we need. +The line `arcSettings.graphqlSubscribeToQueries = false;` overrides arc.js default behavior to open a subscription for each query. So, by default, step 4 is skipped. Instead, we insert, in strategic places, subscriptions to relatively big queries, that will update the cache only for the data that we need. An example of this pattern is in `SchemeProposalsPage.tsx` diff --git a/package-lock.json b/package-lock.json index 34f937396..eb73c8c88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -187,12 +187,12 @@ } }, "@babel/compat-data": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz", - "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz", + "integrity": "sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==", "dev": true, "requires": { - "browserslist": "^4.9.1", + "browserslist": "^4.11.1", "invariant": "^2.2.4", "semver": "^5.5.0" }, @@ -218,19 +218,19 @@ } }, "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", + "@babel/generator": "^7.9.6", "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -274,12 +274,12 @@ } }, "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", "dev": true, "requires": { - "@babel/types": "^7.9.5", + "@babel/types": "^7.9.6", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -333,13 +333,13 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz", - "integrity": "sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz", + "integrity": "sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==", "dev": true, "requires": { - "@babel/compat-data": "^7.8.6", - "browserslist": "^4.9.1", + "@babel/compat-data": "^7.9.6", + "browserslist": "^4.11.1", "invariant": "^2.2.4", "levenary": "^1.1.1", "semver": "^5.5.0" @@ -366,16 +366,16 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz", - "integrity": "sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz", + "integrity": "sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==", "dev": true, "requires": { "@babel/helper-function-name": "^7.9.5", "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-replace-supers": "^7.9.6", "@babel/helper-split-export-declaration": "^7.8.3" } }, @@ -540,15 +540,15 @@ } }, "@babel/helper-replace-supers": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", - "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz", + "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==", "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" } }, "@babel/helper-simple-access": { @@ -588,14 +588,14 @@ } }, "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", + "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", "dev": true, "requires": { "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" } }, "@babel/highlight": { @@ -637,9 +637,9 @@ } }, "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { @@ -704,9 +704,9 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz", - "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz", + "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.3", @@ -1001,38 +1001,38 @@ } }, "@babel/plugin-transform-modules-amd": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz", - "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz", + "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==", "dev": true, "requires": { "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz", - "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz", + "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==", "dev": true, "requires": { "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", "@babel/helper-simple-access": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz", - "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz", + "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==", "dev": true, "requires": { "@babel/helper-hoist-variables": "^7.8.3", "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-umd": { @@ -1184,9 +1184,9 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz", - "integrity": "sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz", + "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==", "requires": { "@babel/helper-module-imports": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", @@ -1259,13 +1259,13 @@ } }, "@babel/preset-env": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.5.tgz", - "integrity": "sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz", + "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.9.0", - "@babel/helper-compilation-targets": "^7.8.7", + "@babel/compat-data": "^7.9.6", + "@babel/helper-compilation-targets": "^7.9.6", "@babel/helper-module-imports": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-proposal-async-generator-functions": "^7.8.3", @@ -1273,7 +1273,7 @@ "@babel/plugin-proposal-json-strings": "^7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-proposal-numeric-separator": "^7.8.3", - "@babel/plugin-proposal-object-rest-spread": "^7.9.5", + "@babel/plugin-proposal-object-rest-spread": "^7.9.6", "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", @@ -1300,9 +1300,9 @@ "@babel/plugin-transform-function-name": "^7.8.3", "@babel/plugin-transform-literals": "^7.8.3", "@babel/plugin-transform-member-expression-literals": "^7.8.3", - "@babel/plugin-transform-modules-amd": "^7.9.0", - "@babel/plugin-transform-modules-commonjs": "^7.9.0", - "@babel/plugin-transform-modules-systemjs": "^7.9.0", + "@babel/plugin-transform-modules-amd": "^7.9.6", + "@babel/plugin-transform-modules-commonjs": "^7.9.6", + "@babel/plugin-transform-modules-systemjs": "^7.9.6", "@babel/plugin-transform-modules-umd": "^7.9.0", "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", "@babel/plugin-transform-new-target": "^7.8.3", @@ -1318,8 +1318,8 @@ "@babel/plugin-transform-typeof-symbol": "^7.8.4", "@babel/plugin-transform-unicode-regex": "^7.8.3", "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.9.5", - "browserslist": "^4.9.1", + "@babel/types": "^7.9.6", + "browserslist": "^4.11.1", "core-js-compat": "^3.6.2", "invariant": "^2.2.2", "levenary": "^1.1.1", @@ -1384,17 +1384,17 @@ } }, "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/runtime-corejs3": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz", - "integrity": "sha512-HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz", + "integrity": "sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==", "dev": true, "requires": { "core-js-pure": "^3.0.0", @@ -1402,9 +1402,9 @@ } }, "@babel/standalone": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.9.5.tgz", - "integrity": "sha512-J6mHRjRUh4pKCd1uz5ghF2LpUwMuGwxy4z+TM+jbvt0dM6NiXd8Z2UOD1ftmGfkuAuDYlgcz4fm62MIjt8iUlg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.9.6.tgz", + "integrity": "sha512-UE0vm/4vuwzGgGNY9wR78ft3DUcHvAU0o/esXas2qjUL8yHMAEc04OmLkb3dfkUwlqbQ4+vC1OLBzwhcoIqLsA==", "dev": true }, "@babel/template": { @@ -1419,17 +1419,17 @@ } }, "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", + "@babel/generator": "^7.9.6", "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" @@ -1459,9 +1459,9 @@ } }, "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "requires": { "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", @@ -1523,10 +1523,10 @@ } } }, - "@daostack/client": { - "version": "0.2.67", - "resolved": "https://registry.npmjs.org/@daostack/client/-/client-0.2.67.tgz", - "integrity": "sha512-N0721KMTQ+npXYI3svc8rQSsupyKvajsQHuDS8KEb3/imTcg4q8dBIdQEYR5aMa//cXpdtvfdS+lIEZT5qRWiA==", + "@daostack/arc.js": { + "version": "0.2.68", + "resolved": "https://registry.npmjs.org/@daostack/arc.js/-/arc.js-0.2.68.tgz", + "integrity": "sha512-6RnFeCxhTFFYvyVCWJteWoGGKQ5JT7zXHI1Zi4JEwU4G9hWwk7s02rsrGX30gcutBvpp/tovpD/OCmkd70TOLw==", "requires": { "apollo-cache-inmemory": "^1.6.5", "apollo-client": "^2.6.8", @@ -2239,9 +2239,9 @@ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "@ethersproject/abi": { - "version": "5.0.0-beta.150", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.0-beta.150.tgz", - "integrity": "sha512-nr1MNiuVeCP8aRJQbyUHa56DdxUhwxcMv8MhggyYAm2iWroJ9aW7siAma47HoQxrVxrJwi1H6rqD7vOc+eNl7g==", + "version": "5.0.0-beta.152", + "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.0-beta.152.tgz", + "integrity": "sha512-+1+ukofyBYNJo8IdIK8lBENkEycgXW1ny1zWT7oYD8GKvczYYrgucRQnJPgt3u9MJYZdje4yxDQFoGd6d4BpRA==", "requires": { "@ethersproject/address": ">=5.0.0-beta.128", "@ethersproject/bignumber": ">=5.0.0-beta.130", @@ -2294,9 +2294,9 @@ } }, "@ethersproject/base64": { - "version": "5.0.0-beta.132", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.0.0-beta.132.tgz", - "integrity": "sha512-zLpyJ6BzxTipQUERRy3cj2RbPvUKJ8wqTDvPmtELXdJcMttULBBkAHBWLqY+19K9K8VL08bE72sfr6QeLz9h5g==", + "version": "5.0.0-beta.133", + "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.0.0-beta.133.tgz", + "integrity": "sha512-y9aveGc/WQQuRwQ/uAQDmoZ3ybDzTcUvQ1fgQeO9m+H0A/YBGW+Rkm04NcM3xoul3BP8jpulRKcUIUvVwERdbw==", "requires": { "@ethersproject/bytes": ">=5.0.0-beta.129" } @@ -2311,9 +2311,9 @@ } }, "@ethersproject/bignumber": { - "version": "5.0.0-beta.137", - "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.0.0-beta.137.tgz", - "integrity": "sha512-X96uhPzTkw4TSs4ZT8kCAVuJP/j7zi6pL1RO7CfY3f5Alg+cA1Ngpv+XjGQOau1RWrLl+qReGMaJgNxd9U9svw==", + "version": "5.0.0-beta.138", + "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.0.0-beta.138.tgz", + "integrity": "sha512-DTlOEJw6jAFz7/qkY8p4mPGGHVwgYUUC5rk1Pbg2/gR/gHPFDim+uBY+XGavh0QSWd1i3hXKafVPre92j4fs5g==", "requires": { "@ethersproject/bytes": ">=5.0.0-beta.129", "@ethersproject/logger": ">=5.0.0-beta.129", @@ -2338,9 +2338,9 @@ } }, "@ethersproject/contracts": { - "version": "5.0.0-beta.148", - "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.0.0-beta.148.tgz", - "integrity": "sha512-SbNlBNY8/RCoMajF1r5aWkcGi9lh2YfQWTUFpc5Wt00+H22TiZbHBnHJyTINxIeo2485mlEUlEDriFVf2qfGWw==", + "version": "5.0.0-beta.150", + "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.0.0-beta.150.tgz", + "integrity": "sha512-ODHv8o3dJPXo2vTtQ1dmla6KhykTtYlgQxwgyyYXt/r2PhMVyFQsljVYkJRUuHgC17WYBopmWGeVeYAxNeOhtQ==", "requires": { "@ethersproject/abi": ">=5.0.0-beta.137", "@ethersproject/abstract-provider": ">=5.0.0-beta.131", @@ -2366,9 +2366,9 @@ } }, "@ethersproject/hdnode": { - "version": "5.0.0-beta.138", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.0-beta.138.tgz", - "integrity": "sha512-Wzpl1QmCdslGyWkxFgLTGhbGz8ABSGucoRQb+HmB0cZ0RwP87jd0NMTIGu4oYopkTzU06m+Fyyg80buSupIqgA==", + "version": "5.0.0-beta.139", + "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.0-beta.139.tgz", + "integrity": "sha512-VOg9bZDNO1OC5Ryph3iNof1i4Te5b3thiEyGqOIQaN2esfGWkt6nUvHRy5na6knjyBY68zVr7yj39LdX5rsOPA==", "requires": { "@ethersproject/abstract-signer": ">=5.0.0-beta.132", "@ethersproject/basex": ">=5.0.0-beta.127", @@ -2385,9 +2385,9 @@ } }, "@ethersproject/json-wallets": { - "version": "5.0.0-beta.137", - "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.0.0-beta.137.tgz", - "integrity": "sha512-fPCCQNBS/ph5/4Wh5qWnyOST6q1nqa2R+QzY2e/k/AeQ1RgEhaFABZbj41dfgfajk15TD44wKVkXzzrarFKDWA==", + "version": "5.0.0-beta.138", + "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.0.0-beta.138.tgz", + "integrity": "sha512-cyJ8WX5/hYduA0I8SWujY+usO9DV1mmpmEfLrkd8JWecdByMhWTXZfgsJY92u98AoKyGm8vjAIVuLcA++Xuffg==", "requires": { "@ethersproject/abstract-signer": ">=5.0.0-beta.132", "@ethersproject/address": ">=5.0.0-beta.128", @@ -2434,9 +2434,9 @@ } }, "@ethersproject/logger": { - "version": "5.0.0-beta.136", - "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.0.0-beta.136.tgz", - "integrity": "sha512-baWK/4ccsVcyUU20nhp7k+hoRYsiaOfURYlyvQCoUUFKD3mpSRQCH42wxCosZZSCWz4rTHgASLQDdKkBtNVz1w==" + "version": "5.0.0-beta.137", + "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.0.0-beta.137.tgz", + "integrity": "sha512-H36iMhWOY+tco1+o2NZUdQT8Gc6Y9795RSPgvluatvjvyt3X6mHtWXes4F8Rc5N/95px++a/ODYVSkSmlr68+A==" }, "@ethersproject/networks": { "version": "5.0.0-beta.136", @@ -2447,26 +2447,26 @@ } }, "@ethersproject/pbkdf2": { - "version": "5.0.0-beta.134", - "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.0.0-beta.134.tgz", - "integrity": "sha512-ic9QwtaEzQANF4xggwh4LT3YtNEClxJZFpUPrbS+BTZ63R1hPhw+xVCtfHuKSOy2xZ4z8Sm6v8RHG6QoZrsthA==", + "version": "5.0.0-beta.135", + "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.0.0-beta.135.tgz", + "integrity": "sha512-j5bMqkEPwd7NcbF1Z4FI5rNZvydEKWx4EcxJd0vMN/DLSk0wilCVRcFuuz5w+sSc6sERbkNpD7AQh8a5whZsvQ==", "requires": { "@ethersproject/bytes": ">=5.0.0-beta.129", "@ethersproject/sha2": ">=5.0.0-beta.129" } }, "@ethersproject/properties": { - "version": "5.0.0-beta.138", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.0-beta.138.tgz", - "integrity": "sha512-vLVftNTxonJ0SkkcMcpXHN9pABD84clh+Cz3TV79qvh+lc0MFX3dnYL1JinBdFnqLPXU9vw2LbTrBhwQY8bzCQ==", + "version": "5.0.0-beta.139", + "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.0-beta.139.tgz", + "integrity": "sha512-IFMEWxWkx8ATeGtY56pnHXK40eJgfO9UeEsK/24Qzwyl5jA5Lhz6OoElaW3UG5LLupHmLoRuLyuG1WNg2olC3A==", "requires": { "@ethersproject/logger": ">=5.0.0-beta.129" } }, "@ethersproject/providers": { - "version": "5.0.0-beta.162", - "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.0-beta.162.tgz", - "integrity": "sha512-mXT5pQLOmRkXP5pza6TuV9RitaI50b1O2r0og8VzUIHcjO9bq4yppVbWs0Zcxn4KQAiIrAd2xXbYE3q2KdfUYQ==", + "version": "5.0.0-beta.164", + "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.0-beta.164.tgz", + "integrity": "sha512-c8pu+eYROr88dfDuW9aImESq2nHupzE5fFERHwLMQnl5eW20iEy37/1CEIRhjhBsHtRA/JpFPSRKPr4o1RcF4Q==", "requires": { "@ethersproject/abstract-provider": ">=5.0.0-beta.131", "@ethersproject/abstract-signer": ">=5.0.0-beta.132", @@ -2494,9 +2494,9 @@ } }, "@ethersproject/random": { - "version": "5.0.0-beta.134", - "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.0.0-beta.134.tgz", - "integrity": "sha512-diq2+ycpNFQKgbR7ZNwXV5wIGiVZ7dQkMuKVLp6Essh4xLDsyLiplHLgMTICDNicaWbq8c87kFEFy/7360HlOw==", + "version": "5.0.0-beta.135", + "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.0.0-beta.135.tgz", + "integrity": "sha512-wYboNR0L8eYCpwYT2PiOD7mwPMj26i94FyQmt4DONAsBrvLCrEYYFmY2uqUMBrb5E4DVoubh4ObevAYTjriYaQ==", "requires": { "@ethersproject/bytes": ">=5.0.0-beta.129", "@ethersproject/logger": ">=5.0.0-beta.129" @@ -2512,9 +2512,9 @@ } }, "@ethersproject/sha2": { - "version": "5.0.0-beta.135", - "resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.0.0-beta.135.tgz", - "integrity": "sha512-DK/cUT5ilCVLtf1xk7XDPB9xGHsXiU3TsULKsEg823cTBIhFl2l0IiHAGqu9uiMlSJRpb2BwrWQuMgmFe/vMwQ==", + "version": "5.0.0-beta.136", + "resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.0.0-beta.136.tgz", + "integrity": "sha512-MUxCjFhCPRSggkoQN5H1nbDlC5GpAJpvIWInTTqVP0bN/0vRZ8BuyoYi1Xb961xpSoYlZwJjK8e6/5j346f6Hw==", "requires": { "@ethersproject/bytes": ">=5.0.0-beta.129", "@ethersproject/logger": ">=5.0.0-beta.129", @@ -2554,9 +2554,9 @@ } }, "@ethersproject/transactions": { - "version": "5.0.0-beta.134", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.0.0-beta.134.tgz", - "integrity": "sha512-06VxNv6UHds153Ey3WJ2YDPReNkwmIm8fyuJOXRZ6IoYh5ns5CfR4fkmHSBtw7+/KIVjmRoMQZ4Yg/tcGmzz0A==", + "version": "5.0.0-beta.135", + "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.0.0-beta.135.tgz", + "integrity": "sha512-QdXLrm+e4XyaC1QSFW+mfj4/g7/ia/OiAdOQxYcuUsbSHI5ijXFeF2JBzvMuP8pprIfhFkiCuxWI8oXiFGAdRA==", "requires": { "@ethersproject/address": ">=5.0.0-beta.128", "@ethersproject/bignumber": ">=5.0.0-beta.130", @@ -2570,9 +2570,9 @@ } }, "@ethersproject/wallet": { - "version": "5.0.0-beta.139", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.0-beta.139.tgz", - "integrity": "sha512-zpcB/ooB9Ts+Qq7PWvFd71qaogBYuOzgQ3oB9WRmxag/MDyu7l6OccG/WG7PoGWIOCyUKF7B/Z5kIIL6uEaRaA==", + "version": "5.0.0-beta.140", + "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.0-beta.140.tgz", + "integrity": "sha512-woVhEFsoTmOWf8AByKuP5XvQ/8gsmOSxvthEblgfyKyFh3wsO2cEV+6F0ITerj62reJ1MPof+RDUYaw0JCSCYA==", "requires": { "@ethersproject/abstract-provider": ">=5.0.0-beta.131", "@ethersproject/abstract-signer": ">=5.0.0-beta.132", @@ -2592,32 +2592,20 @@ } }, "@ethersproject/web": { - "version": "5.0.0-beta.136", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.0-beta.136.tgz", - "integrity": "sha512-slJ+6diNl1ZuHhAO0OPX11BAhfyZtD5oxbpEp3+A/agR+iHKMmC5AZTJU0vhl2622Jpx21Aa35s2IHU2lPui5A==", + "version": "5.0.0-beta.137", + "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.0-beta.137.tgz", + "integrity": "sha512-A5pyWFSVjUHK/etvAkX3tOTMe6Vn1oOReFUCZ/wUzECJE4fLLLPs1e+MKkkcEKtJygeo8rc0sDuNj/EjN8U7+Q==", "requires": { "@ethersproject/base64": ">=5.0.0-beta.126", "@ethersproject/logger": ">=5.0.0-beta.129", "@ethersproject/properties": ">=5.0.0-beta.131", - "@ethersproject/strings": ">=5.0.0-beta.130", - "cross-fetch": "3.0.4" - }, - "dependencies": { - "cross-fetch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.4.tgz", - "integrity": "sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw==", - "requires": { - "node-fetch": "2.6.0", - "whatwg-fetch": "3.0.0" - } - } + "@ethersproject/strings": ">=5.0.0-beta.130" } }, "@ethersproject/wordlists": { - "version": "5.0.0-beta.135", - "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.0.0-beta.135.tgz", - "integrity": "sha512-hGwIme0in4cJrhdumTJVc1OLEa7S/oxALMOION4C+31yKFdWfX00dOXi6aqokWkGaUQXvmHz4r9/GhfqzoB2Qg==", + "version": "5.0.0-beta.136", + "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.0.0-beta.136.tgz", + "integrity": "sha512-KBRUlUljdnQh2jGXZi6tvAU8rdUzsg5/ErWIcO2lhcMn7LKaLGhedmKHsHDwETWLzHWbsEK6728R9UHrTvaakw==", "requires": { "@ethersproject/bytes": ">=5.0.0-beta.129", "@ethersproject/hash": ">=5.0.0-beta.128", @@ -3142,16 +3130,16 @@ } }, "@material-ui/core": { - "version": "4.9.11", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.9.11.tgz", - "integrity": "sha512-S2Ha9GpTxzl29XMeMc8dQX2pj97yApNzuhe/23If53fMdg5Fmd3SgbE1bMbyXeKhxwtXZjOFxd0vU+W/sez8Ew==", + "version": "4.9.13", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.9.13.tgz", + "integrity": "sha512-GEXNwUr+laZ0N+F1efmHB64Fyg+uQIRXLqbSejg3ebSXgLYNpIjnMOPRfWdu4rICq0dAIgvvNXGkKDMcf3AMpA==", "requires": { "@babel/runtime": "^7.4.4", - "@material-ui/react-transition-group": "^4.2.0", - "@material-ui/styles": "^4.9.10", - "@material-ui/system": "^4.9.10", + "@material-ui/react-transition-group": "^4.3.0", + "@material-ui/styles": "^4.9.13", + "@material-ui/system": "^4.9.13", "@material-ui/types": "^5.0.1", - "@material-ui/utils": "^4.9.6", + "@material-ui/utils": "^4.9.12", "@types/react-transition-group": "^4.2.0", "clsx": "^1.0.4", "hoist-non-react-statics": "^3.3.2", @@ -3220,15 +3208,15 @@ } }, "@material-ui/styles": { - "version": "4.9.10", - "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.9.10.tgz", - "integrity": "sha512-EXIXlqVyFDnjXF6tj72y6ZxiSy+mHtrsCo3Srkm3XUeu3Z01aftDBy7ZSr3TQ02gXHTvDSBvegp3Le6p/tl7eA==", + "version": "4.9.13", + "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.9.13.tgz", + "integrity": "sha512-lWlXJanBdHQ18jW/yphedRokHcvZD1GdGzUF/wQxKDsHwDDfO45ZkAxuSBI202dG+r1Ph483Z3pFykO2obeSRA==", "requires": { "@babel/runtime": "^7.4.4", "@emotion/hash": "^0.8.0", "@material-ui/types": "^5.0.1", "@material-ui/utils": "^4.9.6", - "clsx": "^1.0.2", + "clsx": "^1.0.4", "csstype": "^2.5.2", "hoist-non-react-statics": "^3.3.2", "jss": "^10.0.3", @@ -3243,9 +3231,9 @@ } }, "@material-ui/system": { - "version": "4.9.10", - "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.9.10.tgz", - "integrity": "sha512-E+t0baX2TBZk6ALm8twG6objpsxLdMM4MDm1++LMt2m7CetCAEc3aIAfDaprk4+tm5hFT1Cah5dRWk8EeIFQYw==", + "version": "4.9.13", + "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.9.13.tgz", + "integrity": "sha512-6AlpvdW6KJJ5bF1Xo2OD13sCN8k+nlL36412/bWnWZOKIfIMo/Lb8c8d1DOIaT/RKWxTEUaWnKZjabVnA3eZjA==", "requires": { "@babel/runtime": "^7.4.4", "@material-ui/utils": "^4.9.6", @@ -3258,9 +3246,9 @@ "integrity": "sha512-wURPSY7/3+MAtng3i26g+WKwwNE3HEeqa/trDBR5+zWKmcjO+u9t7Npu/J1r+3dmIa/OeziN9D/18IrBKvKffw==" }, "@material-ui/utils": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.9.6.tgz", - "integrity": "sha512-gqlBn0JPPTUZeAktn1rgMcy9Iczrr74ecx31tyZLVGdBGGzsxzM6PP6zeS7FuoLS6vG4hoZP7hWnOoHtkR0Kvw==", + "version": "4.9.12", + "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.9.12.tgz", + "integrity": "sha512-/0rgZPEOcZq5CFA4+4n6Q6zk7fi8skHhH2Bcra8R3epoJEYy5PL55LuMazPtPH1oKeRausDV/Omz4BbgFsn1HQ==", "requires": { "@babel/runtime": "^7.4.4", "prop-types": "^15.7.2", @@ -3720,9 +3708,9 @@ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" }, "@solidity-parser/parser": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.5.2.tgz", - "integrity": "sha512-uRyvnvVYmgNmTBpWDbBsH/0kPESQhQpEc4KsvMRLVzFJ1o1s0uIv0Y6Y9IB5vI1Dwz2CbS4X/y4Wyw/75cTFnQ==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.6.0.tgz", + "integrity": "sha512-RiJXfS22frulogcfQCFhbKrd5ATu6P4tYUv/daChiIh6VHyKQ1kkVZVfX6aP7c2YGU/Bf9RwGNKdwLjfpaoqYQ==", "dev": true }, "@stablelib/utf8": { @@ -4113,9 +4101,9 @@ "dev": true }, "css-loader": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.2.tgz", - "integrity": "sha512-hDL0DPopg6zQQSRlZm0hyeaqIRnL0wbWjay9BZxoiJBpbfOW4WHfbaYQhwnDmEa0kZUc1CJ3IFo15ot1yULMIQ==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz", + "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==", "dev": true, "requires": { "camelcase": "^5.3.1", @@ -4129,7 +4117,7 @@ "postcss-modules-scope": "^2.2.0", "postcss-modules-values": "^3.0.0", "postcss-value-parser": "^4.0.3", - "schema-utils": "^2.6.5", + "schema-utils": "^2.6.6", "semver": "^6.3.0" } }, @@ -4176,9 +4164,9 @@ "dev": true }, "html-webpack-plugin": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.2.0.tgz", - "integrity": "sha512-zL7LYTuq/fcJX6vV6tmmvFR508Bd9e6kvVGbS76YAjZ2CPVRzsjkvDYs/SshPevpolSdTWgaDV39D6k6oQoVFw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz", + "integrity": "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w==", "dev": true, "requires": { "@types/html-minifier-terser": "^5.0.0", @@ -4283,9 +4271,9 @@ "dev": true }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -4398,9 +4386,9 @@ } }, "postcss-value-parser": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", - "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", "dev": true }, "resolve-from": { @@ -4465,13 +4453,13 @@ } }, "style-loader": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.4.tgz", - "integrity": "sha512-SbBHRD8fwK3pX+4UDF4ETxUF0+rCvk29LWTTI7Rt0cgsDjAj3SWM76ByTe6u2+4IlJ/WwluB7wuslWETCoPQdg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz", + "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==", "dev": true, "requires": { "loader-utils": "^2.0.0", - "schema-utils": "^2.6.5" + "schema-utils": "^2.6.6" }, "dependencies": { "loader-utils": { @@ -4990,139 +4978,147 @@ "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==" }, "web3-core": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.6.tgz", - "integrity": "sha512-y/QNBFtr5cIR8vxebnotbjWJpOnO8LDYEAzZjeRRUJh2ijmhjoYk7dSNx9ExgC0UCfNFRoNCa9dGRu/GAxwRlw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.7.tgz", + "integrity": "sha512-QA0MTae0gXcr3KHe3cQ4x56+Wh43ZKWfMwg1gfCc3NNxPRM1jJ8qudzyptCAUcxUGXWpDG8syLIn1APDz5J8BQ==", "requires": { "@types/bn.js": "^4.11.4", "@types/node": "^12.6.1", - "web3-core-helpers": "1.2.6", - "web3-core-method": "1.2.6", - "web3-core-requestmanager": "1.2.6", - "web3-utils": "1.2.6" + "bignumber.js": "^9.0.0", + "web3-core-helpers": "1.2.7", + "web3-core-method": "1.2.7", + "web3-core-requestmanager": "1.2.7", + "web3-utils": "1.2.7" } }, "web3-core-helpers": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.6.tgz", - "integrity": "sha512-gYKWmC2HmO7RcDzpo4L1K8EIoy5L8iubNDuTC6q69UxczwqKF/Io0kbK/1Z10Av++NlzOSiuyGp2gc4t4UOsDw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.7.tgz", + "integrity": "sha512-bdU++9QATGeCetVrMp8pV97aQtVkN5oLBf/TWu/qumC6jK/YqrvLlBJLdwbz0QveU8zOSap6GCvJbqKvmmbV2A==", "requires": { "underscore": "1.9.1", - "web3-eth-iban": "1.2.6", - "web3-utils": "1.2.6" + "web3-eth-iban": "1.2.7", + "web3-utils": "1.2.7" } }, "web3-core-method": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.6.tgz", - "integrity": "sha512-r2dzyPEonqkBg7Mugq5dknhV5PGaZTHBZlS/C+aMxNyQs3T3eaAsCTqlQDitwNUh/sUcYPEGF0Vo7ahYK4k91g==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.7.tgz", + "integrity": "sha512-e1TI0QUnByDMbQ8QHwnjxfjKw0LIgVRY4TYrlPijET9ebqUJU1HCayn/BHIMpV6LKyR1fQj9EldWyT64wZQXkg==", "requires": { "underscore": "1.9.1", - "web3-core-helpers": "1.2.6", - "web3-core-promievent": "1.2.6", - "web3-core-subscriptions": "1.2.6", - "web3-utils": "1.2.6" + "web3-core-helpers": "1.2.7", + "web3-core-promievent": "1.2.7", + "web3-core-subscriptions": "1.2.7", + "web3-utils": "1.2.7" } }, "web3-core-promievent": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.6.tgz", - "integrity": "sha512-km72kJef/qtQNiSjDJJVHIZvoVOm6ytW3FCYnOcCs7RIkviAb5JYlPiye0o4pJOLzCXYID7DK7Q9bhY8qWb1lw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.7.tgz", + "integrity": "sha512-jNmsM/czCeMGQqKKwM9/HZVTJVIF96hdMVNN/V9TGvp+EEE7vDhB4pUocDnc/QF9Z/5QFBCVmvNWttlRgZmU0A==", "requires": { - "any-promise": "1.3.0", "eventemitter3": "3.1.2" } }, "web3-core-requestmanager": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.6.tgz", - "integrity": "sha512-QU2cbsj9Dm0r6om40oSwk8Oqbp3wTa08tXuMpSmeOTkGZ3EMHJ1/4LiJ8shwg1AvPMrKVU0Nri6+uBNCdReZ+g==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.7.tgz", + "integrity": "sha512-HJb/txjHixu1dxIebiZQKBoJCaNu4gsh7mq/uj6Z/w6tIHbybL90s/7ADyMED353yyJ2tDWtYJqeMVAR+KtdaA==", "requires": { "underscore": "1.9.1", - "web3-core-helpers": "1.2.6", - "web3-providers-http": "1.2.6", - "web3-providers-ipc": "1.2.6", - "web3-providers-ws": "1.2.6" + "web3-core-helpers": "1.2.7", + "web3-providers-http": "1.2.7", + "web3-providers-ipc": "1.2.7", + "web3-providers-ws": "1.2.7" } }, "web3-core-subscriptions": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.6.tgz", - "integrity": "sha512-M0PzRrP2Ct13x3wPulFtc5kENH4UtnPxO9YxkfQlX2WRKENWjt4Rfq+BCVGYEk3rTutDfWrjfzjmqMRvXqEY5Q==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.7.tgz", + "integrity": "sha512-W/CzQYOUawdMDvkgA/fmLsnG5aMpbjrs78LZMbc0MFXLpH3ofqAgO2by4QZrrTShUUTeWS0ZuEkFFL/iFrSObw==", "requires": { "eventemitter3": "3.1.2", "underscore": "1.9.1", - "web3-core-helpers": "1.2.6" + "web3-core-helpers": "1.2.7" } }, "web3-eth-abi": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.6.tgz", - "integrity": "sha512-w9GAyyikn8nSifSDZxAvU9fxtQSX+W2xQWMmrtTXmBGCaE4/ywKOSPAO78gq8AoU4Wq5yqVGKZLLbfpt7/sHlA==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.7.tgz", + "integrity": "sha512-4FnlT1q+D0XBkxSMXlIb/eG337uQeMaUdtVQ4PZ3XzxqpcoDuMgXm4o+3NRxnWmr4AMm6QKjM+hcC7c0mBKcyg==", "requires": { "ethers": "4.0.0-beta.3", "underscore": "1.9.1", - "web3-utils": "1.2.6" + "web3-utils": "1.2.7" } }, "web3-eth-contract": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.6.tgz", - "integrity": "sha512-ak4xbHIhWgsbdPCkSN+HnQc1SH4c856y7Ly+S57J/DQVzhFZemK5HvWdpwadJrQTcHET3ZeId1vq3kmW7UYodw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.7.tgz", + "integrity": "sha512-uW23Y0iL7XroRNbf9fWZ1N6OYhEYTJX8gTuYASuRnpYrISN5QGiQML6pq/NCzqypR1bl5E0fuINZQSK/xefIVw==", "requires": { "@types/bn.js": "^4.11.4", "underscore": "1.9.1", - "web3-core": "1.2.6", - "web3-core-helpers": "1.2.6", - "web3-core-method": "1.2.6", - "web3-core-promievent": "1.2.6", - "web3-core-subscriptions": "1.2.6", - "web3-eth-abi": "1.2.6", - "web3-utils": "1.2.6" + "web3-core": "1.2.7", + "web3-core-helpers": "1.2.7", + "web3-core-method": "1.2.7", + "web3-core-promievent": "1.2.7", + "web3-core-subscriptions": "1.2.7", + "web3-eth-abi": "1.2.7", + "web3-utils": "1.2.7" } }, "web3-eth-iban": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.6.tgz", - "integrity": "sha512-TPMc3BW9Iso7H+9w+ytbqHK9wgOmtocyCD3PaAe5Eie50KQ/j7ThA60dGJnxItVo6yyRv5pZAYxPVob9x/fJlg==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.7.tgz", + "integrity": "sha512-2NrClz1PoQ3nSJBd+91ylCOVga9qbTxjRofq/oSCoHVAEvz3WZyttx9k5DC+0rWqwJF1h69ufFvdHAAlmN/4lg==", "requires": { "bn.js": "4.11.8", - "web3-utils": "1.2.6" + "web3-utils": "1.2.7" } }, "web3-providers-http": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.6.tgz", - "integrity": "sha512-2+SaFCspb5f82QKuHB3nEPQOF9iSWxRf7c18fHtmnLNVkfG9SwLN1zh67bYn3tZGUdOI3gj8aX4Uhfpwx9Ezpw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.7.tgz", + "integrity": "sha512-vazGx5onuH/zogrwkUaLFJwFcJ6CckP65VFSHoiV+GTQdkOqgoDIha7StKkslvDz4XJ2FuY/zOZHbtuOYeltXQ==", "requires": { - "web3-core-helpers": "1.2.6", + "web3-core-helpers": "1.2.7", "xhr2-cookies": "1.1.0" } }, "web3-providers-ipc": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.6.tgz", - "integrity": "sha512-b0Es+/GTZyk5FG3SgUDW+2/mBwJAXWt5LuppODptiOas8bB2khLjG6+Gm1K4uwOb+1NJGPt5mZZ8Wi7vibtQ+A==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.7.tgz", + "integrity": "sha512-/zc0y724H2zbkV4UbGGMhsEiLfafjagIzfrsWZnyTZUlSB0OGRmmFm2EkLJAgtXrLiodaHHyXKM0vB8S24bxdA==", "requires": { "oboe": "2.1.4", "underscore": "1.9.1", - "web3-core-helpers": "1.2.6" + "web3-core-helpers": "1.2.7" } }, "web3-providers-ws": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.6.tgz", - "integrity": "sha512-20waSYX+gb5M5yKhug5FIwxBBvkKzlJH7sK6XEgdOx6BZ9YYamLmvg9wcRVtnSZO8hV/3cWenO/tRtTrHVvIgQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.7.tgz", + "integrity": "sha512-b5XzqDpRkNVe6MFs5K6iqOEyjQikHtg3KuU2/ClCDV37hm0WN4xCRVMC0LwegulbDXZej3zT9+1CYzGaGFREzA==", "requires": { "@web3-js/websocket": "^1.0.29", + "eventemitter3": "^4.0.0", "underscore": "1.9.1", - "web3-core-helpers": "1.2.6" + "web3-core-helpers": "1.2.7" + }, + "dependencies": { + "eventemitter3": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", + "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" + } } }, "web3-utils": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.6.tgz", - "integrity": "sha512-8/HnqG/l7dGmKMgEL9JeKPTtjScxOePTzopv5aaKFExPfaBrYRkgoMqhoowCiAl/s16QaTn4DoIF1QC4YsT7Mg==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.7.tgz", + "integrity": "sha512-FBh/CPJND+eiPeUF9KVbTyTZtXNWxPWtByBaWS6e2x4ACazPX711EeNaZaChIOGSLGe6se2n7kg6wnawe/MjuQ==", "requires": { "bn.js": "4.11.8", "eth-lib": "0.2.7", @@ -5137,13 +5133,13 @@ } }, "@toruslabs/torus-embed": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@toruslabs/torus-embed/-/torus-embed-1.3.0.tgz", - "integrity": "sha512-oZO7pFYjQCAXD/MvnhBEYPFf3rKt6eabT3l6f3OOlvOMW3LUxYOGnILgRx4sNwL9RR2YfU2qN5NbtQ3nUJcNFA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@toruslabs/torus-embed/-/torus-embed-1.3.1.tgz", + "integrity": "sha512-6/RZjSAp1BhJ8UtnG5fetlQIp0+Ks/vqDC1pQ2As4C3eR4vOLRoxj5BwGriju132NQRVjN4nKbxz/Ez6EN2bJA==", "requires": { "@chaitanyapotti/random-id": "^1.0.3", - "@toruslabs/fetch-node-details": "^2.2.0", - "@toruslabs/torus.js": "^2.1.0", + "@toruslabs/fetch-node-details": "^2.2.1", + "@toruslabs/torus.js": "^2.1.2", "create-hash": "^1.2.0", "eth-json-rpc-errors": "^2.0.2", "fast-deep-equal": "^3.1.1", @@ -5217,9 +5213,9 @@ } }, "web3-utils": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.6.tgz", - "integrity": "sha512-8/HnqG/l7dGmKMgEL9JeKPTtjScxOePTzopv5aaKFExPfaBrYRkgoMqhoowCiAl/s16QaTn4DoIF1QC4YsT7Mg==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.7.tgz", + "integrity": "sha512-FBh/CPJND+eiPeUF9KVbTyTZtXNWxPWtByBaWS6e2x4ACazPX711EeNaZaChIOGSLGe6se2n7kg6wnawe/MjuQ==", "requires": { "bn.js": "4.11.8", "eth-lib": "0.2.7", @@ -5279,9 +5275,9 @@ } }, "@types/babel__traverse": { - "version": "7.0.10", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.10.tgz", - "integrity": "sha512-74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw==", + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz", + "integrity": "sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==", "dev": true, "requires": { "@babel/types": "^7.3.0" @@ -5429,9 +5425,9 @@ } }, "@types/jquery": { - "version": "3.3.35", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.35.tgz", - "integrity": "sha512-pnIELWhHXJ7RgoFylhiTxD+96QlKBJfEx8JCLj963/dh7zBOKFkZ6rlNqbaCcn2JZrsAxCI8WhgRXznBx2iDsA==", + "version": "3.3.37", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.37.tgz", + "integrity": "sha512-4MNntGYm6xdDiz2+B92xEmWcFN9mOeMXqS854lSe7LDpBhzscUjvXjCAl6JwPBtAkqmPZq+L4I5UyXXNDZyq4Q==", "dev": true, "requires": { "@types/sizzle": "*" @@ -5530,9 +5526,9 @@ } }, "@types/reach__router": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.4.tgz", - "integrity": "sha512-DZgYfxUIlVSjvf0AvBbYNbpXLrTFNNpU1HrvCRbnMtx3nvGUUWC1/zlAe4dD4FCPFtc+LQuIPEsDiTb0zQkthg==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.5.tgz", + "integrity": "sha512-h0NbqXN/tJuBY/xggZSej1SKQEstbHO7J/omt1tYoFGmj3YXOodZKbbqD4mNDh7zvEGYd7YFrac1LTtAr3xsYQ==", "dev": true, "requires": { "@types/history": "*", @@ -5558,9 +5554,9 @@ } }, "@types/react-dom": { - "version": "16.9.6", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.6.tgz", - "integrity": "sha512-S6ihtlPMDotrlCJE9ST1fRmYrQNNwfgL61UB4I1W7M6kPulUKx9fXAleW5zpdIjUQ4fTaaog8uERezjsGUj9HQ==", + "version": "16.9.7", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.7.tgz", + "integrity": "sha512-GHTYhM8/OwUCf254WO5xqR/aqD3gC9kSTLpopWGpQLpnw23jk44RvMHsyUSEplvRJZdHxhJGMMLF0kCPYHPhQA==", "dev": true, "requires": { "@types/react": "*" @@ -5627,9 +5623,9 @@ } }, "@types/react-router": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.5.tgz", - "integrity": "sha512-RZPdCtZympi6X7EkGyaU7ISiAujDYTWgqMF9owE3P6efITw27IWQykcti0BvA5h4Mu1LLl5rxrpO3r8kHyUZ/Q==", + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.7.tgz", + "integrity": "sha512-2ouP76VQafKjtuc0ShpwUebhHwJo0G6rhahW9Pb8au3tQTjYXd2jta4wv6U2tGLR/I42yuG00+UXjNYY0dTzbg==", "dev": true, "requires": { "@types/history": "*", @@ -5660,9 +5656,9 @@ } }, "@types/react-select": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.11.tgz", - "integrity": "sha512-ggUsAdZuRFtLMjGMcdf9SeeE678TRq3lAKj1fbwGM8JAZTIzCu1CED0dvJgFVCPT2bDs8TcBD6+6SN6i4e7JYQ==", + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.12.tgz", + "integrity": "sha512-3NVEc1sbaNtI1b06smzr9dlNKTkYWttL27CdEsorMvd2EgTOM/PJmrzkClaVQmBDg52MzQO05xVwNZruEUKpHw==", "dev": true, "requires": { "@types/react": "*", @@ -5922,25 +5918,25 @@ "integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==" }, "@typescript-eslint/eslint-plugin": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.29.0.tgz", - "integrity": "sha512-X/YAY7azKirENm4QRpT7OVmzok02cSkqeIcLmdz6gXUQG4Hk0Fi9oBAynSAyNXeGdMRuZvjBa0c1Lu0dn/u6VA==", + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz", + "integrity": "sha512-iIC0Pb8qDaoit+m80Ln/aaeu9zKQdOLF4SHcGLarSeY1gurW6aU4JsOPMjKQwXlw70MvWKZQc6S2NamA8SJ/gg==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "2.29.0", + "@typescript-eslint/experimental-utils": "2.31.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz", - "integrity": "sha512-H/6VJr6eWYstyqjWXBP2Nn1hQJyvJoFdDtsHxGiD+lEP7piGnGpb/ZQd+z1ZSB1F7dN+WsxUDh8+S4LwI+f3jw==", + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz", + "integrity": "sha512-MI6IWkutLYQYTQgZ48IVnRXmLR/0Q6oAyJgiOror74arUMh7EWjJkADfirZhRsUMHeLJ85U2iySDwHTSnNi9vA==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.29.0", + "@typescript-eslint/typescript-estree": "2.31.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" }, @@ -5958,21 +5954,21 @@ } }, "@typescript-eslint/parser": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.29.0.tgz", - "integrity": "sha512-H78M+jcu5Tf6m/5N8iiFblUUv+HJDguMSdFfzwa6vSg9lKR8Mk9BsgeSjO8l2EshKnJKcbv0e8IDDOvSNjl0EA==", + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.31.0.tgz", + "integrity": "sha512-uph+w6xUOlyV2DLSC6o+fBDzZ5i7+3/TxAsH4h3eC64tlga57oMb96vVlXoMwjR/nN+xyWlsnxtbDkB46M2EPQ==", "dev": true, "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.29.0", - "@typescript-eslint/typescript-estree": "2.29.0", + "@typescript-eslint/experimental-utils": "2.31.0", + "@typescript-eslint/typescript-estree": "2.31.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz", - "integrity": "sha512-3YGbtnWy4az16Egy5Fj5CckkVlpIh0MADtAQza+jiMADRSKkjdpzZp/5WuvwK/Qib3Z0HtzrDFeWanS99dNhnA==", + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz", + "integrity": "sha512-vxW149bXFXXuBrAak0eKHOzbcu9cvi6iNcJDzEtOkRwGHxJG15chiAQAwhLOsk+86p9GTr/TziYvw+H9kMaIgA==", "dev": true, "requires": { "debug": "^4.1.1", @@ -6144,9 +6140,9 @@ } }, "chokidar": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", - "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", "dev": true, "requires": { "anymatch": "~3.1.1", @@ -6156,7 +6152,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.3.0" + "readdirp": "~3.4.0" } }, "cli-cursor": { @@ -6189,10 +6185,13 @@ } }, "ejs": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.0.2.tgz", - "integrity": "sha512-IncmUpn1yN84hy2shb0POJ80FWrfGNY0cxO9f4v+/sG7qcBvAtVWUA1IdzY/8EYUmOVhoKJVdJjNd3AZcnxOjA==", - "dev": true + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.2.tgz", + "integrity": "sha512-zFuywxrAWtX5Mk2KAuoJNkXXbfezpNA0v7i+YC971QORguPekpjpAgeOv99YWSdKXwj7JxI2QAWDeDkE8fWtXw==", + "dev": true, + "requires": { + "jake": "^10.6.1" + } }, "emoji-regex": { "version": "8.0.0", @@ -6349,12 +6348,12 @@ "dev": true }, "readdirp": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", - "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "dev": true, "requires": { - "picomatch": "^2.0.7" + "picomatch": "^2.2.1" } }, "restore-cursor": { @@ -7072,9 +7071,9 @@ }, "dependencies": { "@types/node": { - "version": "13.13.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz", - "integrity": "sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A==" + "version": "13.13.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz", + "integrity": "sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==" } } }, @@ -8247,9 +8246,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -8269,9 +8268,9 @@ } }, "postcss-value-parser": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", - "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", "dev": true }, "source-map": { @@ -8398,9 +8397,9 @@ "dev": true }, "source-map-support": { - "version": "0.5.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz", - "integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -10384,9 +10383,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001046", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz", - "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==" + "version": "1.0.30001050", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001050.tgz", + "integrity": "sha512-OvGZqalCwmapci76ISq5q4kuAskb1ebqF3FEQBv1LE1kWht0pojlDDqzFlmk5jgYkuZN7MNZ1n+ULwe/7MaDNQ==" }, "capture-exit": { "version": "2.0.0", @@ -11621,9 +11620,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -11877,9 +11876,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -11980,9 +11979,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -12060,9 +12059,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -12163,14 +12162,14 @@ "integrity": "sha512-qNM9eqlxd53TWJeGtY1IQPj90b563Zx49eZs8e0uMyEvPgvNVmX1uZDtdzAcflB3PniuH9creAzcFOdyJ9YGvA==" }, "csv-parse": { - "version": "4.8.9", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.8.9.tgz", - "integrity": "sha512-uDxIDIDLb89gxqixSgGqDj3EA5A8D0pgUeyp9Qut8u+eCIC8IXkTtaxJEnnWDb6N2HqBY64suSlcOGg5ZBtsAQ==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.9.0.tgz", + "integrity": "sha512-SaFMvRWzobY9z0Nxg+q5pXvU2JY7p++icb1Bb/ZwGSLv058cLabhGg3YNpLPI2KALtZnoe/oNBCfWX9xgTkcaA==" }, "csv-stringify": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.4.3.tgz", - "integrity": "sha512-WJLgRJQcVjPK45jXS1xfnkwVbw9bOjg2F2BQRa9OkG7Di2W/geclPZNlcQTwxbzn1nEDI2ane2AubTdTd6gCvw==" + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.5.0.tgz", + "integrity": "sha512-G05575DSO/9vFzQxZN+Srh30cNyHk0SM0ePyiTChMD5WVt7GMTVPBQf4rtgMF6mqhNCJUPw4pN8LDe8MF9EYOA==" }, "currently-unhandled": { "version": "0.4.1", @@ -13050,9 +13049,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.415", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz", - "integrity": "sha512-GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw==" + "version": "1.3.427", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", + "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" }, "element-resize-detector": { "version": "1.2.1", @@ -15334,6 +15333,15 @@ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" }, + "filelist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz", + "integrity": "sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==", + "dev": true, + "requires": { + "minimatch": "^3.0.4" + } + }, "filesize": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz", @@ -15582,9 +15590,9 @@ } }, "focus-lock": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.6.7.tgz", - "integrity": "sha512-KRo93U/afEqt7w5tBm4t0FHf/Li8tEYav3n4GUiZdeRlRfrtMbL8yQg0xRVnY/kmBRmQ4xkqIlbaMvuqlu53kg==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.6.8.tgz", + "integrity": "sha512-vkHTluRCoq9FcsrldC0ulQHiyBYgVJB2CX53I8r0nTC6KnEij7Of0jpBspjt3/CuNb6fyoj3aOh9J2HgQUM0og==", "dev": true }, "focus-trap": { @@ -17478,9 +17486,9 @@ } }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, "graceful-readlink": { "version": "1.0.1", @@ -17713,12 +17721,25 @@ } }, "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", + "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "hash.js": { @@ -17974,9 +17995,9 @@ } }, "html-minifier-terser": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz", - "integrity": "sha512-cBSFFghQh/uHcfSiL42KxxIRMF7A144+3E44xdlctIjxEmkEfCvouxNyFH2wysXk1fCGBPwtcr3hDWlGTfkDew==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz", + "integrity": "sha512-tiYE76O1zunboByeB/nFGwUEb263Z3nkNv6Lz2oLC1s6M36bLKfTrjQ+7ssVfaucVllE+N7hh/FbpbxvnIA+LQ==", "dev": true, "requires": { "camel-case": "^4.1.1", @@ -18543,9 +18564,9 @@ "integrity": "sha512-MsMOijQ4v0xlmrz1fc7lyPEy7jFhoNF7EVaRSP7mPzs20LaFOwG6qNjGRy3Ie85n9DARlcUnB1zbsBv5sJrIvw==" }, "nanoid": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.3.tgz", - "integrity": "sha512-Zw8rTOUfh6FlKgkEbHiB1buOF2zOPOQyGirABUWn+9Z7m9PpyoLVkh6Ksc53vBjndINQ2+9LfRPaHxb/u45EGg==" + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.4.tgz", + "integrity": "sha512-ycTkPSwmUmEdtvPPuszyOCm+Fzw+/AngWkaJ52oZ6l4Mdhh/yNNrWflAzrXbSn3v1mL+GBl6qegU6w6ml5JSWw==" } } }, @@ -44036,16 +44057,17 @@ } }, "ipld-dag-pb": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/ipld-dag-pb/-/ipld-dag-pb-0.18.4.tgz", - "integrity": "sha512-T7Fa6xDGtWqRE3uE3bU0eflKATkZrBuh7LwFByCdz0lUpES6aMRDoUdIjlOxWAvEN01oUeT7jeeX/ZWINsI1gw==", + "version": "0.18.5", + "resolved": "https://registry.npmjs.org/ipld-dag-pb/-/ipld-dag-pb-0.18.5.tgz", + "integrity": "sha512-8IAPZrkRjgTpkxV9JOwXSBe0GXNxd4B2lubPgbifTGL92rZOEKWutpijsWsWvjXOltDFHKMQIIIhkgLC5RPqbA==", "requires": { "buffer": "^5.6.0", "cids": "~0.8.0", "class-is": "^1.1.0", "multicodec": "^1.0.1", "multihashing-async": "~0.8.1", - "protons": "^1.0.2" + "protons": "^1.0.2", + "stable": "^0.1.8" }, "dependencies": { "cids": { @@ -44738,15 +44760,63 @@ "iterate-iterator": "^1.0.1" } }, + "jake": { + "version": "10.6.1", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.6.1.tgz", + "integrity": "sha512-pHUK3+V0BjOb1XSi95rbBksrMdIqLVC9bJqDnshVyleYsET3H0XAq+3VB2E3notcYvv4wRdRHn13p7vobG+wfQ==", + "dev": true, + "requires": { + "async": "0.9.x", + "chalk": "^2.4.2", + "filelist": "^1.0.1", + "minimatch": "^3.0.4" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "jarallax": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/jarallax/-/jarallax-1.12.0.tgz", - "integrity": "sha512-ct22wQAZHN/zv/PjZpldDNhqlcr1vP7p3xjyI4c56tobxH3xODLu7FdfNFPyN5KqzSL9vH15SoNT2YDcsnzKvQ==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/jarallax/-/jarallax-1.12.1.tgz", + "integrity": "sha512-8AKPKjLz8JcjZFwdMMbf3W7QG9BTzB3rN0k47Xx+tWpkPeGgHodxEUB2OGsj3eOzLCpSvolfW0PtwTp7i3CrhA==", "requires": { "global": "^4.4.0", "lite-ready": "^1.0.4", - "rafl": "^1.2.2", - "video-worker": "^1.1.6" + "video-worker": "^1.1.8" }, "dependencies": { "global": { @@ -45564,9 +45634,9 @@ "dev": true }, "source-map-support": { - "version": "0.5.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz", - "integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -45917,9 +45987,9 @@ } }, "jest-worker": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz", - "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz", + "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==", "dev": true, "requires": { "merge-stream": "^2.0.0", @@ -47894,16 +47964,16 @@ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", - "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==" }, "mime-types": { - "version": "2.1.26", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", - "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", "requires": { - "mime-db": "1.43.0" + "mime-db": "1.44.0" } }, "mimic-fn": { @@ -48209,9 +48279,9 @@ "integrity": "sha512-h/5GqxNIoSqnjt7SHxVtU7i1Kg0Xoxj853amzmzLgLRZKK9WwPc9tMuawW79ftmFSQhML0Zwt8kEuG1DIjQNBA==" }, "mocha": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz", - "integrity": "sha512-3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz", + "integrity": "sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA==", "dev": true, "requires": { "ansi-colors": "3.2.3", @@ -48227,7 +48297,7 @@ "js-yaml": "3.13.1", "log-symbols": "3.0.0", "minimatch": "3.0.4", - "mkdirp": "0.5.3", + "mkdirp": "0.5.5", "ms": "2.1.1", "node-environment-flags": "1.0.6", "object.assign": "4.1.0", @@ -48391,9 +48461,9 @@ } }, "mkdirp": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", - "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { "minimist": "^1.2.5" @@ -48463,9 +48533,9 @@ } }, "mock-fs": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.11.0.tgz", - "integrity": "sha512-Yp4o3/ZA15wsXqJTT+R+9w2AYIkD1i80Lds47wDbuUhOvQvm+O2EfjFZSz0pMgZZSPHRhGxgcd2+GL4+jZMtdw==" + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.12.0.tgz", + "integrity": "sha512-/P/HtrlvBxY4o/PzXY9cCNBrdylDNxg7gnrv2sMNxj+UJ2m8jSpl0/A6fuJeNAWr99ZvGWH8XCbE0vmnM5KupQ==" }, "moment": { "version": "2.24.0", @@ -49395,10 +49465,13 @@ }, "dependencies": { "is-wsl": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz", - "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==", - "dev": true + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "requires": { + "is-docker": "^2.0.0" + } } } }, @@ -49964,9 +50037,9 @@ } }, "p-queue": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz", - "integrity": "sha512-fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz", + "integrity": "sha512-X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw==", "requires": { "eventemitter3": "^4.0.0", "p-timeout": "^3.1.0" @@ -50730,12 +50803,12 @@ "dev": true }, "polished": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/polished/-/polished-3.5.2.tgz", - "integrity": "sha512-vWoRDg3gY5RQBtUfcj9MRN10VCIf4EkdUikGxyXItg2Hnwk+eIVtdBiLajN0ldFeT3Vq4r/QNbjrQdhqBKrTug==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/polished/-/polished-3.6.0.tgz", + "integrity": "sha512-H7tsy9h5JVGXh7BdNzm/v/Q+zIasiwXnYflSmrLd+YpK+8dXKJTKl/kzCtB2kns2N5dyelRvjUtpOKK/nLCanA==", "dev": true, "requires": { - "@babel/runtime": "^7.8.7" + "@babel/runtime": "^7.9.2" } }, "popper.js": { @@ -50744,9 +50817,9 @@ "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, "portfinder": { - "version": "1.0.25", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz", - "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz", + "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==", "dev": true, "requires": { "async": "^2.6.2", @@ -50880,9 +50953,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -50891,9 +50964,9 @@ } }, "postcss-value-parser": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", - "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", "dev": true }, "source-map": { @@ -50970,9 +51043,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51039,9 +51112,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51107,9 +51180,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51175,9 +51248,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51243,9 +51316,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51311,9 +51384,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51339,9 +51412,9 @@ } }, "postcss-flexbugs-fixes": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.0.tgz", - "integrity": "sha512-QRE0n3hpkxxS/OGvzOa+PDuy4mh/Jg4o9ui22/ko5iGYOG3M5dfJabjnAZjTdh2G9F85c7Hv8hWcEDEKW/xceQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz", + "integrity": "sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==", "dev": true, "requires": { "postcss": "^7.0.26" @@ -51379,9 +51452,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51500,9 +51573,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51571,9 +51644,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51656,9 +51729,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51736,9 +51809,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51807,9 +51880,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51892,9 +51965,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -51963,9 +52036,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52077,9 +52150,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52147,9 +52220,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52218,9 +52291,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52289,9 +52362,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52359,9 +52432,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52429,9 +52502,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52511,9 +52584,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52588,9 +52661,9 @@ "dev": true }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52657,9 +52730,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52727,9 +52800,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52810,9 +52883,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52881,9 +52954,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -52963,9 +53036,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -53033,9 +53106,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -53406,9 +53479,9 @@ } }, "property-information": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.4.0.tgz", - "integrity": "sha512-nmMWAm/3vKFGmmOWOcdLjgq/Hlxa+hsuR/px1Lp/UGEyc5A22A6l78Shc2C0E71sPmAqglni+HrS7L7VJ7AUCA==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.5.0.tgz", + "integrity": "sha512-RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA==", "dev": true, "requires": { "xtend": "^4.0.0" @@ -53420,9 +53493,9 @@ "integrity": "sha512-G/2kcamPF2S49W5yaMGdIpkG6+5wZF0fzBteLKgEHjbNzqjZQ85aAs1iJGto31EJaSTkNvHs5IXuHSaTLWBAiA==" }, "protons": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/protons/-/protons-1.0.2.tgz", - "integrity": "sha512-PexfP8Vh9pLMa5jUWJZLqofoQYmLUTrqLYAtqNoxwgm2ixxqLQz2BHJ7XEPCS4ZhTx/n5MXWpcT6P91oM+mgOQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/protons/-/protons-1.2.0.tgz", + "integrity": "sha512-V6wwlbbgZ6qtqd1zRSk7HqvwkoadmeNntUlqd1On9vHyC1tPI6H8GJotfup+9hG2FsDQK+MctaLrSouyunfxNg==", "requires": { "buffer": "^5.5.0", "protocol-buffers-schema": "^3.3.1", @@ -53619,14 +53692,6 @@ "performance-now": "^2.1.0" } }, - "rafl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/rafl/-/rafl-1.2.2.tgz", - "integrity": "sha1-/pMPdYIRAg1H44gV9Rlqi+QVB0A=", - "requires": { - "global": "~4.3.0" - } - }, "ramda": { "version": "0.26.1", "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz", @@ -53699,9 +53764,9 @@ } }, "rc-animate": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.10.3.tgz", - "integrity": "sha512-A9qQ5Y8BLlM7EhuCO3fWb/dChndlbWtY/P5QvPqBU7h4r5Q2QsvsbpTGgdYZATRDZbTRnJXXfVk9UtlyS7MBLg==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.11.1.tgz", + "integrity": "sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.6", @@ -53737,9 +53802,9 @@ } }, "rc-util": { - "version": "4.20.3", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.20.3.tgz", - "integrity": "sha512-NBBc9Ad5yGAVTp4jV+pD7tXQGqHxGM2onPSZFyVoJ5fuvRF+ZgzSjZ6RXLPE0pVVISRJ07h+APgLJPBcAeZQlg==", + "version": "4.20.5", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.20.5.tgz", + "integrity": "sha512-f67s4Dt1quBYhrVPq5QMKmK3eS2hN1NNIAyhaiG0HmvqiGYAXMQ7SP2AlGqv750vnzhJs38JklbkWT1/wjhFPg==", "requires": { "add-dom-event-listener": "^1.1.0", "prop-types": "^15.5.10", @@ -54118,9 +54183,9 @@ } }, "react-docgen-typescript": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-1.16.3.tgz", - "integrity": "sha512-xYISCr8mFKfV15talgpicOF/e0DudTucf1BXzu/HteMF4RM3KsfxXkhWybZC3LTVbYrdbammDV26Z4Yuk+MoWg==", + "version": "1.16.4", + "resolved": "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-1.16.4.tgz", + "integrity": "sha512-9NkfxDnLB+zYPRE4JBWoNc/JB0N1YWkZEq91al4F/e6BGMKHtAOESaEmrqdooxBLlxDhGKUGCXhPGJHHsG6bFQ==", "dev": true }, "react-docgen-typescript-loader": { @@ -54244,9 +54309,9 @@ } }, "react-helmet-async": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.5.tgz", - "integrity": "sha512-nqGA5a1HRZsw1lzDn+bYuUN2FyHRiY+DgjRVhEOKVBDTrrqJCpCIOuY/IRHdobr+KD1gGTP0WabZsTrIHnFKJA==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.6.tgz", + "integrity": "sha512-t+bhAI4NgxfEv8ez4r77cLfR4O4Z55E/FH2DT+uiE4U7yfWgAk7OAOi7IxHxuYEVLI26bqjZvlVCkpC5/5AoNA==", "dev": true, "requires": { "@babel/runtime": "^7.9.2", @@ -54257,17 +54322,17 @@ }, "dependencies": { "react-fast-compare": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.0.1.tgz", - "integrity": "sha512-C5vP0J644ofZGd54P8++O7AvrqMEbrGf8Ue0eAUJLJyw168dAX2aiYyX/zcY/eSNwO0IDjsKUaLE6n83D+TnEg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.0.2.tgz", + "integrity": "sha512-1fBw8Efm6fb1blbRorZcO3OqzWgxYWxXzlaNeqEVXcrDdyFzeqygrPVU6qrPuqnqYMpUJVkQBdDgDJQTmCXp+Q==", "dev": true } } }, "react-hot-loader": { - "version": "4.12.20", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.20.tgz", - "integrity": "sha512-lPlv1HVizi0lsi+UFACBJaydtRYILWkfHAC/lyCs6ZlAxlOZRQIfYHDqiGaRvL/GF7zyti+Qn9XpnDAUvdFA4A==", + "version": "4.12.21", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.21.tgz", + "integrity": "sha512-Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA==", "dev": true, "requires": { "fast-levenshtein": "^2.0.6", @@ -55646,21 +55711,10 @@ "dev": true }, "run-async": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz", - "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - }, - "dependencies": { - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - } - } + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true }, "run-queue": { "version": "1.0.3", @@ -55781,9 +55835,9 @@ } }, "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.6.tgz", + "integrity": "sha512-MKuEYXFSGuRSi8FZ3A7imN1CeVn9Gpw0/SFJKdL1ejXJneI9a5rwlEZrKejhEFAA3O6yr3eIyl/WuvASvlT36g==", "dev": true, "requires": { "glob": "^7.0.0", @@ -56556,9 +56610,9 @@ "dev": true }, "shelljs": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", - "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", + "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", "dev": true, "requires": { "glob": "^7.0.0", @@ -57633,9 +57687,9 @@ } }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz", + "integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -58080,9 +58134,9 @@ } }, "terser": { - "version": "4.6.11", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz", - "integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==", + "version": "4.6.13", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz", + "integrity": "sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==", "dev": true, "requires": { "commander": "^2.20.0", @@ -58103,9 +58157,9 @@ "dev": true }, "source-map-support": { - "version": "0.5.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz", - "integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -58115,19 +58169,19 @@ } }, "terser-webpack-plugin": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz", - "integrity": "sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.6.tgz", + "integrity": "sha512-I8IDsQwZrqjdmOicNeE8L/MhwatAap3mUrtcAKJuilsemUNcX+Hier/eAzwStVqhlCxq0aG3ni9bK/0BESXkTg==", "dev": true, "requires": { "cacache": "^13.0.1", - "find-cache-dir": "^3.2.0", - "jest-worker": "^25.1.0", - "p-limit": "^2.2.2", - "schema-utils": "^2.6.4", - "serialize-javascript": "^2.1.2", + "find-cache-dir": "^3.3.1", + "jest-worker": "^25.4.0", + "p-limit": "^2.3.0", + "schema-utils": "^2.6.6", + "serialize-javascript": "^3.0.0", "source-map": "^0.6.1", - "terser": "^4.4.3", + "terser": "^4.6.12", "webpack-sources": "^1.4.3" }, "dependencies": { @@ -58203,6 +58257,12 @@ "ajv-keywords": "^3.4.1" } }, + "serialize-javascript": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz", + "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -58622,13 +58682,13 @@ } }, "truffle-flattener": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/truffle-flattener/-/truffle-flattener-1.4.3.tgz", - "integrity": "sha512-r29fkSkV8i9oMW35KbpKR0bP4iPnzIJqlW2S+CL3BjLsxq6YnlMn9+e0BpiJIJPmeXJgeYHQvCGceucpM0Dovg==", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/truffle-flattener/-/truffle-flattener-1.4.4.tgz", + "integrity": "sha512-S/WmvubzlUj1mn56wEI6yo1bmPpKDNdEe5rtyVC1C5iNfZWobD/V69pAYI15IBDJrDqUyh+iXgpTkzov50zpQw==", "dev": true, "requires": { "@resolver-engine/imports-fs": "^0.2.2", - "@solidity-parser/parser": "^0.5.2", + "@solidity-parser/parser": "^0.6.0", "find-up": "^2.1.0", "mkdirp": "^1.0.4", "tsort": "0.0.1" @@ -58805,9 +58865,9 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-support": { - "version": "0.5.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz", - "integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -59078,9 +59138,9 @@ "dev": true }, "uglify-js": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz", - "integrity": "sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==", + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz", + "integrity": "sha512-zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q==", "dev": true, "requires": { "commander": "~2.20.3" @@ -59388,9 +59448,9 @@ }, "dependencies": { "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==", "dev": true }, "schema-utils": { @@ -59610,9 +59670,9 @@ } }, "video-worker": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/video-worker/-/video-worker-1.1.7.tgz", - "integrity": "sha512-MzHtyDsNNQYY+PKZTE/3JOtVdQ4Andv/pTHyV51zPaf3RXXMjLgUl5Pblgy+tcz8RVpi7NbQNO4lq9CWfBE+BQ==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/video-worker/-/video-worker-1.1.8.tgz", + "integrity": "sha512-eUDefy2ZrY7TgAepGoHVS3uh7MDPsPD2Ug5gD7I+bBJnqAXf9Cp9GM2aOnIS3ZrDDeyRq2wbhFr/x1MsCKun/w==", "requires": { "global": "^4.4.0" }, @@ -60553,9 +60613,9 @@ }, "dependencies": { "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==", "dev": true }, "mkdirp": { @@ -60829,9 +60889,9 @@ } }, "webpack-virtual-modules": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.2.1.tgz", - "integrity": "sha512-0PWBlxyt4uGDofooIEanWhhyBOHdd+lr7QpYNDLC7/yc5lqJT8zlc04MTIBnKj+c2BlQNNuwE5er/Tg4wowHzA==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz", + "integrity": "sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==", "dev": true, "requires": { "debug": "^3.0.0" diff --git a/package.json b/package.json index cf967612b..14505ea14 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "dependencies": { "3box": "1.17.1", "@burner-wallet/burner-connect-provider": "^0.1.1", - "@daostack/client": "0.2.67", + "@daostack/arc.js": "0.2.68", "@dorgtech/daocreator-ui": "^1.0.8", "@fortawesome/fontawesome-svg-core": "^1.2.10", "@fortawesome/free-brands-svg-icons": "^5.6.1", diff --git a/scripts/fetchContracts.ts b/scripts/fetchContracts.ts index 0a0ff219b..dea6ab5da 100644 --- a/scripts/fetchContracts.ts +++ b/scripts/fetchContracts.ts @@ -1,4 +1,4 @@ -import { Arc } from '@daostack/client'; +import { Arc } from '@daostack/arc.js'; const fs = require("fs"); import { settings } from "../src/settings"; const Web3 = require("web3"); diff --git a/scripts/populate.ts b/scripts/populate.ts index 8389e6981..14eb1b508 100644 --- a/scripts/populate.ts +++ b/scripts/populate.ts @@ -1 +1 @@ -import { Arc } from '@daostack/client' +import { Arc } from '@daostack/arc.js' diff --git a/src/actions/arcActions.ts b/src/actions/arcActions.ts index 43303eae8..aae6f95d8 100644 --- a/src/actions/arcActions.ts +++ b/src/actions/arcActions.ts @@ -1,4 +1,4 @@ -import { Address, DAO, IProposalCreateOptions, IProposalOutcome, ITransactionState, ITransactionUpdate, ReputationFromTokenScheme, Scheme } from "@daostack/client"; +import { Address, DAO, IProposalCreateOptions, IProposalOutcome, ITransactionState, ITransactionUpdate, ReputationFromTokenScheme, Scheme } from "@daostack/arc.js"; import { IAsyncAction } from "actions/async"; import { getArc } from "arc"; import { toWei } from "lib/util"; diff --git a/src/arc.ts b/src/arc.ts index 9787da97f..d1c34f84e 100644 --- a/src/arc.ts +++ b/src/arc.ts @@ -2,7 +2,7 @@ import { NotificationStatus } from "reducers/notifications"; import { getNetworkId, getNetworkName, targetedNetwork } from "./lib/util"; import { settings, USE_CONTRACTINFOS_CACHE } from "./settings"; import { RetryLink } from "apollo-link-retry"; -import { Address, Arc } from "@daostack/client"; +import { Address, Arc } from "@daostack/arc.js"; import Web3Modal, { getProviderInfo, IProviderInfo } from "web3modal"; import { Observable } from "rxjs"; diff --git a/src/components/Account/AccountBalances.tsx b/src/components/Account/AccountBalances.tsx index f18ffa49f..a1eb9de9f 100644 --- a/src/components/Account/AccountBalances.tsx +++ b/src/components/Account/AccountBalances.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IMemberState } from "@daostack/client"; +import { Address, IDAOState, IMemberState } from "@daostack/arc.js"; import { baseTokenName, ethErrorHandler, genName } from "lib/util"; import BN = require("bn.js"); diff --git a/src/components/Account/AccountPopup.tsx b/src/components/Account/AccountPopup.tsx index 75f2d3135..7087b101b 100644 --- a/src/components/Account/AccountPopup.tsx +++ b/src/components/Account/AccountPopup.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IMemberState } from "@daostack/client"; +import { Address, IDAOState, IMemberState } from "@daostack/arc.js"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { getProfile } from "actions/profilesActions"; import AccountImage from "components/Account/AccountImage"; diff --git a/src/components/Account/AccountProfilePage.tsx b/src/components/Account/AccountProfilePage.tsx index 3804c0067..3140ac10f 100644 --- a/src/components/Account/AccountProfilePage.tsx +++ b/src/components/Account/AccountProfilePage.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IMemberState, DAO } from "@daostack/client"; +import { IDAOState, IMemberState, DAO } from "@daostack/arc.js"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import BN = require("bn.js"); diff --git a/src/components/Dao/DaoContainer.tsx b/src/components/Dao/DaoContainer.tsx index ad6b07f1d..0940067c6 100644 --- a/src/components/Dao/DaoContainer.tsx +++ b/src/components/Dao/DaoContainer.tsx @@ -1,4 +1,4 @@ -import { IDAOState, Member } from "@daostack/client"; +import { IDAOState, Member } from "@daostack/arc.js"; import { getProfilesForAddresses } from "actions/profilesActions"; import { getArc } from "arc"; import CreateProposalPage from "components/Proposal/Create/CreateProposalPage"; diff --git a/src/components/Dao/DaoHistoryPage.tsx b/src/components/Dao/DaoHistoryPage.tsx index 51f914197..4575eb16b 100644 --- a/src/components/Dao/DaoHistoryPage.tsx +++ b/src/components/Dao/DaoHistoryPage.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IProposalStage, Proposal, Vote, Scheme, Stake } from "@daostack/client"; +import { Address, IDAOState, IProposalStage, Proposal, Vote, Scheme, Stake } from "@daostack/arc.js"; import { getArc } from "arc"; import Loading from "components/Shared/Loading"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; diff --git a/src/components/Dao/DaoLandingPage.tsx b/src/components/Dao/DaoLandingPage.tsx index 95e98da05..49607601c 100644 --- a/src/components/Dao/DaoLandingPage.tsx +++ b/src/components/Dao/DaoLandingPage.tsx @@ -1,4 +1,4 @@ -import { IDAOState } from "@daostack/client"; +import { IDAOState } from "@daostack/arc.js"; import * as React from "react"; import * as css from "./DaoLandingPage.scss"; import { Page } from "pages"; diff --git a/src/components/Dao/DaoMember.tsx b/src/components/Dao/DaoMember.tsx index 9ecfc3e47..34bb03141 100644 --- a/src/components/Dao/DaoMember.tsx +++ b/src/components/Dao/DaoMember.tsx @@ -1,5 +1,5 @@ import BN = require("bn.js"); -import { IDAOState, IMemberState, Member } from "@daostack/client"; +import { IDAOState, IMemberState, Member } from "@daostack/arc.js"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import AccountImage from "components/Account/AccountImage"; import AccountProfileName from "components/Account/AccountProfileName"; diff --git a/src/components/Dao/DaoMembersPage.tsx b/src/components/Dao/DaoMembersPage.tsx index d53064680..fe035c070 100644 --- a/src/components/Dao/DaoMembersPage.tsx +++ b/src/components/Dao/DaoMembersPage.tsx @@ -1,4 +1,4 @@ -import { IDAOState, Member } from "@daostack/client"; +import { IDAOState, Member } from "@daostack/arc.js"; import { getProfile } from "actions/profilesActions"; import Loading from "components/Shared/Loading"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; diff --git a/src/components/Dao/DaoSchemesPage.tsx b/src/components/Dao/DaoSchemesPage.tsx index fcb97cbd3..9c068a6b2 100644 --- a/src/components/Dao/DaoSchemesPage.tsx +++ b/src/components/Dao/DaoSchemesPage.tsx @@ -1,4 +1,4 @@ -import { CompetitionScheme, IDAOState, ISchemeState, Scheme } from "@daostack/client"; +import { CompetitionScheme, IDAOState, ISchemeState, Scheme } from "@daostack/arc.js"; import { enableWalletProvider, getArc } from "arc"; import classNames from "classnames"; import Loading from "components/Shared/Loading"; diff --git a/src/components/Dao/ProposalSchemeCard.tsx b/src/components/Dao/ProposalSchemeCard.tsx index b92793c8b..319b1ee5a 100644 --- a/src/components/Dao/ProposalSchemeCard.tsx +++ b/src/components/Dao/ProposalSchemeCard.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IProposalStage, IProposalState, ISchemeState, Proposal, Scheme } from "@daostack/client"; +import { IDAOState, IProposalStage, IProposalState, ISchemeState, Proposal, Scheme } from "@daostack/arc.js"; import { getArc } from "arc"; import VoteGraph from "components/Proposal/Voting/VoteGraph"; import ProposalCountdown from "components/Shared/ProposalCountdown"; @@ -25,7 +25,7 @@ const ProposalSchemeCard = (props: IProps) => { const [schemeState, boostedProposals] = data; - const numProposals = schemeState.numberOfQueuedProposals + schemeState.numberOfBoostedProposals + schemeState.numberOfQueuedProposals; + const numProposals = schemeState.numberOfPreBoostedProposals + schemeState.numberOfBoostedProposals + schemeState.numberOfQueuedProposals; const proposals = boostedProposals.slice(0, 3); const proposalsHTML = proposals.map((proposal: Proposal) => ); diff --git a/src/components/Dao/SimpleSchemeCard.tsx b/src/components/Dao/SimpleSchemeCard.tsx index 7a69efa12..5417e9475 100644 --- a/src/components/Dao/SimpleSchemeCard.tsx +++ b/src/components/Dao/SimpleSchemeCard.tsx @@ -1,4 +1,4 @@ -import { IDAOState, ISchemeState, Scheme } from "@daostack/client"; +import { IDAOState, ISchemeState, Scheme } from "@daostack/arc.js"; import { schemeName } from "lib/schemeUtils"; import * as React from "react"; import { Link } from "react-router-dom"; diff --git a/src/components/Dao/UnknownSchemeCard.tsx b/src/components/Dao/UnknownSchemeCard.tsx index b60b44f61..092201e9c 100644 --- a/src/components/Dao/UnknownSchemeCard.tsx +++ b/src/components/Dao/UnknownSchemeCard.tsx @@ -1,4 +1,4 @@ -import { Scheme, ISchemeState } from "@daostack/client"; +import { Scheme, ISchemeState } from "@daostack/arc.js"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import { splitByCamelCase } from "lib/util"; import * as React from "react"; diff --git a/src/components/Daos/DaoCard.tsx b/src/components/Daos/DaoCard.tsx index 40814b106..9bb135da0 100644 --- a/src/components/Daos/DaoCard.tsx +++ b/src/components/Daos/DaoCard.tsx @@ -1,4 +1,4 @@ -import { DAO, IDAOState } from "@daostack/client"; +import { DAO, IDAOState } from "@daostack/arc.js"; import classNames from "classnames"; import FollowButton from "components/Shared/FollowButton"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; diff --git a/src/components/Daos/DaosPage.tsx b/src/components/Daos/DaosPage.tsx index e9b6d85bf..f2b6ab08c 100644 --- a/src/components/Daos/DaosPage.tsx +++ b/src/components/Daos/DaosPage.tsx @@ -1,4 +1,4 @@ -import { DAO, DAOFieldsFragment } from "@daostack/client"; +import { DAO, DAOFieldsFragment } from "@daostack/arc.js"; import { getArc } from "arc"; import Loading from "components/Shared/Loading"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; diff --git a/src/components/Feed/DaoFeedItem.tsx b/src/components/Feed/DaoFeedItem.tsx index b19d40de7..c46dfcd17 100644 --- a/src/components/Feed/DaoFeedItem.tsx +++ b/src/components/Feed/DaoFeedItem.tsx @@ -1,4 +1,4 @@ -import { IDAOState } from "@daostack/client"; +import { IDAOState } from "@daostack/arc.js"; import { getArc } from "arc"; import { generate } from "geopattern"; import FollowButton from "components/Shared/FollowButton"; diff --git a/src/components/Feed/ProposalFeedItem.tsx b/src/components/Feed/ProposalFeedItem.tsx index 023c561d2..6ecdd6fb6 100644 --- a/src/components/Feed/ProposalFeedItem.tsx +++ b/src/components/Feed/ProposalFeedItem.tsx @@ -1,4 +1,4 @@ -import { IDAOState } from "@daostack/client"; +import { IDAOState } from "@daostack/arc.js"; import { getArc } from "arc"; import AccountPopup from "components/Account/AccountPopup"; import AccountProfileName from "components/Account/AccountProfileName"; diff --git a/src/components/Feed/UserFeedItem.tsx b/src/components/Feed/UserFeedItem.tsx index bc9b07eab..e7bfbed56 100644 --- a/src/components/Feed/UserFeedItem.tsx +++ b/src/components/Feed/UserFeedItem.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IMemberState } from "@daostack/client"; +import { IDAOState, IMemberState } from "@daostack/arc.js"; import { getArc } from "arc"; import AccountPopup from "components/Account/AccountPopup"; import AccountProfileName from "components/Account/AccountProfileName"; diff --git a/src/components/Proposal/ActionButton.tsx b/src/components/Proposal/ActionButton.tsx index a248193a2..1b3d037f2 100644 --- a/src/components/Proposal/ActionButton.tsx +++ b/src/components/Proposal/ActionButton.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IProposalOutcome, IProposalStage, IProposalState, IRewardState, Token } from "@daostack/client"; +import { Address, IDAOState, IProposalOutcome, IProposalStage, IProposalState, IRewardState, Token } from "@daostack/arc.js"; import { executeProposal, redeemProposal } from "actions/arcActions"; import { enableWalletProvider, getArc } from "arc"; import classNames from "classnames"; diff --git a/src/components/Proposal/Create/CreateProposalPage.tsx b/src/components/Proposal/Create/CreateProposalPage.tsx index c4f2a2225..fa17a08c0 100644 --- a/src/components/Proposal/Create/CreateProposalPage.tsx +++ b/src/components/Proposal/Create/CreateProposalPage.tsx @@ -1,4 +1,4 @@ -import { ISchemeState } from "@daostack/client"; +import { ISchemeState } from "@daostack/arc.js"; import { getArc } from "arc"; import CreateKnownGenericSchemeProposal from "components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal"; import CreateSchemeRegistrarProposal from "components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal"; diff --git a/src/components/Proposal/Create/SchemeForms/CreateContributionRewardProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateContributionRewardProposal.tsx index 7bb9f507c..370c569e3 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateContributionRewardProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateContributionRewardProposal.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { connect } from "react-redux"; -import { IDAOState, ISchemeState } from "@daostack/client"; +import { IDAOState, ISchemeState } from "@daostack/arc.js"; import { createProposal } from "actions/arcActions"; import { enableWalletProvider, getArc } from "arc"; import { ErrorMessage, Field, Form, Formik, FormikProps } from "formik"; diff --git a/src/components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal.tsx index 09d8709ef..78b6f8a33 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { connect } from "react-redux"; -import { IProposalType, ISchemeState } from "@daostack/client"; +import { IProposalType, ISchemeState } from "@daostack/arc.js"; import { enableWalletProvider, getArc } from "arc"; import { ErrorMessage, Field, FieldArray, Form, Formik, FormikErrors, FormikProps, FormikTouched } from "formik"; diff --git a/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx index b23c39181..15f45b2fa 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx @@ -14,7 +14,7 @@ import { GetSchemeIsActiveActions, getSchemeIsActive, REQUIRED_SCHEME_PERMISSION import { exportUrl, importUrlValues } from "lib/proposalUtils"; import { ErrorMessage, Field, Form, Formik, FormikProps } from "formik"; import classNames from "classnames"; -import { IProposalType, ISchemeState, Scheme } from "@daostack/client"; +import { IProposalType, ISchemeState, Scheme } from "@daostack/arc.js"; import { connect } from "react-redux"; import * as React from "react"; import * as css from "../CreateProposal.scss"; diff --git a/src/components/Proposal/Create/SchemeForms/CreateUnknownGenericSchemeProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateUnknownGenericSchemeProposal.tsx index 0d9e4aac9..8f8af63ac 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateUnknownGenericSchemeProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateUnknownGenericSchemeProposal.tsx @@ -1,4 +1,4 @@ -import { ISchemeState } from "@daostack/client"; +import { ISchemeState } from "@daostack/arc.js"; import { createProposal } from "actions/arcActions"; import { enableWalletProvider } from "arc"; import { ErrorMessage, Field, Form, Formik, FormikProps } from "formik"; diff --git a/src/components/Proposal/Create/SchemeForms/TagsSelector.tsx b/src/components/Proposal/Create/SchemeForms/TagsSelector.tsx index 4be0d9bdb..8c29d0e1b 100644 --- a/src/components/Proposal/Create/SchemeForms/TagsSelector.tsx +++ b/src/components/Proposal/Create/SchemeForms/TagsSelector.tsx @@ -1,12 +1,12 @@ import * as React from "react"; import { WithContext as ReactTags, Tag } from "react-tag-input"; import classNames from "classnames"; -import { Tag as TagEntity } from "@daostack/client"; +import { Tag as TagEntity } from "@daostack/arc.js"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import { getArc } from "arc"; import { RefObject } from "react"; import { map } from "rxjs/operators"; -import { ITagState } from "@daostack/client/dist/types/tag"; +import { ITagState } from "@daostack/arc.js/dist/types/tag"; import * as css from "./TagsSelector.scss"; interface IExternalProps { diff --git a/src/components/Proposal/ProposalCard.tsx b/src/components/Proposal/ProposalCard.tsx index 2ff50bd23..7039c5ab1 100644 --- a/src/components/Proposal/ProposalCard.tsx +++ b/src/components/Proposal/ProposalCard.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IProposalStage, Vote, Proposal } from "@daostack/client"; +import { Address, IDAOState, IProposalStage, Vote, Proposal } from "@daostack/arc.js"; import classNames from "classnames"; import AccountPopup from "components/Account/AccountPopup"; import AccountProfileName from "components/Account/AccountProfileName"; diff --git a/src/components/Proposal/ProposalData.tsx b/src/components/Proposal/ProposalData.tsx index b342374f6..34af85456 100644 --- a/src/components/Proposal/ProposalData.tsx +++ b/src/components/Proposal/ProposalData.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IMemberState, IProposalState, IRewardState, Reward, Stake, Vote } from "@daostack/client"; +import { Address, IDAOState, IMemberState, IProposalState, IRewardState, Reward, Stake, Vote } from "@daostack/arc.js"; import { getArc } from "arc"; import { ethErrorHandler } from "lib/util"; @@ -141,7 +141,7 @@ export default withSubscription({ arcDao.member(currentAccountAddress).state(), // TODO: also need the member state for the proposal proposer and beneficiary // but since we need the proposal state first to get those addresses we will need to - // update the client query to load them inline + // update the arc.js query to load them inline concat(of(new BN("0")), arcDao.ethBalance()) .pipe(ethErrorHandler()), arc.GENToken().balanceOf(currentAccountAddress) diff --git a/src/components/Proposal/ProposalDetailsPage.tsx b/src/components/Proposal/ProposalDetailsPage.tsx index 4e4606b68..8f2a00bb6 100644 --- a/src/components/Proposal/ProposalDetailsPage.tsx +++ b/src/components/Proposal/ProposalDetailsPage.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IProposalStage, Vote } from "@daostack/client"; +import { Address, IDAOState, IProposalStage, Vote } from "@daostack/arc.js"; import classNames from "classnames"; import AccountPopup from "components/Account/AccountPopup"; import AccountProfileName from "components/Account/AccountProfileName"; diff --git a/src/components/Proposal/ProposalHistoryRow.tsx b/src/components/Proposal/ProposalHistoryRow.tsx index 679ae7240..2573d07dc 100644 --- a/src/components/Proposal/ProposalHistoryRow.tsx +++ b/src/components/Proposal/ProposalHistoryRow.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IExecutionState, IMemberState, IProposalOutcome, IProposalState, Stake, Vote, Proposal } from "@daostack/client"; +import { Address, IDAOState, IExecutionState, IMemberState, IProposalOutcome, IProposalState, Stake, Vote, Proposal } from "@daostack/arc.js"; import classNames from "classnames"; import AccountPopup from "components/Account/AccountPopup"; import AccountProfileName from "components/Account/AccountProfileName"; diff --git a/src/components/Proposal/ProposalStatus.tsx b/src/components/Proposal/ProposalStatus.tsx index 90df57bc5..4670e94ce 100644 --- a/src/components/Proposal/ProposalStatus.tsx +++ b/src/components/Proposal/ProposalStatus.tsx @@ -1,4 +1,4 @@ -import { IProposalStage, IProposalState } from "@daostack/client"; +import { IProposalStage, IProposalState } from "@daostack/arc.js"; import classNames from "classnames"; import * as React from "react"; import { proposalExpired, proposalFailed, proposalPassed } from "lib/proposalHelpers"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummary.tsx b/src/components/Proposal/ProposalSummary/ProposalSummary.tsx index e4196b63c..71a4eb056 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummary.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummary.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IProposalState, IProposalType } from "@daostack/client"; +import { IDAOState, IProposalState, IProposalType } from "@daostack/arc.js"; import classNames from "classnames"; import { GenericSchemeRegistry } from "genericSchemeRegistry"; import * as React from "react"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryCO2ken.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryCO2ken.tsx index 4c8e5efae..0588ea1b8 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryCO2ken.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryCO2ken.tsx @@ -1,4 +1,4 @@ -import { IProposalState } from "@daostack/client"; +import { IProposalState } from "@daostack/arc.js"; import BN = require("bn.js"); import classNames from "classnames"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryContributionReward.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryContributionReward.tsx index 2a2a3db97..89c24a96f 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryContributionReward.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryContributionReward.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IProposalState } from "@daostack/client"; +import { IDAOState, IProposalState } from "@daostack/arc.js"; import classNames from "classnames"; import AccountPopup from "components/Account/AccountPopup"; import AccountProfileName from "components/Account/AccountProfileName"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryDutchX.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryDutchX.tsx index 268e1fb2e..9e9809068 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryDutchX.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryDutchX.tsx @@ -1,4 +1,4 @@ -import { IProposalState } from "@daostack/client"; +import { IProposalState } from "@daostack/arc.js"; import BN = require("bn.js"); import classNames from "classnames"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx index e27a886aa..bd64623cf 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IProposalState } from "@daostack/client"; +import { IDAOState, IProposalState } from "@daostack/arc.js"; import classNames from "classnames"; import { GenericSchemeInfo } from "genericSchemeRegistry"; import { linkToEtherScan } from "lib/util"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummarySchemeRegistrar.tsx b/src/components/Proposal/ProposalSummary/ProposalSummarySchemeRegistrar.tsx index 0571fde30..6ea053947 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummarySchemeRegistrar.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummarySchemeRegistrar.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IProposalState, IProposalType, ISchemeRegistrar } from "@daostack/client"; +import { IDAOState, IProposalState, IProposalType, ISchemeRegistrar } from "@daostack/arc.js"; import classNames from "classnames"; import { copyToClipboard, getNetworkName, linkToEtherScan } from "lib/util"; import { schemeNameAndAddress } from "lib/schemeUtils"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryStandardBounties.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryStandardBounties.tsx index a64de3e58..a620f335e 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryStandardBounties.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryStandardBounties.tsx @@ -1,4 +1,4 @@ -import { IProposalState } from "@daostack/client"; +import { IProposalState } from "@daostack/arc.js"; import * as classNames from "classnames"; import { GenericSchemeInfo } from "genericSchemeRegistry"; import { linkToEtherScan } from "lib/util"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryUnknownGenericScheme.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryUnknownGenericScheme.tsx index e284d9d78..a1474fbc1 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryUnknownGenericScheme.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryUnknownGenericScheme.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IProposalState } from "@daostack/client"; +import { IDAOState, IProposalState } from "@daostack/arc.js"; import classNames from "classnames"; import { linkToEtherScan } from "lib/util"; import * as React from "react"; diff --git a/src/components/Proposal/RedemptionsString.tsx b/src/components/Proposal/RedemptionsString.tsx index e1efa5008..c665cb50f 100644 --- a/src/components/Proposal/RedemptionsString.tsx +++ b/src/components/Proposal/RedemptionsString.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IProposalState, IRewardState } from "@daostack/client"; +import { Address, IDAOState, IProposalState, IRewardState } from "@daostack/arc.js"; import BN = require("bn.js"); import Reputation from "components/Account/Reputation"; diff --git a/src/components/Proposal/RedemptionsTip.tsx b/src/components/Proposal/RedemptionsTip.tsx index 06c34ef82..3de268bf6 100644 --- a/src/components/Proposal/RedemptionsTip.tsx +++ b/src/components/Proposal/RedemptionsTip.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IProposalState, IProposalOutcome } from "@daostack/client"; +import { Address, IDAOState, IProposalState, IProposalOutcome } from "@daostack/arc.js"; import Reputation from "components/Account/Reputation"; import { baseTokenName, formatTokens, fromWei, genName, tokenDecimals, tokenSymbol, AccountClaimableRewardsType } from "lib/util"; import * as React from "react"; diff --git a/src/components/Proposal/RewardsString.tsx b/src/components/Proposal/RewardsString.tsx index db4965053..f1ced315d 100644 --- a/src/components/Proposal/RewardsString.tsx +++ b/src/components/Proposal/RewardsString.tsx @@ -1,7 +1,7 @@ import BN = require("bn.js"); import * as React from "react"; -import { IDAOState, IProposalState } from "@daostack/client"; +import { IDAOState, IProposalState } from "@daostack/arc.js"; import { baseTokenName, formatTokens, tokenDetails } from "lib/util"; import Reputation from "components/Account/Reputation"; diff --git a/src/components/Proposal/Staking/BoostAmount.tsx b/src/components/Proposal/Staking/BoostAmount.tsx index 1039b0e77..8ada82816 100644 --- a/src/components/Proposal/Staking/BoostAmount.tsx +++ b/src/components/Proposal/Staking/BoostAmount.tsx @@ -1,5 +1,5 @@ import { formatTokens } from "lib/util"; -import { IProposalStage, IProposalState } from "@daostack/client"; +import { IProposalStage, IProposalState } from "@daostack/arc.js"; import classNames from "classnames"; import * as React from "react"; diff --git a/src/components/Proposal/Staking/StakeButtons.tsx b/src/components/Proposal/Staking/StakeButtons.tsx index cf09369f1..5471e58a2 100644 --- a/src/components/Proposal/Staking/StakeButtons.tsx +++ b/src/components/Proposal/Staking/StakeButtons.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IProposalOutcome, IProposalStage, IProposalState, Stake } from "@daostack/client"; +import { Address, IDAOState, IProposalOutcome, IProposalStage, IProposalState, Stake } from "@daostack/arc.js"; import { approveStakingGens, stakeProposal } from "actions/arcActions"; import { enableWalletProvider } from "arc"; diff --git a/src/components/Proposal/Staking/StakeGraph.tsx b/src/components/Proposal/Staking/StakeGraph.tsx index 3a935bcd2..a35118b07 100644 --- a/src/components/Proposal/Staking/StakeGraph.tsx +++ b/src/components/Proposal/Staking/StakeGraph.tsx @@ -1,4 +1,4 @@ -import { IProposalState } from "@daostack/client"; +import { IProposalState } from "@daostack/arc.js"; import classNames from "classnames"; import { formatTokens, fromWei } from "lib/util"; import * as React from "react"; diff --git a/src/components/Proposal/Voting/VoteBreakdown.tsx b/src/components/Proposal/Voting/VoteBreakdown.tsx index 21c52c396..4a79a63eb 100644 --- a/src/components/Proposal/Voting/VoteBreakdown.tsx +++ b/src/components/Proposal/Voting/VoteBreakdown.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IMemberState, IProposalOutcome, IProposalState } from "@daostack/client"; +import { Address, IDAOState, IMemberState, IProposalOutcome, IProposalState } from "@daostack/arc.js"; import { enableWalletProvider } from "arc"; import BN = require("bn.js"); diff --git a/src/components/Proposal/Voting/VoteButtons.tsx b/src/components/Proposal/Voting/VoteButtons.tsx index b032af25d..c5bfab629 100644 --- a/src/components/Proposal/Voting/VoteButtons.tsx +++ b/src/components/Proposal/Voting/VoteButtons.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IMemberState, IProposalOutcome, IProposalStage, IProposalState } from "@daostack/client"; +import { Address, IDAOState, IMemberState, IProposalOutcome, IProposalStage, IProposalState } from "@daostack/arc.js"; import { voteOnProposal } from "actions/arcActions"; import { enableWalletProvider } from "arc"; @@ -101,6 +101,7 @@ class VoteButtons extends React.Component { (proposal.stage === IProposalStage.Boosted && expired) || (proposal.stage === IProposalStage.QuietEndingPeriod && expired) || (currentAccountState && currentAccountState.reputation.eq(new BN(0))) || + (currentAccountState && (proposal.createdAt < currentAccountState.createdAt)) || currentVote === IProposalOutcome.Pass || currentVote === IProposalOutcome.Fail ; @@ -113,13 +114,28 @@ class VoteButtons extends React.Component { "Can't change your vote" : (currentAccountState && currentAccountState.reputation.eq(new BN(0))) ? "Requires reputation in this DAO" : - proposal.stage === IProposalStage.ExpiredInQueue || - (proposal.stage === IProposalStage.Boosted && expired) || - (proposal.stage === IProposalStage.QuietEndingPeriod && expired) || - (proposal.stage === IProposalStage.Queued && expired) ? - "Can't vote on expired proposals" : - proposal.stage === IProposalStage.Executed ? - `Can't vote on ${proposal.winningOutcome === IProposalOutcome.Pass ? "passed" : "failed"} proposals` : ""; + /** + * The following condition deduces that the user could not have had rep when the + * proposal was created because of the following behavior in the subgraph: + * + * 1) `currentAccountState` (`ReputationHolder` in the subgraph) represents an entity that associates + * a single DAO with an ethereum account + * 2) currentAccountState can only exist in the subgraph when the account has > 0 rep in the DAO + * 3) `currentAccountState.createdAt` is set only once: When currentAccountState is being instantiated + * for the first time, in response to a Mint event that brings the rep > 0 + * 4) when a Burn event brings the rep <= 0, then the entity is removed from the subgraph + * 5) when `currentAccount` is not found in the subgraph, then a fake `currentAccountState` is created with + * rep == 0 + */ + (currentAccountState && (proposal.createdAt < currentAccountState.createdAt)) ? + "Must have had reputation in this DAO when the proposal was created" : + proposal.stage === IProposalStage.ExpiredInQueue || + (proposal.stage === IProposalStage.Boosted && expired) || + (proposal.stage === IProposalStage.QuietEndingPeriod && expired) || + (proposal.stage === IProposalStage.Queued && expired) ? + "Can't vote on expired proposals" : + proposal.stage === IProposalStage.Executed ? + `Can't vote on ${proposal.winningOutcome === IProposalOutcome.Pass ? "passed" : "failed"} proposals` : ""; const voteUpButtonClass = classNames({ [css.votedFor]: currentVote === IProposalOutcome.Pass, diff --git a/src/components/Proposal/Voting/VoteGraph.tsx b/src/components/Proposal/Voting/VoteGraph.tsx index 6a8e35516..15697924c 100644 --- a/src/components/Proposal/Voting/VoteGraph.tsx +++ b/src/components/Proposal/Voting/VoteGraph.tsx @@ -1,4 +1,4 @@ -import { IProposalStage, IProposalState } from "@daostack/client"; +import { IProposalStage, IProposalState } from "@daostack/arc.js"; import BN = require("bn.js"); import classNames from "classnames"; diff --git a/src/components/Proposal/Voting/VotersModal.tsx b/src/components/Proposal/Voting/VotersModal.tsx index 0a6d50a32..cf7c7da4f 100644 --- a/src/components/Proposal/Voting/VotersModal.tsx +++ b/src/components/Proposal/Voting/VotersModal.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IProposalOutcome, IProposalState, Vote } from "@daostack/client"; +import { Address, IDAOState, IProposalOutcome, IProposalState, Vote } from "@daostack/arc.js"; import { getArc } from "arc"; import classNames from "classnames"; import AccountImage from "components/Account/AccountImage"; diff --git a/src/components/Redemptions/RedemptionsButton.tsx b/src/components/Redemptions/RedemptionsButton.tsx index c6742831b..1a2f09c85 100644 --- a/src/components/Redemptions/RedemptionsButton.tsx +++ b/src/components/Redemptions/RedemptionsButton.tsx @@ -1,4 +1,4 @@ -import { Address } from "@daostack/client"; +import { Address } from "@daostack/arc.js"; import { getArc } from "arc"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import gql from "graphql-tag"; diff --git a/src/components/Redemptions/RedemptionsMenu.tsx b/src/components/Redemptions/RedemptionsMenu.tsx index c04ea7f53..279f934a7 100644 --- a/src/components/Redemptions/RedemptionsMenu.tsx +++ b/src/components/Redemptions/RedemptionsMenu.tsx @@ -1,4 +1,4 @@ -import { Address, IDAOState, IProposalState, IRewardState, Proposal, Reward } from "@daostack/client"; +import { Address, IDAOState, IProposalState, IRewardState, Proposal, Reward } from "@daostack/arc.js"; import { enableWalletProvider, getArc } from "arc"; import { redeemProposal } from "actions/arcActions"; diff --git a/src/components/Redemptions/RedemptionsPage.tsx b/src/components/Redemptions/RedemptionsPage.tsx index 9bb3e59e1..b5e7f8fc3 100644 --- a/src/components/Redemptions/RedemptionsPage.tsx +++ b/src/components/Redemptions/RedemptionsPage.tsx @@ -1,4 +1,4 @@ -import { Address, DAOFieldsFragment, IContributionReward, IDAOState, IRewardState, Proposal } from "@daostack/client"; +import { Address, DAOFieldsFragment, IContributionReward, IDAOState, IRewardState, Proposal } from "@daostack/arc.js"; import { enableWalletProvider, getArc } from "arc"; import { redeemProposal } from "actions/arcActions"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/Card.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/Card.tsx index c8875f6e3..f8c4738be 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/Card.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/Card.tsx @@ -6,7 +6,7 @@ import { IProfileState } from "reducers/profilesReducer"; import { IRootState } from "reducers"; import CountdownText from "components/Scheme/ContributionRewardExtRewarders/Competition/CountdownText"; import { connect } from "react-redux"; -import { IDAOState, IProposalState } from "@daostack/client"; +import { IDAOState, IProposalState } from "@daostack/arc.js"; import { Link } from "react-router-dom"; import * as React from "react"; import { competitionStatus, CompetitionStatus } from "./utils"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CountdownText.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CountdownText.tsx index a9e2de78b..1a46a1cc1 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CountdownText.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CountdownText.tsx @@ -1,6 +1,6 @@ import Countdown from "components/Shared/Countdown"; import { formatFriendlyDateForLocalTimezone } from "lib/util"; -import { ICompetitionProposalState } from "@daostack/client"; +import { ICompetitionProposalState } from "@daostack/arc.js"; import * as React from "react"; import { CompetitionStatus, CompetitionStatusEnum } from "./utils"; import * as css from "./Competitions.scss"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateProposal.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateProposal.tsx index e9ef9534e..4ca2e0b48 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateProposal.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateProposal.tsx @@ -1,4 +1,4 @@ -import { IDAOState, ISchemeState, IProposalCreateOptionsCompetition } from "@daostack/client"; +import { IDAOState, ISchemeState, IProposalCreateOptionsCompetition } from "@daostack/arc.js"; import * as arcActions from "actions/arcActions"; import { enableWalletProvider, getArc } from "arc"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateSubmission.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateSubmission.tsx index eb87b4afb..943d5096f 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateSubmission.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateSubmission.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IProposalState } from "@daostack/client"; +import { IDAOState, IProposalState } from "@daostack/arc.js"; import { ErrorMessage, Field, Form, Formik, FormikProps } from "formik"; import { isValidUrl } from "lib/util"; import * as React from "react"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/Details.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/Details.tsx index 3fdf979c2..46c9b9a5e 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/Details.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/Details.tsx @@ -19,7 +19,7 @@ import { Link, RouteComponentProps } from "react-router-dom"; import { DiscussionEmbed } from "disqus-react"; import { connect } from "react-redux"; import { IDAOState, IProposalState, ICompetitionSuggestionState, Address, CompetitionVote, IProposalOutcome, - CompetitionSuggestion, Proposal, Scheme } from "@daostack/client"; + CompetitionSuggestion, Proposal, Scheme } from "@daostack/arc.js"; import gql from "graphql-tag"; import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; import * as React from "react"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/List.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/List.tsx index bbbec2e3e..2f74b5ea6 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/List.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/List.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; -import { ISchemeState, IDAOState, IProposalState, CompetitionSuggestion, CompetitionVote } from "@daostack/client"; +import { ISchemeState, IDAOState, IProposalState, CompetitionSuggestion, CompetitionVote } from "@daostack/arc.js"; import { SortService } from "lib/sortService"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import { combineLatest, of } from "rxjs"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/StatusBlob.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/StatusBlob.tsx index 230e77d4b..0dacc0d09 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/StatusBlob.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/StatusBlob.tsx @@ -1,4 +1,4 @@ -import { ICompetitionProposalState } from "@daostack/client"; +import { ICompetitionProposalState } from "@daostack/arc.js"; import * as React from "react"; import classNames from "classnames"; import { competitionStatus } from "./utils"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/SubmissionDetails.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/SubmissionDetails.tsx index 67be5d5c0..18a09d072 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/SubmissionDetails.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/SubmissionDetails.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IProposalState, Address, ICompetitionSuggestionState, CompetitionVote } from "@daostack/client"; +import { IDAOState, IProposalState, Address, ICompetitionSuggestionState, CompetitionVote } from "@daostack/arc.js"; import * as React from "react"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/utils.ts b/src/components/Scheme/ContributionRewardExtRewarders/Competition/utils.ts index b825da7f6..5d476f6ff 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/utils.ts +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/utils.ts @@ -1,4 +1,4 @@ -import { ICompetitionProposalState, Competition, CompetitionSuggestion, ICompetitionSuggestionState, CompetitionVote, Address } from "@daostack/client"; +import { ICompetitionProposalState, Competition, CompetitionSuggestion, ICompetitionSuggestionState, CompetitionVote, Address } from "@daostack/arc.js"; import * as Redux from "redux"; import { ThunkAction } from "redux-thunk"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/DetailsPageRouter.tsx b/src/components/Scheme/ContributionRewardExtRewarders/DetailsPageRouter.tsx index a6499e04e..1baff686e 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/DetailsPageRouter.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/DetailsPageRouter.tsx @@ -2,7 +2,7 @@ import { RouteComponentProps } from "react-router"; import * as React from "react"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import { getArc } from "arc"; -import { IDAOState, IProposalState, Address } from "@daostack/client"; +import { IDAOState, IProposalState, Address } from "@daostack/arc.js"; import Loading from "components/Shared/Loading"; import { getCrxRewarderComponent, CrxRewarderComponentType } from "components/Scheme/ContributionRewardExtRewarders/rewardersProps"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/rewardersProps.ts b/src/components/Scheme/ContributionRewardExtRewarders/rewardersProps.ts index 58590eafc..83ea94784 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/rewardersProps.ts +++ b/src/components/Scheme/ContributionRewardExtRewarders/rewardersProps.ts @@ -1,4 +1,4 @@ -import { ISchemeState } from "@daostack/client"; +import { ISchemeState } from "@daostack/arc.js"; import { getArc } from "arc"; export const hasRewarderContract = (schemeState: ISchemeState): boolean => { diff --git a/src/components/Scheme/ReputationFromToken.tsx b/src/components/Scheme/ReputationFromToken.tsx index 0246a2a1d..08ea3ebfe 100644 --- a/src/components/Scheme/ReputationFromToken.tsx +++ b/src/components/Scheme/ReputationFromToken.tsx @@ -1,5 +1,5 @@ import { promisify } from "util"; -import { Address, ISchemeState, Token } from "@daostack/client"; +import { Address, ISchemeState, Token } from "@daostack/arc.js"; import axios from "axios"; import { getWeb3Provider, getArcSettings } from "arc"; import { soliditySHA3 } from "ethereumjs-abi"; diff --git a/src/components/Scheme/SchemeContainer.tsx b/src/components/Scheme/SchemeContainer.tsx index 8edf08df5..41b69afbf 100644 --- a/src/components/Scheme/SchemeContainer.tsx +++ b/src/components/Scheme/SchemeContainer.tsx @@ -1,6 +1,6 @@ import { History } from "history"; import { first, filter, toArray, mergeMap } from "rxjs/operators"; -import { Address, CompetitionScheme, IProposalStage, IDAOState, ISchemeState, IProposalState, IProposalOutcome, Scheme } from "@daostack/client"; +import { Address, CompetitionScheme, IProposalStage, IDAOState, ISchemeState, IProposalState, IProposalOutcome, Scheme } from "@daostack/arc.js"; import { getArc } from "arc"; import classNames from "classnames"; import Loading from "components/Shared/Loading"; diff --git a/src/components/Scheme/SchemeInfoPage.tsx b/src/components/Scheme/SchemeInfoPage.tsx index a30898eba..aa4abd105 100644 --- a/src/components/Scheme/SchemeInfoPage.tsx +++ b/src/components/Scheme/SchemeInfoPage.tsx @@ -4,7 +4,7 @@ import { enableWalletProvider } from "arc"; import { History } from "history"; import * as React from "react"; import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; -import { Address, ISchemeState, IGenesisProtocolParams, IDAOState } from "@daostack/client"; +import { Address, ISchemeState, IGenesisProtocolParams, IDAOState } from "@daostack/arc.js"; import { copyToClipboard, fromWei, linkToEtherScan, roundUp } from "lib/util"; import { schemeName } from "lib/schemeUtils"; import * as moment from "moment"; diff --git a/src/components/Scheme/SchemeOpenBountyPage.tsx b/src/components/Scheme/SchemeOpenBountyPage.tsx index 5ffcfbb80..6abf27624 100644 --- a/src/components/Scheme/SchemeOpenBountyPage.tsx +++ b/src/components/Scheme/SchemeOpenBountyPage.tsx @@ -3,7 +3,7 @@ import * as React from "react"; import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; -import { Address, ISchemeState } from "@daostack/client"; +import { Address, ISchemeState } from "@daostack/arc.js"; import { schemeName } from "lib/schemeUtils"; import { getNetworkName } from "lib/util"; import * as css from "./SchemeInfo.scss"; diff --git a/src/components/Scheme/SchemeProposalsPage.tsx b/src/components/Scheme/SchemeProposalsPage.tsx index 0d727af4a..3c644bec2 100644 --- a/src/components/Scheme/SchemeProposalsPage.tsx +++ b/src/components/Scheme/SchemeProposalsPage.tsx @@ -1,5 +1,5 @@ import { History } from "history"; -import { Address, IDAOState, IProposalStage, ISchemeState, Proposal, Vote, Reward, Scheme, Stake } from "@daostack/client"; +import { Address, IDAOState, IProposalStage, ISchemeState, Proposal, Vote, Reward, Scheme, Stake } from "@daostack/arc.js"; import { enableWalletProvider, getArc } from "arc"; import Loading from "components/Shared/Loading"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; diff --git a/src/components/Shared/PreTransactionModal.tsx b/src/components/Shared/PreTransactionModal.tsx index 6aa277381..02abb43d1 100644 --- a/src/components/Shared/PreTransactionModal.tsx +++ b/src/components/Shared/PreTransactionModal.tsx @@ -1,4 +1,4 @@ -import { IDAOState, IMemberState, IProposalState, IProposalStage } from "@daostack/client"; +import { IDAOState, IMemberState, IProposalState, IProposalStage } from "@daostack/arc.js"; import { enableWalletProvider } from "arc"; import BN = require("bn.js"); diff --git a/src/components/Shared/ProposalCountdown.tsx b/src/components/Shared/ProposalCountdown.tsx index 8fb954c59..1e5d733cb 100644 --- a/src/components/Shared/ProposalCountdown.tsx +++ b/src/components/Shared/ProposalCountdown.tsx @@ -1,4 +1,4 @@ -import { IProposalOutcome, IProposalStage, IProposalState } from "@daostack/client"; +import { IProposalOutcome, IProposalStage, IProposalState } from "@daostack/arc.js"; import * as classNames from "classnames"; import * as moment from "moment"; import * as React from "react"; diff --git a/src/components/Shared/UserSearchField.tsx b/src/components/Shared/UserSearchField.tsx index 5d7772652..d1ddaa005 100644 --- a/src/components/Shared/UserSearchField.tsx +++ b/src/components/Shared/UserSearchField.tsx @@ -1,4 +1,4 @@ -import { Member } from "@daostack/client"; +import { Member } from "@daostack/arc.js"; import * as React from "react"; import * as Autosuggest from "react-autosuggest"; import { connect } from "react-redux"; diff --git a/src/layouts/AppContainer.tsx b/src/layouts/AppContainer.tsx index 169c2b6a7..fcfd9af22 100644 --- a/src/layouts/AppContainer.tsx +++ b/src/layouts/AppContainer.tsx @@ -24,7 +24,7 @@ import { ModalContainer } from "react-router-modal"; import { History } from "history"; import classNames from "classnames"; import { captureException, withScope } from "@sentry/browser"; -import { Address } from "@daostack/client"; +import { Address } from "@daostack/arc.js"; import { sortedNotifications } from "../selectors/notifications"; import * as css from "./App.scss"; diff --git a/src/layouts/Header.tsx b/src/layouts/Header.tsx index 448772c1e..87d3646f2 100644 --- a/src/layouts/Header.tsx +++ b/src/layouts/Header.tsx @@ -20,7 +20,7 @@ import { of } from "rxjs"; import Toggle from "react-toggle"; import { RefObject } from "react"; import classNames from "classnames"; -import { Address, IDAOState } from "@daostack/client"; +import { Address, IDAOState } from "@daostack/arc.js"; import { ETHDENVER_OPTIMIZATION } from "../settings"; import * as css from "./App.scss"; import ProviderConfigButton from "layouts/ProviderConfigButton"; diff --git a/src/layouts/SidebarMenu.tsx b/src/layouts/SidebarMenu.tsx index b40e0640b..e2499d36c 100644 --- a/src/layouts/SidebarMenu.tsx +++ b/src/layouts/SidebarMenu.tsx @@ -1,4 +1,4 @@ -import { IDAOState, Token } from "@daostack/client"; +import { IDAOState, Token } from "@daostack/arc.js"; import { hideMenu } from "actions/uiActions"; import { getArc } from "arc"; import TrainingTooltip from "components/Shared/TrainingTooltip"; diff --git a/src/lib/daoHelpers.ts b/src/lib/daoHelpers.ts index 792ec8bf5..77f4ab06a 100644 --- a/src/lib/daoHelpers.ts +++ b/src/lib/daoHelpers.ts @@ -1,4 +1,4 @@ -import { DAO, IDAOState, Reputation, Token } from "@daostack/client"; +import { DAO, IDAOState, Reputation, Token } from "@daostack/arc.js"; import { getArc } from "arc"; import BN = require("bn.js"); diff --git a/src/lib/proposalHelpers.ts b/src/lib/proposalHelpers.ts index f00a5f5a1..d62ed4276 100644 --- a/src/lib/proposalHelpers.ts +++ b/src/lib/proposalHelpers.ts @@ -1,6 +1,6 @@ import * as moment from "moment"; -import { IProposalOutcome, IProposalStage, IProposalState } from "@daostack/client"; +import { IProposalOutcome, IProposalStage, IProposalState } from "@daostack/arc.js"; export interface IRedemptionState { accountAddress: string; diff --git a/src/lib/schemeUtils.ts b/src/lib/schemeUtils.ts index 090f216d9..a7786cc20 100644 --- a/src/lib/schemeUtils.ts +++ b/src/lib/schemeUtils.ts @@ -2,7 +2,7 @@ import { Address, IContractInfo, - ISchemeState} from "@daostack/client"; + ISchemeState} from "@daostack/arc.js"; import { rewarderContractName } from "components/Scheme/ContributionRewardExtRewarders/rewardersProps"; import { GenericSchemeRegistry } from "genericSchemeRegistry"; diff --git a/src/lib/util.ts b/src/lib/util.ts index 7bbd88749..17922021f 100644 --- a/src/lib/util.ts +++ b/src/lib/util.ts @@ -3,7 +3,7 @@ import { Address, IProposalStage, IProposalState, - IRewardState} from "@daostack/client"; + IRewardState} from "@daostack/arc.js"; import { of } from "rxjs"; import { catchError } from "rxjs/operators"; diff --git a/test/integration/proposal-competition.ts b/test/integration/proposal-competition.ts index 7cacf4d76..d69d46d7d 100644 --- a/test/integration/proposal-competition.ts +++ b/test/integration/proposal-competition.ts @@ -1,6 +1,6 @@ import * as uuid from "uuid"; import { first } from "rxjs/operators"; -import { DAO, Arc } from "@daostack/client"; +import { DAO, Arc } from "@daostack/arc.js"; import { getArc, setCalendarDate, hideCookieAcceptWindow, gotoDaoSchemes } from "./utils"; describe("Proposals", () => { diff --git a/test/integration/utils.ts b/test/integration/utils.ts index 036f9d872..2d7a4e706 100644 --- a/test/integration/utils.ts +++ b/test/integration/utils.ts @@ -1,4 +1,4 @@ -import { Arc } from "@daostack/client"; +import { Arc } from "@daostack/arc.js"; const settings = { graphqlHttpProvider: "http://127.0.0.1:8000/subgraphs/name/daostack", From 3c54598a587c1f55c5f1d503f8e2d5e96fb2a35b Mon Sep 17 00:00:00 2001 From: orenyodfat Date: Wed, 6 May 2020 08:13:49 +0300 Subject: [PATCH 03/10] Update subgraph_endpoints.json (#1662) --- src/subgraph_endpoints.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/subgraph_endpoints.json b/src/subgraph_endpoints.json index a0cb7cf44..81e4d5c77 100644 --- a/src/subgraph_endpoints.json +++ b/src/subgraph_endpoints.json @@ -1,12 +1,12 @@ { - "http_main": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v39_3", - "ws_main": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v39_3", - "http_rinkeby": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v39_3_rinkeby", - "ws_rinkeby": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v39_3_rinkeby", - "http_kovan": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v39_3_kovan", - "ws_kovan": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v39_3_kovan", - "http_xdai": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v39_3_xdai", - "ws_xdai": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v39_3_xdai", + "http_main": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v39_4", + "ws_main": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v39_4", + "http_rinkeby": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v39_4_rinkeby", + "ws_rinkeby": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v39_4_rinkeby", + "http_kovan": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v39_4_kovan", + "ws_kovan": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v39_4_kovan", + "http_xdai": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v39_4_xdai", + "ws_xdai": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v39_4_xdai", "http_ganache": "http://127.0.0.1:8000/subgraphs/name/daostack", "ws_ganache": "ws://127.0.0.1:8001/subgraphs/name/daostack" } From ff1e3c20ec61e136c0ab1d5543ed1aaa19dcc6b3 Mon Sep 17 00:00:00 2001 From: orenyodfat Date: Thu, 7 May 2020 00:45:54 +0300 Subject: [PATCH 04/10] add console warn if scheme has future activation time (#1669) * Update schemeUtils.ts * lint --- src/lib/schemeUtils.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/schemeUtils.ts b/src/lib/schemeUtils.ts index a7786cc20..0af136c03 100644 --- a/src/lib/schemeUtils.ts +++ b/src/lib/schemeUtils.ts @@ -210,6 +210,11 @@ export function getSchemeIsActive(scheme: ISchemeState, action?: GetSchemeIsActi console.warn(` getSchemeIsActive: voting machine appears not to be GenesisProtocol: ${scheme.name}`); return true; } else { - return moment(votingMachineParams.activationTime*1000).isSameOrBefore(moment()); + if (moment(votingMachineParams.activationTime*1000).isSameOrBefore(moment())) { + return true; + } + // eslint-disable-next-line no-console + console.warn(` getSchemeIsActive: future activation time: ${scheme.name}`); + return false; } } From 623a5a1669be3a6d36cf03c76f11d25c42472b8a Mon Sep 17 00:00:00 2001 From: Theeylon Date: Thu, 7 May 2020 16:51:35 +0300 Subject: [PATCH 05/10] xDAI: Remove burner connect , Add Tor.us (#1652) * Update settings.ts xDAI: - Remove burner connect (Not in use) - add Tor.us * Update settings.ts * Update settings.ts * update settings.ts Updated with the xDAI network URL * Update settings.ts * Update settings.ts * Update settings.ts * Update settings.ts * Update settings.ts * Update settings.ts * web3modal v 1.6.3 * spelling * update package-lock.json * add network to torus..option * setting. * lint Co-authored-by: orenyodfat Co-authored-by: Oren Sokolowsky --- CHANGELOG.md | 4 +- package-lock.json | 887 +++++++--------------------------------------- package.json | 2 +- src/settings.ts | 15 +- 4 files changed, 148 insertions(+), 760 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f31b28a5b..1c20b208f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,8 +21,8 @@ - added support for embedded youtube and vimeo videos in proposal descriptions - recommended node.js version to build Alchemy is set to 12.16.2 - upgrade to use subgraph v39_3 - - add subgraph_endpoints.json so it could be read externaly - - add CENNZ ERC20 token to be showen as dao owned tokens/balance + - add subgraph_endpoints.json so it could be read externally + - add CENNZ ERC20 token to be shown as dao owned tokens/balance - Bugs Fixed - fix Torus not connecting on first try diff --git a/package-lock.json b/package-lock.json index eb73c8c88..ee29b35f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2239,9 +2239,9 @@ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "@ethersproject/abi": { - "version": "5.0.0-beta.152", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.0-beta.152.tgz", - "integrity": "sha512-+1+ukofyBYNJo8IdIK8lBENkEycgXW1ny1zWT7oYD8GKvczYYrgucRQnJPgt3u9MJYZdje4yxDQFoGd6d4BpRA==", + "version": "5.0.0-beta.153", + "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.0-beta.153.tgz", + "integrity": "sha512-aXweZ1Z7vMNzJdLpR1CZUAIgnwjrZeUSvN9syCwlBaEBUFJmFY+HHnfuTI5vIhVs/mRkfJVrbEyl51JZQqyjAg==", "requires": { "@ethersproject/address": ">=5.0.0-beta.128", "@ethersproject/bignumber": ">=5.0.0-beta.130", @@ -2269,9 +2269,9 @@ } }, "@ethersproject/abstract-signer": { - "version": "5.0.0-beta.141", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.0.0-beta.141.tgz", - "integrity": "sha512-94ldEV+H2BI00lBEWKf0HlX7IrbMcPPFYbSnj2f1/cqB2y8RNttEe0gR39ALrCUeqY+ceLnKxIz2tOY9sllMFw==", + "version": "5.0.0-beta.142", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.0.0-beta.142.tgz", + "integrity": "sha512-5DeGLRjjOKuwGcOHnLp7L9JqsOs6h6Y4/ge0DgDuwtQwIgo03jIeEb+IPLKsjJp8VJWOYSaodreyXFVLuA5ZwA==", "requires": { "@ethersproject/abstract-provider": ">=5.0.0-beta.131", "@ethersproject/bignumber": ">=5.0.0-beta.130", @@ -2338,9 +2338,9 @@ } }, "@ethersproject/contracts": { - "version": "5.0.0-beta.150", - "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.0.0-beta.150.tgz", - "integrity": "sha512-ODHv8o3dJPXo2vTtQ1dmla6KhykTtYlgQxwgyyYXt/r2PhMVyFQsljVYkJRUuHgC17WYBopmWGeVeYAxNeOhtQ==", + "version": "5.0.0-beta.151", + "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.0.0-beta.151.tgz", + "integrity": "sha512-ELmsmZ/vE/rz5ydJNlU04aXsh7sw22tzmy7vM5JXCgMm5nEFhGoRF+dRIrUFCuUV2Mxe0bALN11qGkRqFKlXRQ==", "requires": { "@ethersproject/abi": ">=5.0.0-beta.137", "@ethersproject/abstract-provider": ">=5.0.0-beta.131", @@ -2456,17 +2456,17 @@ } }, "@ethersproject/properties": { - "version": "5.0.0-beta.139", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.0-beta.139.tgz", - "integrity": "sha512-IFMEWxWkx8ATeGtY56pnHXK40eJgfO9UeEsK/24Qzwyl5jA5Lhz6OoElaW3UG5LLupHmLoRuLyuG1WNg2olC3A==", + "version": "5.0.0-beta.140", + "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.0-beta.140.tgz", + "integrity": "sha512-0VH4JZvDWjYClByFl+xr2g3CrQ1D0helmM5IOP8ZFCxiAGnyQee+vwORKdVISZ5IlTJYJYXD5UrYHRF3LxTsHA==", "requires": { "@ethersproject/logger": ">=5.0.0-beta.129" } }, "@ethersproject/providers": { - "version": "5.0.0-beta.164", - "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.0-beta.164.tgz", - "integrity": "sha512-c8pu+eYROr88dfDuW9aImESq2nHupzE5fFERHwLMQnl5eW20iEy37/1CEIRhjhBsHtRA/JpFPSRKPr4o1RcF4Q==", + "version": "5.0.0-beta.165", + "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.0-beta.165.tgz", + "integrity": "sha512-SgQHvy/Yaar0WEqP2Yo6U6r6CiVytXkX49DgN3wDsRi2J21yHX2js+ODfabTTRDw7l/tyn5UmDJow84jju/eRg==", "requires": { "@ethersproject/abstract-provider": ">=5.0.0-beta.131", "@ethersproject/abstract-signer": ">=5.0.0-beta.132", @@ -2592,9 +2592,9 @@ } }, "@ethersproject/web": { - "version": "5.0.0-beta.137", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.0-beta.137.tgz", - "integrity": "sha512-A5pyWFSVjUHK/etvAkX3tOTMe6Vn1oOReFUCZ/wUzECJE4fLLLPs1e+MKkkcEKtJygeo8rc0sDuNj/EjN8U7+Q==", + "version": "5.0.0-beta.138", + "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.0-beta.138.tgz", + "integrity": "sha512-FoiUdnhq7nyvtlLE2eZGWNm3BZmz8NGSGaKyMmxAlvZofLCWfvditNijUzF143HueDkDD9tglDvig/6QJCj0aQ==", "requires": { "@ethersproject/base64": ">=5.0.0-beta.126", "@ethersproject/logger": ">=5.0.0-beta.129", @@ -3158,9 +3158,9 @@ } }, "react-transition-group": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz", - "integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", "requires": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -3184,9 +3184,9 @@ }, "dependencies": { "react-transition-group": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz", - "integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", "requires": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -3708,9 +3708,9 @@ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" }, "@solidity-parser/parser": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.6.0.tgz", - "integrity": "sha512-RiJXfS22frulogcfQCFhbKrd5ATu6P4tYUv/daChiIh6VHyKQ1kkVZVfX6aP7c2YGU/Bf9RwGNKdwLjfpaoqYQ==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.6.1.tgz", + "integrity": "sha512-MUA5kP9LdeTILeOsaz/k/qA4MdTNUxrn6q6HMYsMzQN5crU9bWKND2DaoWZhzofQM0VaTOaD8GFkCw1BYbNj5w==", "dev": true }, "@stablelib/utf8": { @@ -5133,9 +5133,9 @@ } }, "@toruslabs/torus-embed": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@toruslabs/torus-embed/-/torus-embed-1.3.1.tgz", - "integrity": "sha512-6/RZjSAp1BhJ8UtnG5fetlQIp0+Ks/vqDC1pQ2As4C3eR4vOLRoxj5BwGriju132NQRVjN4nKbxz/Ez6EN2bJA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@toruslabs/torus-embed/-/torus-embed-1.3.3.tgz", + "integrity": "sha512-IximJ1+HlVHggjzE9aXT494EB8BiPN/1ONgCO3rxjcC9eXOcj6vAmo7ZLREEDPEwQkoPc8T2fDRUEtkdA4RLXg==", "requires": { "@chaitanyapotti/random-id": "^1.0.3", "@toruslabs/fetch-node-details": "^2.2.1", @@ -5374,9 +5374,9 @@ "dev": true }, "@types/html-minifier-terser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.0.0.tgz", - "integrity": "sha512-q95SP4FdkmF0CwO0F2q0H6ZgudsApaY/yCtAQNRn1gduef5fGpyEphzy0YCq/N0UFvDSnLg5V8jFK/YGXlDiCw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz", + "integrity": "sha512-iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA==", "dev": true }, "@types/invariant": { @@ -5425,9 +5425,9 @@ } }, "@types/jquery": { - "version": "3.3.37", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.37.tgz", - "integrity": "sha512-4MNntGYm6xdDiz2+B92xEmWcFN9mOeMXqS854lSe7LDpBhzscUjvXjCAl6JwPBtAkqmPZq+L4I5UyXXNDZyq4Q==", + "version": "3.3.38", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.38.tgz", + "integrity": "sha512-nkDvmx7x/6kDM5guu/YpXkGZ/Xj/IwGiLDdKM99YA5Vag7pjGyTJ8BNUh/6hxEn/sEu5DKtyRgnONJ7EmOoKrA==", "dev": true, "requires": { "@types/sizzle": "*" @@ -5475,9 +5475,9 @@ } }, "@types/node": { - "version": "12.12.37", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.37.tgz", - "integrity": "sha512-4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg==" + "version": "12.12.38", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.38.tgz", + "integrity": "sha512-75eLjX0pFuTcUXnnWmALMzzkYorjND0ezNEycaKesbUBg9eGZp4GHPuDmkRc4mQQvIpe29zrzATNRA6hkYqwmA==" }, "@types/npmlog": { "version": "4.1.2", @@ -5835,9 +5835,9 @@ } }, "@types/underscore": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.4.tgz", - "integrity": "sha512-CjHWEMECc2/UxOZh0kpiz3lEyX2Px3rQS9HzD20lxMvx571ivOBQKeLnqEjxUY0BMgp6WJWo/pQLRBwMW5v4WQ==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.0.tgz", + "integrity": "sha512-ZAbqul7QAKpM2h1PFGa5ETN27ulmqtj0QviYHasw9LffvXZvVHuraOx/FOsIPPDNGZN0Qo1nASxxSfMYOtSoCw==", "dev": true }, "@types/web3": { @@ -7071,9 +7071,9 @@ }, "dependencies": { "@types/node": { - "version": "13.13.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz", - "integrity": "sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==" + "version": "13.13.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.5.tgz", + "integrity": "sha512-3ySmiBYJPqgjiHA7oEaIo2Rzz0HrOZ7yrNO5HWyaE5q0lQ3BppDZ3N53Miz8bw2I7gh1/zir2MGVZBvpb1zq9g==" } } }, @@ -10006,17 +10006,35 @@ } }, "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.1.0.tgz", + "integrity": "sha512-VYxo7cDCeYUoBZ0ZCy4UyEUCP3smyBd4DRQM5nrFS1jJjPJjX7rP3oLRpPoWfkhQfyJ0I9ZbHbKafrFD/SGlrg==", "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.2", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0" + }, + "dependencies": { + "bn.js": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz", + "integrity": "sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA==" + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "browserify-zlib": { @@ -10383,9 +10401,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001050", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001050.tgz", - "integrity": "sha512-OvGZqalCwmapci76ISq5q4kuAskb1ebqF3FEQBv1LE1kWht0pojlDDqzFlmk5jgYkuZN7MNZ1n+ULwe/7MaDNQ==" + "version": "1.0.30001053", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001053.tgz", + "integrity": "sha512-HtV4wwIZl6GA4Oznse8aR274XUOYGZnQLcf/P8vHgmlfqSNelwD+id8CyHOceqLqt9yfKmo7DUZTh1EuS9pukg==" }, "capture-exit": { "version": "2.0.0", @@ -12621,6 +12639,11 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "detect-browser": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/detect-browser/-/detect-browser-5.1.0.tgz", + "integrity": "sha512-WKa9p+/MNwmTiS+V2AS6eGxic+807qvnV3hC+4z2GTY+F42h1n8AynVTMMc4EJBC32qMs6yjOTpeDEQQt/AVqQ==" + }, "detect-file": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", @@ -13049,9 +13072,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.427", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", - "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + "version": "1.3.430", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.430.tgz", + "integrity": "sha512-HMDYkANGhx6vfbqpOf/hc6hWEmiOipOHGDeRDeUb3HLD3XIWpvKQxFgWf0tgHcr3aNv6I/8VPecplqmQsXoZSw==" }, "element-resize-detector": { "version": "1.2.1", @@ -14557,9 +14580,9 @@ } }, "ethereumjs-common": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.0.tgz", - "integrity": "sha512-SZOjgK1356hIY7MRj3/ma5qtfr/4B5BL+G4rP/XSMYr2z1H5el4RX5GReYCKmQmYI/nSBmRnwrZ17IfHuG0viQ==" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.1.tgz", + "integrity": "sha512-aVUPRLgmXORGXXEVkFYgPhr9TGtpBY2tGhZ9Uh0A3lIUzUDr1x6kQx33SbjPUkLkX3eniPQnIL/2psjkjrOfcQ==" }, "ethereumjs-tx": { "version": "2.1.2", @@ -15913,554 +15936,14 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz", - "integrity": "sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, "optional": true, "requires": { "bindings": "^1.5.0", - "nan": "^2.12.1", - "node-pre-gyp": "*" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "3.2.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.6.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true - }, - "minipass": { - "version": "2.9.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.3.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.9.0" - } - }, - "mkdirp": { - "version": "0.5.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "ms": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.3.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.14.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4.4.2" - } - }, - "nopt": { - "version": "4.0.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "npm-normalize-package-bin": "^1.0.1" - } - }, - "npm-normalize-package-bin": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1", - "npm-normalize-package-bin": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - } - }, - "readable-stream": { - "version": "2.3.7", - "bundled": true, - "dev": true, - "optional": 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" - } - }, - "rimraf": { - "version": "2.7.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.7.1", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.13", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "yallist": { - "version": "3.1.1", - "bundled": true, - "dev": true, - "optional": true - } + "nan": "^2.12.1" } }, "fstream": { @@ -18564,9 +18047,9 @@ "integrity": "sha512-MsMOijQ4v0xlmrz1fc7lyPEy7jFhoNF7EVaRSP7mPzs20LaFOwG6qNjGRy3Ie85n9DARlcUnB1zbsBv5sJrIvw==" }, "nanoid": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.4.tgz", - "integrity": "sha512-ycTkPSwmUmEdtvPPuszyOCm+Fzw+/AngWkaJ52oZ6l4Mdhh/yNNrWflAzrXbSn3v1mL+GBl6qegU6w6ml5JSWw==" + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.5.tgz", + "integrity": "sha512-77yYm8wPy8igTpUQv9fA0VzEb5Ohxt5naC3zTK1oAb+u1MiyITtx0jpYrYRFfgJlefwJy2SkCaojZvxSYq6toA==" } } }, @@ -49004,15 +48487,15 @@ } }, "node-releases": { - "version": "1.1.53", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", - "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==", + "version": "1.1.55", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz", + "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==", "dev": true }, "node-sass": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.0.tgz", - "integrity": "sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -49029,7 +48512,7 @@ "node-gyp": "^3.8.0", "npmlog": "^4.0.0", "request": "^2.88.0", - "sass-graph": "^2.2.4", + "sass-graph": "2.2.5", "stdout-stream": "^1.4.0", "true-case-path": "^1.0.2" }, @@ -50803,9 +50286,9 @@ "dev": true }, "polished": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/polished/-/polished-3.6.0.tgz", - "integrity": "sha512-H7tsy9h5JVGXh7BdNzm/v/Q+zIasiwXnYflSmrLd+YpK+8dXKJTKl/kzCtB2kns2N5dyelRvjUtpOKK/nLCanA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/polished/-/polished-3.6.2.tgz", + "integrity": "sha512-V0dyaVJUM5e5wIhLHvZyyE9PhXoI0AlGT6RDww1V/v+STsocLsVGWmi+9OKTL49oaQj85XFDvsWi/uHQJ0rpWg==", "dev": true, "requires": { "@babel/runtime": "^7.9.2" @@ -54663,9 +54146,9 @@ }, "dependencies": { "react-transition-group": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz", - "integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", "requires": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -55835,140 +55318,43 @@ } }, "sass-graph": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.6.tgz", - "integrity": "sha512-MKuEYXFSGuRSi8FZ3A7imN1CeVn9Gpw0/SFJKdL1ejXJneI9a5rwlEZrKejhEFAA3O6yr3eIyl/WuvASvlT36g==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", "dev": true, "requires": { "glob": "^7.0.0", "lodash": "^4.0.0", "scss-tokenizer": "^0.2.3", - "yargs": "^7.0.0" + "yargs": "^13.3.2" }, "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, - "requires": { - "invert-kv": "^1.0.0" - } - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, - "requires": { - "lcid": "^1.0.0" - } - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", + "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" } }, "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { - "camelcase": "^3.0.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -57373,9 +56759,9 @@ } }, "stream-transform": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-transform/-/stream-transform-2.0.1.tgz", - "integrity": "sha512-GiTcO/rRvZP2R8WPwxmxCFP+Of1yIATuFAmYkvSLDfcD93X2WHiPwdgIqeFT2CvL1gyAsjQvu1nB6RDNQ5b2jw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/stream-transform/-/stream-transform-2.0.2.tgz", + "integrity": "sha512-J+D5jWPF/1oX+r9ZaZvEXFbu7znjxSkbNAHJ9L44bt/tCVuOEWZlDqU9qJk7N2xBU1S+K2DPpSKeR/MucmCA1Q==", "requires": { "mixme": "^0.3.1" } @@ -58890,9 +58276,9 @@ "dev": true }, "tslib": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", - "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==" + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz", + "integrity": "sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg==" }, "tsort": { "version": "0.0.1", @@ -60168,10 +59554,11 @@ } }, "web3modal": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/web3modal/-/web3modal-1.5.0.tgz", - "integrity": "sha512-ylh/uhcjJ5Z6uXCv//EdeouemuLYijWptosde2wa2G6hr3A0BOJR9Gk2bPrkQ7h/dpYLYAS6/4Oay27I8sep2Q==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/web3modal/-/web3modal-1.6.3.tgz", + "integrity": "sha512-4xgpCC+uX+lON52y1dGzkxtlufVjSHEirVn0A8KwUs4RKXGFpZNU8jRDfkrbw7gdeznsscxym+NNgwK/ZcME5w==", "requires": { + "detect-browser": "^5.1.0", "prop-types": "^15.7.2", "react": "^16.8.6", "react-dom": "^16.8.6", diff --git a/package.json b/package.json index 14505ea14..5481c690d 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "ts-node": "^5.0.1", "utility-types": "^3.7.0", "web3": "1.2.4", - "web3modal": "1.5.0" + "web3modal": "1.6.3" }, "devDependencies": { "@babel/plugin-syntax-dynamic-import": "^7.7.4", diff --git a/src/settings.ts b/src/settings.ts index e52d4b36a..a8232ce22 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -110,14 +110,15 @@ function getWeb3ConnectProviderOptions(network: string) { case "xdai": return { network: "xdai", - burnerconnect: { - package: BurnerConnectProvider, + torus: { + package: Torus, options: { - defaultNetwork: "100", - defaultWallets: [ - { origin: "https://buffidao.com/", name: "BuffiDAO" }, - { origin: "https://judge.buffidao.com/", name: "Judges BuffiDAO Wallet" }, - ], + networkParams: { + host: "https://xdai.poanetwork.dev", + chainId: 100, + networkName: "xdai", + network: "xdai", + }, }, }, }; From 6329555213993da13942265abf46d5a3ac42ebab Mon Sep 17 00:00:00 2001 From: orenyodfat Date: Sat, 9 May 2020 15:51:52 +0300 Subject: [PATCH 06/10] temorary workaround for gh issue #1684 (#1691) --- src/components/Proposal/Voting/VoteButtons.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/Proposal/Voting/VoteButtons.tsx b/src/components/Proposal/Voting/VoteButtons.tsx index c5bfab629..abc4602ed 100644 --- a/src/components/Proposal/Voting/VoteButtons.tsx +++ b/src/components/Proposal/Voting/VoteButtons.tsx @@ -7,7 +7,7 @@ import classNames from "classnames"; import Reputation from "components/Account/Reputation"; import { ActionTypes, default as PreTransactionModal } from "components/Shared/PreTransactionModal"; import Analytics from "lib/analytics"; -import { fromWei } from "lib/util"; +import { fromWei, targetedNetwork } from "lib/util"; import { Page } from "pages"; import * as React from "react"; import { connect } from "react-redux"; @@ -101,7 +101,9 @@ class VoteButtons extends React.Component { (proposal.stage === IProposalStage.Boosted && expired) || (proposal.stage === IProposalStage.QuietEndingPeriod && expired) || (currentAccountState && currentAccountState.reputation.eq(new BN(0))) || - (currentAccountState && (proposal.createdAt < currentAccountState.createdAt)) || + (currentAccountState && (proposal.createdAt < currentAccountState.createdAt) && + //this is a workaround till https://github.com/daostack/subgraph/issues/548 + (targetedNetwork() !== "ganache")) || currentVote === IProposalOutcome.Pass || currentVote === IProposalOutcome.Fail ; From 7359cc0aba2c0591a21ee7c8e0733e026f53f566 Mon Sep 17 00:00:00 2001 From: Doug Kent Date: Mon, 11 May 2020 07:14:43 -0400 Subject: [PATCH 07/10] add plugin to SchemeRegstrar plugins list (#1688) --- .../Create/SchemeForms/CreateSchemeRegistrarProposal.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx index 15f45b2fa..7683a0761 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx @@ -258,6 +258,7 @@ class CreateSchemeRegistrarProposal extends React.Component {

Competition Plugin — Create competitions with prizes split between any number of winners. Competitions accept submissions from anyone, and Reputation-holders vote to decide the winners.

ENS Plugins — A set of plugins that enables the DAO to control Ethereum Name Service addresses via proposals.

Reputation from Token — Allow anyone to redeem Reputation using a token of your choice.

+

Stake for Reputation Plugin — Allow anyone to stake a token of your choice to earn voting power in your DAO.

Bounties Plugins — Via proposal, create DAO-administered bounties on Bounties Network.

Join and Quit Plugins — Allow anyone to join the DAO via a donation and quit anytime, reclaiming at least part of their original funds (“rage quit”). Coming soon.

NFT Plugins — Allow the DAO to hold, send, mint, and sell NFTs (non-fungible tokens). Coming soon.

From 2e93f86d2120747623760113d04b4d96f98c61c1 Mon Sep 17 00:00:00 2001 From: Doug Kent Date: Mon, 11 May 2020 07:15:44 -0400 Subject: [PATCH 08/10] breadcrumbs for dao landing page, proposal plugins (#1683) --- src/components/Dao/DaoSchemesPage.tsx | 2 +- src/components/Scheme/SchemeProposalsPage.tsx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Dao/DaoSchemesPage.tsx b/src/components/Dao/DaoSchemesPage.tsx index 9c068a6b2..e4367f9ca 100644 --- a/src/components/Dao/DaoSchemesPage.tsx +++ b/src/components/Dao/DaoSchemesPage.tsx @@ -105,7 +105,7 @@ class DaoSchemesPage extends React.Component { return (
- {dao.name} + Proposal Plugins

Proposal Plugins

diff --git a/src/components/Scheme/SchemeProposalsPage.tsx b/src/components/Scheme/SchemeProposalsPage.tsx index 3c644bec2..d44aa01a0 100644 --- a/src/components/Scheme/SchemeProposalsPage.tsx +++ b/src/components/Scheme/SchemeProposalsPage.tsx @@ -125,7 +125,8 @@ class SchemeProposalsPage extends React.Component { const schemeFriendlyName = schemeName(scheme, scheme.address); return ( -
+ <> + Proposal Plugins {schemeFriendlyName}
@@ -233,7 +234,7 @@ class SchemeProposalsPage extends React.Component {
} -
+ ); } } From 24b8069f32d589e1ee04861f63b614fa6630e012 Mon Sep 17 00:00:00 2001 From: Doug Kent Date: Mon, 11 May 2020 07:37:12 -0400 Subject: [PATCH 09/10] refactor and fix appearance of New Proposal button (#1681) --- src/components/Scheme/Scheme.scss | 120 ++++++++++++------ src/components/Scheme/SchemeContainer.tsx | 100 +++++++++++---- src/components/Scheme/SchemeInfo.scss | 29 ----- src/components/Scheme/SchemeInfoPage.tsx | 21 --- src/components/Scheme/SchemeProposals.scss | 29 ----- src/components/Scheme/SchemeProposalsPage.tsx | 31 +---- 6 files changed, 162 insertions(+), 168 deletions(-) diff --git a/src/components/Scheme/Scheme.scss b/src/components/Scheme/Scheme.scss index 8a9038739..d16c097cd 100644 --- a/src/components/Scheme/Scheme.scss +++ b/src/components/Scheme/Scheme.scss @@ -8,7 +8,7 @@ color: #689ad6; padding: 0; margin: 0; - padding-bottom: 15px; + margin-bottom: 30px; background-color: #e5ebf2; padding-top: 10px; } @@ -17,42 +17,76 @@ width: 100%; background-color: rgba(229, 235, 242, 1); border-bottom: 1px solid rgba(212, 220, 228, 1); - padding-top: 15px; - position: relative; - margin-bottom: 20px; - - a { - color: rgba(0, 29, 53, 1); - display: inline-block; - font-size: 16px; - transition: all 0.25s ease; - } - - a:visited { - color: rgba(0, 29, 53, 1); - } - - .proposals, - .info, - .crx, - .openbounty { - border-bottom: 2px solid rgba(34, 128, 254, 0); - /* TODO: for .crx this left/right padding may not be appropriate for all CrX rewarder contracts. */ - padding: 10px 24px; - } - - .proposals.active, - .info.active, - .crx.active, - .openbounty.active { - border-bottom: 2px solid rgba(34, 128, 254, 1); - } + margin-bottom: 15px; + + .row { + display: flex; + + .tabs { + flex-grow: 2; + white-space: nowrap; + + a { + color: rgba(0, 29, 53, 1); + display: inline-block; + font-size: 16px; + transition: all 0.25s ease; + } + + a:visited { + color: rgba(0, 29, 53, 1); + } + + .proposals, + .info, + .crx, + .openbounty { + border-bottom: 2px solid rgba(34, 128, 254, 0); + /* TODO: for .crx this left/right padding may not be appropriate for all CrX rewarder contracts. */ + padding: 10px 24px 10px 24px; + } + + .proposals.active, + .info.active, + .crx.active, + .openbounty.active { + border-bottom: 2px solid rgba(34, 128, 254, 1); + } + + .proposals:hover, + .info:hover, + .crx:hover, + .openbounty:hover { + border-bottom: 2px solid rgba(34, 128, 254, 0.5); + } + } - .proposals:hover, - .info:hover, - .crx:hover, - .openbounty:hover { - border-bottom: 2px solid rgba(34, 128, 254, 0.5); + .editPlugin, + .createProposal { + align-self: center; + + a { + padding: 8px 15px; + color: $white; + background-color: rgba(3, 118, 255, 1); + border-radius: 15px; + font-size: 13px; + white-space: nowrap; + display: inline-block; + + &:hover { + background-color: $accent-1; + color: $white; + } + + .disabled, + .disabled:hover { + background-color: rgba(200, 200, 200, 0.5); + border: 1px solid rgba(200, 200, 200, 1); + cursor: not-allowed; + } + } + } } } @@ -159,8 +193,18 @@ } .schemeMenu { - a { - font-size: 12px; + text-align: center; + .row { + display: inline-block; + margin-bottom: 8px; + + .tabs { + display: block; + margin-bottom: 1rem; + a { + font-size: 12px; + } + } } } } diff --git a/src/components/Scheme/SchemeContainer.tsx b/src/components/Scheme/SchemeContainer.tsx index 41b69afbf..03fc79cf0 100644 --- a/src/components/Scheme/SchemeContainer.tsx +++ b/src/components/Scheme/SchemeContainer.tsx @@ -1,7 +1,7 @@ import { History } from "history"; import { first, filter, toArray, mergeMap } from "rxjs/operators"; import { Address, CompetitionScheme, IProposalStage, IDAOState, ISchemeState, IProposalState, IProposalOutcome, Scheme } from "@daostack/arc.js"; -import { getArc } from "arc"; +import { getArc, enableWalletProvider } from "arc"; import classNames from "classnames"; import Loading from "components/Shared/Loading"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; @@ -69,7 +69,12 @@ class SchemeContainer extends React.Component { } private schemeInfoPageHtml = (props: any) => ; - private schemeProposalsPageHtml = (isActive: boolean, crxRewarderProps: ICrxRewarderProps) => (props: any) => ; + private schemeProposalsPageHtml = (isActive: boolean, crxRewarderProps: ICrxRewarderProps) => (props: any) => + ; private contributionsRewardExtTabHtml = () => (props: any) => { if (!this.state.crxListComponent) { @@ -94,11 +99,28 @@ class SchemeContainer extends React.Component { this.setState(newState); } + private handleNewProposal = async (e: any): Promise => { + if (!await enableWalletProvider({ showNotification: this.props.showNotification })) { return; } + + this.props.history.push(`/dao/${this.props.daoState.address}/scheme/${this.props.schemeId}/proposals/create/`); + + e.preventDefault(); + }; + + private handleEditPlugin = async (e: any) => { + if (!await enableWalletProvider({ showNotification: this.props.showNotification })) { return; } + + this.props.history.push(`/dao/${this.props.daoState.id}/scheme/${this.props.schemeId}/proposals/create/?currentTab=editScheme`); + e.preventDefault(); + } + + public render(): RenderOutput { const { schemeId, daoState } = this.props; const daoAvatarAddress = daoState.address; const schemeState = this.props.data[0]; const approvedProposals = this.props.data[2]; + const inInfoTab = this.props.location.pathname.match(/info\/*$/i); if (schemeState.name === "ReputationFromToken") { return ; @@ -109,11 +131,11 @@ class SchemeContainer extends React.Component { const proposalsTabClass = classNames({ [css.proposals]: true, - [css.active]: isProposalScheme && !this.props.location.pathname.includes("info") && !this.props.location.pathname.includes("crx") && !this.props.location.pathname.includes("open"), + [css.active]: isProposalScheme && !inInfoTab && !this.props.location.pathname.includes("crx") && !this.props.location.pathname.includes("open"), }); const infoTabClass = classNames({ [css.info]: true, - [css.active]: !isProposalScheme || this.props.location.pathname.includes("info"), + [css.active]: !isProposalScheme || inInfoTab, }); const openBountiesTabClass = classNames({ [css.openbounty]: true, @@ -126,7 +148,6 @@ class SchemeContainer extends React.Component { }); const schemeFriendlyName = schemeName(schemeState, schemeState.address); - return (
@@ -143,25 +164,58 @@ class SchemeContainer extends React.Component {
- {isProposalScheme - ? Proposals - : ""} - - { // if Bounties Scheme, create new tab - (schemeName(schemeState, schemeState.address) === "Standard Bounties") && - Open Bounties - } - - - Information - - { - this.state.crxRewarderProps ? - - {this.state.crxRewarderProps.friendlyName} ({approvedProposals.length}) + +
+
+ {isProposalScheme + ? Proposals + : ""} + + { // if Bounties Scheme, create new tab + (schemeName(schemeState, schemeState.address) === "Standard Bounties") && + Open Bounties + } + + + Information - : "" - } + { + this.state.crxRewarderProps ? + + {this.state.crxRewarderProps.friendlyName} ({approvedProposals.length}) + + : "" + } +
+ + {inInfoTab ? + + : + + } +
diff --git a/src/components/Scheme/SchemeInfo.scss b/src/components/Scheme/SchemeInfo.scss index 0b01ec403..4f58e645c 100644 --- a/src/components/Scheme/SchemeInfo.scss +++ b/src/components/Scheme/SchemeInfo.scss @@ -92,35 +92,6 @@ cursor: pointer; } -.editPlugin { - z-index: 1000000; - position: fixed; - right: 0; - top: 155px; - text-align: right; - - a { - padding: 8px 15px; - color: $white; - background-color: rgba(3, 118, 255, 1); - border-radius: 15px; - font-size: 13px; - white-space: nowrap; - - &:hover { - background-color: $accent-1; - color: $white; - } - - &.disabled, - &.disabled:hover { - background-color: rgba(200, 200, 200, 0.5); - border: 1px solid rgba(200, 200, 200, 1); - cursor: not-allowed; - } - } -} - @media only screen and (max-width: 425px) { .ellipsis { position: relative; diff --git a/src/components/Scheme/SchemeInfoPage.tsx b/src/components/Scheme/SchemeInfoPage.tsx index aa4abd105..bf4966b1b 100644 --- a/src/components/Scheme/SchemeInfoPage.tsx +++ b/src/components/Scheme/SchemeInfoPage.tsx @@ -1,6 +1,5 @@ /* tslint:disable:max-classes-per-file */ -import { enableWalletProvider } from "arc"; import { History } from "history"; import * as React from "react"; import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; @@ -11,7 +10,6 @@ import * as moment from "moment"; import { NotificationStatus, showNotification } from "reducers/notifications"; import { connect } from "react-redux"; import Tooltip from "rc-tooltip"; -import TrainingTooltip from "components/Shared/TrainingTooltip"; import * as css from "./SchemeInfo.scss"; interface IDispatchProps { @@ -38,13 +36,6 @@ class SchemeInfo extends React.Component { this.props.showNotification(NotificationStatus.Success, "Copied to clipboard!"); }; - private handleEditPlugin = async (e: any) => { - if (!await enableWalletProvider({ showNotification: this.props.showNotification })) { return; } - - this.props.history.push(`/dao/${this.props.daoState.id}/scheme/${this.props.schemeManager.id}/proposals/create/?currentTab=editScheme`); - e.preventDefault(); - } - public render(): RenderOutput { const { daoState, scheme } = this.props; const daoAvatarAddress = daoState.address; @@ -132,18 +123,6 @@ class SchemeInfo extends React.Component { return
Info - -

{schemeName(scheme, scheme.address)}

diff --git a/src/components/Scheme/SchemeProposals.scss b/src/components/Scheme/SchemeProposals.scss index 6d21a71fa..7eedb892b 100644 --- a/src/components/Scheme/SchemeProposals.scss +++ b/src/components/Scheme/SchemeProposals.scss @@ -120,32 +120,3 @@ margin-top: 8px; } } - -.createProposal { - z-index: 1000000; - position: fixed; - right: 0; - top: 155px; - text-align: right; - - a { - padding: 8px 15px; - color: $white; - background-color: rgba(3, 118, 255, 1); - border-radius: 15px; - font-size: 13px; - white-space: nowrap; - - &:hover { - background-color: $accent-1; - color: $white; - } - - &.disabled, - &.disabled:hover { - background-color: rgba(200, 200, 200, 0.5); - border: 1px solid rgba(200, 200, 200, 1); - cursor: not-allowed; - } - } -} \ No newline at end of file diff --git a/src/components/Scheme/SchemeProposalsPage.tsx b/src/components/Scheme/SchemeProposalsPage.tsx index d44aa01a0..de0212051 100644 --- a/src/components/Scheme/SchemeProposalsPage.tsx +++ b/src/components/Scheme/SchemeProposalsPage.tsx @@ -1,6 +1,6 @@ import { History } from "history"; import { Address, IDAOState, IProposalStage, ISchemeState, Proposal, Vote, Reward, Scheme, Stake } from "@daostack/arc.js"; -import { enableWalletProvider, getArc } from "arc"; +import { getArc } from "arc"; import Loading from "components/Shared/Loading"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import gql from "graphql-tag"; @@ -45,6 +45,7 @@ interface IExternalProps { scheme: ISchemeState; daoState: IDAOState; crxRewarderProps: any; + handleNewProposal: (e: any) => void; } interface IDispatchProps { @@ -70,17 +71,6 @@ class SchemeProposalsPage extends React.Component { }); } - private async handleNewProposal(daoAvatarAddress: Address, schemeId: any): Promise { - if (!await enableWalletProvider({ showNotification: this.props.showNotification })) { return; } - - this.props.history.push(`/dao/${daoAvatarAddress}/scheme/${schemeId}/proposals/create/`); - } - - private _handleNewProposal = (e: any): void => { - this.handleNewProposal(this.props.daoState.address, this.props.scheme.id); - e.preventDefault(); - }; - public render(): RenderOutput { const { data } = this.props; @@ -129,21 +119,6 @@ class SchemeProposalsPage extends React.Component { Proposal Plugins {schemeFriendlyName} - - { proposalsQueued.length === 0 && proposalsPreBoosted.length === 0 && proposalsBoosted.length === 0 ?
@@ -161,7 +136,7 @@ class SchemeProposalsPage extends React.Component { [css.disabled]: !isActive, })} href="#!" - onClick={isActive ? this._handleNewProposal : null} + onClick={isActive ? this.props.handleNewProposal : null} data-test-id="createProposal" >+ New Proposal
From 71fa3fd86d01f6c5b0999707c68d708f2047865b Mon Sep 17 00:00:00 2001 From: Doug Kent Date: Mon, 11 May 2020 13:05:09 -0400 Subject: [PATCH 10/10] Bump version and update changelog (#1694) * bump version, update changelog * edit * remove references to alchemy server * update nodejs version in readme --- CHANGELOG.md | 5 +++++ README.md | 5 ++--- docs/development.md | 2 +- docs/nodocker.md | 4 ---- package-lock.json | 2 +- package.json | 2 +- scripts/serviceStatus.js | 8 -------- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ea5726e0..0df8ff4ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,14 @@ ## 0.10.7 - Features Added + - Added "Stake for Reputation Plugin" to the list of known plugins that can be registered to a DAO + - Use Tor.us and Metamask providers when running against xDAI network (removes Burner Connect) - Bugs Fixed - Display a proper msg for daos members with no reputation at the moment of a proposal creation - Fix summing up the number of schemes open proposals + - Cosmetic improvement to the New Proposal button + - Fix to breadcrumbs relating to the new DAO landing page + - Don't display unregistered schemes in the Plugin Manager plugins dropdown ## 0.10.6 - Features Added diff --git a/README.md b/README.md index 57ee65c0a..3e071e395 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,7 @@ While anyone can propose and predict, only people who hold reputation (voting po ## Dependencies: * [NVM](https://github.com/creationix/nvm#installation) can be helpful to manage different versions of node -* [NodeJS 9.4 or greater + NPM](https://github.com/creationix/nvm#usage) -* You will need [alchemy-server](https://github.com/daostack/alchemy-server) running locally for the app to function +* [NodeJS 12.6.2 or greater + NPM](https://github.com/creationix/nvm#usage) ## Installation @@ -41,7 +40,7 @@ you can recreate the docker environment by installing an starting all [services The easiest way to start developing is to work with docker. Here is a quick setup; there are more detailed instructions in [here](./docs/development.md). -After you have installed docker, run the following command to spin up ganache (with the migrated contracts), the caching server and the alchemy server: +After you have installed docker, run the following command to spin up ganache (with the migrated contracts), the graph-node server: ```sh docker-compose up graph-node ``` diff --git a/docs/development.md b/docs/development.md index 51fe0bd55..042bec0a8 100644 --- a/docs/development.md +++ b/docs/development.md @@ -3,7 +3,7 @@ There are different ways a developer can use the docker environment for development. Probably the most flexible way is to run the services that alchemy depends on in one terminal, -and run the alchemy server in a separate terminal: +and run the graph-node server in a separate terminal: ```sh # run this only if package.json has changed diff --git a/docs/nodocker.md b/docs/nodocker.md index 7b665fe85..a1af74071 100644 --- a/docs/nodocker.md +++ b/docs/nodocker.md @@ -4,10 +4,6 @@ You can run all needed services locally # Run app locally -## Run the Alchemy Server -1. If you want to be able to save and display the proposal titles and descriptions you will need the Alchemy Server app running. -2. Follow instructions [here](https://github.com/daostack/alchemy-server) - ## Working with Ganache without MetaMask 1. Make sure plugins such as MetaMask or Parity extension are deactivated 2. Run `npm run auto-start-ganache` diff --git a/package-lock.json b/package-lock.json index ee29b35f2..140e43a13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "alchemy-client", - "version": "0.10.6", + "version": "0.10.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5481c690d..a81dfdb01 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "alchemy-client", - "version": "0.10.6", + "version": "0.10.7", "description": "An app for collaborative networks (DAOs), based on the DAO stack.", "author": "DAOstack", "license": "GPL-3.0", diff --git a/scripts/serviceStatus.js b/scripts/serviceStatus.js index 6662f1782..bf200e4d4 100644 --- a/scripts/serviceStatus.js +++ b/scripts/serviceStatus.js @@ -28,14 +28,6 @@ async function main() { name: 'Graphiql interface for daostack', url: 'http://127.0.0.1:8000/subgraphs/name/daostack' }, - { - name: 'Alchemy Server', - url: 'http://0.0.0.0:3001/explorer' - }, - { - name: 'Alchemy server (accounts)', - url: 'http://127.0.0.1:3001/api/accounts' - }, { name: 'Alchemy Application', url: 'http://0.0.0.0:3000',