Commit 5dd1249d authored by Noah Zinsmeister's avatar Noah Zinsmeister

feat: quick fix for new governor

parent 9eb20624
...@@ -16,10 +16,12 @@ export const V2_ROUTER_ADDRESS: AddressMap = constructSameAddressMap( ...@@ -16,10 +16,12 @@ export const V2_ROUTER_ADDRESS: AddressMap = constructSameAddressMap(
'0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D', '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D',
false false
) )
export const GOVERNANCE_ADDRESS: AddressMap = constructSameAddressMap( export const GOVERNANCE_ADDRESSES: AddressMap[] = [
'0x5e4be8Bc9637f0EAA1A755019e06A68ce081D58F', constructSameAddressMap('0x5e4be8Bc9637f0EAA1A755019e06A68ce081D58F', false),
false {
) [SupportedChainId.MAINNET]: '0xC4e172459f1E7939D522503B81AFAaC1014CE6F6',
},
]
export const TIMELOCK_ADDRESS: AddressMap = constructSameAddressMap('0x1a9C8182C09F50C8318d769245beA52c32BE35BC', false) export const TIMELOCK_ADDRESS: AddressMap = constructSameAddressMap('0x1a9C8182C09F50C8318d769245beA52c32BE35BC', false)
export const MERKLE_DISTRIBUTOR_ADDRESS: AddressMap = { export const MERKLE_DISTRIBUTOR_ADDRESS: AddressMap = {
[SupportedChainId.MAINNET]: '0x090D4613473dEE047c3f2706764f49E0821D256e', [SupportedChainId.MAINNET]: '0x090D4613473dEE047c3f2706764f49E0821D256e',
......
import { GOVERNANCE_ADDRESS, TIMELOCK_ADDRESS, UNI_ADDRESS } from './addresses' import { GOVERNANCE_ADDRESSES, TIMELOCK_ADDRESS, UNI_ADDRESS } from './addresses'
export const COMMON_CONTRACT_NAMES: { [chainId: number]: { [address: string]: string } } = { export const COMMON_CONTRACT_NAMES: { [chainId: number]: { [address: string]: string } } = {
[1]: { [1]: {
[UNI_ADDRESS[1]]: 'UNI', [UNI_ADDRESS[1]]: 'UNI',
[GOVERNANCE_ADDRESS[1]]: 'Governance', [GOVERNANCE_ADDRESSES[0][1]]: 'Governance (V0)',
[GOVERNANCE_ADDRESSES[1][1]]: 'Governance',
[TIMELOCK_ADDRESS[1]]: 'Timelock', [TIMELOCK_ADDRESS[1]]: 'Timelock',
}, },
[4]: {
[UNI_ADDRESS[4]]: 'Rinkeby UNI',
[GOVERNANCE_ADDRESS[4]]: 'Rinkeby Governance',
[TIMELOCK_ADDRESS[4]]: 'Rinkeby Timelock',
},
[3]: {
[UNI_ADDRESS[3]]: 'Ropsten UNI',
[GOVERNANCE_ADDRESS[3]]: 'Ropsten Governance',
[TIMELOCK_ADDRESS[3]]: 'Ropsten Timelock',
},
[42]: {
[UNI_ADDRESS[42]]: 'Kovan UNI',
[GOVERNANCE_ADDRESS[42]]: 'Kovan Governance',
[TIMELOCK_ADDRESS[42]]: 'Kovan Timelock',
},
[5]: {
[UNI_ADDRESS[5]]: 'Goerli UNI',
[GOVERNANCE_ADDRESS[5]]: 'Goerli Governance',
[TIMELOCK_ADDRESS[5]]: 'Goerli Timelock',
},
} }
export const DEFAULT_AVERAGE_BLOCK_TIME_IN_SECS = 13 export const DEFAULT_AVERAGE_BLOCK_TIME_IN_SECS = 13
......
import { UNISWAP_GRANTS_PROPOSAL_DESCRIPTION } from './uniswap_grants_proposal_description'
// Proposals are 0-indexed
export const PROPOSAL_DESCRIPTION_TEXT: { [proposalId: number]: string } = {
[2]: UNISWAP_GRANTS_PROPOSAL_DESCRIPTION,
}
...@@ -27,7 +27,7 @@ import { ...@@ -27,7 +27,7 @@ import {
V3_CORE_FACTORY_ADDRESSES, V3_CORE_FACTORY_ADDRESSES,
V3_MIGRATOR_ADDRESSES, V3_MIGRATOR_ADDRESSES,
ARGENT_WALLET_DETECTOR_ADDRESS, ARGENT_WALLET_DETECTOR_ADDRESS,
GOVERNANCE_ADDRESS, GOVERNANCE_ADDRESSES,
MERKLE_DISTRIBUTOR_ADDRESS, MERKLE_DISTRIBUTOR_ADDRESS,
MULTICALL2_ADDRESSES, MULTICALL2_ADDRESSES,
V2_ROUTER_ADDRESS, V2_ROUTER_ADDRESS,
...@@ -116,8 +116,11 @@ export function useMerkleDistributorContract() { ...@@ -116,8 +116,11 @@ export function useMerkleDistributorContract() {
return useContract(MERKLE_DISTRIBUTOR_ADDRESS, MERKLE_DISTRIBUTOR_ABI, true) return useContract(MERKLE_DISTRIBUTOR_ADDRESS, MERKLE_DISTRIBUTOR_ABI, true)
} }
export function useGovernanceContract() { export function useGovernanceContracts(): (Contract | null)[] {
return useContract(GOVERNANCE_ADDRESS, GOVERNANCE_ABI, true) return [
useContract(GOVERNANCE_ADDRESSES[0], GOVERNANCE_ABI, false),
useContract(GOVERNANCE_ADDRESSES[1], GOVERNANCE_ABI, true),
]
} }
export function useUniContract() { export function useUniContract() {
......
...@@ -120,7 +120,8 @@ export default function Vote() { ...@@ -120,7 +120,8 @@ export default function Vote() {
const toggleDelegateModal = useToggleDelegateModal() const toggleDelegateModal = useToggleDelegateModal()
// get data to list all proposals // get data to list all proposals
const allProposals: ProposalData[] = useAllProposalData() // TODO don't hardcode for first gov alpha
const allProposals: ProposalData[] = useAllProposalData()[0]
// user data // user data
const availableVotes: CurrencyAmount<Token> | undefined = useUserVotes() const availableVotes: CurrencyAmount<Token> | undefined = useUserVotes()
...@@ -248,7 +249,7 @@ export default function Vote() { ...@@ -248,7 +249,7 @@ export default function Vote() {
</TYPE.subHeader> </TYPE.subHeader>
</EmptyProposals> </EmptyProposals>
)} )}
{allProposals?.map((p: ProposalData, i) => { {allProposals?.reverse()?.map((p: ProposalData, i) => {
return ( return (
<Proposal as={Link} to={'/vote/' + p.id} key={i}> <Proposal as={Link} to={'/vote/' + p.id} key={i}>
<ProposalNumber>{p.id}</ProposalNumber> <ProposalNumber>{p.id}</ProposalNumber>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment