Merge branch 'main' of https://github.com/wevm/ox into tmm/1193-errors

wevm · Nov 12, 2024 · af7b6db · af7b6db
2 parents 603e571 + 2a7d21b
commit af7b6db
Show file tree

Hide file tree

Showing 195 changed files with 648 additions and 592 deletions.
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -20,15 +20,16 @@ jobs:
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies
 
-      - name: Setup .npmrc file
-        uses: actions/setup-node@v4
-        with:
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Publish to npm
-        run: | 
-          cd src && pnpm version $(npm pkg get version | sed 's/"//g')-$(date +'%Y%m%dT%H%M%S') && cd ../ 
-          pnpm changeset:prepublish
-          cd src && pnpm publish --no-git-checks --provenance false && cd ../
+      - name: Publish Snapshots
+        continue-on-error: true
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          snapshot=$(git branch --show-current | tr -cs '[:alnum:]-' '-' | tr '[:upper:]' '[:lower:]' | sed 's/-$//')
+          npm config set "//registry.npmjs.org/:_authToken" "$NPM_TOKEN"
+          pnpm clean
+          pnpm changeset version --no-git-tag --snapshot $snapshot
+          pnpm changeset:prepublish
+          pnpm changeset publish --no-git-tag --snapshot $snapshot --tag $snapshot
+
diff --git a/examples/webauthn-p256/CHANGELOG.md b/examples/webauthn-p256/CHANGELOG.md
@@ -1,5 +1,40 @@
 # webauthn-p256
 
+## 0.0.6
+
+### Patch Changes
+
+- Updated dependencies [[`644b96a`](https://github.com/wevm/ox/commit/644b96a169a118c6f0606eda5354785523ed099b)]:
+  - [email protected]
+
+## 0.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`777fe42`](https://github.com/wevm/ox/commit/777fe4249c5225c676ff690fda58c5fcfb35d1f0)]:
+  - [email protected]
+
+## 0.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`868d431`](https://github.com/wevm/ox/commit/868d4319a8cda77345f85f9f2e88ca786f0c8cfe)]:
+  - [email protected]
+
+## 0.0.3
+
+### Patch Changes
+
+- Updated dependencies [[`f438faf`](https://github.com/wevm/ox/commit/f438fafbd396248283876eba220f4c661c47bfd2)]:
+  - [email protected]
+
+## 0.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`b7de4f2`](https://github.com/wevm/ox/commit/b7de4f2180520fd7f2bf08955df6e676d75db93e)]:
+  - [email protected]
+
 ## 0.0.1
 
 ### Patch Changes

diff --git a/examples/webauthn-p256/package.json b/examples/webauthn-p256/package.json
@@ -1,7 +1,7 @@
 {
   "name": "webauthn-p256",
   "private": true,
-  "version": "0.0.1",
+  "version": "0.0.6",
   "type": "module",
   "scripts": {
     "dev": "vite"

diff --git a/scripts/utils/exports.ts b/scripts/utils/exports.ts
@@ -27,6 +27,7 @@ export function getExports({
     if (!parentEntry.isDirectory()) {
       if (parentEntry.name.endsWith('test.ts')) continue
       if (parentEntry.name === 'jsr.json') continue
+      if (parentEntry.name === 'tsdoc.json') continue
       if (
         !parentEntry.name.endsWith('.ts') &&
         !parentEntry.name.endsWith('.json')

diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
@@ -1,5 +1,35 @@
 # ox
 
+## 0.1.5
+
+### Patch Changes
+
+- [`644b96a`](https://github.com/wevm/ox/commit/644b96a169a118c6f0606eda5354785523ed099b) Thanks [@jxom](https://github.com/jxom)! - Added additional guard for `result` in `Provider.from`.
+
+## 0.1.4
+
+### Patch Changes
+
+- [`777fe42`](https://github.com/wevm/ox/commit/777fe4249c5225c676ff690fda58c5fcfb35d1f0) Thanks [@jxom](https://github.com/jxom)! - Tweaked `trimLeft` to remove all leading zeros.
+
+## 0.1.3
+
+### Patch Changes
+
+- [`868d431`](https://github.com/wevm/ox/commit/868d4319a8cda77345f85f9f2e88ca786f0c8cfe) Thanks [@jxom](https://github.com/jxom)! - Added handling for odd-length hex values.
+
+## 0.1.2
+
+### Patch Changes
+
+- [#17](https://github.com/wevm/ox/pull/17) [`f438faf`](https://github.com/wevm/ox/commit/f438fafbd396248283876eba220f4c661c47bfd2) Thanks [@jxom](https://github.com/jxom)! - Moved modules to `core/`.
+
+## 0.1.1
+
+### Patch Changes
+
+- [`b7de4f2`](https://github.com/wevm/ox/commit/b7de4f2180520fd7f2bf08955df6e676d75db93e) Thanks [@jxom](https://github.com/jxom)! - Fixed `RpcSchema` inference on `params`.
+
 ## 0.1.0
 
 ### Minor Changes

diff --git a/src/Abi.ts → src/core/Abi.ts b/src/Abi.ts → src/core/Abi.ts
diff --git a/src/AbiConstructor.ts → src/core/AbiConstructor.ts b/src/AbiConstructor.ts → src/core/AbiConstructor.ts
diff --git a/src/AbiError.ts → src/core/AbiError.ts b/src/AbiError.ts → src/core/AbiError.ts
diff --git a/src/AbiEvent.ts → src/core/AbiEvent.ts b/src/AbiEvent.ts → src/core/AbiEvent.ts
diff --git a/src/AbiFunction.ts → src/core/AbiFunction.ts b/src/AbiFunction.ts → src/core/AbiFunction.ts
diff --git a/src/AbiItem.ts → src/core/AbiItem.ts b/src/AbiItem.ts → src/core/AbiItem.ts
diff --git a/src/AbiParameters.ts → src/core/AbiParameters.ts b/src/AbiParameters.ts → src/core/AbiParameters.ts
diff --git a/src/AccessList.ts → src/core/AccessList.ts b/src/AccessList.ts → src/core/AccessList.ts
diff --git a/src/AccountProof.ts → src/core/AccountProof.ts b/src/AccountProof.ts → src/core/AccountProof.ts
@@ -1,4 +1,4 @@
-import type { Address, Hex } from './index.js'
+import type { Address, Hex } from '../index.js'
 
 /** An Account Proof as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/main/src/schemas/state.yaml). */
 export type AccountProof<bigintType = bigint, numberType = number> = {

diff --git a/src/Address.ts → src/core/Address.ts b/src/Address.ts → src/core/Address.ts
diff --git a/src/AesGcm.ts → src/core/AesGcm.ts b/src/AesGcm.ts → src/core/AesGcm.ts
diff --git a/src/Authorization.ts → src/core/Authorization.ts b/src/Authorization.ts → src/core/Authorization.ts
diff --git a/src/Base58.ts → src/core/Base58.ts b/src/Base58.ts → src/core/Base58.ts
diff --git a/src/Base64.ts → src/core/Base64.ts b/src/Base64.ts → src/core/Base64.ts
diff --git a/src/Blobs.ts → src/core/Blobs.ts b/src/Blobs.ts → src/core/Blobs.ts
diff --git a/src/Block.ts → src/core/Block.ts b/src/Block.ts → src/core/Block.ts
diff --git a/src/Bloom.ts → src/core/Bloom.ts b/src/Bloom.ts → src/core/Bloom.ts
diff --git a/src/Bls.ts → src/core/Bls.ts b/src/Bls.ts → src/core/Bls.ts
diff --git a/src/BlsPoint.ts → src/core/BlsPoint.ts b/src/BlsPoint.ts → src/core/BlsPoint.ts
diff --git a/src/Bytes.ts → src/core/Bytes.ts b/src/Bytes.ts → src/core/Bytes.ts
@@ -230,15 +230,14 @@ fromBoolean.parseError = (error: unknown) =>
 export function fromHex(value: Hex.Hex, options: fromHex.Options = {}): Bytes {
   const { size } = options
 
-  if (value.length % 2) throw new Hex.InvalidLengthError(value)
-
   let hex = value
   if (size) {
     internal_hex.assertSize(value, size)
     hex = Hex.padRight(value, size)
   }
 
-  const hexString = hex.slice(2) as string
+  let hexString = hex.slice(2) as string
+  if (hexString.length % 2) hexString = `0${hexString}`
 
   const length = hexString.length / 2
   const bytes = new Uint8Array(length)
@@ -264,7 +263,6 @@ export declare namespace fromHex {
   type ErrorType =
     | internal_hex.assertSize.ErrorType
     | Hex.padRight.ErrorType
-    | Hex.InvalidLengthError
     | Errors.GlobalErrorType
 }
 

diff --git a/src/Caches.ts → src/core/Caches.ts b/src/Caches.ts → src/core/Caches.ts
diff --git a/src/ContractAddress.ts → src/core/ContractAddress.ts b/src/ContractAddress.ts → src/core/ContractAddress.ts
diff --git a/src/Ens.ts → src/core/Ens.ts b/src/Ens.ts → src/core/Ens.ts
diff --git a/src/Errors.ts → src/core/Errors.ts b/src/Errors.ts → src/core/Errors.ts
diff --git a/src/Fee.ts → src/core/Fee.ts b/src/Fee.ts → src/core/Fee.ts
diff --git a/src/Filter.ts → src/core/Filter.ts b/src/Filter.ts → src/core/Filter.ts
diff --git a/src/Hash.ts → src/core/Hash.ts b/src/Hash.ts → src/core/Hash.ts
diff --git a/src/HdKey.ts → src/core/HdKey.ts b/src/HdKey.ts → src/core/HdKey.ts
diff --git a/src/Hex.ts → src/core/Hex.ts b/src/Hex.ts → src/core/Hex.ts
@@ -155,7 +155,7 @@ export function fromBoolean(
   value: boolean,
   options: fromBoolean.Options = {},
 ): Hex {
-  const hex: Hex = `0x0${Number(value)}`
+  const hex: Hex = `0x${Number(value)}`
   if (typeof options.size === 'number') {
     internal.assertSize(hex, options.size)
     return padLeft(hex, options.size)
@@ -275,8 +275,7 @@ export function fromNumber(
     signed && value_ < 0 ? (1n << BigInt(size * 8)) + BigInt(value_) : value_
   ).toString(16)
 
-  const hex =
-    `0x${stringValue.length % 2 === 0 ? stringValue : `0${stringValue}`}` as Hex
+  const hex = `0x${stringValue}` as Hex
   if (size) return padLeft(hex, size) as Hex
   return hex
 }
@@ -649,14 +648,11 @@ toBigInt.parseError = (error: unknown) => error as toBigInt.ErrorType
  * @returns The decoded boolean.
  */
 export function toBoolean(hex: Hex, options: toBoolean.Options = {}): boolean {
-  let hex_ = hex
-  if (options.size) {
-    internal.assertSize(hex, options.size)
-    hex_ = trimLeft(hex_)
-  }
-  if (trimLeft(hex_) === '0x00') return false
-  if (trimLeft(hex_) === '0x01') return true
-  throw new InvalidHexBooleanError(hex_)
+  if (options.size) internal.assertSize(hex, options.size)
+  const hex_ = trimLeft(hex)
+  if (hex_ === '0x') return false
+  if (hex_ === '0x1') return true
+  throw new InvalidHexBooleanError(hex)
 }
 
 export declare namespace toBoolean {

diff --git a/src/Json.ts → src/core/Json.ts b/src/Json.ts → src/core/Json.ts
diff --git a/src/Kzg.ts → src/core/Kzg.ts b/src/Kzg.ts → src/core/Kzg.ts
diff --git a/src/Log.ts → src/core/Log.ts b/src/Log.ts → src/core/Log.ts
diff --git a/src/Mnemonic.ts → src/core/Mnemonic.ts b/src/Mnemonic.ts → src/core/Mnemonic.ts
diff --git a/src/P256.ts → src/core/P256.ts b/src/P256.ts → src/core/P256.ts
diff --git a/src/PersonalMessage.ts → src/core/PersonalMessage.ts b/src/PersonalMessage.ts → src/core/PersonalMessage.ts
diff --git a/src/Provider.ts → src/core/Provider.ts b/src/Provider.ts → src/core/Provider.ts
@@ -371,6 +371,7 @@ export function from(provider: any, options: Options = {}): Provider<Options> {
     async request(args) {
       const result = await provider.request(args)
       if (
+        result &&
         typeof result === 'object' &&
         'jsonrpc' in (result as { jsonrpc?: unknown })
       )

diff --git a/src/PublicKey.ts → src/core/PublicKey.ts b/src/PublicKey.ts → src/core/PublicKey.ts
diff --git a/src/Rlp.ts → src/core/Rlp.ts b/src/Rlp.ts → src/core/Rlp.ts
diff --git a/src/RpcRequest.ts → src/core/RpcRequest.ts b/src/RpcRequest.ts → src/core/RpcRequest.ts
@@ -1,5 +1,5 @@
+import type { Errors } from '../index.js'
 import type * as RpcSchema from './RpcSchema.js'
-import type { Errors } from './index.js'
 import type * as RpcSchema_internal from './internal/rpcSchema.js'
 import type { Compute } from './internal/types.js'
 

diff --git a/src/RpcResponse.ts → src/core/RpcResponse.ts b/src/RpcResponse.ts → src/core/RpcResponse.ts
@@ -1,4 +1,4 @@
-import type { Errors, RpcRequest } from './index.js'
+import type { Errors, RpcRequest } from '../index.js'
 import type {
   Compute,
   IsNarrowable,

diff --git a/src/RpcSchema.ts → src/core/RpcSchema.ts b/src/RpcSchema.ts → src/core/RpcSchema.ts
diff --git a/src/RpcTransport.ts → src/core/RpcTransport.ts b/src/RpcTransport.ts → src/core/RpcTransport.ts
diff --git a/src/Secp256k1.ts → src/core/Secp256k1.ts b/src/Secp256k1.ts → src/core/Secp256k1.ts
diff --git a/src/Signature.ts → src/core/Signature.ts b/src/Signature.ts → src/core/Signature.ts
diff --git a/src/Siwe.ts → src/core/Siwe.ts b/src/Siwe.ts → src/core/Siwe.ts
diff --git a/src/Solidity.ts → src/core/Solidity.ts b/src/Solidity.ts → src/core/Solidity.ts
diff --git a/src/Transaction.ts → src/core/Transaction.ts b/src/Transaction.ts → src/core/Transaction.ts
diff --git a/src/TransactionEnvelope.ts → src/core/TransactionEnvelope.ts b/src/TransactionEnvelope.ts → src/core/TransactionEnvelope.ts
diff --git a/src/TransactionEnvelopeEip1559.ts → src/core/TransactionEnvelopeEip1559.ts b/src/TransactionEnvelopeEip1559.ts → src/core/TransactionEnvelopeEip1559.ts
diff --git a/src/TransactionEnvelopeEip2930.ts → src/core/TransactionEnvelopeEip2930.ts b/src/TransactionEnvelopeEip2930.ts → src/core/TransactionEnvelopeEip2930.ts
diff --git a/src/TransactionEnvelopeEip4844.ts → src/core/TransactionEnvelopeEip4844.ts b/src/TransactionEnvelopeEip4844.ts → src/core/TransactionEnvelopeEip4844.ts
diff --git a/src/TransactionEnvelopeEip7702.ts → src/core/TransactionEnvelopeEip7702.ts b/src/TransactionEnvelopeEip7702.ts → src/core/TransactionEnvelopeEip7702.ts
diff --git a/src/TransactionEnvelopeLegacy.ts → src/core/TransactionEnvelopeLegacy.ts b/src/TransactionEnvelopeLegacy.ts → src/core/TransactionEnvelopeLegacy.ts
diff --git a/src/TransactionReceipt.ts → src/core/TransactionReceipt.ts b/src/TransactionReceipt.ts → src/core/TransactionReceipt.ts
diff --git a/src/TransactionRequest.ts → src/core/TransactionRequest.ts b/src/TransactionRequest.ts → src/core/TransactionRequest.ts
diff --git a/src/TypedData.ts → src/core/TypedData.ts b/src/TypedData.ts → src/core/TypedData.ts
diff --git a/src/ValidatorData.ts → src/core/ValidatorData.ts b/src/ValidatorData.ts → src/core/ValidatorData.ts
diff --git a/src/Value.ts → src/core/Value.ts b/src/Value.ts → src/core/Value.ts
diff --git a/src/WebAuthnP256.ts → src/core/WebAuthnP256.ts b/src/WebAuthnP256.ts → src/core/WebAuthnP256.ts
diff --git a/src/WebCryptoP256.ts → src/core/WebCryptoP256.ts b/src/WebCryptoP256.ts → src/core/WebCryptoP256.ts
diff --git a/src/Withdrawal.ts → src/core/Withdrawal.ts b/src/Withdrawal.ts → src/core/Withdrawal.ts
diff --git a/src/_test/Abi.test-d.ts → src/core/_test/Abi.test-d.ts b/src/_test/Abi.test-d.ts → src/core/_test/Abi.test-d.ts
diff --git a/src/_test/Abi.test.ts → src/core/_test/Abi.test.ts b/src/_test/Abi.test.ts → src/core/_test/Abi.test.ts
diff --git a/src/_test/AbiConstructor.test-d.ts → src/core/_test/AbiConstructor.test-d.ts b/src/_test/AbiConstructor.test-d.ts → src/core/_test/AbiConstructor.test-d.ts
diff --git a/src/_test/AbiConstructor.test.ts → src/core/_test/AbiConstructor.test.ts b/src/_test/AbiConstructor.test.ts → src/core/_test/AbiConstructor.test.ts
@@ -1,10 +1,10 @@
 import { AbiConstructor } from 'ox'
 import { describe, expect, test } from 'vitest'
 
-import { Constructor } from '../../contracts/generated.js'
-import { anvilMainnet } from '../../test/anvil.js'
-import { seaportContractConfig } from '../../test/constants/abis.js'
-import { address } from '../../test/constants/addresses.js'
+import { Constructor } from '../../../contracts/generated.js'
+import { anvilMainnet } from '../../../test/anvil.js'
+import { seaportContractConfig } from '../../../test/constants/abis.js'
+import { address } from '../../../test/constants/addresses.js'
 
 describe('decode', () => {
   test('default', () => {

diff --git a/src/_test/AbiError.test-d.ts → src/core/_test/AbiError.test-d.ts b/src/_test/AbiError.test-d.ts → src/core/_test/AbiError.test-d.ts
diff --git a/src/_test/AbiError.test.ts → src/core/_test/AbiError.test.ts b/src/_test/AbiError.test.ts → src/core/_test/AbiError.test.ts
@@ -1,8 +1,8 @@
 import { Abi, AbiError, AbiFunction, AbiItem } from 'ox'
 import { describe, expect, test } from 'vitest'
-import { Errors } from '../../contracts/generated.js'
-import { anvilMainnet } from '../../test/anvil.js'
-import { seaportContractConfig } from '../../test/constants/abis.js'
+import { Errors } from '../../../contracts/generated.js'
+import { anvilMainnet } from '../../../test/anvil.js'
+import { seaportContractConfig } from '../../../test/constants/abis.js'
 
 describe('decode', () => {
   test('behavior: no args', () => {

diff --git a/src/_test/AbiEvent.snap-d.ts → src/core/_test/AbiEvent.snap-d.ts b/src/_test/AbiEvent.snap-d.ts → src/core/_test/AbiEvent.snap-d.ts
@@ -4,7 +4,7 @@ import { describe, test } from 'vitest'
 import {
   seaportContractConfig,
   wagmiContractConfig,
-} from '../../test/constants/abis.js'
+} from '../../../test/constants/abis.js'
 
 describe('decode', () => {
   test('behavior: named', () => {

diff --git a/src/_test/AbiEvent.test.ts → src/core/_test/AbiEvent.test.ts b/src/_test/AbiEvent.test.ts → src/core/_test/AbiEvent.test.ts
@@ -1,9 +1,9 @@
 import { Abi, AbiEvent, Hex } from 'ox'
 import { describe, expect, test } from 'vitest'
 
-import { anvilMainnet } from '../../test/anvil.js'
-import { wagmiContractConfig } from '../../test/constants/abis.js'
-import { address } from '../../test/constants/addresses.js'
+import { anvilMainnet } from '../../../test/anvil.js'
+import { wagmiContractConfig } from '../../../test/constants/abis.js'
+import { address } from '../../../test/constants/addresses.js'
 
 describe('assertArgs', () => {
   test('default', () => {

diff --git a/src/_test/AbiFunction.snap-d.ts → src/core/_test/AbiFunction.snap-d.ts b/src/_test/AbiFunction.snap-d.ts → src/core/_test/AbiFunction.snap-d.ts
@@ -1,8 +1,8 @@
 import { attest } from '@ark/attest'
 import { Abi, AbiFunction, AbiParameters } from 'ox'
 import { describe, test } from 'vitest'
-import { erc20Abi, wagmiContractConfig } from '../../test/constants/abis.js'
-import { address } from '../../test/constants/addresses.js'
+import { erc20Abi, wagmiContractConfig } from '../../../test/constants/abis.js'
+import { address } from '../../../test/constants/addresses.js'
 
 describe('decodeData', () => {
   test('default', () => {

diff --git a/src/_test/AbiFunction.test.ts → src/core/_test/AbiFunction.test.ts b/src/_test/AbiFunction.test.ts → src/core/_test/AbiFunction.test.ts
@@ -1,9 +1,9 @@
 import { Abi, AbiFunction, AbiParameters } from 'ox'
 import { describe, expect, test } from 'vitest'
 
-import { anvilMainnet } from '../../test/anvil.js'
-import { erc20Abi, wagmiContractConfig } from '../../test/constants/abis.js'
-import { address } from '../../test/constants/addresses.js'
+import { anvilMainnet } from '../../../test/anvil.js'
+import { erc20Abi, wagmiContractConfig } from '../../../test/constants/abis.js'
+import { address } from '../../../test/constants/addresses.js'
 
 describe('decodeData', () => {
   test('default', () => {

diff --git a/src/_test/AbiItem.snap-d.ts → src/core/_test/AbiItem.snap-d.ts b/src/_test/AbiItem.snap-d.ts → src/core/_test/AbiItem.snap-d.ts
@@ -2,7 +2,7 @@ import { attest } from '@ark/attest'
 import { Abi, AbiFunction, AbiItem } from 'ox'
 import { describe, test } from 'vitest'
 
-import { wagmiContractConfig } from '../../test/constants/abis.js'
+import { wagmiContractConfig } from '../../../test/constants/abis.js'
 
 describe('fromAbi', () => {
   test('default', () => {

diff --git a/src/_test/AbiItem.test.ts → src/core/_test/AbiItem.test.ts b/src/_test/AbiItem.test.ts → src/core/_test/AbiItem.test.ts
diff --git a/src/_test/AbiParameters.bench.ts → src/core/_test/AbiParameters.bench.ts b/src/_test/AbiParameters.bench.ts → src/core/_test/AbiParameters.bench.ts
@@ -3,8 +3,8 @@ import { AbiItem } from 'ox'
 import { bench, describe } from 'vitest'
 import { Web3 } from 'web3'
 
-import { seaportContractConfig } from '../../test/constants/abis.js'
-import { address } from '../../test/constants/addresses.js'
+import { seaportContractConfig } from '../../../test/constants/abis.js'
+import { address } from '../../../test/constants/addresses.js'
 import { decode, encode } from '../AbiParameters.js'
 
 const fulfillAdvancedOrder = AbiItem.fromAbi(

diff --git a/src/_test/AbiParameters.decode.test.ts → src/core/_test/AbiParameters.decode.test.ts b/src/_test/AbiParameters.decode.test.ts → src/core/_test/AbiParameters.decode.test.ts
@@ -4,8 +4,8 @@ import { assertType, describe, expect, test } from 'vitest'
 import {
   multicall3Abi,
   seaportContractConfig,
-} from '../../test/constants/abis.js'
-import { address } from '../../test/constants/addresses.js'
+} from '../../../test/constants/abis.js'
+import { address } from '../../../test/constants/addresses.js'
 
 describe('static', () => {
   test('blank', () => {

diff --git a/src/_test/AbiParameters.encode.test.ts → src/core/_test/AbiParameters.encode.test.ts b/src/_test/AbiParameters.encode.test.ts → src/core/_test/AbiParameters.encode.test.ts
@@ -1,8 +1,8 @@
 import { AbiItem, AbiParameters } from 'ox'
 import { describe, expect, test } from 'vitest'
 
-import { seaportContractConfig } from '../../test/constants/abis.js'
-import { address } from '../../test/constants/addresses.js'
+import { seaportContractConfig } from '../../../test/constants/abis.js'
+import { address } from '../../../test/constants/addresses.js'
 import { getArrayComponents } from '../internal/abiParameters.js'
 
 describe('static', () => {

diff --git a/src/_test/AbiParameters.snap-d.ts → src/core/_test/AbiParameters.snap-d.ts b/src/_test/AbiParameters.snap-d.ts → src/core/_test/AbiParameters.snap-d.ts
diff --git a/src/_test/AbiParameters.test.ts → src/core/_test/AbiParameters.test.ts b/src/_test/AbiParameters.test.ts → src/core/_test/AbiParameters.test.ts
@@ -1,6 +1,6 @@
 import { AbiParameters } from 'ox'
 import { describe, expect, test } from 'vitest'
-import { address } from '../../test/constants/addresses.js'
+import { address } from '../../../test/constants/addresses.js'
 
 describe('encodePacked', () => {
   test.each([

diff --git a/src/_test/AccessList.test.ts → src/core/_test/AccessList.test.ts b/src/_test/AccessList.test.ts → src/core/_test/AccessList.test.ts
diff --git a/src/_test/AccountProof.test.ts → src/core/_test/AccountProof.test.ts b/src/_test/AccountProof.test.ts → src/core/_test/AccountProof.test.ts
diff --git a/src/_test/Address.bench.ts → src/core/_test/Address.bench.ts b/src/_test/Address.bench.ts → src/core/_test/Address.bench.ts
diff --git a/src/_test/Address.test.ts → src/core/_test/Address.test.ts b/src/_test/Address.test.ts → src/core/_test/Address.test.ts
diff --git a/src/_test/AesGcm.test.ts → src/core/_test/AesGcm.test.ts b/src/_test/AesGcm.test.ts → src/core/_test/AesGcm.test.ts