vocdoni · emmdim · Nov 9, 2023 · Nov 2, 2023 · Nov 3, 2023 · Nov 3, 2023
diff --git a/packages/contracts/src/architecture.md b/packages/contracts/src/architecture.md
diff --git a/packages/contracts/test/utils/types.ts b/packages/contracts/test/utils/types.ts
diff --git a/packages/contracts/test/vocdoni-voting.ts b/packages/contracts/test/vocdoni-voting.ts
@@ -815,6 +815,7 @@ describe('Vocdoni Plugin', function () {
           [signers[0].address], // signers[0] is listed
           vocdoniVotingSettings
         );
+
         await expect(
           vocdoniVoting
             .connect(signers[2]) // not listed

diff --git a/packages/js-client/src/internal/graphql-queries/example.ts b/packages/js-client/src/internal/graphql-queries/example.ts
diff --git a/packages/js-client/src/internal/graphql-queries/index.ts b/packages/js-client/src/internal/graphql-queries/index.ts
@@ -1,3 +1,3 @@
 // add your grapql queries here and export them with this file
+export * from './settings';
 export * from './proposal';
-export * from './token';
diff --git a/packages/js-client/src/internal/graphql-queries/proposal.ts b/packages/js-client/src/internal/graphql-queries/proposal.ts
@@ -1,77 +1,54 @@
 import { gql } from 'graphql-request';
 
-export const QueryTokenVotingProposal = gql`
-  query TokenVotingProposal($proposalId: ID!) {
-    tokenVotingProposal(id: $proposalId) {
+export const QueryPluginProposal = gql`
+  query PluginProposal($proposalId: ID!) {
+    pluginProposals(id: $proposalId) {
       id
       dao {
         id
-        subdomain
       }
-      creator
       metadata
-      createdAt
-      creationBlockNumber
-      executionDate
-      executionBlockNumber
       actions {
-        to
+        id
         value
         data
       }
-      yes
-      no
-      abstain
-      votingMode
-      supportThreshold
+      allowFailureMap
+      failureMap
+      pluginProposalId
+      vochainProposalId
+      creator
       startDate
+      createdAt
       voteEndDate
+      tallyEndDate
+      creationBlockNumber
+      snapshotBlock
       executed
-      earlyExecutable
-      potentiallyExecutable
+      executionDate
+      executionBlockNumber
       executionTxHash
-      voters {
-        voter {
-          address
-        }
-        voteReplaced
-        voteOption
-        votingPower
+      approvers {
+        id
       }
-      plugin {
-        token {
-          id
-          name
-          symbol
-          __typename
-          ... on ERC20Contract {
-            decimals
-          }
-          ... on ERC20WrapperContract {
-            decimals
-            underlyingToken {
-              id
-              name
-              symbol
-              decimals
-            }
-          }
-        }
+      tally {
+        id
+        values
       }
-      totalVotingPower
-      minVotingPower
+      tallyApproved
     }
   }
 `;
-export const QueryTokenVotingProposals = gql`
-  query TokenVotingProposals(
-    $where: TokenVotingProposal_filter!
+
+export const QueryPluginProposals = gql`
+  query QueryPluginProposals(
+    $where: PluginProposal_filter!
     $limit: Int!
     $skip: Int!
     $direction: OrderDirection!
-    $sortBy: TokenVotingProposal_orderBy!
+    $sortBy: TPluginProposal_orderBy!
   ) {
-    tokenVotingProposals(
+    pluginProposals(
       where: $where
       first: $limit
       skip: $skip
@@ -81,50 +58,36 @@ export const QueryTokenVotingProposals = gql`
       id
       dao {
         id
-        subdomain
       }
-      creator
       metadata
-      yes
-      no
-      abstain
+      actions {
+        id
+        value
+        data
+      }
+      allowFailureMap
+      failureMap
+      pluginProposalId
+      vochainProposalId
+      creator
       startDate
+      createdAt
       voteEndDate
+      tallyEndDate
+      creationBlockNumber
+      snapshotBlock
       executed
-      earlyExecutable
-      potentiallyExecutable
-      votingMode
-      supportThreshold
-      minVotingPower
-      totalVotingPower
-      voters {
-        voter {
-          address
-        }
-        voteReplaced
-        voteOption
-        votingPower
+      executionDate
+      executionBlockNumber
+      executionTxHash
+      approvers {
+        id
       }
-      plugin {
-        token {
-          id
-          name
-          symbol
-          __typename
-          ... on ERC20Contract {
-            decimals
-          }
-          ... on ERC20WrapperContract {
-            decimals
-            underlyingToken {
-              id
-              name
-              symbol
-              decimals
-            }
-          }
-        }
+      tally {
+        id
+        values
       }
+      tallyApproved
     }
   }
 `;
diff --git a/packages/js-client/src/internal/graphql-queries/settings.ts b/packages/js-client/src/internal/graphql-queries/settings.ts
@@ -0,0 +1,19 @@
+import { gql } from 'graphql-request';
+
+export const QueryPluginSettings = gql`
+  query PluginSettings($address: ID!, $block: Block_height) {
+    plugin(id: $address, block: $block) {
+      id
+      onlyExecutionMultisigProposalCreation
+      minTallyApprovals
+      minParticipation
+      supportThreshold
+      minVoteDuration
+      minTallyDuration
+      daoTokenAddress
+      censusStrategyURI
+      minProposerVotingPower
+      executionMultisigMembers
+    }
+  }
+`;
diff --git a/packages/js-client/src/internal/graphql-queries/token.ts b/packages/js-client/src/internal/graphql-queries/token.ts
diff --git a/packages/subgraph/manifest/subgraph.placeholder.yaml b/packages/subgraph/manifest/subgraph.placeholder.yaml
@@ -1,5 +1,5 @@
 {{info}}
-specVersion: 0.0.2
+specVersion: 0.0.5
 description: A template for Plugin subgraphs
 repository: https://github.com/aragon/osx-plugin-subgraph
 schema:
@@ -16,7 +16,7 @@ dataSources:
       startBlock: {{startBlock}}
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.7
       language: wasm/assemblyscript
       entities:
         - PluginInstallation
@@ -52,17 +52,27 @@ templates:
       abi: VocdoniVoting
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.7
       language: wasm/assemblyscript
       entities:
         - Plugin
       abis:
         - name: VocdoniVoting
           file: $PLUGIN_MODULE/artifacts/src/VocdoniVoting.sol/VocdoniVoting.json
       eventHandlers:
+        - event: PluginSettingsUpdated(bool,indexed uint16,uint32,uint32,uint64,uint64,indexed address,indexed string,uint256)
+          handler: handlePluginSettingsUpdated
         - event: ProposalCreated(indexed uint256,indexed bytes32,indexed address,uint64,uint64,uint64,(address,uint256,bytes)[],uint256)
           handler: handleProposalCreated
         - event: ProposalExecuted(indexed uint256)
           handler: handleProposalExecuted
+        - event: ExecutionMultisigMembersAdded(address[])
+          handler:  handleExecutionMultisigMembersAdded
+        - event: ExecutionMultisigMembersRemoved(address[])
+          handler: handleExecutionMultisigMembersRemoved
+        - event: TallySet(indexed uint256,uint256[][])
+          handler: handleTallySet
+        - event: TallyApproval(indexed uint256,indexed address)
+          handler: handleTallyApproval
       file: ./src/plugin/plugin.ts