chore: tweaks

Author: jxom

src/tempo/Formatters.ts

@@ -125,21 +125,9 @@ export function formatTransactionRequest(
     account && 'accessKeyAddress' in account
       ? account.accessKeyAddress
       : undefined
-  const keyAuthorization = rpc.keyAuthorization
-    ? {
-        ...rpc.keyAuthorization,
-        // FIXME(ox): remove once https://github.com/tempoxyz/tempo/pull/1683 is deployed.
-        chainId:
-          rpc.keyAuthorization.chainId === '0x' ||
-          rpc.keyAuthorization.chainId === '0x0'
-            ? 0
-            : parseInt(rpc.keyAuthorization.chainId || '0x0', 16),
-      }
-    : undefined
 
   return {
     ...rpc,
-    ...(keyAuthorization ? { keyAuthorization } : {}),
     ...(keyData ? { keyData } : {}),
     ...(keyId ? { keyId } : {}),
     ...(keyType ? { keyType } : {}),

src/tempo/chainConfig.ts

@@ -48,7 +48,11 @@ export const chainConfig = {
       }
 
       request.nonceKey = (() => {
-        if (typeof request.nonceKey !== 'undefined') return request.nonceKey
+        if (
+          typeof request.nonceKey !== 'undefined' &&
+          request.nonceKey !== 'random'
+        )
+          return request.nonceKey
 
         const address = request.account?.address ?? request.from
         if (!address) return undefined

test/src/tempo/config.ts

@@ -2,7 +2,11 @@ import { Mnemonic } from 'ox'
 import { generateMnemonic } from '../../../src/accounts/generateMnemonic.js'
 import { english } from '../../../src/accounts/wordlists.js'
 import { sendTransactionSync } from '../../../src/actions/index.js'
-import { tempoLocalnet, tempoTestnet } from '../../../src/chains/index.js'
+import {
+  tempoDevnet,
+  tempoLocalnet,
+  tempoTestnet,
+} from '../../../src/chains/index.js'
 import {
   type Address,
   type Chain,
@@ -41,7 +45,8 @@ export const addresses = {
 } as const
 
 export const chain = (() => {
-  if (nodeEnv === 'testnet' || nodeEnv === 'devnet') return tempoTestnet
+  if (nodeEnv === 'devnet') return tempoDevnet
+  if (nodeEnv === 'testnet') return tempoTestnet
   return tempoLocalnet
 })()
 
@@ -267,17 +272,13 @@ export async function fundAddress(
   const { address } = parameters
   const account = accounts.at(0)!
   if (account.address === address) return
-  await Promise.all(
-    // fund pathUSD, alphaUSD
-    [0n, 1n].map((feeToken) =>
-      Actions.token.transferSync(client, {
-        account,
-        amount: parseUnits('10000', 6),
-        to: address,
-        token: feeToken,
-      }),
-    ),
-  )
+  for (const token of [0n, 1n])
+    await Actions.token.transferSync(client, {
+      account,
+      amount: parseUnits('10000', 6),
+      to: address,
+      token,
+    })
 }
 
 export declare namespace fundAddress {