fix CI & build scripts (#46)

* remove tsbuildinfo on build:type. needed to rebuild types_/ * don't error if buildinfo file DNE * tweak typecheck script to ignore types_/ * chore: format * update lockfile * chore: format * (temp) disable commit hook so I can separate a commit * fix broken vitest (needs lint) * lint * re-enable pre-commit hook * fix global window.ethereum definition * remove old code * ignore generated.ts * ignore generated.ts in other tsconfi * upgrade vite, vitest, disable non-test-related test errors, disable anvil tests * upgrade vite, vitest, disable non-test-related test errors, disable anvil tests * chore: format --------- Co-authored-by: zeroXbrock <[email protected]>
flashbots · Jun 21, 2024 · bede0f8 · bede0f8
1 parent 4c97f07
commit bede0f8
Show file tree

Hide file tree

Showing 30 changed files with 106 additions and 111 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "build": "bun run clean && bun run build:cjs && bun run build:esm && bun run build:types",
     "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./src/_cjs --removeComments --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./src/_cjs/package.json",
     "build:esm": "tsc --project ./tsconfig.build.json --module es2015 --outDir ./src/_esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./src/_esm/package.json",
-    "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./src/_types --emitDeclarationOnly --declaration --declarationMap",
+    "build:types": "rm -f tsconfig.build.tsbuildinfo && tsc --project ./tsconfig.build.json --module esnext --declarationDir ./src/_types --emitDeclarationOnly --declaration --declarationMap",
     "changeset": "changeset",
     "changeset:release": "bun run build && changeset publish",
     "changeset:version": "changeset version && bun scripts/updateVersion.ts && bun install --lockfile-only",
@@ -27,11 +27,11 @@
     "test:parser": "vitest -c ./test/vitest.config.ts ./src/chains/suave/parsers.test.ts",
     "test:cov": "vitest dev -c ./test/vitest.config.ts --coverage",
     "test:ci": "CI=true vitest -c ./test/vitest.config.ts --coverage --retry=3 --bail=1",
-    "test:typecheck": "SKIP_GLOBAL_SETUP=true vitest typecheck -c ./test/vitest.config.ts",
+    "test:typecheck": "SKIP_GLOBAL_SETUP=true vitest --typecheck.ignoreSourceErrors -c ./test/vitest.config.ts",
     "test:ui": "vitest dev -c ./test/vitest.config.ts --ui",
     "vectors": "bun test vectors/**/*.test.ts",
     "vectors:generate": "bun vectors/generate.ts",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --project ./tsconfig.typecheck.json --module esnext --noEmit"
   },
   "devDependencies": {
     "@actions/core": "1.10.0",
@@ -54,8 +54,8 @@
     "simple-git-hooks": "^2.8.1",
     "size-limit": "^8.2.4",
     "typescript": "5.0.4",
-    "vite": "^4.4.2",
-    "vitest": "~0.34.3",
+    "vite": "^5.3.1",
+    "vitest": "^1.6.0",
     "which-pm-runs": "^1.1.0"
   },
   "simple-git-hooks": {

diff --git a/playgrounds/browser/src/components/actions/GetTransaction.tsx b/playgrounds/browser/src/components/actions/GetTransaction.tsx
@@ -65,7 +65,10 @@ function GetTransactionByHashAndIndex({ client }: { client: PublicClient }) {
   const handleGetTransaction = async () => {
     if (blockHash && index) {
       setTransaction(
-        await client.getTransaction({ blockHash, index: parseInt(index) }),
+        await client.getTransaction({
+          blockHash,
+          index: Number.parseInt(index),
+        }),
       )
     }
   }
@@ -111,7 +114,7 @@ function GetTransactionByNumberAndIndex({ client }: { client: PublicClient }) {
       setTransaction(
         await client.getTransaction({
           blockNumber: BigInt(blockNumber),
-          index: parseInt(index),
+          index: Number.parseInt(index),
         }),
       )
     }
@@ -159,7 +162,7 @@ function GetTransactionByTagAndIndex({ client }: { client: PublicClient }) {
       setTransaction(
         await client.getTransaction({
           blockTag,
-          index: parseInt(index),
+          index: Number.parseInt(index),
         }),
       )
     }

diff --git a/playgrounds/browser/src/components/actions/SendTransaction.tsx b/playgrounds/browser/src/components/actions/SendTransaction.tsx
@@ -1,4 +1,4 @@
-import { WalletClient, parseEther } from 'viem'
+import { type WalletClient, parseEther } from 'viem'
 import { goerli } from 'viem/chains'
 
 export function SendTransaction({ client }: { client: WalletClient }) {

diff --git a/site/.vitepress/sidebar.ts b/site/.vitepress/sidebar.ts
@@ -1,4 +1,4 @@
-import { DefaultTheme } from 'vitepress'
+import type { DefaultTheme } from 'vitepress'
 
 export const sidebar: DefaultTheme.Sidebar = {
   '/docs/': [

diff --git a/site/index.ts b/site/index.ts
@@ -1 +1 @@
-export {}
+export type {}
diff --git a/src/actions/wallet/signTransaction.ts b/src/actions/wallet/signTransaction.ts
@@ -10,7 +10,7 @@ import { AccountNotFoundError } from '../../errors/account.js'
 import type { ErrorType } from '../../errors/utils.js'
 import type { GetAccountParameter } from '../../types/account.js'
 import type { Chain, GetChain } from '../../types/chain.js'
-import { type RpcTransactionRequest } from '../../types/rpc.js'
+import type { RpcTransactionRequest } from '../../types/rpc.js'
 import type {
   TransactionRequest,
   TransactionSerializable,

diff --git a/src/chains/celo/formatters.ts b/src/chains/celo/formatters.ts
@@ -1,4 +1,4 @@
-import { type ChainFormatters } from '../../types/chain.js'
+import type { ChainFormatters } from '../../types/chain.js'
 import type { Hash } from '../../types/misc.js'
 import type { RpcTransaction } from '../../types/rpc.js'
 import { hexToBigInt } from '../../utils/encoding/fromHex.js'

diff --git a/src/chains/optimism/formatters.ts b/src/chains/optimism/formatters.ts
@@ -1,6 +1,6 @@
-import { type ChainFormatters } from '../../types/chain.js'
+import type { ChainFormatters } from '../../types/chain.js'
 import type { Hash } from '../../types/misc.js'
-import { type RpcTransaction } from '../../types/rpc.js'
+import type { RpcTransaction } from '../../types/rpc.js'
 import { hexToBigInt } from '../../utils/encoding/fromHex.js'
 import { defineBlock } from '../../utils/formatters/block.js'
 import {

diff --git a/src/chains/suave/formatters.ts b/src/chains/suave/formatters.ts
@@ -1,5 +1,5 @@
 import { zeroAddress } from '../../constants/address.js'
-import { type ChainFormatters } from '../../types/chain.js'
+import type { ChainFormatters } from '../../types/chain.js'
 import type { Hash, Hex } from '../../types/misc.js'
 import type { RpcTransaction } from '../../types/rpc.js'
 import type {
@@ -22,16 +22,16 @@ import {
   formatTransactionRequest,
 } from '../../utils/formatters/transactionRequest.js'
 import { suaveRigil } from '../index.js'
-import {
-  type ConfidentialComputeRecord,
-  type RpcTransactionReceiptSuave,
-  type RpcTransactionRequestSuave,
-  type RpcTransactionSuave,
-  type SuaveBlockOverrides,
-  type SuaveTxType,
-  type TransactionReceiptSuave,
-  type TransactionRequestSuave,
-  type TransactionSuave,
+import type {
+  ConfidentialComputeRecord,
+  RpcTransactionReceiptSuave,
+  RpcTransactionRequestSuave,
+  RpcTransactionSuave,
+  SuaveBlockOverrides,
+  SuaveTxType,
+  TransactionReceiptSuave,
+  TransactionRequestSuave,
+  TransactionSuave,
 } from './types.js'
 
 export const formattersSuave = {
@@ -75,7 +75,7 @@ export const formattersSuave = {
         return {
           // format original eth params as legacy tx
           ...formatTransaction({ ...args, type: '0x0' } as RpcTransaction),
-          chainId: parseInt(args.chainId, 16),
+          chainId: Number.parseInt(args.chainId, 16),
           accessList: args.accessList,
           // ... then replace and add fields as needed
           gasPrice: hexToBigInt(args.gasPrice as Hex),
@@ -99,7 +99,7 @@ export const formattersSuave = {
             confidentialInputsHash: args.requestRecord.confidentialInputsHash,
             chainId:
               args.requestRecord.chainId &&
-              parseInt(args.requestRecord.chainId, 16),
+              Number.parseInt(args.requestRecord.chainId, 16),
             type: args.requestRecord.type,
             typeHex: args.requestRecord.typeHex,
           } as ConfidentialComputeRecord,

diff --git a/src/chains/suave/wallet.ts b/src/chains/suave/wallet.ts
@@ -13,7 +13,7 @@ import {
   hexToSignature,
   keccak256,
 } from '../../index.js'
-import { type Hex } from '../../types/misc.js'
+import type { Hex } from '../../types/misc.js'
 import { suaveRigil } from '../index.js'
 import {
   serializeConfidentialComputeRecord,

diff --git a/src/clients/transports/custom.test.ts b/src/clients/transports/custom.test.ts
@@ -1,7 +1,7 @@
 import { assertType, describe, expect, test, vi } from 'vitest'
 
 import type { EIP1193RequestFn } from '../../index.js'
-import '../../types/window.js'
+import '../../types/global.js'
 import { type CustomTransport, custom } from './custom.js'
 
 vi.stubGlobal('window', {

diff --git a/src/package.json b/src/package.json
@@ -86,42 +86,18 @@
   },
   "typesVersions": {
     "*": {
-      "abi": [
-        "./_types/abi/index.d.ts"
-      ],
-      "accounts": [
-        "./_types/accounts/index.d.ts"
-      ],
-      "actions": [
-        "./_types/actions/index.d.ts"
-      ],
-      "chains": [
-        "./_types/chains/index.d.ts"
-      ],
-      "chains/utils": [
-        "./_types/chains/utils/index.d.ts"
-      ],
-      "contract": [
-        "./_types/contract/index.d.ts"
-      ],
-      "ens": [
-        "./_types/ens/index.d.ts"
-      ],
-      "public": [
-        "./_types/public/index.d.ts"
-      ],
-      "test": [
-        "./_types/test/index.d.ts"
-      ],
-      "utils": [
-        "./_types/utils/index.d.ts"
-      ],
-      "wallet": [
-        "./_types/wallet/index.d.ts"
-      ],
-      "window": [
-        "./_types/window/index.d.ts"
-      ]
+      "abi": ["./_types/abi/index.d.ts"],
+      "accounts": ["./_types/accounts/index.d.ts"],
+      "actions": ["./_types/actions/index.d.ts"],
+      "chains": ["./_types/chains/index.d.ts"],
+      "chains/utils": ["./_types/chains/utils/index.d.ts"],
+      "contract": ["./_types/contract/index.d.ts"],
+      "ens": ["./_types/ens/index.d.ts"],
+      "public": ["./_types/public/index.d.ts"],
+      "test": ["./_types/test/index.d.ts"],
+      "utils": ["./_types/utils/index.d.ts"],
+      "wallet": ["./_types/wallet/index.d.ts"],
+      "window": ["./_types/window/index.d.ts"]
     }
   },
   "peerDependencies": {
@@ -145,22 +121,12 @@
   },
   "license": "MIT",
   "repository": "flashbots/suave-viem",
-  "authors": [
-    "awkweb.eth",
-    "jxom.eth"
-  ],
+  "authors": ["awkweb.eth", "jxom.eth"],
   "funding": [
     {
       "type": "github",
       "url": "https://github.com/sponsors/wagmi-dev"
     }
   ],
-  "keywords": [
-    "eth",
-    "ethereum",
-    "dapps",
-    "wallet",
-    "web3",
-    "suave"
-  ]
+  "keywords": ["eth", "ethereum", "dapps", "wallet", "web3", "suave"]
 }
diff --git a/src/types/window.ts → src/types/global.d.ts b/src/types/window.ts → src/types/global.d.ts
@@ -1,4 +1,4 @@
-import type { EIP1193Provider } from './eip1193.js'
+import { type EIP1193Provider } from './eip1193.ts'
 
 declare global {
   interface Window {

diff --git a/src/utils/abi/decodeAbiParameters.ts b/src/utils/abi/decodeAbiParameters.ts
@@ -277,7 +277,7 @@ function decodeBytes<const TParam extends AbiParameter>(
     return { consumed: 32, value }
   }
 
-  const value = slice(data, position, position + parseInt(size), {
+  const value = slice(data, position, position + Number.parseInt(size), {
     strict: true,
   })
   return { consumed: 32, value }
@@ -293,7 +293,7 @@ function decodeNumber<const TParam extends AbiParameter>(
   { param }: { param: TParam },
 ) {
   const signed = param.type.startsWith('int')
-  const size = parseInt(param.type.split('int')[1] || '256')
+  const size = Number.parseInt(param.type.split('int')[1] || '256')
   return {
     consumed: 32,
     value:

diff --git a/src/utils/abi/encodeAbiParameters.ts b/src/utils/abi/encodeAbiParameters.ts
@@ -265,9 +265,9 @@ function encodeBytes<const TParam extends AbiParameter>(
       encoded: concat([padHex(numberToHex(bytesSize, { size: 32 })), value_]),
     }
   }
-  if (bytesSize !== parseInt(paramSize))
+  if (bytesSize !== Number.parseInt(paramSize))
     throw new AbiEncodingBytesSizeMismatchError({
-      expectedSize: parseInt(paramSize),
+      expectedSize: Number.parseInt(paramSize),
       value,
     })
   return { dynamic: false, encoded: padHex(value, { dir: 'right' }) }

diff --git a/src/utils/abi/encodePacked.ts b/src/utils/abi/encodePacked.ts
@@ -107,7 +107,7 @@ function encode<const TPackedAbiType extends PackedAbiType | unknown>(
   const intMatch = (type as string).match(integerRegex)
   if (intMatch) {
     const [_type, baseType, bits = '256'] = intMatch
-    const size = parseInt(bits) / 8
+    const size = Number.parseInt(bits) / 8
     return numberToHex(value as number, {
       size: isArray ? 32 : size,
       signed: baseType === 'int',
@@ -117,9 +117,9 @@ function encode<const TPackedAbiType extends PackedAbiType | unknown>(
   const bytesMatch = (type as string).match(bytesRegex)
   if (bytesMatch) {
     const [_type, size] = bytesMatch
-    if (parseInt(size) !== ((value as Hex).length - 2) / 2)
+    if (Number.parseInt(size) !== ((value as Hex).length - 2) / 2)
       throw new BytesSizeMismatchError({
-        expectedSize: parseInt(size),
+        expectedSize: Number.parseInt(size),
         givenSize: ((value as Hex).length - 2) / 2,
       })
     return pad(value as Hex, { dir: 'right', size: isArray ? 32 : null }) as Hex

diff --git a/src/utils/buildRequest.ts b/src/utils/buildRequest.ts
@@ -201,7 +201,8 @@ export function buildRequest<TRequest extends (args: any) => Promise<any>>(
           // If we find a Retry-After header, let's retry after the given time.
           if (error && error instanceof HttpRequestError) {
             const retryAfter = error?.headers?.get('Retry-After')
-            if (retryAfter?.match(/\d/)) return parseInt(retryAfter) * 1000
+            if (retryAfter?.match(/\d/))
+              return Number.parseInt(retryAfter) * 1000
           }
 
           // Otherwise, let's retry with an exponential backoff.

diff --git a/src/utils/ccip.ts b/src/utils/ccip.ts
@@ -2,7 +2,7 @@ import type { Abi, Address } from 'abitype'
 
 import { type CallParameters, call } from '../actions/public/call.js'
 import type { Transport } from '../clients/transports/createTransport.js'
-import { type BaseError } from '../errors/base.js'
+import type { BaseError } from '../errors/base.js'
 import {
   OffchainLookupError,
   OffchainLookupResponseMalformedError,

diff --git a/src/utils/ens/avatar/utils.ts b/src/utils/ens/avatar/utils.ts
@@ -242,7 +242,7 @@ export function parseNftUri(uri_: string): ParsedNft {
     throw new EnsAvatarInvalidNftUriError({ reason: 'ERC namespace not found' })
 
   return {
-    chainID: parseInt(chainID),
+    chainID: Number.parseInt(chainID),
     namespace: erc_namespace.toLowerCase(),
     contractAddress: contractAddress as Address,
     tokenID,

diff --git a/src/utils/promise/withCache.ts b/src/utils/promise/withCache.ts
@@ -41,7 +41,7 @@ export type WithCacheParameters = {
  */
 export async function withCache<TData>(
   fn: () => Promise<TData>,
-  { cacheKey, cacheTime = Infinity }: WithCacheParameters,
+  { cacheKey, cacheTime = Number.POSITIVE_INFINITY }: WithCacheParameters,
 ) {
   const cache = getCache<TData>(cacheKey)
 

diff --git a/src/utils/transaction/serializeAccessList.ts b/src/utils/transaction/serializeAccessList.ts
@@ -10,7 +10,7 @@ import type { ErrorType } from '../../errors/utils.js'
 import type { Hex } from '../../types/misc.js'
 import type { AccessList } from '../../types/transaction.js'
 import { type IsAddressErrorType, isAddress } from '../address/isAddress.js'
-import { type RecursiveArray } from '../encoding/toRlp.js'
+import type { RecursiveArray } from '../encoding/toRlp.js'
 
 export type SerializeAccessListErrorType =
   | InvalidStorageKeySizeErrorType

diff --git a/src/utils/typedData.ts b/src/utils/typedData.ts
@@ -57,7 +57,7 @@ export function validateTypedData<
         // and will throw.
         numberToHex(value, {
           signed: base === 'int',
-          size: parseInt(size_) / 8,
+          size: Number.parseInt(size_) / 8,
         })
       }
 
@@ -67,9 +67,9 @@ export function validateTypedData<
       const bytesMatch = type.match(bytesRegex)
       if (bytesMatch) {
         const [_type, size_] = bytesMatch
-        if (size_ && size(value as Hex) !== parseInt(size_))
+        if (size_ && size(value as Hex) !== Number.parseInt(size_))
           throw new BytesSizeMismatchError({
-            expectedSize: parseInt(size_),
+            expectedSize: Number.parseInt(size_),
             givenSize: size(value as Hex),
           })
       }

diff --git a/src/window/index.ts b/src/window/index.ts
@@ -1 +1 @@
-import '../types/window.js'
+import '../types/global.js'