formatting (#22)

base-org · Aug 27, 2023 · 6c37f3e · 6c37f3e
1 parent 2ceb3a2
commit 6c37f3e
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 56 deletions.
diff --git a/src/_test/constants.ts b/src/_test/constants.ts
@@ -47,7 +47,6 @@ export const poolId = Number(process.env.VITEST_POOL_ID ?? 1)
 export const localHttpUrl = `http://127.0.0.1:8545/${poolId}`
 export const localWsUrl = `ws://127.0.0.1:8545/${poolId}`
 
-
 const messages = new Map()
 function warn(message: string) {
   if (!messages.has(message)) {
@@ -80,4 +79,4 @@ if (process.env.VITE_ANVIL_BLOCK_TIME) {
 } else {
   blockTime = 1
   warn(`\`VITE_ANVIL_BLOCK_TIME\` not found. Falling back to \`${blockTime}\`.`)
-}
+}
diff --git a/src/_test/globalSetup.ts b/src/_test/globalSetup.ts
@@ -33,4 +33,4 @@ export default async function () {
       blockTime,
     },
   })
-}
+}
diff --git a/src/actions/public/getWithdrawalMessages.test.ts b/src/actions/public/getWithdrawalMessages.test.ts
@@ -10,8 +10,7 @@ test('correctly retrieves L2 hash', async () => {
   }).extend(publicOpStackActions)
 
   const messages = await client.getWithdrawalMessages({
-    hash:
-      '0x999bab960dbdf600c51371ae819957063337a50cec2eb8032412739defadabe7',
+    hash: '0x999bab960dbdf600c51371ae819957063337a50cec2eb8032412739defadabe7',
   })
   expect(messages.length).toEqual(1)
   expect(messages[0].nonce).toBeDefined()

diff --git a/src/actions/public/getWithdrawalMessages.ts b/src/actions/public/getWithdrawalMessages.ts
@@ -1,13 +1,21 @@
-import { type PublicClient, Chain, Transport, Hash, Address, Hex, decodeEventLog } from 'viem'
+import {
+  type PublicClient,
+  Chain,
+  Transport,
+  Hash,
+  Address,
+  Hex,
+  decodeEventLog,
+} from 'viem'
 import { l2ToL1MessagePasserABI } from '@eth-optimism/contracts-ts'
 
 export type MessagePassedEvent = {
-  nonce: bigint, 
-  sender: Address,
-  target: Address,
-  value: bigint,
-  gasLimit: bigint,
-  data: Hex,
+  nonce: bigint
+  sender: Address
+  target: Address
+  value: bigint
+  gasLimit: bigint
+  data: Hex
   withdrawalHash: Hex
 }
 
@@ -45,5 +53,5 @@ export async function getWithdrawalMessages<TChain extends Chain | undefined>(
       }
     } catch {}
   }
-  return events;
+  return events
 }
diff --git a/src/actions/wallet/writeUnsafeDepositTransaction.test.ts b/src/actions/wallet/writeUnsafeDepositTransaction.test.ts
@@ -1,8 +1,11 @@
 import { expect, test } from 'vitest'
 import { publicClient, walletClient, testClient } from '../../_test/utils'
-import { DepositTransactionParameters, writeUnsafeDepositTransaction } from './writeUnsafeDepositTransaction'
+import {
+  DepositTransactionParameters,
+  writeUnsafeDepositTransaction,
+} from './writeUnsafeDepositTransaction'
 import { base } from '@roninjin10/rollup-chains'
-import { accounts,  } from '../../_test/constants'
+import { accounts } from '../../_test/constants'
 import { mine } from 'viem/actions'
 import { encodeFunctionData } from 'viem'
 import { optimismPortalABI } from '@eth-optimism/contracts-ts'
@@ -24,21 +27,21 @@ test('default', async () => {
 })
 
 test('sends transaction to correct address', async () => {
-  const hash =  await writeUnsafeDepositTransaction(walletClient, {
-      args: {
-        to: '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb',
-        value: 1n,
-        gasLimit: 1n,
-        data: '0x',
-        isCreation: false,
-      },
-      toChain: base,
-      account: accounts[0].address,
-    })
-  
+  const hash = await writeUnsafeDepositTransaction(walletClient, {
+    args: {
+      to: '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb',
+      value: 1n,
+      gasLimit: 1n,
+      data: '0x',
+      isCreation: false,
+    },
+    toChain: base,
+    account: accounts[0].address,
+  })
+
   await mine(testClient, { blocks: 1 })
 
-  const r = await publicClient.getTransactionReceipt({hash});
+  const r = await publicClient.getTransactionReceipt({ hash })
   expect(r.to).toEqual(base.opContracts.OptimismPortalProxy.toLocaleLowerCase())
 })
 
@@ -51,42 +54,46 @@ test('correctly passes arugments', async () => {
     gasLimit: 1n,
     data: '0x',
     isCreation: false,
-  };
+  }
+
+  const hash = await writeUnsafeDepositTransaction(walletClient, {
+    args,
+    toChain: base,
+    account: accounts[0].address,
+  })
 
-  const hash =  await writeUnsafeDepositTransaction(walletClient, {
-      args,
-      toChain: base,
-      account: accounts[0].address,
-    })
-
   await mine(testClient, { blocks: 1 })
 
-  const t = await publicClient.getTransaction({hash});
-  expect(t.input).toEqual(encodeFunctionData({
-    abi: optimismPortalABI,
-    functionName: 'depositTransaction',
-    args: [args.to, args.value!, args.gasLimit, args.isCreation!, args.data!]
-  }))
+  const t = await publicClient.getTransaction({ hash })
+  expect(t.input).toEqual(
+    encodeFunctionData({
+      abi: optimismPortalABI,
+      functionName: 'depositTransaction',
+      args: [args.to, args.value!, args.gasLimit, args.isCreation!, args.data!],
+    }),
+  )
 })
 
 test('uses defaults for data, isCreation, and value', async () => {
   const args: DepositTransactionParameters = {
     to: '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb',
     gasLimit: 1n,
-  };
+  }
+
+  const hash = await writeUnsafeDepositTransaction(walletClient, {
+    args,
+    toChain: base,
+    account: accounts[0].address,
+  })
 
-  const hash =  await writeUnsafeDepositTransaction(walletClient, {
-      args,
-      toChain: base,
-      account: accounts[0].address,
-    })
-
   await mine(testClient, { blocks: 1 })
 
-  const t = await publicClient.getTransaction({hash});
-  expect(t.input).toEqual(encodeFunctionData({
-    abi: optimismPortalABI,
-    functionName: 'depositTransaction',
-    args: [args.to, 0n, args.gasLimit, false, '0x']
-  }))
+  const t = await publicClient.getTransaction({ hash })
+  expect(t.input).toEqual(
+    encodeFunctionData({
+      abi: optimismPortalABI,
+      functionName: 'depositTransaction',
+      args: [args.to, 0n, args.gasLimit, false, '0x'],
+    }),
+  )
 })
diff --git a/src/decorators/publicOpStack.ts b/src/decorators/publicOpStack.ts
@@ -4,7 +4,11 @@ import {
   GetL2HashesForDepositTxReturnType,
   getL2HashesForDepositTx,
 } from '../actions/public/getL2HashesForDepositTx'
-import { GetWithdrawalMessagesParameters, GetWithdrawalMessagesReturnType, getWithdrawalMessages } from '../actions/public/getWithdrawalMessages'
+import {
+  GetWithdrawalMessagesParameters,
+  GetWithdrawalMessagesReturnType,
+  getWithdrawalMessages,
+} from '../actions/public/getWithdrawalMessages'
 
 /// NOTE We don't currently need account for exisiting actions but keeping in case
 export type PublicOpStackActions<

diff --git a/vitest.config.ts b/vitest.config.ts
@@ -22,4 +22,4 @@ export default defineConfig({
     globalSetup: ['./src/_test/globalSetup.ts'],
     testTimeout: 10_000,
   },
-})
+})