Merge pull request #1184 from DarkFlorist/print-error-on-block-proces…

…sing-failure print error if we fail to process a block
DarkFlorist · Nov 21, 2024 · 8a8ca75 · 8a8ca75
2 parents 825f46e + c31736a
commit 8a8ca75
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/app/ts/background/background-startup.ts b/app/ts/background/background-startup.ts
@@ -194,7 +194,7 @@ async function newBlockAttemptCallback(blockheader: EthereumBlockHeader, ethereu
 	}
 }
 
-async function onErrorBlockCallback(ethereumClientService: EthereumClientService) {
+async function onErrorBlockCallback(ethereumClientService: EthereumClientService, error: unknown) {
 	try {
 		const rpcConnectionStatus = {
 			isConnected: false,
@@ -206,6 +206,7 @@ async function onErrorBlockCallback(ethereumClientService: EthereumClientService
 		await setRpcConnectionStatus(rpcConnectionStatus)
 		await updateExtensionBadge()
 		await sendPopupMessageToOpenWindows({ method: 'popup_failed_to_get_block', data: { rpcConnectionStatus } })
+		await handleUnexpectedError(error)
 	} catch(error) {
 		await handleUnexpectedError(error)
 	}

diff --git a/app/ts/simulation/services/EthereumClientService.ts b/app/ts/simulation/services/EthereumClientService.ts
@@ -17,11 +17,11 @@ export class EthereumClientService {
 	private cacheRefreshTimer: NodeJS.Timer | undefined = undefined
 	private retrievingBlock = false
 	private newBlockAttemptCallback: (blockHeader: EthereumBlockHeader, ethereumClientService: EthereumClientService, isNewBlock: boolean) => Promise<void>
-	private onErrorBlockCallback: (ethereumClientService: EthereumClientService) => Promise<void>
+	private onErrorBlockCallback: (ethereumClientService: EthereumClientService, error: unknown) => Promise<void>
 	private requestHandler
 	private rpcEntry
 
-    constructor(requestHandler: IEthereumJSONRpcRequestHandler, newBlockAttemptCallback: (blockHeader: EthereumBlockHeader, ethereumClientService: EthereumClientService, isNewBlock: boolean) => Promise<void>, onErrorBlockCallback: (ethereumClientService: EthereumClientService) => Promise<void>, rpcEntry: RpcEntry) {
+    constructor(requestHandler: IEthereumJSONRpcRequestHandler, newBlockAttemptCallback: (blockHeader: EthereumBlockHeader, ethereumClientService: EthereumClientService, isNewBlock: boolean) => Promise<void>, onErrorBlockCallback: (ethereumClientService: EthereumClientService, error: unknown) => Promise<void>, rpcEntry: RpcEntry) {
 		this.requestHandler = requestHandler
 		this.newBlockAttemptCallback = newBlockAttemptCallback
 		this.onErrorBlockCallback = onErrorBlockCallback
@@ -80,8 +80,8 @@ export class EthereumClientService {
 			if (gotNewBlock) this.requestHandler.clearCache()
 			this.newBlockAttemptCallback(newBlock, this, gotNewBlock)
 			this.cachedBlock = newBlock
-		} catch(error) {
-			return this.onErrorBlockCallback(this)
+		} catch(error: unknown) {
+			return this.onErrorBlockCallback(this, error)
 		} finally {
 			this.retrievingBlock = false
 		}

diff --git a/app/ts/simulation/simulator.ts b/app/ts/simulation/simulator.ts
@@ -136,7 +136,7 @@ export const parseInputData = async (transaction: { to: EthereumAddress | undefi
 		return { paramName, typeValue: parseSolidityValueByTypePure(verifiedSolidityType.value, value, isArray) }
 	})
 	return {
-		input: transaction.input, 
+		input: transaction.input,
 		type: 'Parsed' as const,
 		name: parsed.name,
 		args: valuesWithTypes,
@@ -208,7 +208,7 @@ export class Simulator {
 	public ethereum: EthereumClientService
 	public tokenPriceService: TokenPriceService
 	private newBlockAttemptCallback: NewBlockCallBack
-	public constructor(rpcNetwork: RpcEntry, newBlockAttemptCallback: NewBlockCallBack, onErrorBlockCallback: (ethereumClientService: EthereumClientService) => Promise<void>, tokenPriceCacheAge = 60000) {
+	public constructor(rpcNetwork: RpcEntry, newBlockAttemptCallback: NewBlockCallBack, onErrorBlockCallback: (ethereumClientService: EthereumClientService, error: unknown) => Promise<void>, tokenPriceCacheAge = 60000) {
 		this.newBlockAttemptCallback = newBlockAttemptCallback
 		this.ethereum = new EthereumClientService(
 			new EthereumJSONRpcRequestHandler(rpcNetwork.httpsRpc, true),