restrict governance UI to mainnet only

fix governor name bug

revert useContract change

add governorIndex to vote page

only fetch latest useLatestProposalCount

fix useDataFromEventLogs

hardcode proposalIndexes for old governors

src/constants/addresses.ts

@@ -18,13 +18,19 @@ export const V2_ROUTER_ADDRESS: AddressMap = constructSameAddressMap(
 )
 
 // most current governance contract address should always be the 0 index
+// only support governance on mainnet
 export const GOVERNANCE_ADDRESSES: AddressMap[] = [
   {
     [SupportedChainId.MAINNET]: '0xC4e172459f1E7939D522503B81AFAaC1014CE6F6',
   },
-  constructSameAddressMap('0x5e4be8Bc9637f0EAA1A755019e06A68ce081D58F', false),
+  {
+    [SupportedChainId.MAINNET]: '0x5e4be8Bc9637f0EAA1A755019e06A68ce081D58F',
+  },
 ]
-export const TIMELOCK_ADDRESS: AddressMap = constructSameAddressMap('0x1a9C8182C09F50C8318d769245beA52c32BE35BC', false)
+export const TIMELOCK_ADDRESS: AddressMap = {
+  [SupportedChainId.MAINNET]: '0x1a9C8182C09F50C8318d769245beA52c32BE35BC',
+}
+
 export const MERKLE_DISTRIBUTOR_ADDRESS: AddressMap = {
   [SupportedChainId.MAINNET]: '0x090D4613473dEE047c3f2706764f49E0821D256e',
 }

src/constants/governance.ts

@@ -6,7 +6,9 @@ const governanceContracts = (): Record<string, string> =>
   GOVERNANCE_ADDRESSES.reduce(
     (acc, addressMap, i) => ({
       ...acc,
-      [addressMap[SupportedChainId.MAINNET]]: `Governance${i === GOVERNANCE_ADDRESSES.length - 1 ? '' : ` (V${i})`}`,
+      [addressMap[SupportedChainId.MAINNET]]: `Governance${
+        i === 0 ? '' : ` (V${GOVERNANCE_ADDRESSES.length - 1 - i})`
+      }`,
     }),
     {}
   )

src/constants/proposals/index.ts

 export const UNISWAP_GRANTS_START_BLOCK = 11473815
-export const EDUCATION_FUND_1_START_BLOCK = 12620175

src/hooks/useContract.ts

@@ -46,34 +46,19 @@ import { useActiveWeb3React } from './web3'
 
 // returns null on errors
 export function useContract<T extends Contract = Contract>(
-  addressOrAddressMap: string | { [chainId: number]: string } | { [chainId: number]: string }[] | undefined,
+  addressOrAddressMap: string | { [chainId: number]: string } | undefined,
   ABI: any,
   withSignerIfPossible = true
 ): T | null {
   const { library, account, chainId } = useActiveWeb3React()
 
   return useMemo(() => {
-    if (!addressOrAddressMap || !ABI || !library || !chainId) {
-      return null
-    }
+    if (!addressOrAddressMap || !ABI || !library || !chainId) return null
     let address: string | undefined
-    if (typeof addressOrAddressMap === 'string') {
-      address = addressOrAddressMap
-    } else if (!Array.isArray(addressOrAddressMap)) {
-      address = addressOrAddressMap[chainId]
-    }
-    if (!address && !Array.isArray(addressOrAddressMap)) {
-      return null
-    }
+    if (typeof addressOrAddressMap === 'string') address = addressOrAddressMap
+    else address = addressOrAddressMap[chainId]
+    if (!address) return null
     try {
-      if (Array.isArray(addressOrAddressMap)) {
-        return addressOrAddressMap.map((addressMap) =>
-          getContract(addressMap[chainId], ABI, library, withSignerIfPossible && account ? account : undefined)
-        )
-      }
-      if (!address) {
-        return null
-      }
       return getContract(address, ABI, library, withSignerIfPossible && account ? account : undefined)
     } catch (error) {
       console.error('Failed to get contract', error)
@@ -131,21 +116,22 @@ export function useMerkleDistributorContract() {
   return useContract(MERKLE_DISTRIBUTOR_ADDRESS, MERKLE_DISTRIBUTOR_ABI, true)
 }
 
-export function useGovernanceContracts(): Contract[] | null {
+export function useGovernanceContracts(): (Contract | null)[] {
   const { library, account, chainId } = useActiveWeb3React()
 
   return useMemo(() => {
     if (!library || !chainId) {
-      return null
-    }
-    try {
-      return GOVERNANCE_ADDRESSES.filter((addressMap) => Boolean(addressMap[chainId])).map((addressMap) =>
-        getContract(addressMap[chainId], GOVERNANCE_ABI, library, account ? account : undefined)
-      )
-    } catch (error) {
-      console.error('Failed to get contract', error)
-      return null
+      return []
     }
+
+    return GOVERNANCE_ADDRESSES.filter((addressMap) => Boolean(addressMap[chainId])).map((addressMap) => {
+      try {
+        return getContract(addressMap[chainId], GOVERNANCE_ABI, library, account ? account : undefined)
+      } catch (error) {
+        console.error('Failed to get contract', error)
+        return null
+      }
+    })
   }, [library, chainId, account])
 }
 

src/pages/App.tsx

@@ -87,7 +87,7 @@ export default function App() {
           <Web3ReactManager>
             <Switch>
               <Route exact strict path="/vote" component={Vote} />
-              <Route exact strict path="/vote/:id" component={VotePage} />
+              <Route exact strict path="/vote/:governorIndex/:id" component={VotePage} />
               <Route exact strict path="/claim" component={OpenClaimAddressModalAndRedirectToSwap} />
               <Route exact strict path="/uni" component={Earn} />
               <Route exact strict path="/uni/:currencyIdA/:currencyIdB" component={Manage} />

src/pages/Vote/VotePage.tsx

@@ -121,13 +121,13 @@ const ProposerAddressLink = styled(ExternalLink)`
 
 export default function VotePage({
   match: {
-    params: { id },
+    params: { governorIndex, id },
   },
-}: RouteComponentProps<{ id: string }>) {
+}: RouteComponentProps<{ governorIndex: string; id: string }>) {
   const { chainId, account } = useActiveWeb3React()
 
   // get data for this specific proposal
-  const proposalData: ProposalData | undefined = useProposalData(id)
+  const proposalData: ProposalData | undefined = useProposalData(Number.parseInt(governorIndex), id)
 
   // update support based on button interactions
   const [support, setSupport] = useState<boolean>(true)

src/pages/Vote/index.tsx

@@ -248,9 +248,9 @@ export default function Vote() {
               </TYPE.subHeader>
             </EmptyProposals>
           )}
-          {allProposals?.reverse().map((p: ProposalData, i) => {
+          {allProposals?.reverse()?.map((p: ProposalData) => {
             return (
-              <Proposal as={Link} to={'/vote/' + p.id} key={i}>
+              <Proposal as={Link} to={`/vote/${p.governorIndex}/${p.id}`} key={`${p.governorIndex}${p.id}`}>
                 <ProposalNumber>{p.id}</ProposalNumber>
                 <ProposalTitle>{p.title}</ProposalTitle>
                 <ProposalStatus status={p.status}>{ProposalState[p.status]}</ProposalStatus>