OS-459 : Subgraph update to v1.3.0

packages/contracts/test/upgrade/dao.ts

@@ -7,8 +7,8 @@ import {
   DAO__factory as DAO_V1_0_0__factory,
 } from '../../typechain/osx-versions/v1_0_0/contracts/core/dao/DAO.sol';
 import {
-  DAO as DAO_V1_2_0,
-  DAO__factory as DAO_V1_2_0__factory,
+  DAO as DAO_V1_3_0,
+  DAO__factory as DAO_V1_3_0__factory,
 } from '../../typechain/osx-versions/v1_2_0/contracts/core/dao/DAO.sol';
 import {DAO, DAO__factory, ProtocolVersion__factory} from '../../typechain';
 
@@ -21,11 +21,11 @@ import {getInterfaceID} from '../test-utils/interfaces';
 
 let signers: SignerWithAddress[];
 let DAO_V1_0_0: DAO_V1_0_0__factory;
-let DAO_V1_2_0: DAO_V1_2_0__factory;
+let DAO_V1_3_0: DAO_V1_3_0__factory;
 let DAO_Current: DAO__factory;
 
 let daoV100Proxy: DAO_V1_0_0;
-let daoV120Proxy: DAO_V1_2_0;
+let daoV120Proxy: DAO_V1_3_0;
 
 let daoV100Implementation: string;
 let daoV120Implementation: string;
@@ -46,7 +46,7 @@ describe('DAO Upgrade', function () {
 
     // We don't use the typchain here but directly grab the artifacts. This will be changed in an upcoming PR again.
     DAO_V1_0_0 = new DAO_V1_0_0__factory(signers[0]);
-    DAO_V1_2_0 = new DAO_V1_2_0__factory(signers[0]);
+    DAO_V1_3_0 = new DAO_V1_3_0__factory(signers[0]);
     DAO_Current = new DAO__factory(signers[0]);
 
     // Deploy the v1.3.0 implementation
@@ -262,7 +262,7 @@ describe('DAO Upgrade', function () {
 
     context(`v1.2.0 to v1.3.0`, function () {
       beforeEach(async function () {
-        daoV120Proxy = await deployWithProxy(DAO_V1_2_0);
+        daoV120Proxy = await deployWithProxy(DAO_V1_3_0);
         await daoV120Proxy.initialize(
           DUMMY_METADATA,
           signers[0].address,
@@ -303,7 +303,7 @@ describe('DAO Upgrade', function () {
 
         // Check the emitted implementation.
         const emittedImplementation = (
-          await findEventTopicLog(upgradeTx, DAO_V1_2_0.interface, 'Upgraded')
+          await findEventTopicLog(upgradeTx, DAO_V1_3_0.interface, 'Upgraded')
         ).args.implementation;
         expect(emittedImplementation).to.equal(daoCurrentImplementaion.address);
 
@@ -486,7 +486,7 @@ describe('DAO Upgrade', function () {
       );
 
       // prepare v1.2.0
-      daoV120Proxy = await deployWithProxy(DAO_V1_2_0);
+      daoV120Proxy = await deployWithProxy(DAO_V1_3_0);
       await daoV120Proxy.initialize(
         DUMMY_METADATA,
         signers[0].address,

packages/subgraph/CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Renamed handling updates from v1.2.0 to v1.3.0
+- Fixed start & end date issue by indexing from `getProposal()` instead of the event.
 - BREAKING: DAO's plugins attribute derive from `PluginInstallation` instead of `IPlugin`.
 - BREAKING: Changed attribute of `proposalId` in all proposal entities to `pluginProposalId`
 - Supports now multiple `DAORegistries`, `PluginRepoRegistries` and `PluginSetupProcessors` as datasources.

packages/subgraph/manifest/subgraph.placeholder.yaml

@@ -142,7 +142,7 @@ templates:
           handler: handleSignatureValidatorSet
         - event: NewURI(string)
           handler: handleNewURI
-  - name: DaoTemplateV1_2_0
+  - name: DaoTemplateV1_3_0
     kind: ethereum/contract
     network: {{network}}
     source:
@@ -151,7 +151,7 @@ templates:
       kind: ethereum/events
       apiVersion: 0.0.5
       language: wasm/assemblyscript
-      file: ./src/dao/dao_v1_2_0.ts
+      file: ./src/dao/dao_v1_3_0.ts
       entities:
         - Dao
       abis:

packages/subgraph/src/dao/dao_v1_2_0.ts → packages/subgraph/src/dao/dao_v1_3_0.ts

@@ -2,7 +2,7 @@ import {TransactionActionsProposal} from '../../generated/schema';
 import {
   Executed,
   ExecutedActionsStruct
-} from '../../generated/templates/DaoTemplateV1_2_0/DAO';
+} from '../../generated/templates/DaoTemplateV1_3_0/DAO';
 import {handleAction} from './utils';
 
 export function handleExecuted(event: Executed): void {

packages/subgraph/src/packages/addresslist/addresslist-voting.ts

@@ -44,8 +44,6 @@ export function _handleProposalCreated(
   proposalEntity.metadata = metadata;
   proposalEntity.createdAt = event.block.timestamp;
   proposalEntity.creationBlockNumber = event.block.number;
-  proposalEntity.startDate = event.params.startDate;
-  proposalEntity.endDate = event.params.endDate;
   proposalEntity.allowFailureMap = event.params.allowFailureMap;
   proposalEntity.potentiallyExecutable = false;
 
@@ -63,6 +61,11 @@ export function _handleProposalCreated(
     proposalEntity.snapshotBlock = parameters.snapshotBlock;
     proposalEntity.minVotingPower = parameters.minVotingPower;
 
+    // Get the dates from `parameters` returned from `getProposal()`,
+    // so all the dates are correct in both build 1 & 2
+    proposalEntity.startDate = parameters.startDate;
+    proposalEntity.endDate = parameters.endDate;
+
     // Tally
     let tally = proposal.value.value3;
     proposalEntity.abstain = tally.abstain;

packages/subgraph/src/packages/token/token-voting.ts

@@ -40,19 +40,18 @@ export function _handleProposalCreated(
   daoId: string,
   metadata: string
 ): void {
+  let pluginAddress = event.address;
   let pluginProposalId = event.params.proposalId;
-  let proposalId = getProposalId(event.address, pluginProposalId);
+  let proposalId = getProposalId(pluginAddress, pluginProposalId);
 
   let proposalEntity = new TokenVotingProposal(proposalId);
   proposalEntity.dao = daoId;
-  proposalEntity.plugin = event.address.toHexString();
+  proposalEntity.plugin = pluginAddress.toHexString();
   proposalEntity.pluginProposalId = pluginProposalId;
   proposalEntity.creator = event.params.creator;
   proposalEntity.metadata = metadata;
   proposalEntity.createdAt = event.block.timestamp;
   proposalEntity.creationBlockNumber = event.block.number;
-  proposalEntity.startDate = event.params.startDate;
-  proposalEntity.endDate = event.params.endDate;
   proposalEntity.allowFailureMap = event.params.allowFailureMap;
   proposalEntity.potentiallyExecutable = false;
 
@@ -70,6 +69,11 @@ export function _handleProposalCreated(
     proposalEntity.snapshotBlock = parameters.snapshotBlock;
     proposalEntity.minVotingPower = parameters.minVotingPower;
 
+    // Get the dates from `parameters` returned from `getProposal()`,
+    // so all the dates are correct in both build 1 & 2
+    proposalEntity.startDate = parameters.startDate;
+    proposalEntity.endDate = parameters.endDate;
+
     // Tally
     let tally = proposal.value.value3;
     proposalEntity.abstain = tally.abstain;

packages/subgraph/src/registries/daoRegistry.ts

@@ -1,5 +1,5 @@
 import {DAORegistered} from '../../generated/DAORegistry/DAORegistry';
-import {DaoTemplateV1_0_0, DaoTemplateV1_2_0} from '../../generated/templates';
+import {DaoTemplateV1_0_0, DaoTemplateV1_3_0} from '../../generated/templates';
 import {Dao} from '../../generated/schema';
 import {dataSource} from '@graphprotocol/graph-ts';
 
@@ -22,7 +22,7 @@ export function handleDAORegistered(event: DAORegistered): void {
 
   // subscribe to templates
   DaoTemplateV1_0_0.create(event.params.dao);
-  DaoTemplateV1_2_0.create(event.params.dao);
+  DaoTemplateV1_3_0.create(event.params.dao);
 
   entity.save();
 }

packages/subgraph/tests/dao/dao_v1_2_0.test.ts → packages/subgraph/tests/dao/dao_v1_3_0.test.ts

@@ -13,8 +13,8 @@ import {
   Action,
   ERC721Balance
 } from '../../generated/schema';
-import {Executed} from '../../generated/templates/DaoTemplateV1_2_0/DAO';
-import {handleExecuted} from '../../src/dao/dao_v1_2_0';
+import {Executed} from '../../generated/templates/DaoTemplateV1_3_0/DAO';
+import {handleExecuted} from '../../src/dao/dao_v1_3_0';
 import {
   ERC20_transfer,
   getTransferId,