Merge pull request #76 from oasisprotocol/csillag/simplify-eth-massing

Simplify distributing ethereum access

frontend/src/hooks/useContracts.ts

@@ -5,15 +5,16 @@ import {
   IPollACL__factory,
 } from '@oasisprotocol/blockvote-contracts'
 import type { PollManager, GaslessVoting, IPollACL, IPollManagerACL } from '../types'
-import { EthereumContext } from '../providers/EthereumContext'
 import { useEffect, useState } from 'react'
 import {
   VITE_CONTRACT_GASLESSVOTING,
   VITE_CONTRACT_POLLMANAGER,
   VITE_CONTRACT_POLLMANAGER_ACL,
 } from '../constants/config'
+import { useEthereum } from './useEthereum'
 
-export const useContracts = (eth: EthereumContext, aclAddress?: string | undefined) => {
+export const useContracts = (aclAddress?: string | undefined) => {
+  const eth = useEthereum()
   const [pollManager, setPollManager] = useState<PollManager | undefined>()
   const [pollManagerAddress, setPollManagerAddress] = useState<string | undefined>()
   const [pollManagerWithSigner, setPollManagerWithSigner] = useState<PollManager | undefined>()
@@ -69,6 +70,7 @@ export const useContracts = (eth: EthereumContext, aclAddress?: string | undefin
   }, [aclAddress, eth.state.provider])
 
   return {
+    eth,
     pollManager,
     pollManagerAddress,
     pollManagerWithSigner,

frontend/src/hooks/useExtendedPoll.ts

@@ -15,7 +15,6 @@ import { dashboard, demoSettings } from '../constants/config'
 import { getDemoPoll } from '../constants/demoPolls'
 import { usePollGaslessStatus } from './usePollGaslessStatus'
 import { usePollPermissions } from './usePollPermissions'
-import { useEthereum } from './useEthereum'
 import { useContracts } from './useContracts'
 import { decodePollMetadata } from '../utils/poll.utils'
 import { getVerdict } from '../components/InputFields'
@@ -29,8 +28,7 @@ export const useExtendedPoll = (
     onDashboard: boolean
   },
 ) => {
-  const eth = useEthereum()
-  const { pollManager } = useContracts(eth)
+  const { pollManager } = useContracts()
 
   const proposalId = proposal?.id
   const isDemo = proposalId === '0xdemo'

frontend/src/hooks/usePollGaslessStatus.ts

@@ -1,11 +1,9 @@
 import { useEffect, useState } from 'react'
 import { useContracts } from './useContracts'
-import { useEthereum } from './useEthereum'
 import { dashboard } from '../constants/config'
 
 export const usePollGaslessStatus = (proposalId: string | undefined, onDashboard: boolean) => {
-  const eth = useEthereum()
-  const { pollManagerAddress: daoAddress, gaslessVoting } = useContracts(eth)
+  const { pollManagerAddress: daoAddress, gaslessVoting } = useContracts()
 
   const [version, setVersion] = useState(0)
   const [gvAddresses, setGvAddresses] = useState<string[]>([])

frontend/src/hooks/usePollPermissions.ts

@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react'
 import { useContracts } from './useContracts'
-import { useEthereum } from './useEthereum'
 import { denyWithReason } from '../components/InputFields'
 import { ExtendedPoll } from '../types'
 import { CheckPermissionContext, CheckPermissionInputs, PollPermissions } from '../utils/poll.utils'
@@ -21,17 +20,18 @@ export const usePollPermissions = (poll: ExtendedPoll | undefined, onDashboard:
   const aclAddress = poll?.proposal.params.acl
   const creator = poll?.proposal.owner
 
-  const eth = useEthereum()
-  const { pollManagerAddress: daoAddress, pollACL } = useContracts(eth, aclAddress)
-
-  const { userAddress } = eth
+  const { eth, pollManagerAddress: daoAddress, pollACL } = useContracts(aclAddress)
 
   const [isPending, setIsPending] = useState(false)
   const [isMine, setIsMine] = useState<boolean | undefined>()
   const [permissions, setPermissions] = useState<PollPermissions>({ ...blackPermissions })
 
   const checkPermissions = async (force = false) => {
     const isDemo = proposalId === '0xdemo'
+    const {
+      userAddress,
+      state: { provider },
+    } = eth
 
     setIsMine(
       isDemo
@@ -75,7 +75,7 @@ export const usePollPermissions = (poll: ExtendedPoll | undefined, onDashboard:
 
     const context: CheckPermissionContext = {
       daoAddress,
-      provider: eth.state.provider,
+      provider,
     }
 
     setIsPending(true)
@@ -84,7 +84,10 @@ export const usePollPermissions = (poll: ExtendedPoll | undefined, onDashboard:
     if (newStatus) setPermissions(newStatus)
   }
 
-  useEffect(() => void checkPermissions(), [proposalId, pollACL, daoAddress, poll?.ipfsParams, userAddress])
+  useEffect(
+    () => void checkPermissions(),
+    [proposalId, pollACL, daoAddress, poll?.ipfsParams, eth.userAddress],
+  )
 
   return {
     isMine,

frontend/src/hooks/useProposalFromChain.ts

@@ -1,12 +1,10 @@
 import { useEffect, useState } from 'react'
 import { Proposal } from '../types'
-import { useEthereum } from './useEthereum'
 import { useContracts } from './useContracts'
 import { ZeroAddress } from 'ethers'
 
 export const useProposalFromChain = (proposalId: string) => {
-  const eth = useEthereum()
-  const { pollManager } = useContracts(eth)
+  const { pollManager } = useContracts()
 
   const [isLoading, setIsLoading] = useState(false)
   const [proposal, setProposal] = useState<Proposal>()

frontend/src/pages/CreatePollPage/useCreatePollForm.ts

@@ -14,7 +14,6 @@ import {
   useTextField,
 } from '../../components/InputFields'
 import { createPoll as doCreatePoll, parseEther, CreatePollProps } from '../../utils/poll.utils'
-import { useEthereum } from '../../hooks/useEthereum'
 import { useContracts } from '../../hooks/useContracts'
 import classes from './index.module.css'
 import { DateUtils } from '../../utils/date.utils'
@@ -43,8 +42,8 @@ const expectedRanges = {
 } as const
 
 export const useCreatePollForm = () => {
-  const eth = useEthereum()
-  const { pollManagerWithSigner: daoSigner } = useContracts(eth)
+  // const eth = useEthereum()
+  const { eth, pollManagerWithSigner: daoSigner } = useContracts()
 
   const [isCreating, setIsCreating] = useState<boolean>(false)
   const [step, setStep] = useState<CreationStep>('basics')

frontend/src/pages/DashboardPage/useDashboardData.ts

@@ -153,7 +153,7 @@ DashboardData.export()
 
 export const useDashboardData = () => {
   const eth = useEthereum()
-  const { pollManager, pollManagerAddress: daoAddress, pollManagerACL } = useContracts(eth)
+  const { pollManager, pollManagerAddress: daoAddress, pollManagerACL } = useContracts()
 
   const { userAddress } = eth
 

frontend/src/pages/PollPage/hook.ts

@@ -66,7 +66,7 @@ export const usePollData = (pollId: string) => {
   } = useExtendedPoll(proposal, { onDashboard: false })
 
   const { now } = useTime()
-  const { pollManagerWithSigner: signerDao, gaslessVoting } = useContracts(eth, poll?.proposal.params?.acl)
+  const { pollManagerWithSigner: signerDao, gaslessVoting } = useContracts(poll?.proposal.params?.acl)
 
   const remainingTime = useMemo(
     () => (deadline ? DateUtils.calculateRemainingTimeFrom(deadline, now) : undefined),