Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: decode execute tx error #46

Merged
merged 2 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/frontend/src/components/steps/Step2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { Job } from 'bull'
import {
ContractTransactionReceipt,
ContractTransactionResponse,
EventLog,
hexlify,
Interface,
parseUnits,
Expand Down
11 changes: 8 additions & 3 deletions packages/frontend/src/hooks/useExecutorService.test.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { renderHook, waitFor } from '@testing-library/react'
import axios from 'axios'
import EventSourceMock, { sources } from 'eventsourcemock'
import { vi } from 'vitest'

import useExecutorService, {
ExecuteDto,
TracingOptions,
} from './useExecutorService'
import axios from 'axios'
import { ExecuteError, ExecuteProcessorError } from '../types'

const validExecuteDtoMock: ExecuteDto = {
logIndexes: [],
Expand Down Expand Up @@ -145,6 +146,10 @@ describe('observeExecutorServiceJob', () => {
})

it('should error() when eventsource sends error event', async () => {
const errorMock: ExecuteError = {
type: ExecuteProcessorError.CERTIFICATE_NOT_FOUND,
message: 'message',
}
const { result } = renderHook(() => useExecutorService())

await waitFor(() => {
Expand All @@ -158,13 +163,13 @@ describe('observeExecutorServiceJob', () => {
)
observable.subscribe({
error: (error) => {
expect(error).toBe('"any error"')
expect(error).toBe(errorMock.message)
},
})

sources[
`${import.meta.env.VITE_EXECUTOR_SERVICE_ENDPOINT}/v1/job/subscribe/1`
].emitError('any error')
].emitError({ data: JSON.stringify(errorMock) })
}
})
})
62 changes: 56 additions & 6 deletions packages/frontend/src/hooks/useExecutorService.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import * as ERC20MessagingJSON from '@topos-protocol/topos-smart-contracts/artifacts/contracts/examples/ERC20Messaging.sol/ERC20Messaging.json'
import * as BurnableMintableCappedERC20JSON from '@topos-protocol/topos-smart-contracts/artifacts/contracts/topos-core/BurnableMintableCappedERC20.sol/BurnableMintableCappedERC20.json'
import axios from 'axios'
import { Job, JobId } from 'bull'
import { OAuthResponse } from 'common'
import { Interface } from 'ethers'
import { EventSourcePolyfill } from 'event-source-polyfill'
import { useContext, useEffect, useMemo, useState } from 'react'
import { Observable } from 'rxjs'

import { OAuthResponse } from 'common'
import { ErrorsContext } from '../contexts/errors'
import {
ExecuteError,
ExecuteProcessorError,
ExecuteTransactionError,
} from '../types'

export interface ExecuteDto {
logIndexes: number[]
Expand Down Expand Up @@ -106,11 +114,53 @@ export default function useExecutorService() {
}
}

eventSource.onerror = (error: any) => {
const message = error.data || JSON.stringify(error)
console.error(message)
eventSource.close()
subscriber.error(message)
eventSource.onerror = ({ data }: any) => {
try {
const executeError: ExecuteError = JSON.parse(data)
let { message } = executeError

if (
executeError.type ===
ExecuteProcessorError.EXECUTE_TRANSACTION_REVERT
) {
const executeTransactionError: ExecuteTransactionError =
JSON.parse(executeError.message)

if (!executeTransactionError.decoded) {
const ERC20MessagingInterface = new Interface(
ERC20MessagingJSON.abi
)
const ERC20Interface = new Interface(
BurnableMintableCappedERC20JSON.abi
)

const decodedError =
ERC20MessagingInterface.parseError(
executeTransactionError.data
) || ERC20Interface.parseError(executeTransactionError.data)

message = JSON.stringify({
type: ExecuteProcessorError.EXECUTE_TRANSACTION_REVERT,
message: decodedError?.name,
})
} else {
message = JSON.stringify({
type: ExecuteProcessorError.EXECUTE_TRANSACTION_REVERT,
message: executeTransactionError.data,
})
}
} else {
message = executeError.message
}

console.error(message)
eventSource.close()
subscriber.error(message)
} catch (error) {
console.error(error)
eventSource.close()
subscriber.error(error)
}
}
})
}
Expand Down
20 changes: 20 additions & 0 deletions packages/frontend/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,23 @@ export interface FetchData<T> {
error?: Error
loading?: boolean
}

export enum ExecuteProcessorError {
PROVIDER_INVALID_ENDPOINT = 'PROVIDER_INVALID_ENDPOINT',
CONTRACT_INVALID_ADDRESS = 'CONTRACT_INVALID_ADDRESS',
CONTRACT_INVALID_NO_CODE = 'CONTRACT_INVALID_NO_CODE',
WALLET_INVALID_PRIVATE_KEY = 'WALLET_INVALID_PRIVATE_KEY',
CERTIFICATE_NOT_FOUND = 'CERTIFICATE_NOT_FOUND',
EXECUTE_TRANSACTION_FAILED_INIT = 'EXECUTE_TRANSACTION_FAILED_INIT',
EXECUTE_TRANSACTION_REVERT = 'EXECUTE_TRANSACTION_REVERT',
}

export interface ExecuteError {
type: ExecuteProcessorError
message: string
}

export interface ExecuteTransactionError {
decoded?: boolean
data: string
}
Loading