OS-265 : builder testing

packages/subgraph/.gitignore

@@ -9,3 +9,4 @@ artifacts
 deploy-output.txt
 dev-data
 tests/.latest.json
+tests/helpers/extended-schema.ts

packages/subgraph/CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added `method-classes`.
+- Added `schema-extender.ts`.
 - Added `installations` to `IPlugin`.
 - Added `PluginRelease`.
 - Added `metadata` to `PluginVersion`.

packages/subgraph/package.json

@@ -8,12 +8,14 @@
     "lint": "eslint . --ext .ts",
     "build:contracts": "cd ../contracts && yarn build",
     "manifest": "scripts/build-manifest.sh",
-    "build": "scripts/build-subgraph.sh",
+    "extend:schema": "yarn ts-node tests/schema-extender.ts",
+    "build": "scripts/build-subgraph.sh && yarn extend:schema",
     "deploy": "scripts/deploy-subgraph.sh",
     "create:local": "graph create aragon/aragon-core-rinkeby --node http://localhost:8020",
     "deploy:local": "LOCAL=true scripts/deploy-subgraph.sh",
     "start:dev": "docker-compose -f docker/docker-compose.yml up -d && sleep 15 && yarn create:local && yarn deploy:local",
     "stop:dev": "docker-compose -f docker/docker-compose.yml down",
+    "test:fast": "graph test",
     "test": "graph test -r",
     "coverage": "graph test -c",
     "formatting:check": "prettier '**/*.{json,ts,js}' -c",
@@ -26,6 +28,8 @@
     "@typescript-eslint/parser": "^5.18.0",
     "eslint": "^8.12.0",
     "matchstick-as": "^0.5.1",
-    "mustache": "^4.2.0"
+    "mustache": "^4.2.0",
+    "ts-morph": "^17.0.1",
+    "typescript": "^4.9.5"
   }
 }

packages/subgraph/schema.graphql

@@ -348,7 +348,7 @@ type TokenVotingPlugin implements IPlugin @entity {
   minParticipation: BigInt
   minDuration: BigInt
   minProposerVotingPower: BigInt
-  proposalCount: BigInt
+  proposalCount: BigInt!
   token: Token
   members: [TokenVotingMember!]! @derivedFrom(field: "plugin")
 }
@@ -362,7 +362,7 @@ type TokenVotingMember @entity {
 
 type TokenVotingVoter @entity {
   id: ID! # address
-  address: String # address as string to facilitate filtering by address on the UI
+  address: String! # address as string to facilitate filtering by address on the UI
   proposals: [TokenVotingVote!]! @derivedFrom(field: "voter")
   plugin: TokenVotingPlugin!
   lastUpdated: BigInt

packages/subgraph/src/plugin/utils.ts

@@ -5,6 +5,7 @@ import {
   ethereum,
   crypto,
   ByteArray,
+  BigInt
 } from '@graphprotocol/graph-ts';
 
 import {TokenVoting as TokenVotingContract} from '../../generated/templates/TokenVoting/TokenVoting';
@@ -44,6 +45,7 @@ function createTokenVotingPlugin(plugin: Address, daoId: string): void {
     packageEntity = new TokenVotingPlugin(pluginId);
     packageEntity.pluginAddress = plugin;
     packageEntity.dao = daoId;
+    packageEntity.proposalCount = BigInt.zero();
     let contract = TokenVotingContract.bind(plugin);
     let supportThreshold = contract.try_supportThreshold();
     let minParticipation = contract.try_minParticipation();
@@ -80,6 +82,7 @@ function createAddresslistVotingPlugin(plugin: Address, daoId: string): void {
     packageEntity = new AddresslistVotingPlugin(plugin.toHexString());
     packageEntity.pluginAddress = plugin;
     packageEntity.dao = daoId;
+    packageEntity.proposalCount = BigInt.zero();
 
     let contract = AddresslistVotingContract.bind(plugin);
 
@@ -136,6 +139,7 @@ function createMultisigPlugin(plugin: Address, daoId: string): void {
     packageEntity.onlyListed = false;
     packageEntity.pluginAddress = plugin;
     packageEntity.dao = daoId;
+    packageEntity.proposalCount = BigInt.zero();
 
     // Create template
     let context = new DataSourceContext();

packages/subgraph/src/utils/constants.ts

@@ -7,11 +7,22 @@ export const VOTER_OPTIONS = new Map<number, string>()
   .set(2, 'Yes')
   .set(3, 'No');
 
+export const VOTE_OPTIONS = new Map<string, string>()
+  .set('None', '0')
+  .set('Abstain', '1')
+  .set('Yes', '2')
+  .set('No', '3');
+
 export const VOTING_MODES = new Map<number, string>()
   .set(0, 'Standard')
   .set(1, 'EarlyExecution')
   .set(2, 'VoteReplacement');
 
+export const VOTING_MODE_INDEXES = new Map<string, string>()
+  .set('Standard', '0')
+  .set('EarlyExecution', '1')
+  .set('VoteReplacement', '2');
+
 export const TOKEN_VOTING_INTERFACE = '0x50eb001e';
 export const ADDRESSLIST_VOTING_INTERFACE = '0x5f21eb8b';
 export const ADMIN_INTERFACE = '0xa5793356';

packages/subgraph/tests/admin/adminMembers.test.ts

@@ -5,7 +5,7 @@ import {
   test,
   describe,
   beforeEach,
-  afterEach,
+  afterEach
 } from 'matchstick-as/assembly/index';
 
 import {ADDRESS_ONE, ADDRESS_TWO, DAO_ADDRESS} from '../constants';

packages/subgraph/tests/constants.ts

@@ -19,14 +19,6 @@ export const TWO = '2';
 export const THREE = '3';
 
 export const PROPOSAL_ID = ZERO;
-export const PROPOSAL_ENTITY_ID = getProposalId(
-  Address.fromString(CONTRACT_ADDRESS),
-  BigInt.fromString(PROPOSAL_ID)
-);
-
-export const PLUGIN_ENTITY_ID = Address.fromString(
-  CONTRACT_ADDRESS
-).toHexString();
 
 export const STRING_DATA = 'Some String Data ...';
 
@@ -54,7 +46,7 @@ export const ALLOW_FAILURE_MAP = '1';
 
 export const MIN_VOTING_POWER = TWO;
 export const TOTAL_VOTING_POWER = THREE;
-export const CREATED_AT = '1644850000';
+export const CREATED_AT = ONE;
 
 export const ZERO_BYTES32 =
   '0x0000000000000000000000000000000000000000000000000000000000000000';
@@ -72,3 +64,12 @@ export const PLUGIN_SETUP_ID =
   '0xfb3fd2c4cd4e19944dd3f8437e67476240cd9e3efb2294ebd10c59c8f1d6817c';
 export const APPLIED_PLUGIN_SETUP_ID =
   '0x00000000cd4e19944dd3f8437e67476240cd9e3efb2294ebd10c59c8f1d6817c';
+
+export const PROPOSAL_ENTITY_ID = getProposalId(
+  Address.fromString(CONTRACT_ADDRESS),
+  BigInt.fromString(PROPOSAL_ID)
+);
+
+export const PLUGIN_ENTITY_ID = Address.fromString(
+  CONTRACT_ADDRESS
+).toHexString();