chore: tweaks

Author: jxom

package.json

@@ -63,7 +63,7 @@
     "ethers": "^6.15.0",
     "knip": "^5.64.0",
     "micro-eth-signer": "^0.14.0",
-    "ox": "~0.10.6",
+    "ox": "~0.11.0",
     "permissionless": "^0.2.57",
     "prool": "~0.2.1",
     "publint": "^0.2.12",

pnpm-lock.yaml

@@ -218,7 +218,7 @@
     "@scure/bip39": "1.6.0",
     "abitype": "1.2.3",
     "isows": "1.0.7",
-    "ox": "0.10.6",
+    "ox": "0.11.0",
     "ws": "8.18.3"
   },
   "license": "MIT",

src/package.json

@@ -126,31 +126,15 @@ export function formatTransactionRequest(
       ? account.accessKeyAddress
       : undefined
   const keyAuthorization = rpc.keyAuthorization
-    ? (() => {
-        const keyAuthorization = {
-          ...rpc.keyAuthorization,
-          // FIXME(ox): chainId not serialized in nested object
-          chainId:
-            rpc.keyAuthorization.chainId === '0x' ||
-            rpc.keyAuthorization.chainId === '0x0'
-              ? 0
-              : parseInt(rpc.keyAuthorization.chainId || '0x0', 16),
-        }
-        // FIXME(ox): expects `preHash` not `prehash`
-        if (
-          keyAuthorization.signature &&
-          keyAuthorization.signature.type === 'p256' &&
-          'prehash' in keyAuthorization.signature
-        ) {
-          const { prehash, ...rest } = keyAuthorization.signature
-          keyAuthorization.signature = {
-            ...rest,
-            // @ts-expect-error
-            preHash: prehash,
-          }
-        }
-        return 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 {

src/tempo/Formatters.ts

@@ -22,8 +22,8 @@ afterEach(async () => {
 describe('getUserToken', () => {
   test('default', async () => {
     // Fund accounts
-    await fundAddress(client, { address: account2.address, sequential: true })
-    await fundAddress(client, { address: account3.address, sequential: true })
+    await fundAddress(client, { address: account2.address })
+    await fundAddress(client, { address: account3.address })
 
     // Set token (address)
     await actions.fee.setUserTokenSync(client, {

src/tempo/actions/fee.test.ts

@@ -427,7 +427,7 @@ describe('sendTransaction', () => {
       )
 
       // fund account
-      await fundAddress(client, { address: account.address, sequential: true })
+      await fundAddress(client, { address: account.address })
 
       const receipt = await sendTransactionSync(client, {
         account,
@@ -501,7 +501,7 @@ describe('sendTransaction', () => {
       )
 
       // fund account
-      await fundAddress(client, { address: account.address, sequential: true })
+      await fundAddress(client, { address: account.address })
 
       const receipt = await sendTransactionSync(client, {
         account,
@@ -709,7 +709,7 @@ describe('sendTransaction', () => {
       const account = Account.fromWebCryptoP256(keyPair)
 
       // fund account
-      await fundAddress(client, { address: account.address, sequential: true })
+      await fundAddress(client, { address: account.address })
 
       const receipt = await sendTransactionSync(client, {
         account,
@@ -781,7 +781,7 @@ describe('sendTransaction', () => {
       const account = Account.fromWebCryptoP256(keyPair)
 
       // fund account
-      await fundAddress(client, { address: account.address, sequential: true })
+      await fundAddress(client, { address: account.address })
 
       const receipt = await sendTransactionSync(client, {
         account,
@@ -879,7 +879,7 @@ describe('sendTransaction', () => {
       })
 
       // fund account
-      await fundAddress(client, { address: account.address, sequential: true })
+      await fundAddress(client, { address: account.address })
 
       const keyAuthorization = await account.signKeyAuthorization(accessKey)
 
@@ -912,7 +912,7 @@ describe('sendTransaction', () => {
       )
 
       // fund account
-      await fundAddress(client, { address: account.address, sequential: true })
+      await fundAddress(client, { address: account.address })
 
       const receipt = await sendTransactionSync(client, {
         account,
@@ -990,7 +990,7 @@ describe('sendTransaction', () => {
       )
 
       // fund account
-      await fundAddress(client, { address: account.address, sequential: true })
+      await fundAddress(client, { address: account.address })
 
       const receipt = await sendTransactionSync(client, {
         account,
@@ -1151,7 +1151,7 @@ describe('sendTransaction', () => {
       })
 
       // fund account
-      await fundAddress(client, { address: account.address, sequential: true })
+      await fundAddress(client, { address: account.address })
 
       const keyAuthorization = await account.signKeyAuthorization(accessKey)
 

src/tempo/e2e.test.ts

@@ -264,34 +264,28 @@ export async function fundAddress(
   client: Client<Transport, Chain>,
   parameters: fundAddress.Parameters,
 ) {
-  const { address, sequential } = parameters
+  const { address } = parameters
   const account = accounts.at(0)!
   if (account.address === address) return
-
-  const tokens = [0n, 1n]
-  const shared = {
-    account,
-    amount: parseUnits('10000', 6),
-    to: address,
-  }
-
-  if (sequential)
-    for (const token of tokens)
-      await Actions.token.transferSync(client, { ...shared, token: token })
-  else
-    await Promise.all(
-      tokens.map((token) =>
-        Actions.token.transferSync(client, { ...shared, token }),
-      ),
-    )
+  await Promise.all(
+    // fund pathUSD, alphaUSD
+    [0n, 1n].map((feeToken) =>
+      Actions.token.transferSync(client, {
+        account,
+        amount: parseUnits('10000', 6),
+        // TODO: remove once `eth_fillTransaction` supports nonce keys.
+        gas: 100_000n,
+        to: address,
+        token: feeToken,
+      }),
+    ),
+  )
 }
 
 export declare namespace fundAddress {
   export type Parameters = {
     /** Account to fund. */
     address: Address
-    /** Run transfers sequentially to avoid 2D nonce gas costs. */
-    sequential?: boolean | undefined
   }
 }