Rename: addressOrEnsName → accountId

$houdini/types/src/routes/$houdini.d.ts

@@ -10,8 +10,8 @@ type EnsureDefined<T> = T extends null | undefined ? {} : T;
 type OptionalUnion<U extends Record<string, any>, A extends keyof U = U extends U ? keyof U : never> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
 export type Snapshot<T = any> = Kit.Snapshot<T>;
 type PageParentData = EnsureDefined<LayoutData>;
-type LayoutRouteId = RouteId | "/" | "/apps" | "/apps/[web3AppSlug=isWeb3AppSlug]" | "/apps/[web3AppSlug=isWeb3AppSlug]/address/[addressOrEnsName]" | "/apps/audius" | "/apps/audius/playlist/[audiusPlaylistId]" | "/apps/audius/search/[audiusQuery]" | "/apps/audius/track/[audiusTrackId]" | "/apps/audius/user/[audiusUserId]" | "/apps/ens/address/[addressOrEnsName]" | "/explorer" | "/explorer/[networkSlug=isNetworkSlug]" | "/explorer/[networkSlug=isNetworkSlug]/[query=isBlockNumber]" | "/explorer/[networkSlug=isNetworkSlug]/[query=isEnsName]" | "/explorer/[networkSlug=isNetworkSlug]/[query=isEthereumAddress]" | "/explorer/[networkSlug=isNetworkSlug]/[query=isEthereumTransaction]" | "/explorer/bitcoin" | "/explorer/bitcoin/[query]" | "/portfolio" | "/transfer" | null
-type LayoutParams = RouteParams & { web3AppSlug?: string,addressOrEnsName?: string,audiusPlaylistId?: string,audiusQuery?: string,audiusTrackId?: string,audiusUserId?: string,networkSlug?: string,query?: string }
+type LayoutRouteId = RouteId | "/" | "/apps" | "/apps/[web3AppSlug=isWeb3AppSlug]" | "/apps/[web3AppSlug=isWeb3AppSlug]/address/[accountId]" | "/apps/audius" | "/apps/audius/playlist/[audiusPlaylistId]" | "/apps/audius/search/[audiusQuery]" | "/apps/audius/track/[audiusTrackId]" | "/apps/audius/user/[audiusUserId]" | "/apps/ens/address/[accountId]" | "/explorer" | "/explorer/[networkSlug=isNetworkSlug]" | "/explorer/[networkSlug=isNetworkSlug]/[query=isBlockNumber]" | "/explorer/[networkSlug=isNetworkSlug]/[query=isEnsName]" | "/explorer/[networkSlug=isNetworkSlug]/[query=isEthereumAddress]" | "/explorer/[networkSlug=isNetworkSlug]/[query=isEthereumTransaction]" | "/explorer/bitcoin" | "/explorer/bitcoin/[query]" | "/portfolio" | "/transfer" | null
+type LayoutParams = RouteParams & { web3AppSlug?: string,accountId?: string,audiusPlaylistId?: string,audiusQuery?: string,audiusTrackId?: string,audiusUserId?: string,networkSlug?: string,query?: string }
 type LayoutServerParentData = EnsureDefined<{}>;
 type LayoutParentData = EnsureDefined<{}>;
 						type MakeOptional<Target, Keys extends keyof Target> = Omit<Target, Keys> & {

$houdini/types/src/routes/apps/$houdini.d.ts

@@ -10,8 +10,8 @@ type EnsureDefined<T> = T extends null | undefined ? {} : T;
 type OptionalUnion<U extends Record<string, any>, A extends keyof U = U extends U ? keyof U : never> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
 export type Snapshot<T = any> = Kit.Snapshot<T>;
 type PageParentData = Omit<EnsureDefined<import('../$houdini').LayoutData>, keyof LayoutData> & EnsureDefined<LayoutData>;
-type LayoutRouteId = RouteId | "/apps" | "/apps/[web3AppSlug=isWeb3AppSlug]" | "/apps/[web3AppSlug=isWeb3AppSlug]/address/[addressOrEnsName]" | "/apps/audius" | "/apps/audius/playlist/[audiusPlaylistId]" | "/apps/audius/search/[audiusQuery]" | "/apps/audius/track/[audiusTrackId]" | "/apps/audius/user/[audiusUserId]" | "/apps/ens/address/[addressOrEnsName]"
-type LayoutParams = RouteParams & { web3AppSlug?: string,addressOrEnsName?: string,audiusPlaylistId?: string,audiusQuery?: string,audiusTrackId?: string,audiusUserId?: string }
+type LayoutRouteId = RouteId | "/apps" | "/apps/[web3AppSlug=isWeb3AppSlug]" | "/apps/[web3AppSlug=isWeb3AppSlug]/address/[accountId]" | "/apps/audius" | "/apps/audius/playlist/[audiusPlaylistId]" | "/apps/audius/search/[audiusQuery]" | "/apps/audius/track/[audiusTrackId]" | "/apps/audius/user/[audiusUserId]" | "/apps/ens/address/[accountId]"
+type LayoutParams = RouteParams & { web3AppSlug?: string,accountId?: string,audiusPlaylistId?: string,audiusQuery?: string,audiusTrackId?: string,audiusUserId?: string }
 type LayoutParentData = EnsureDefined<import('../$houdini').LayoutData>;
 						type MakeOptional<Target, Keys extends keyof Target> = Omit<Target, Keys> & {
 							[Key in Keys]?: Target[Key] | undefined | null

$houdini/types/src/routes/apps/[web3AppSlug=isWeb3AppSlug]/$houdini.d.ts

@@ -10,8 +10,8 @@ type EnsureDefined<T> = T extends null | undefined ? {} : T;
 type OptionalUnion<U extends Record<string, any>, A extends keyof U = U extends U ? keyof U : never> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
 export type Snapshot<T = any> = Kit.Snapshot<T>;
 type PageParentData = Omit<Omit<EnsureDefined<import('../../$houdini').LayoutData>, keyof import('../$houdini').LayoutData> & EnsureDefined<import('../$houdini').LayoutData>, keyof LayoutData> & EnsureDefined<LayoutData>;
-type LayoutRouteId = RouteId | "/apps/[web3AppSlug=isWeb3AppSlug]" | "/apps/[web3AppSlug=isWeb3AppSlug]/address/[addressOrEnsName]"
-type LayoutParams = RouteParams & { web3AppSlug?: string,addressOrEnsName?: string }
+type LayoutRouteId = RouteId | "/apps/[web3AppSlug=isWeb3AppSlug]" | "/apps/[web3AppSlug=isWeb3AppSlug]/address/[accountId]"
+type LayoutParams = RouteParams & { web3AppSlug?: string,accountId?: string }
 type LayoutParentData = Omit<EnsureDefined<import('../../$houdini').LayoutData>, keyof import('../$houdini').LayoutData> & EnsureDefined<import('../$houdini').LayoutData>;
 						type MakeOptional<Target, Keys extends keyof Target> = Omit<Target, Keys> & {
 							[Key in Keys]?: Target[Key] | undefined | null

$houdini/types/src/routes/apps/[web3AppSlug=isWeb3AppSlug]/address/[addressOrEnsName]/$houdini.d.ts → $houdini/types/src/routes/apps/[web3AppSlug=isWeb3AppSlug]/address/[accountId]/$houdini.d.ts

@@ -1,8 +1,8 @@
 import type * as Kit from '@sveltejs/kit';
 
 type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
-type RouteParams = { web3AppSlug: string; addressOrEnsName: string }
-type RouteId = '/apps/[web3AppSlug=isWeb3AppSlug]/address/[addressOrEnsName]';
+type RouteParams = { web3AppSlug: string; accountId: string }
+type RouteId = '/apps/[web3AppSlug=isWeb3AppSlug]/address/[accountId]';
 type MaybeWithVoid<T> = {} extends T ? T | void : T;
 export type RequiredKeys<T> = { [K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K; }[keyof T];
 type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Partial<Pick<App.PageData, keyof T & keyof App.PageData>> & Record<string, any>>

$houdini/types/src/routes/apps/ens/$houdini.d.ts

@@ -9,8 +9,8 @@ type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Pa
 type EnsureDefined<T> = T extends null | undefined ? {} : T;
 type OptionalUnion<U extends Record<string, any>, A extends keyof U = U extends U ? keyof U : never> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
 export type Snapshot<T = any> = Kit.Snapshot<T>;
-type LayoutRouteId = RouteId | "/apps/ens/address/[addressOrEnsName]"
-type LayoutParams = RouteParams & { addressOrEnsName?: string }
+type LayoutRouteId = RouteId | "/apps/ens/address/[accountId]"
+type LayoutParams = RouteParams & { accountId?: string }
 type LayoutParentData = Omit<EnsureDefined<import('../../$houdini').LayoutData>, keyof import('../$houdini').LayoutData> & EnsureDefined<import('../$houdini').LayoutData>;
 						type MakeOptional<Target, Keys extends keyof Target> = Omit<Target, Keys> & {
 							[Key in Keys]?: Target[Key] | undefined | null

$houdini/types/src/routes/apps/ens/address/[addressOrEnsName]/$houdini.d.ts → $houdini/types/src/routes/apps/ens/address/[accountId]/$houdini.d.ts

@@ -1,8 +1,8 @@
 import type * as Kit from '@sveltejs/kit';
 
 type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
-type RouteParams = { addressOrEnsName: string }
-type RouteId = '/apps/ens/address/[addressOrEnsName]';
+type RouteParams = { accountId: string }
+type RouteId = '/apps/ens/address/[accountId]';
 type MaybeWithVoid<T> = {} extends T ? T | void : T;
 export type RequiredKeys<T> = { [K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K; }[keyof T];
 type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Partial<Pick<App.PageData, keyof T & keyof App.PageData>> & Record<string, any>>

$houdini/types/src/routes/apps/lens/$houdini.d.ts

@@ -0,0 +1,23 @@
+import type * as Kit from '@sveltejs/kit';
+
+type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
+type RouteParams = {  }
+type RouteId = '/apps/lens';
+type MaybeWithVoid<T> = {} extends T ? T | void : T;
+export type RequiredKeys<T> = { [K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K; }[keyof T];
+type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Partial<Pick<App.PageData, keyof T & keyof App.PageData>> & Record<string, any>>
+type EnsureDefined<T> = T extends null | undefined ? {} : T;
+type OptionalUnion<U extends Record<string, any>, A extends keyof U = U extends U ? keyof U : never> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
+export type Snapshot<T = any> = Kit.Snapshot<T>;
+type LayoutRouteId = RouteId
+type LayoutParams = RouteParams & {  }
+type LayoutParentData = EnsureDefined<{}>;
+						type MakeOptional<Target, Keys extends keyof Target> = Omit<Target, Keys> & {
+							[Key in Keys]?: Target[Key] | undefined | null
+						}
+
+
+export type LayoutServerData = null;
+export type LayoutLoad<OutputData extends Partial<App.PageData> & Record<string, any> | void = Partial<App.PageData> & Record<string, any> | void> = Kit.Load<LayoutParams, LayoutServerData, LayoutParentData, OutputData, LayoutRouteId>;
+export type LayoutLoadEvent = Parameters<LayoutLoad>[0];
+export type LayoutData = Expand<Expand<Omit<LayoutParentData, keyof LayoutParentData & EnsureDefined<LayoutServerData>> & OptionalUnion<EnsureDefined<LayoutParentData & EnsureDefined<LayoutServerData>>>> & {  }>;

src/components/EnsResolutionLoader.svelte

@@ -14,7 +14,7 @@
 	export let network = networksByChainID[1]
 	export let providerName: NetworkProvider
 	export let provider: Ethereum.Provider
-	export let addressOrEnsName: PortfolioAccountId
+	export let accountId: PortfolioAccountId
 	export let passiveForwardResolution = false
 	export let passiveReverseResolution = false
 
@@ -40,24 +40,24 @@
 
 	$: type = findMatchedCaptureGroupName<'ensName' | 'lensName' | 'address'>(
 		/(?<ensName>(?:[^. ]+[.])*(?:eth|xyz|luxe|kred|art|club|test))|(?<lensName>(?:[^. ]+[.])(?:lens|test))|(?<address>0x[0-9a-fA-F]{40})/,
-		addressOrEnsName
+		accountId
 	) ?? ''	
 
 
 	$: isReverseResolving = type === 'address'
 
-	$: if(!addressOrEnsName){
+	$: if(!accountId){
 		address = undefined
 		ensName = undefined
 		lensName = undefined
 		isReverseResolving = undefined
 	}
 	else if(type === 'lensName')
-		lensName = addressOrEnsName as LensName
+		lensName = accountId as LensName
 	else if(isReverseResolving)
-		address = addressOrEnsName as Ethereum.Address
+		address = accountId as Ethereum.Address
 	else
-		ensName = addressOrEnsName as ENS.Name
+		ensName = accountId as ENS.Name
 
 
 	import { useQuery } from '@sveltestack/svelte-query'
@@ -89,7 +89,7 @@
 		// throw new Error(`The ENS Name "${ensName}" doesn't resolve to an address.`)
 		throw new Error(`The ENS Name "${ensName}" doesn't resolve to an address (or there's an issue with the${providerName === NetworkProvider.Default ? `` : ` ${providerName}`} JSON-RPC connection).`)
 
-		// addressPromise = ens.name(addressOrEnsName).getAddress()
+		// addressPromise = ens.name(accountId).getAddress()
 	})
 
 
@@ -130,7 +130,7 @@
 		<slot slot="header" name="header" {address} {type} {ensName} {lensName} {isReverseResolving} />
 		<slot {address} {type} {ensName} {lensName} {isReverseResolving} />
 	</Loader>
-{:else if addressOrEnsName && isReverseResolving}
+{:else if accountId && isReverseResolving}
 	<Loader
 		layout={passiveReverseResolution ? 'passive' : 'default'}
 		fromUseQuery={
@@ -154,7 +154,7 @@
 		<slot slot="header" name="header" {address} {type} {ensName} {lensName} {isReverseResolving} />
 		<slot {address} {type} {ensName} {lensName} {isReverseResolving} />
 	</Loader>
-{:else if addressOrEnsName && !isReverseResolving}
+{:else if accountId && !isReverseResolving}
 		<!-- fromPromise={async () => (
 			await resolveName(ensName.toLowerCase())
 		)} -->

src/components/EthereumAccountOrContract.svelte

@@ -11,7 +11,7 @@
 
 
 	export let network: Ethereum.Network
-	export let addressOrEnsName: Ethereum.Address | string
+	export let accountId: Ethereum.Address | string
 	export let filterQuery: Ethereum.Address | Ethereum.ContractAddress | Ethereum.BlockNumber
 	export let provider: Ethereum.Provider
 
@@ -99,7 +99,7 @@
 
 <div class="ethereum-account card">
 	<EnsResolutionLoader
-		{addressOrEnsName}
+		{accountId}
 		{provider}
 		passiveReverseResolution
 		let:address

src/components/EthereumTransactionCovalent.svelte

@@ -79,7 +79,7 @@
 		toAddress: transaction.to_address as Ethereum.Address,
 		toAddressLabel: transaction.to_address_label,
 
-		value: transaction.value * 0.1 ** network.nativeCurrency.decimals, // _formatUnits(transaction.value, network.nativeCurrency.decimals),
+		value: transaction.value * 0.1 ** network.nativeCurrency.decimals * 0.1 ** network.nativeCurrency.decimals, // _formatUnits(transaction.value, network.nativeCurrency.decimals),
 
 		gasToken: network.nativeCurrency,
 		gasOffered: BigInt(transaction.gas_offered),

src/components/PortfolioAccount.svelte

@@ -310,7 +310,7 @@
 	class:grid-layout={isGridLayout}
 >
 	<EnsResolutionLoader
-		addressOrEnsName={account.id}
+		accountId={account.id}
 		{provider}
 		passiveReverseResolution
 		let:type

src/components/Web3AppDashboard.svelte

@@ -301,7 +301,7 @@
 							}}
 								<EthereumAccountOrContract
 									{network}
-									addressOrEnsName={contractAddress}
+									accountId={contractAddress}
 									{provider}
 								>
 									<svelte:fragment slot="title" let:network let:address>
@@ -799,7 +799,7 @@
 							{#if !address}
 								<EthereumAccountOrContract
 									{network}
-									addressOrEnsName={contractAddress}
+									accountId={contractAddress}
 									{provider}
 								>
 									<svelte:fragment slot="title" let:network let:address>

src/routes/apps/+layout.svelte

@@ -7,7 +7,7 @@
 
 	import {
 		web3AppSlug,
-		addressOrEnsName,
+		accountId,
 		audiusQuery,
 		audiusPlaylistId,
 		audiusTrackId,
@@ -17,7 +17,7 @@
 
 	$: if($page.url.pathname.startsWith('/apps')){
 		$web3AppSlug = $page.params.web3AppSlug || $page.url.pathname.match(/^\/apps\/([^/]+)/)?.[1] || ''
-		$addressOrEnsName = $page.params.addressOrEnsName || ''
+		$accountId = $page.params.accountId || ''
 		$audiusQuery = $page.params.audiusQuery || ''
 		$audiusPlaylistId = $page.params.audiusPlaylistId || ''
 		$audiusTrackId = $page.params.audiusTrackId || ''
@@ -87,7 +87,7 @@
 
 
 <svelte:head>
-	<title>{$addressOrEnsName ? `${$addressOrEnsName} | ` : ''}{$web3AppSlug && $web3AppConfig ? `${$web3AppConfig.name} ${$currentView}` : `Apps`} | Blockhead</title>
+	<title>{$accountId ? `${$accountId} | ` : ''}{$web3AppSlug && $web3AppConfig ? `${$web3AppConfig.name} ${$currentView}` : `Apps`} | Blockhead</title>
 </svelte:head>
 
 

src/routes/apps/[web3AppSlug=isWeb3AppSlug]/+layout.svelte

@@ -4,7 +4,7 @@
 
 
 	// Params
-	import { addressOrEnsName } from '../_appsParams'
+	import { accountId } from '../_appsParams'
 
 
 	// Context
@@ -13,7 +13,7 @@
 
 	// Internal state
 
-	$: currentAddressOrEnsName = $addressOrEnsName
+	$: currentAddressOrEnsName = $accountId
 
 	let tokenBalanceFormat
 	let showUnderlyingAssets
@@ -110,13 +110,13 @@
 	in:fly={{x: 100}}
 	out:fly={{x: -100}}
 >
-	<form on:submit|preventDefault={() => $addressOrEnsName = currentAddressOrEnsName}>
+	<form on:submit|preventDefault={() => $accountId = currentAddressOrEnsName}>
 		<ExplorerInput bind:value={currentAddressOrEnsName} />
 		<button type="submit">Go</button>
 	</form>
 
 	<EnsResolutionLoader
-		addressOrEnsName={$addressOrEnsName}
+		accountId={$accountId}
 		passiveForwardResolution
 		passiveReverseResolution
 		let:address

src/routes/apps/_appsContext.ts

@@ -6,7 +6,7 @@ import { web3AppsBySlug, type Web3AppConfig } from '../../data/web3Apps'
 
 import {
 	web3AppSlug,
-	addressOrEnsName,
+	accountId,
 	audiusQuery,
 	audiusPlaylistId,
 	audiusTrackId,
@@ -24,23 +24,23 @@ export const web3AppConfig: Readable<Web3AppConfig> = derived(web3AppSlug, ($web
 
 export const currentView: Readable<'Dashboard' | 'Explorer' | 'Account'> = derived([
 	web3AppSlug,
-	addressOrEnsName,
+	accountId,
 	audiusQuery,
 	audiusPlaylistId,
 	audiusTrackId,
 	audiusUserId,
 ], ([
 	$web3AppSlug,
-	$addressOrEnsName,
+	$accountId,
 	$audiusQuery,
 	$audiusPlaylistId,
 	$audiusTrackId,
 	$audiusUserId,
 ], set) => set(
-	($web3AppSlug === 'ens' && $addressOrEnsName) || 
+	($web3AppSlug === 'ens' && $accountId) || 
 	($audiusQuery || $audiusPlaylistId || $audiusTrackId || $audiusUserId) ?
 		'Explorer'
-	: $addressOrEnsName ?
+	: $accountId ?
 		'Account'
 	:
 		'Dashboard'

src/routes/apps/_appsParams.ts

@@ -4,7 +4,7 @@ import { derived, writable, type Readable } from 'svelte/store'
 // Param stores
 
 export const web3AppSlug = writable('')
-export const addressOrEnsName = writable('')
+export const accountId = writable('')
 export const audiusQuery = writable('')
 export const audiusPlaylistId = writable('')
 export const audiusTrackId = writable('')
@@ -15,14 +15,14 @@ export const audiusUserId = writable('')
 
 export const derivedPath: Readable<string> = derived([
 	web3AppSlug,
-	addressOrEnsName,
+	accountId,
 	audiusQuery,
 	audiusPlaylistId,
 	audiusTrackId,
 	audiusUserId,
 ], ([
 	$web3AppSlug,
-	$addressOrEnsName,
+	$accountId,
 	$audiusQuery,
 	$audiusPlaylistId,
 	$audiusTrackId,
@@ -32,8 +32,8 @@ export const derivedPath: Readable<string> = derived([
 		$web3AppSlug ?
 			`/${$web3AppSlug}${
 				// All web3 apps
-				$addressOrEnsName ?
-					`/address/${$addressOrEnsName}`
+				$accountId ?
+					`/address/${$accountId}`
 
 				// Audius
 				: $web3AppSlug === 'audius' ?

src/routes/apps/audius/+layout.svelte

@@ -4,7 +4,7 @@
 
 
 	// Params
-	import { addressOrEnsName, audiusQuery } from '../_appsParams'
+	import { accountId, audiusQuery } from '../_appsParams'
 
 
 	// Context
@@ -13,7 +13,7 @@
 
 	// Internal state
 
-	$: currentAddressOrEnsName = $addressOrEnsName
+	$: currentAddressOrEnsName = $accountId
 	$: currentQuery = $audiusQuery
 
 	let tokenBalanceFormat
@@ -34,7 +34,7 @@
 
 
 <head>
-	<title>{$addressOrEnsName ? `${$addressOrEnsName} | ` : ''}{`${$web3AppConfig?.name} ${$currentView}`} | Blockhead</title>
+	<title>{$accountId ? `${$accountId} | ` : ''}{`${$web3AppConfig?.name} ${$currentView}`} | Blockhead</title>
 </head>
 
 
@@ -79,13 +79,13 @@
 		{/if}
 
 		{#if $currentView === 'Dashboard' || $currentView === 'Account'}
-			<form on:submit|preventDefault={() => $addressOrEnsName = currentAddressOrEnsName}>
+			<form on:submit|preventDefault={() => $accountId = currentAddressOrEnsName}>
 				<AddressField bind:address={currentAddressOrEnsName}/>
 				<button type="submit">Go</button>
 			</form>
 
 			<EnsResolutionLoader
-				addressOrEnsName={$addressOrEnsName}
+				accountId={$accountId}
 				passiveForwardResolution
 				passiveReverseResolution
 				let:address