Merge pull request #201 from lidofinance/fix/rpc-fallback

fix: drop unnecessary decode event calls

modules/votes/utils/getEventExecuteVote.ts

@@ -1,26 +1,29 @@
 import type {
  AragonVotingAbi,
+ ExecuteVoteEvent,
  ExecuteVoteEventObject,
 } from 'generated/AragonVotingAbi'
 
 export async function getEventExecuteVote(
  contractVoting: AragonVotingAbi,
  voteId: string | number,
  block?: string | number,
-) {
+): Promise<{
+ event: ExecuteVoteEvent
+ decoded: ExecuteVoteEventObject
+} | null> {
  const filter = contractVoting.filters.ExecuteVote(Number(voteId))
  const events = await contractVoting.queryFilter(
  filter,
  block ? Number(block) : undefined,
  )
- const event = events[0]
- if (!events[0]) return undefined
- if (!event.decode) {
- throw new Error('ExecuteVote event decoding error')
+ if (!events.length) {
+ return null
  }
- const decoded: ExecuteVoteEventObject = event.decode(event.data, event.topics)
+ const event = events[0]
+
  return {
  event,
- decoded,
+ decoded: event.args,
  }
 }

modules/votes/utils/getEventVoteStart.ts

@@ -7,17 +7,17 @@ export async function getEventStartVote(
  contractVoting: AragonVotingAbi,
  voteId: string | number,
  block?: string | number,
-) {
+): Promise<StartVoteEventObject | null> {
  const filter = contractVoting.filters.StartVote(Number(voteId))
  const events = await contractVoting.queryFilter(
  filter,
  block ? Number(block) : undefined,
  block ? Number(block) + 1 : undefined,
  )
- const event = events[0]
- if (!events[0] || !event.decode) {
+
+ if (!events.length) {
  return null
  }
- const decoded = event.decode(event.data, event.topics)
- return decoded as StartVoteEventObject
+
+ return events[0].args
 }

modules/votes/utils/getEventsCastVote.ts

@@ -1,8 +1,5 @@
 import type { AragonVotingAbi } from 'generated'
-import type {
- CastVoteEventObject,
- AttemptCastVoteAsDelegateEventObject,
-} from 'generated/AragonVotingAbi'
+import type { CastVoteEventObject } from 'generated/AragonVotingAbi'
 
 export function unifyEventsVotedWithLast(events: CastVoteEventObject[]) {
  return events.reverse().reduce(
@@ -31,9 +28,7 @@ export async function getEventsCastVote(
  filter,
  block ? Number(block) : undefined,
  )
- const decoded = events.map(e =>
- e.decode!(e.data, e.topics),
- ) as CastVoteEventObject[]
+ const decoded = events.map(e => e.args) as CastVoteEventObject[]
  return unifyEventsVotedWithLast(decoded)
 }
 
@@ -67,11 +62,7 @@ export async function getEventsAttemptCastVoteAsDelegate(
  >()
 
  delegateEvents.forEach(event => {
- const decodedEvent = event.decode!(
- event.data,
- event.topics,
- ) as AttemptCastVoteAsDelegateEventObject
- decodedEvent.voters.forEach(voter => {
+ event.args.voters.forEach(voter => {
  const voterLower = voter.toLowerCase()
  const existing = voterToLatestVote.get(voterLower)
  if (
@@ -84,18 +75,14 @@ export async function getEventsAttemptCastVoteAsDelegate(
  blockNumber: event.blockNumber,
  transactionIndex: event.transactionIndex,
  isDelegate: true,
- delegate: decodedEvent.delegate,
+ delegate: event.args.delegate,
  })
  }
  })
  })
 
  castVoteEvents.forEach(event => {
- const decodedEvent = event.decode!(
- event.data,
- event.topics,
- ) as CastVoteEventObject
- const voterLower = decodedEvent.voter.toLowerCase()
+ const voterLower = event.args.voter.toLowerCase()
  const existing = voterToLatestVote.get(voterLower)
  if (
  !existing ||
@@ -113,22 +100,18 @@ export async function getEventsAttemptCastVoteAsDelegate(
 
  return delegateEvents
  .map(event => {
- const decodedEvent = event.decode!(
- event.data,
- event.topics,
- ) as AttemptCastVoteAsDelegateEventObject
- const filteredVoters = decodedEvent.voters.filter(voter => {
+ const filteredVoters = event.args.voters.filter(voter => {
  const latestVote = voterToLatestVote.get(voter.toLowerCase())
  return (
  latestVote &&
  latestVote.isDelegate &&
- latestVote.delegate === decodedEvent.delegate &&
+ latestVote.delegate === event.args.delegate &&
  latestVote.blockNumber === event.blockNumber &&
  latestVote.transactionIndex === event.transactionIndex
  )
  })
  return {
- ...decodedEvent,
+ ...event.args,
  voters: filteredVoters,
  }
  })