floating · mholtzman · Aug 31, 2023 · Sep 1, 2023 · Sep 6, 2023 · Sep 6, 2023
diff --git a/app/tray/Account/Requests/TransactionRequest/TxFee/index.js b/app/tray/Account/Requests/TransactionRequest/TxFee/index.js
@@ -83,7 +83,9 @@ class TxFee extends React.Component {
     const serializedTransaction = utils.serializeTransaction(tx)
 
     // Get current Ethereum gas price
-    const ethBaseFee = this.store('main.networksMeta.ethereum', 1, 'gas.price.fees.nextBaseFee')
+    const feeMarket = this.store('main.networksMeta.ethereum', 1, 'gas.fees') || {}
+    const { nextBaseFee: ethBaseFee } = feeMarket
+
     const l1DataFee = calculateOptimismL1DataFee(serializedTransaction, ethBaseFee)
 
     // Compute the L2 execution fee

diff --git a/main/accounts/Account/index.ts b/main/accounts/Account/index.ts
@@ -25,7 +25,7 @@ import { isTransactionRequest, isTypedMessageSignatureRequest } from '../../../r
 import Erc20Contract from '../../contracts/erc20'
 
 import type { PermitSignatureRequest, TypedMessage } from '../types'
-import type { Account, Permission, Signer } from '../../store/state'
+import type { Account, Permission, Signer } from '../../store/state/types'
 
 const nebula = nebulaApi()
 

diff --git a/main/accounts/index.ts b/main/accounts/index.ts
@@ -35,7 +35,7 @@ import { accountNS } from '../../resources/domain/account'
 import { getMaxTotalFee } from '../../resources/gas'
 
 import type { Chain } from '../chains'
-import type { Account, AccountMetadata, Gas } from '../store/state'
+import type { Account, AccountMetadata, Gas } from '../store/state/types'
 
 function notify(title: string, body: string, action: (event: Electron.Event) => void) {
   const notification = new Notification({ title, body })
@@ -553,7 +553,7 @@ export class Accounts extends EventEmitter {
           const gas = store('main.networksMeta', chain.type, chain.id, 'gas') as Gas
 
           if (usesBaseFee(tx)) {
-            const { maxBaseFeePerGas, maxPriorityFeePerGas } = gas.price.fees || {}
+            const { maxBaseFeePerGas, maxPriorityFeePerGas } = gas.fees || {}
 
             if (maxPriorityFeePerGas && maxBaseFeePerGas) {
               this.setPriorityFee(maxPriorityFeePerGas, id, false)

diff --git a/main/accounts/types.ts b/main/accounts/types.ts
@@ -9,7 +9,7 @@ import type { Chain } from '../chains'
 import type { TransactionData } from '../../resources/domain/transaction'
 import type { Action } from '../transaction/actions'
 import type { TokenData } from '../contracts/erc20'
-import type { Token } from '../store/state'
+import type { Token } from '../store/state/types'
 
 export enum ReplacementType {
   Speed = 'speed',

diff --git a/main/api/http.ts b/main/api/http.ts
@@ -10,8 +10,6 @@ import { updateOrigin, isTrusted, parseOrigin } from './origins'
 import validPayload from './validPayload'
 import protectedMethods from './protectedMethods'
 
-import type { Permission } from '../store/state'
-
 const logTraffic = process.env.LOG_TRAFFIC
 
 interface PendingRequest {

diff --git a/main/api/origins.ts b/main/api/origins.ts
@@ -5,7 +5,7 @@ import queryString from 'query-string'
 import accounts, { AccessRequest } from '../accounts'
 import store from '../store'
 
-import type { Permission } from '../store/state'
+import type { Permission } from '../store/state/types'
 
 const dev = process.env.NODE_ENV === 'development'
 

diff --git a/main/chains/gas/index.ts b/main/chains/gas/index.ts
@@ -1,7 +1,7 @@
 import { intToHex } from '@ethereumjs/util'
 import { chainUsesOptimismFees } from '../../../resources/utils/chains'
 
-import type { GasFees } from '../../store/state'
+import type { GasFees } from '../../store/state/types'
 
 interface GasCalculator {
   calculateGas: (blocks: Block[]) => GasFees

diff --git a/main/contracts/deployments/ens/index.ts b/main/contracts/deployments/ens/index.ts
@@ -13,7 +13,7 @@ import type {
 
 import type { JsonFragment } from '@ethersproject/abi'
 import type { DecodableContract } from '../../../transaction/actions'
-import type { InventoryCollection } from '../../../store/state'
+import type { InventoryCollection } from '../../../store/state/types'
 
 // TODO: fix typing on contract types
 type EnsContract = DecodableContract<unknown>

diff --git a/main/dapps/index.ts b/main/dapps/index.ts
@@ -11,7 +11,7 @@ import server from './server'
 import extractColors from '../windows/extractColors'
 import { dappPathExists, getDappCacheDir, isDappVerified } from './verify'
 
-import type { Dapp } from '../store/state'
+import type { Dapp } from '../store/state/types'
 
 const nebula = nebulaApi()
 

diff --git a/main/externalData/balances/controller.ts b/main/externalData/balances/controller.ts
@@ -6,7 +6,7 @@ import { EventEmitter } from 'stream'
 import { toTokenId } from '../../../resources/domain/balance'
 
 import type { CurrencyBalance } from './scan'
-import type { Token, TokenBalance } from '../../store/state'
+import type { Token, TokenBalance } from '../../store/state/types'
 
 const BOOTSTRAP_TIMEOUT_SECONDS = 20
 

diff --git a/main/externalData/balances/processor/index.ts b/main/externalData/balances/processor/index.ts
@@ -1,13 +1,13 @@
 import log from 'electron-log'
-
 import { isEqual } from 'lodash'
+
 import surface from '../../surface'
 import { storeApi } from '../../storeApi'
 import { isNativeCurrency, toTokenId } from '../../../../resources/domain/balance'
-
-import type { Token, TokenBalance } from '../../../store/state'
 import { NATIVE_CURRENCY } from '../../../../resources/constants'
 
+import type { Token, TokenBalance } from '../../../store/state/types'
+
 type UpdatedBalance = TokenBalance & { hideByDefault?: boolean }
 
 const toExpiryWindow = {
@@ -136,7 +136,6 @@ export function handleBalanceUpdate(
   const withLocalData = mergeCustomAndNative(balances, chains)
 
   const changedBalances = getChangedBalances(address, withLocalData)
-
   if (changedBalances.length) {
     storeApi.setBalances(address, changedBalances)
     const { toAdd, toRemove } = splitTokenBalances(changedBalances)

diff --git a/main/externalData/balances/reducers.ts b/main/externalData/balances/reducers.ts
@@ -1,4 +1,4 @@
-import type { Token } from '../../store/state'
+import type { Token } from '../../store/state/types'
 
 export interface TokensByChain {
   [chainId: number]: Token[]

diff --git a/main/externalData/balances/scan.ts b/main/externalData/balances/scan.ts
@@ -10,7 +10,7 @@ import { groupByChain, TokensByChain } from './reducers'
 
 import type { BytesLike } from '@ethersproject/bytes'
 import type EthereumProvider from 'ethereum-provider'
-import type { Balance, Token, TokenBalance } from '../../store/state'
+import type { Balance, Token, TokenBalance } from '../../store/state/types'
 
 const erc20Interface = new Interface(erc20TokenAbi)
 

diff --git a/main/externalData/balances/scanner/index.ts b/main/externalData/balances/scanner/index.ts
@@ -1,11 +1,13 @@
 import log from 'electron-log'
+
+import BalancesWorkerController from '../controller'
 import { storeApi } from '../../storeApi'
 import { NATIVE_CURRENCY } from '../../../../resources/constants'
 import { toTokenId } from '../../../../resources/domain/balance'
-import BalancesWorkerController from '../controller'
 import { handleBalanceUpdate } from '../processor'
 import { CurrencyBalance } from '../scan'
-import { Token, TokenBalance, WithTokenId } from '../../../store/state'
+
+import type { Token, TokenBalance, WithTokenId } from '../../../store/state/types'
 
 const RESTART_WAIT = 5 // seconds
 

diff --git a/main/externalData/balances/worker.ts b/main/externalData/balances/worker.ts
@@ -7,12 +7,12 @@ log.transports.file.level = ['development', 'test'].includes(process.env.NODE_EN
   ? false
   : 'verbose'
 
-import { supportsChain as chainSupportsScan } from '../../multicall'
-import balancesLoader, { BalanceLoader } from './scan'
 import TokenLoader from '../inventory/tokens'
+import balancesLoader, { BalanceLoader } from './scan'
+import { supportsChain as chainSupportsScan } from '../../multicall'
 import { toTokenId } from '../../../resources/domain/balance'
 
-import type { Token } from '../../store/state'
+import type { Token } from '../../store/state/types'
 
 interface ExternalDataWorkerMessage {
   command: string

diff --git a/main/externalData/index.ts b/main/externalData/index.ts
@@ -16,7 +16,7 @@ import {
   createTrayObserver
 } from './observers'
 
-import type { Token } from '../store/state'
+import type { Token } from '../store/state/types'
 
 export interface DataScanner {
   close: () => void

diff --git a/main/externalData/inventory/processor/index.ts b/main/externalData/inventory/processor/index.ts
@@ -2,7 +2,7 @@ import log from 'electron-log'
 
 import { storeApi } from '../../storeApi'
 
-import type { Inventory, InventoryAsset } from '../../../store/state'
+import type { Inventory, InventoryAsset } from '../../../store/state/types'
 
 export const updateCollections = (account: string, inventory: Inventory) => {
   const existingInventory = storeApi.getInventory(account)

diff --git a/main/externalData/inventory/tokens.ts b/main/externalData/inventory/tokens.ts
@@ -5,10 +5,19 @@ import ethProvider from 'eth-provider'
 import nebulaApi from '../../nebula'
 import defaultTokenList from './default-tokens.json'
 
-import type { Token } from '../../store/state'
+import type { Token } from '../../store/state/types'
 
 const TOKENS_ENS_DOMAIN = 'tokens.frame.eth'
 
+type ListedToken = {
+  chainId: number
+  address: string
+  decimals: number
+  symbol: string
+  name: string
+  logoURI?: string
+}
+
 interface TokenSpec extends Token {
   extensions?: {
     omit?: boolean
@@ -19,6 +28,19 @@ function isBlacklisted(token: TokenSpec) {
   return token.extensions?.omit
 }
 
+function convertLogoToMedia(listedToken: ListedToken): TokenSpec {
+  const { logoURI, ...token } = listedToken
+  return {
+    ...token,
+    hideByDefault: false,
+    media: {
+      source: logoURI || '',
+      cdn: {},
+      format: !!logoURI ? 'image' : ''
+    }
+  }
+}
+
 export default class TokenLoader {
   private tokens: TokenSpec[] = defaultTokenList.tokens as TokenSpec[]
   private nextLoad?: NodeJS.Timeout | null
@@ -34,7 +56,7 @@ export default class TokenLoader {
     try {
       const updatedTokens = await this.fetchTokenList(timeout)
       log.info(`Fetched ${updatedTokens.length} tokens`)
-      this.tokens = updatedTokens
+      this.tokens = updatedTokens.map(convertLogoToMedia)
       log.info(`Updated token list to contain ${this.tokens.length} tokens`)
 
       this.nextLoad = setTimeout(() => this.loadTokenList(), 10 * 60_000)
@@ -48,7 +70,7 @@ export default class TokenLoader {
     log.verbose(`Fetching tokens from ${TOKENS_ENS_DOMAIN}`)
 
     let timeoutHandle: NodeJS.Timeout | undefined
-    const requestTimeout = new Promise<TokenSpec[]>((resolve, reject) => {
+    const requestTimeout = new Promise<ListedToken[]>((resolve, reject) => {
       timeoutHandle = setTimeout(() => {
         reject(`Timeout fetching token list from ${TOKENS_ENS_DOMAIN}`)
       }, timeout)

diff --git a/main/externalData/observers/index.ts b/main/externalData/observers/index.ts
@@ -1,10 +1,9 @@
 import deepEqual from 'deep-equal'
 
-import store from '../../store'
 import { arraysEqual } from '../../../resources/utils'
 import { storeApi } from '../storeApi'
 
-import type { Token } from '../../store/state'
+import type { Token } from '../../store/state/types'
 
 interface ActiveAddressChangedHandler {
   addressChanged: (address: Address) => void

diff --git a/main/externalData/rates/store.ts b/main/externalData/rates/store.ts
@@ -5,7 +5,7 @@ import { storeApi } from '../storeApi'
 import { toTokenId } from '../../../resources/domain/balance'
 
 import type { AssetId } from '@framelabs/pylon-client/dist/assetId'
-import type { Rate, WithTokenId } from '../../store/state'
+import type { Rate, WithTokenId } from '../../store/state/types'
 
 type RateUpdate = {
   id: AssetId

diff --git a/main/externalData/rates/subscriptions.ts b/main/externalData/rates/subscriptions.ts
@@ -6,7 +6,7 @@ import { storeApi } from '../storeApi'
 import { toTokenId } from '../../../resources/domain/balance'
 
 import type { AssetId } from '@framelabs/pylon-client/dist/assetId'
-import type { Chain, Rate, Token, WithTokenId } from '../../store/state'
+import type { Chain, Rate, Token, WithTokenId } from '../../store/state/types'
 
 const NO_RATE_DATA = {}
 const RATES_LOADED_TIMEOUT = 2000 // 2 seconds

diff --git a/main/externalData/storeApi.ts b/main/externalData/storeApi.ts
@@ -1,7 +1,7 @@
 import store from '../store'
 import { NATIVE_CURRENCY } from '../../resources/constants'
 
-import type { Chain, Token, Rate, Inventory, InventoryAsset, TokenBalance } from '../store/state'
+import type { Chain, Token, Rate, InventoryAsset, Inventory, TokenBalance } from '../store/state/types'
 
 export const storeApi = {
   // Accounts

diff --git a/main/externalData/surface/index.ts b/main/externalData/surface/index.ts
@@ -6,7 +6,13 @@ import Networks from './networks'
 import { handleBalanceUpdate } from '../balances/processor'
 import { updateCollections, updateItems } from '../inventory/processor'
 
-import type { Inventory, InventoryAsset, Media, TokenBalance } from '../../store/state'
+import type {
+  Inventory,
+  InventoryAsset,
+  InventoryCollection,
+  Media,
+  TokenBalance
+} from '../../store/state/types'
 
 type Subscription = Unsubscribable & { unsubscribables: Unsubscribable[]; collectionItems: CollectionItem[] }
 

diff --git a/main/provider/assets/index.ts b/main/provider/assets/index.ts
@@ -3,8 +3,7 @@ import store from '../../store'
 import { NATIVE_CURRENCY } from '../../../resources/constants'
 import { toTokenId } from '../../../resources/domain/balance'
 
-import type { NativeCurrency, Rate, AssetPreferences } from '../../store/state'
-import type { TokenBalance } from '../../store/state/types/token'
+import type { NativeCurrency, Rate, AssetPreferences, TokenBalance } from '../../store/state/types'
 
 interface AssetsChangedHandler {
   assetsChanged: (address: Address, assets: RPC.GetAssets.Assets) => void

diff --git a/main/provider/chains/index.ts b/main/provider/chains/index.ts
@@ -1,10 +1,9 @@
 import deepEqual from 'deep-equal'
 
-import { Colorway, getColor } from '../../../resources/colors'
 import store from '../../store'
+import { Colorway, getColor } from '../../../resources/colors'
 
-import type { Chain, Origin } from '../../store/state'
-import type { ChainMetadata } from '../../store/state/types/chainMeta'
+import type { Chain, ChainMetadata, Origin } from '../../store/state/types'
 
 // typed access to state
 const storeApi = {

diff --git a/main/provider/helpers.ts b/main/provider/helpers.ts
@@ -19,7 +19,7 @@ import protectedMethods from '../api/protectedMethods'
 import { usesBaseFee, TransactionData, GasFeesSource } from '../../resources/domain/transaction'
 import { getAddress } from '../../resources/utils'
 
-import type { Chain, Permission } from '../store/state'
+import type { Chain } from '../store/state/types'
 
 const permission = (date: number, method: string) => ({ parentCapability: method, date })
 

diff --git a/main/provider/index.ts b/main/provider/index.ts
@@ -61,7 +61,7 @@ import * as sigParser from '../signatures'
 import { hasAddress } from '../../resources/domain/account'
 import { mapRequest } from '../requests'
 
-import type { Origin, Token } from '../store/state'
+import type { Origin, Token } from '../store/state/types'
 
 interface RequiredApproval {
   type: ApprovalType

diff --git a/main/provider/subscriptions.ts b/main/provider/subscriptions.ts
@@ -1,7 +1,8 @@
 import { v5 as uuid } from 'uuid'
+
 import store from '../store'
 
-import type { Permission } from '../store/state'
+import type { Permission } from '../store/state/types'
 
 const trustedOriginIds = ['frame-extension', 'frame-internal'].map((origin) => uuid(origin, uuid.DNS))
 const isTrustedOrigin = (originId: string) => trustedOriginIds.includes(originId)

diff --git a/main/signers/hot/HotSigner/index.ts b/main/signers/hot/HotSigner/index.ts
@@ -10,7 +10,7 @@ import { stringToKey } from '../../../crypt'
 import Signer from '../../Signer'
 import store from '../../../store'
 
-import type { HotSignerType } from '../../../store/state'
+import type { HotSignerType } from '../../../store/state/types'
 import type { TransactionData } from '../../../../resources/domain/transaction'
 import type { TypedMessage } from '../../../accounts/types'
 import type {

diff --git a/main/signers/hot/HotSigner/worker/launch.ts b/main/signers/hot/HotSigner/worker/launch.ts
@@ -3,7 +3,7 @@ import SeedSignerWorker from '../../SeedSigner/worker'
 import launchController from './controller'
 
 import type { WorkerRPCMessage, WorkerTokenMessage } from '../types'
-import type { HotSignerType } from '../../../../store/state'
+import type { HotSignerType } from '../../../../store/state/types'
 
 const signerType = process.argv[2] as HotSignerType
 let worker

diff --git a/main/signers/hot/index.ts b/main/signers/hot/index.ts
@@ -15,7 +15,7 @@ import RingSigner, { RingSignerData } from './RingSigner'
 
 import type { Signers } from '..'
 import type Signer from '../Signer'
-import type { HotSignerType } from '../../store/state'
+import type { HotSignerType } from '../../store/state/types'
 
 export interface HotSignerData {
   type: HotSignerType

diff --git a/main/store/actions/index.js b/main/store/actions/index.js
@@ -284,7 +284,7 @@ module.exports = {
     u('main.privacy.errorReporting', () => enable)
   },
   setGasFees: (u, netType, netId, fees) => {
-    u('main.networksMeta', netType, netId, 'gas.price.fees', () => fees)
+    u('main.networksMeta', netType, netId, 'gas.fees', () => fees)
   },
   setGasPrices: (u, netType, netId, prices) => {
     u('main.networksMeta', netType, netId, 'gas.price.levels', () => prices)
@@ -293,8 +293,6 @@ module.exports = {
     u('main.networksMeta', netType, netId, 'gas.price.selected', () => level)
     if (level === 'custom') {
       u('main.networksMeta', netType, netId, 'gas.price.levels.custom', () => price)
-    } else {
-      u('main.networksMeta', netType, netId, 'gas.price.lastLevel', () => level)
     }
   },
   setNativeCurrencyData: (u, netType, netId, currency) => {