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/actions/nonce.test.ts

@@ -81,31 +81,6 @@ describe('getNonce', () => {
   })
 })
 
-describe('getNonceKeyCount', () => {
-  test('default', async () => {
-    // Get active nonce key count for a fresh account
-    const count = await actions.nonce.getNonceKeyCount(client, {
-      account: accounts.at(10)!.address,
-    })
-
-    // Fresh account should have 0 active nonce keys
-    expect(count).toBe(0n)
-  })
-
-  test('behavior: different accounts are independent', async () => {
-    const count1 = await actions.nonce.getNonceKeyCount(client, {
-      account: accounts.at(10)!.address,
-    })
-    const count2 = await actions.nonce.getNonceKeyCount(client, {
-      account: accounts.at(11)!.address,
-    })
-
-    // Both should be 0 for fresh accounts
-    expect(count1).toBe(0n)
-    expect(count2).toBe(0n)
-  })
-})
-
 describe('watchNonceIncremented', () => {
   test('default', async () => {
     const events: Array<{
@@ -153,52 +128,3 @@ describe('watchNonceIncremented', () => {
     }
   })
 })
-
-describe('watchActiveKeyCountChanged', () => {
-  test('default', async () => {
-    const events: Array<{
-      args: actions.nonce.watchActiveKeyCountChanged.Args
-      log: actions.nonce.watchActiveKeyCountChanged.Log
-    }> = []
-
-    const unwatch = actions.nonce.watchActiveKeyCountChanged(client, {
-      onActiveKeyCountChanged: (args, log) => {
-        events.push({ args, log })
-      },
-    })
-
-    const priorKeyCount = await actions.nonce.getNonceKeyCount(client, {
-      account: account.address,
-    })
-
-    try {
-      // First use of nonceKey 10 should increment active key count
-      await actions.token.transferSync(client, {
-        to: account2.address,
-        amount: 1n,
-        token: 1n,
-        nonceKey: 10n,
-        nonce: 0,
-      })
-
-      // First use of nonceKey 11 should increment again
-      await actions.token.transferSync(client, {
-        to: account2.address,
-        amount: 1n,
-        token: 1n,
-        nonceKey: 11n,
-        nonce: 0,
-      })
-
-      await setTimeout(1000)
-
-      expect(events).toHaveLength(2)
-      expect(events[0]!.args.account).toBe(account.address)
-      // Assert the number of new active keys
-      expect(events[0]!.args.newCount - priorKeyCount).toBe(1n)
-      expect(events[1]!.args.newCount - priorKeyCount).toBe(2n)
-    } finally {
-      unwatch()
-    }
-  })
-})

src/tempo/actions/nonce.ts

@@ -111,27 +111,7 @@ export namespace getNonce {
 }
 
 /**
- * Gets the number of active nonce keys for an account.
- *
- * @example
- * ```ts
- * import { createClient, http } from 'viem'
- * import { tempo } from 'tempo.ts/chains'
- * import { Actions } from 'tempo.ts/viem'
- *
- * const client = createClient({
- *   chain: tempo({ feeToken: '0x20c0000000000000000000000000000000000001' }),
- *   transport: http(),
- * })
- *
- * const count = await Actions.nonce.getNonceKeyCount(client, {
- *   account: '0x...',
- * })
- * ```
- *
- * @param client - Client.
- * @param parameters - Parameters.
- * @returns The number of active nonce keys.
+ * @deprecated This function has been deprecated post-AllegroModerato. It will be removed in a future version.
  */
 export async function getNonceKeyCount<
   chain extends Chain | undefined,
@@ -203,29 +183,7 @@ export namespace getNonceKeyCount {
 }
 
 /**
- * Watches for nonce incremented events.
- *
- * @example
- * ```ts
- * import { createClient, http } from 'viem'
- * import { tempo } from 'tempo.ts/chains'
- * import { Actions } from 'tempo.ts/viem'
- *
- * const client = createClient({
- *   chain: tempo({ feeToken: '0x20c0000000000000000000000000000000000001' }),
- *   transport: http(),
- * })
- *
- * const unwatch = Actions.nonce.watchNonceIncremented(client, {
- *   onNonceIncremented: (args, log) => {
- *     console.log('Nonce incremented:', args)
- *   },
- * })
- * ```
- *
- * @param client - Client.
- * @param parameters - Parameters.
- * @returns A function to unsubscribe from the event.
+ * @deprecated This function has been deprecated post-AllegroModerato. It will be removed in a future version.
  */
 export function watchNonceIncremented<
   chain extends Chain | undefined,

src/tempo/chainConfig.ts

@@ -41,14 +41,17 @@ export const chainConfig = {
       }
 
       if (phase === 'afterFillParameters') {
-        // TODO: remove once https://github.com/tempoxyz/tempo/pull/1684 is deployed.
         if (typeof request.nonceKey === 'bigint' && request.nonceKey > 0n)
-          request.gas = (request.gas ?? 0n) + 30_000n
+          request.gas = (request.gas ?? 0n) + 40_000n
         return request as unknown as typeof r
       }
 
       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