Merge branch 'main' into block-explorer

DarkFlorist · Nov 21, 2024 · 0905962 · 0905962
2 parents 5a9a50a + d16a7f6
commit 0905962
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/app/css/interceptor.css b/app/css/interceptor.css
@@ -53,6 +53,8 @@ body { font-family: "Inter" !important; }
 	--alpha-005: rgba(255, 255, 255, 0.05);
 	--alpha-015: rgba(255, 255, 255, 0.15);
 
+	--big-font-size: 28px;
+	--normal-font-size: 14px;
 	--modal-background-color: rgba(10, 10, 10, .7)
 }
 
@@ -756,7 +758,7 @@ svg.spinner > circle {
 .swap-grid {
 	grid-template-columns: auto auto;
 	display: grid;
-	place-content: center;
+	place-content: space-between;
 	column-gap: 0.25em;
 }
 

diff --git a/app/ts/background/background-startup.ts b/app/ts/background/background-startup.ts
@@ -65,7 +65,7 @@ async function migrateAddressInfoAndContactsFromV1ToV2() {
 async function migrateAddressInfoAndContactsFromV2ToV3() {
 	const userAddressBookEntries = (await browserStorageLocalGet(['userAddressBookEntriesV2'])).userAddressBookEntriesV2
 	const convertOldActiveAddressToAddressBookEntry = (entry: AddressBookEntry): AddressBookEntry => {
-		if ('chainId' in entry && entry.chainId !== undefined) return entry
+		if (entry.chainId !== undefined) return entry
 		if (entry.useAsActiveAddress === true && entry.type === 'contact') return { ...entry, chainId: 'AllChains' }
 		return { ...entry, chainId: 1n }
 	}
@@ -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),