add pollId to roundInfo

subgraph/abis/FundingRound.json

@@ -466,6 +466,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "pollId",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "totalSpent",

subgraph/generated/ClrFund/FundingRound.ts

@@ -386,6 +386,21 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  pollId(): BigInt {
+    let result = super.call("pollId", "pollId():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_pollId(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   totalSpent(): BigInt {
     let result = super.call("totalSpent", "totalSpent():(uint256)", []);
 

subgraph/generated/schema.ts

@@ -796,6 +796,23 @@ export class FundingRound extends Entity {
     }
   }
 
+  get pollId(): BigInt | null {
+    let value = this.get("pollId");
+    if (!value || value.kind == ValueKind.NULL) {
+      return null;
+    } else {
+      return value.toBigInt();
+    }
+  }
+
+  set pollId(value: BigInt | null) {
+    if (!value) {
+      this.unset("pollId");
+    } else {
+      this.set("pollId", Value.fromBigInt(<BigInt>value));
+    }
+  }
+
   get pollAddress(): Bytes | null {
     let value = this.get("pollAddress");
     if (!value || value.kind == ValueKind.NULL) {

subgraph/generated/templates/FundingRound/FundingRound.ts

@@ -386,6 +386,21 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  pollId(): BigInt {
+    let result = super.call("pollId", "pollId():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_pollId(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   totalSpent(): BigInt {
     let result = super.call("totalSpent", "totalSpent():(uint256)", []);
 

subgraph/generated/templates/MACI/FundingRound.ts

@@ -386,6 +386,21 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  pollId(): BigInt {
+    let result = super.call("pollId", "pollId():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_pollId(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   totalSpent(): BigInt {
     let result = super.call("totalSpent", "totalSpent():(uint256)", []);
 

subgraph/generated/templates/Poll/FundingRound.ts

@@ -386,6 +386,21 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  pollId(): BigInt {
+    let result = super.call("pollId", "pollId():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_pollId(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   totalSpent(): BigInt {
     let result = super.call("totalSpent", "totalSpent():(uint256)", []);
 

subgraph/schema.graphql

@@ -58,6 +58,7 @@ type FundingRound @entity {
   id: ID!
   clrFund: ClrFund
   maci: Bytes
+  pollId: BigInt
   pollAddress: Bytes
   messages: [Message!] @derivedFrom(field: "fundingRound")
   recipientRegistry: RecipientRegistry

subgraph/src/ClrFundMapping.ts

@@ -251,8 +251,12 @@ export function handleRoundStarted(event: RoundStarted): void {
   }
 
   log.info('TRY pollAddress', [])
-  let pollAddressCall = fundingRoundContract.try_poll()
+  let pollIdCall = fundingRoundContract.try_pollId()
+  if (!pollIdCall.reverted) {
+    fundingRound.pollId = pollIdCall.value
+  }
 
+  let pollAddressCall = fundingRoundContract.try_poll()
   if (pollAddressCall.reverted) {
     log.info('TRY pollAddress Failed', [])
   } else {

vue-app/src/api/round.ts

@@ -17,6 +17,7 @@ export interface RoundInfo {
   userRegistryAddress: string
   recipientRegistryAddress: string
   maciAddress: string
+  pollId: bigint
   recipientTreeDepth: number
   maxContributors: number
   maxRecipients: number
@@ -148,6 +149,7 @@ export async function getRoundInfo(
   }
 
   const {
+    pollId,
     pollAddress,
     maci: maciAddress,
     recipientRegistryAddress,
@@ -157,9 +159,9 @@ export async function getRoundInfo(
     stateTreeDepth,
     messageTreeDepth,
     voteOptionTreeDepth,
-    startTime,
-    signUpDeadline,
-    votingDeadline,
+    startTime: startTimeInSeconds,
+    signUpDeadline: signUpDeadlineInSeconds,
+    votingDeadline: votingDeadlineInSeconds,
     coordinatorPubKeyX,
     coordinatorPubKeyY,
   } = data.fundingRound
@@ -177,6 +179,9 @@ export async function getRoundInfo(
   const maxContributors = stateTreeDepth ? 2 ** stateTreeDepth - 1 : 0
   const maxMessages = messageTreeDepth ? 2 ** messageTreeDepth - 1 : 0
   const now = DateTime.local()
+  const startTime = DateTime.fromSeconds(Number(startTimeInSeconds || 0))
+  const signUpDeadline = DateTime.fromSeconds(Number(signUpDeadlineInSeconds || 0))
+  const votingDeadline = DateTime.fromSeconds(Number(votingDeadlineInSeconds || 0))
   const contributionsInfo = await getTotalContributed(fundingRoundAddress)
   const contributors = contributionsInfo.count
   let status: string
@@ -214,6 +219,7 @@ export async function getRoundInfo(
     recipientRegistryAddress: utils.getAddress(recipientRegistryAddress),
     userRegistryAddress: utils.getAddress(userRegistryAddress),
     maciAddress: utils.getAddress(maciAddress),
+    pollId: BigInt(pollId || 0),
     recipientTreeDepth: voteOptionTreeDepth || 1,
     maxContributors,
     maxRecipients: voteOptionTreeDepth ? 5 ** voteOptionTreeDepth - 1 : 0,
@@ -224,9 +230,9 @@ export async function getRoundInfo(
     nativeTokenDecimals,
     voiceCreditFactor,
     status,
-    startTime: DateTime.fromSeconds(Number(startTime || 0)),
-    signUpDeadline: DateTime.fromSeconds(Number(signUpDeadline || 0)),
-    votingDeadline: DateTime.fromSeconds(Number(votingDeadline || 0)),
+    startTime,
+    signUpDeadline,
+    votingDeadline,
     totalFunds,
     matchingPool,
     contributions,

vue-app/src/components/ContributionModal.vue

@@ -168,7 +168,7 @@ onMounted(() => {
 })
 
 async function sendVotes() {
-  const { coordinatorPubKey } = currentRound.value!
+  const { coordinatorPubKey, pollId } = currentRound.value!
 
   const contributor = appStore.contributor
   const messages: Message[] = []
@@ -183,6 +183,7 @@ async function sendVotes() {
       recipientIndex,
       voiceCredits,
       nonce,
+      pollId,
     )
     messages.push(message)
     encPubKeys.push(encPubKey)

vue-app/src/graphql/API.ts

@@ -417,6 +417,7 @@ export enum ClrFund_OrderBy {
   CurrentRoundMessageTreeDepth = 'currentRound__messageTreeDepth',
   CurrentRoundNativeToken = 'currentRound__nativeToken',
   CurrentRoundPollAddress = 'currentRound__pollAddress',
+  CurrentRoundPollId = 'currentRound__pollId',
   CurrentRoundRecipientCount = 'currentRound__recipientCount',
   CurrentRoundRecipientRegistryAddress = 'currentRound__recipientRegistryAddress',
   CurrentRoundSignUpDeadline = 'currentRound__signUpDeadline',
@@ -592,6 +593,7 @@ export enum Contribution_OrderBy {
   FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth',
   FundingRoundNativeToken = 'fundingRound__nativeToken',
   FundingRoundPollAddress = 'fundingRound__pollAddress',
+  FundingRoundPollId = 'fundingRound__pollId',
   FundingRoundRecipientCount = 'fundingRound__recipientCount',
   FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress',
   FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline',
@@ -1139,6 +1141,7 @@ export enum Donation_OrderBy {
   FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth',
   FundingRoundNativeToken = 'fundingRound__nativeToken',
   FundingRoundPollAddress = 'fundingRound__pollAddress',
+  FundingRoundPollId = 'fundingRound__pollId',
   FundingRoundRecipientCount = 'fundingRound__recipientCount',
   FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress',
   FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline',
@@ -1178,6 +1181,7 @@ export type FundingRound = {
   nativeToken: Maybe<Scalars['Bytes']>;
   nativeTokenInfo: Maybe<Token>;
   pollAddress: Maybe<Scalars['Bytes']>;
+  pollId: Maybe<Scalars['BigInt']>;
   recipientCount: Scalars['BigInt'];
   recipientRegistry: Maybe<RecipientRegistry>;
   recipientRegistryAddress: Maybe<Scalars['Bytes']>;
@@ -1456,6 +1460,14 @@ export type FundingRound_Filter = {
   pollAddress_not: InputMaybe<Scalars['Bytes']>;
   pollAddress_not_contains: InputMaybe<Scalars['Bytes']>;
   pollAddress_not_in: InputMaybe<Array<Scalars['Bytes']>>;
+  pollId: InputMaybe<Scalars['BigInt']>;
+  pollId_gt: InputMaybe<Scalars['BigInt']>;
+  pollId_gte: InputMaybe<Scalars['BigInt']>;
+  pollId_in: InputMaybe<Array<Scalars['BigInt']>>;
+  pollId_lt: InputMaybe<Scalars['BigInt']>;
+  pollId_lte: InputMaybe<Scalars['BigInt']>;
+  pollId_not: InputMaybe<Scalars['BigInt']>;
+  pollId_not_in: InputMaybe<Array<Scalars['BigInt']>>;
   recipientCount: InputMaybe<Scalars['BigInt']>;
   recipientCount_gt: InputMaybe<Scalars['BigInt']>;
   recipientCount_gte: InputMaybe<Scalars['BigInt']>;
@@ -1638,6 +1650,7 @@ export enum FundingRound_OrderBy {
   NativeTokenInfoSymbol = 'nativeTokenInfo__symbol',
   NativeTokenInfoTokenAddress = 'nativeTokenInfo__tokenAddress',
   PollAddress = 'pollAddress',
+  PollId = 'pollId',
   RecipientCount = 'recipientCount',
   RecipientRegistry = 'recipientRegistry',
   RecipientRegistryAddress = 'recipientRegistryAddress',
@@ -1811,6 +1824,7 @@ export enum Message_OrderBy {
   FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth',
   FundingRoundNativeToken = 'fundingRound__nativeToken',
   FundingRoundPollAddress = 'fundingRound__pollAddress',
+  FundingRoundPollId = 'fundingRound__pollId',
   FundingRoundRecipientCount = 'fundingRound__recipientCount',
   FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress',
   FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline',
@@ -1947,6 +1961,7 @@ export enum PublicKey_OrderBy {
   FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth',
   FundingRoundNativeToken = 'fundingRound__nativeToken',
   FundingRoundPollAddress = 'fundingRound__pollAddress',
+  FundingRoundPollId = 'fundingRound__pollId',
   FundingRoundRecipientCount = 'fundingRound__recipientCount',
   FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress',
   FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline',
@@ -3185,6 +3200,7 @@ export enum Vote_OrderBy {
   FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth',
   FundingRoundNativeToken = 'fundingRound__nativeToken',
   FundingRoundPollAddress = 'fundingRound__pollAddress',
+  FundingRoundPollId = 'fundingRound__pollId',
   FundingRoundRecipientCount = 'fundingRound__recipientCount',
   FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress',
   FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline',
@@ -3345,7 +3361,7 @@ export type GetRoundInfoQueryVariables = Exact<{
 }>;
 
 
-export type GetRoundInfoQuery = { __typename?: 'Query', fundingRound: { __typename?: 'FundingRound', id: string, maci: any | null, pollAddress: any | null, recipientRegistryAddress: any | null, contributorRegistryAddress: any | null, voiceCreditFactor: any | null, isFinalized: boolean | null, isCancelled: boolean | null, contributorCount: any, totalSpent: any | null, matchingPoolSize: any | null, startTime: any | null, signUpDeadline: any | null, votingDeadline: any | null, coordinatorPubKeyX: any | null, coordinatorPubKeyY: any | null, stateTreeDepth: number | null, messageTreeDepth: number | null, voteOptionTreeDepth: number | null, nativeTokenInfo: { __typename?: 'Token', tokenAddress: any | null, symbol: string | null, decimals: any | null } | null } | null };
+export type GetRoundInfoQuery = { __typename?: 'Query', fundingRound: { __typename?: 'FundingRound', id: string, maci: any | null, pollId: any | null, pollAddress: any | null, recipientRegistryAddress: any | null, contributorRegistryAddress: any | null, voiceCreditFactor: any | null, isFinalized: boolean | null, isCancelled: boolean | null, contributorCount: any, totalSpent: any | null, matchingPoolSize: any | null, startTime: any | null, signUpDeadline: any | null, votingDeadline: any | null, coordinatorPubKeyX: any | null, coordinatorPubKeyY: any | null, stateTreeDepth: number | null, messageTreeDepth: number | null, voteOptionTreeDepth: number | null, nativeTokenInfo: { __typename?: 'Token', tokenAddress: any | null, symbol: string | null, decimals: any | null } | null } | null };
 
 export type GetRoundsQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -3548,6 +3564,7 @@ export const GetRoundInfoDocument = gql`
   fundingRound(id: $fundingRoundAddress) {
     id
     maci
+    pollId
     pollAddress
     nativeTokenInfo {
       tokenAddress

vue-app/src/graphql/queries/GetRoundInfo.graphql

@@ -2,6 +2,7 @@ query GetRoundInfo($fundingRoundAddress: ID!) {
   fundingRound(id: $fundingRoundAddress) {
     id
     maci
+    pollId
     pollAddress
     nativeTokenInfo {
       tokenAddress