chore: tweaks

Author: jxom

src/tempo/chainConfig.ts

@@ -31,41 +31,51 @@ export const chainConfig = {
       format: Formatters.formatTransactionRequest,
     }),
   },
-  async prepareTransactionRequest(r) {
-    const request = r as Transaction.TransactionRequest & {
-      account?: Account | undefined
-      chain?:
-        | (Chain & { feeToken?: TokenId.TokenIdOrAddress | undefined })
-        | undefined
-    }
+  prepareTransactionRequest: [
+    async (r, { phase }) => {
+      const request = r as Transaction.TransactionRequest & {
+        account?: Account | undefined
+        chain?:
+          | (Chain & { feeToken?: TokenId.TokenIdOrAddress | undefined })
+          | undefined
+      }
+
+      if (phase === 'afterFillParameters') {
+        // TODO: remove once `eth_fillTransaction` supports nonce keys.
+        if (typeof request.nonceKey === 'bigint' && request.nonceKey > 0n)
+          request.gas = (request.gas ?? 0n) + 30_000n
+        return request as unknown as typeof r
+      }
 
-    request.nonceKey = (() => {
-      if (typeof request.nonceKey !== 'undefined') return request.nonceKey
+      request.nonceKey = (() => {
+        if (typeof request.nonceKey !== 'undefined') return request.nonceKey
 
-      const address = request.account?.address ?? request.from
-      if (!address) return undefined
-      if (!request.chain) return undefined
-      const nonceKey = NonceKeyStore.getNonceKey(NonceKeyStore.store, {
-        address,
-        chainId: request.chain.id,
-      })
+        const address = request.account?.address ?? request.from
+        if (!address) return undefined
+        if (!request.chain) return undefined
+        const nonceKey = NonceKeyStore.getNonceKey(NonceKeyStore.store, {
+          address,
+          chainId: request.chain.id,
+        })
 
-      if (nonceKey === 0n) return undefined
-      return nonceKey
-    })()
+        if (nonceKey === 0n) return undefined
+        return nonceKey
+      })()
 
-    request.nonce = (() => {
-      if (typeof request.nonce === 'number') return request.nonce
-      // TODO: remove this line once `eth_fillTransaction` supports nonce keys.
-      if (request.nonceKey) return 0
-      return undefined
-    })()
+      request.nonce = (() => {
+        if (typeof request.nonce === 'number') return request.nonce
+        // TODO: remove this line once `eth_fillTransaction` supports nonce keys.
+        if (request.nonceKey) return 0
+        return undefined
+      })()
 
-    if (!request.feeToken && request.chain?.feeToken)
-      request.feeToken = request.chain.feeToken
+      if (!request.feeToken && request.chain?.feeToken)
+        request.feeToken = request.chain.feeToken
 
-    return request as unknown as typeof r
-  },
+      return request as unknown as typeof r
+    },
+    { runAt: ['beforeFillTransaction', 'afterFillParameters'] },
+  ],
   serializers: {
     // TODO: casting to satisfy viem – viem v3 to have more flexible serializer type.
     transaction: ((transaction, signature) =>

test/src/tempo/config.ts

@@ -273,8 +273,6 @@ export async function fundAddress(
       Actions.token.transferSync(client, {
         account,
         amount: parseUnits('10000', 6),
-        // TODO: remove once `eth_fillTransaction` supports nonce keys.
-        gas: 100_000n,
         to: address,
         token: feeToken,
       }),