Updated arc.js, test env and subgraph

docker-compose.yml

@@ -46,18 +46,18 @@ services:
       GRAPH_GRAPHQL_MAX_FIRST: 1000
 
   ipfs:
-    image: daostack/test-env-experimental-ipfs:4.0.17
+    image: daostack/test-env-experimental-ipfs:4.0.18
     ports:
       - 5001:5001
 
   postgres:
-    image: daostack/test-env-experimental-postgres:4.0.17
+    image: daostack/test-env-experimental-postgres:4.0.18
     ports:
       - 9432:5432
     environment:
       POSTGRES_PASSWORD: 'letmein'
 
   ganache:
-    image: daostack/test-env-experimental-ganache:4.0.17
+    image: daostack/test-env-experimental-ganache:4.0.18
     ports:
       - 8545:8545

docs/Alchemy_2_0_Benefits.md

@@ -44,6 +44,6 @@
 ## Misc 
  - NFT management plugin - send/mint/list 
  - Arc.react  - enable easy custom React UI components on top of subgraph and arc.js 
- - 2 new Common plugins - JoinAndQuit and Funding Request.
+ - 2 new Common plugins - Join and Funding Request.
  - Key value on chain DAO DB (implemented for Common) though can be used by other DAOs.
  - Automatic etherscan/blockscout contract verification upon each DAO deployment. 

package.json

@@ -79,7 +79,7 @@
   "dependencies": {
     "3box": "^1.20.3",
     "@burner-wallet/burner-connect-provider": "^0.1.1",
-    "@daostack/arc.js": "2.0.0-experimental.48",
+    "@daostack/arc.js": "2.0.0-experimental.50",
     "@dorgtech/daocreator-ui-experimental": "1.1.12",
     "@fortawesome/fontawesome-svg-core": "^1.2.10",
     "@fortawesome/free-brands-svg-icons": "^5.6.1",
@@ -150,7 +150,7 @@
   },
   "devDependencies": {
     "@babel/plugin-syntax-dynamic-import": "^7.7.4",
-    "@daostack/test-env-experimental": "4.0.17",
+    "@daostack/test-env-experimental": "4.0.18",
     "@storybook/addon-info": "^5.0.10",
     "@storybook/react": "^5.0.10",
     "@types/chai": "^4.1.7",

src/actions/arcActions.ts

@@ -8,7 +8,7 @@ import {
   ReputationFromTokenPlugin,
   Proposal,
   FundingRequestProposal,
-  JoinAndQuitProposal,
+  JoinProposal,
   IProposalState,
 } from "@daostack/arc.js";
 import { IAsyncAction } from "actions/async";
@@ -88,8 +88,8 @@ async function tryRedeemProposal(proposalId: string, accountAddress: string, obs
     case "FundingRequest":
       await (proposal as FundingRequestProposal).redeem().subscribe(...observer);
       break;
-    case "JoinAndQuit":
-      await (proposal as JoinAndQuitProposal).redeem().subscribe(...observer);
+    case "Join":
+      await (proposal as JoinProposal).redeem().subscribe(...observer);
       break;
     default:
       break;

src/components/Proposal/Create/PluginForms/CreatePluginManagerProposal.tsx

@@ -115,7 +115,7 @@ export interface IFormValues {
     votingParams: IGenesisProtocolFormValues;
     fundingToken: string;
   };
-  JoinAndQuit: {
+  Join: {
     permissions: IPermissions;
     votingParams: IGenesisProtocolFormValues;
     fundingToken: string;
@@ -218,7 +218,7 @@ const defaultValues: IFormValues = {
     },
     fundingToken: "0x0000000000000000000000000000000000000000",
   },
-  JoinAndQuit: {
+  Join: {
     votingParams: { ...votingParams },
     permissions: {
       registerPlugins: false,

src/components/Proposal/Create/PluginForms/PluginInitializeFields.tsx

@@ -130,14 +130,14 @@ const FundingRequest = () => (
   </div>
 );
 
-const JoinAndQuit = () => (
+const Join = () => (
   <div>
-    {fieldView("JoinAndQuit", "Funding Token", "fundingToken")}
-    {fieldView("JoinAndQuit", "Minimum Join Fee", "minFeeToJoin")}
-    {fieldView("JoinAndQuit", "Initial Reputation", "memberReputation")}
-    {fieldView("JoinAndQuit", "Funding Goal", "fundingGoal")}
-    {fieldView("JoinAndQuit", "Deadline", "fundingGoalDeadline")}
-    {fieldView("JoinAndQuit", "Allow Rage Quit", "rageQuitEnable")}
+    {fieldView("Join", "Funding Token", "fundingToken")}
+    {fieldView("Join", "Minimum Join Fee", "minFeeToJoin")}
+    {fieldView("Join", "Initial Reputation", "memberReputation")}
+    {fieldView("Join", "Funding Goal", "fundingGoal")}
+    {fieldView("Join", "Deadline", "fundingGoalDeadline")}
+    {fieldView("Join", "Allow Rage Quit", "rageQuitEnable")}
   </div>
 );
 
@@ -173,7 +173,7 @@ const fieldsMap = {
   Competition: CompetitionFields,
   ContributionRewardExt: ContributionRewardExtFields,
   FundingRequest: FundingRequest,
-  JoinAndQuit: JoinAndQuit,
+  Join: Join,
   SchemeRegistrar: SchemeRegistrarFields,
   SchemeFactory: PluginManagerFields,
   ReputationFromToken: ReputationFromTokenFields,

src/subgraph_endpoints.json

@@ -1,12 +1,12 @@
 {
   "http_main": "https://api.thegraph.com/subgraphs-daostack/name/daostack/TODO",
   "ws_main": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/TODO",
-  "http_rinkeby": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v8_10_exp_rinkeby",
-  "ws_rinkeby": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v8_10_exp_rinkeby",
-  "http_kovan": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v8_10_exp_kovan",
-  "ws_kovan": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v8_10_exp_kovan",
-  "http_xdai": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v8_10_exp_xdai",
-  "ws_xdai": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v8_10_exp_xdai",
+  "http_rinkeby": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v8_11_exp_rinkeby",
+  "ws_rinkeby": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v8_11_exp_rinkeby",
+  "http_kovan": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v8_11_exp_kovan",
+  "ws_kovan": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v8_11_exp_kovan",
+  "http_xdai": "https://api.thegraph.com/subgraphs-daostack/name/daostack/v8_11_exp_xdai",
+  "ws_xdai": "wss://api.thegraph.com/subgraphs-daostack/name/daostack/v8_11_exp_xdai",
   "http_ganache": "http://127.0.0.1:8000/subgraphs/name/daostack",
   "ws_ganache": "ws://127.0.0.1:8001/subgraphs/name/daostack"
 }