GSMC new closing at (#641)

* GSMC new closing at

* fix

* move consts to utils

Author: ben-kaufman

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@daostack/subgraph",
-  "version": "0.0.41-8",
+  "version": "0.0.41-9",
   "author": "DAOstack (https://www.daostack.io)",
   "license": "GPL-3.0",
   "description": "A caching layer for daostack using The Graph",

package.json

@@ -12,7 +12,7 @@ import { Address,
          store } from '@graphprotocol/graph-ts';
 import { GenesisProtocol } from '../types/GenesisProtocol/GenesisProtocol';
 import { ControllerScheme, DAO, GenesisProtocolParam, Proposal, Tag } from '../types/schema';
-import { concat, equalsBytes, equalStrings } from '../utils';
+import { CLOSING_AT_TIME_DECREASE_GSMC, CLOSING_AT_TIME_INCREASE, concat, equalsBytes, equalStrings } from '../utils';
 import { getDAO, saveDAO } from './dao';
 import { addNewProposalEvent, addVoteFlipEvent } from './event';
 import { updateThreshold } from './gpqueue';
@@ -434,8 +434,11 @@ export function updateProposalExecution(
   proposal.executedAt = timestamp;
   // Setting the closingAt field to a far away point in the future so it will be easy to
   // sort all proposal(open and executed) in ascending order by the closingAt field
-  const CLOSING_AT_TIME_INCREASE = 2147483647;
-  proposal.closingAt = (BigInt.fromI32(CLOSING_AT_TIME_INCREASE).minus(timestamp)).times(BigInt.fromI32(100));
+  if (proposal.genericSchemeMultiCall) {
+    proposal.closingAt = timestamp.minus(BigInt.fromI32(CLOSING_AT_TIME_DECREASE_GSMC));
+  } else {
+    proposal.closingAt = (BigInt.fromI32(CLOSING_AT_TIME_INCREASE).minus(timestamp)).times(BigInt.fromI32(100));
+  }
   if (totalReputation != null) {
     proposal.totalRepWhenExecuted = totalReputation;
   }

src/domain/proposal.ts

@@ -1,4 +1,4 @@
-import { Bytes, store } from '@graphprotocol/graph-ts';
+import { BigInt, Bytes, store } from '@graphprotocol/graph-ts';
 
 // Import event types from the Reputation contract ABI
 import {
@@ -10,10 +10,12 @@ import {
 import * as domain from '../../domain';
 
 // Import entity types generated from the GraphQL schema
+import { getProposal } from '../../domain/proposal';
 import {
   GenericSchemeMultiCallProposal,
   GenericSchemeParam,
 } from '../../types/schema';
+import { CLOSING_AT_TIME_DECREASE_GSMC, CLOSING_AT_TIME_INCREASE } from '../../utils';
 
 function insertNewProposal(event: NewMultiCallProposal): void {
   let ent = new GenericSchemeMultiCallProposal(event.params._proposalId.toHex());
@@ -65,6 +67,13 @@ export function handleProposalExecuted(
   ) as GenericSchemeMultiCallProposal;
   if (ent != null) {
     ent.executed = true;
+    let proposal = getProposal(event.params._proposalId.toHex());
+    proposal.closingAt = (
+      BigInt.fromI32(CLOSING_AT_TIME_INCREASE).minus(
+        proposal.closingAt.plus(BigInt.fromI32(CLOSING_AT_TIME_DECREASE_GSMC)),
+      )
+    ).times(BigInt.fromI32(100));
+    proposal.save();
   }
 
   store.set('GenericSchemeMultiCallProposal', event.params._proposalId.toHex(), ent);

src/mappings/GenericSchemeMultiCall/mapping.ts

@@ -29,6 +29,9 @@ export function concat(a: ByteArray, b: ByteArray): ByteArray {
   return out as ByteArray;
 }
 
+export const CLOSING_AT_TIME_DECREASE_GSMC = 32000000;
+export const CLOSING_AT_TIME_INCREASE = 2147483647;
+
 export function eventId(event: ethereum.Event): string {
   return crypto
     .keccak256(

src/utils.ts

@@ -172,15 +172,43 @@ describe('GenericSchemeMultiCall', () => {
             voter: accounts[3].address,
         });
 
-        await genericSchemeMultiCall.methods.execute(p1).send();
-
         const executedIsIndexed = async () => {
             return (await sendQuery(getProposal)).proposal.executedAt != null;
         };
 
         await waitUntilTrue(executedIsIndexed);
 
-        proposal = (await sendQuery(getProposal)).proposal;
+        const getProposalWithClosingAt = `{
+            proposal(id: "${p1}") {
+                id
+                descriptionHash
+                stage
+                createdAt
+                executedAt
+                proposer
+                votingMachine
+                closingAt
+                genericSchemeMultiCall {
+                  id
+                  dao {
+                     id
+                  }
+                  contractsToCall
+                  callsData
+                  values
+                  executed
+                  returnValues
+                }
+                scheme {
+                  genericSchemeMultiCallParams {
+                    contractsWhiteList
+                    schemeConstraints
+                  }
+                }
+            }
+        }`;
+
+        proposal = (await sendQuery(getProposalWithClosingAt)).proposal;
         expect(proposal).toMatchObject({
             id: p1,
             descriptionHash,
@@ -189,7 +217,38 @@ describe('GenericSchemeMultiCall', () => {
             executedAt: executedAt + '',
             proposer: web3.eth.defaultAccount.toLowerCase(),
             votingMachine: genesisProtocol.options.address.toLowerCase(),
+            closingAt: (parseInt(executedAt, 10) - 32000000).toString(),
+            genericSchemeMultiCall: {
+                id: p1,
+                dao: {
+                    id: addresses.Avatar.toLowerCase(),
+                },
+                contractsToCall,
+                callsData,
+                values,
+                executed: false,
+                returnValues: null,
+            },
+        });
 
+        await genericSchemeMultiCall.methods.execute(p1).send();
+
+        const executedGSMCIsIndexed = async () => {
+            return (await sendQuery(getProposalWithClosingAt)).proposal.genericSchemeMultiCall.executed == true;
+        };
+
+        await waitUntilTrue(executedGSMCIsIndexed);
+
+        proposal = (await sendQuery(getProposalWithClosingAt)).proposal;
+        expect(proposal).toMatchObject({
+            id: p1,
+            descriptionHash,
+            stage: 'Executed',
+            createdAt: p1Creation.toString(),
+            executedAt: executedAt + '',
+            proposer: web3.eth.defaultAccount.toLowerCase(),
+            votingMachine: genesisProtocol.options.address.toLowerCase(),
+            closingAt: ((2147483647 - parseInt(executedAt, 10)) * 100).toString(),
             genericSchemeMultiCall: {
                 id: p1,
                 dao: {