chore: ./test/contracts → ./contracts

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "contracts/lib/forge-std"]
 	path = contracts/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "test/contracts/lib/solady"]
-	path = test/contracts/lib/solady
+	url = git@github.com:foundry-rs/forge-std.git
+[submodule "contracts/lib/solady"]
+	path = contracts/lib/solady
 	url = git@github.com:Vectorized/solady.git

scripts/generateTypedArtifacts.ts → .scripts/generateTypedArtifacts.ts

@@ -1,15 +1,15 @@
 import { join } from 'node:path'
 import { Glob } from 'bun'
 
-const generatedPath = join(import.meta.dir, '../test/contracts/generated.ts')
+const generatedPath = join(import.meta.dir, '../contracts/generated.ts')
 Bun.write(generatedPath, '')
 
 const generated = Bun.file(generatedPath)
 const writer = generated.writer()
 
 const fileNames = []
 
-const glob = new Glob('test/contracts/out/**/*.json')
+const glob = new Glob('contracts/out/**/*.json')
 for await (const file of glob.scan('.')) {
   if (file.includes('build-info')) continue
 

biome.json

@@ -12,6 +12,7 @@
       "CHANGELOG.md",
       "bun.lockb",
       "cache",
+      "contracts",
       "test/contracts",
       "test/kzg/*.json",
       "test/kzg/*.txt",

contracts/foundry.toml

@@ -0,0 +1,6 @@
+[profile.default]
+remappings = [
+  "solady/=lib/solady/src/",
+]
+src = "src"
+out = "out"

package.json

@@ -10,11 +10,11 @@
     "build:trustedSetups:start": "mv src/node/trustedSetups.ts src/node/trustedSetups_esm.ts && mv src/node/trustedSetups_cjs.ts src/node/trustedSetups.ts",
     "build:trustedSetups:end": "mv src/node/trustedSetups.ts src/node/trustedSetups_cjs.ts && mv src/node/trustedSetups_esm.ts src/node/trustedSetups.ts",
     "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./src/_types --emitDeclarationOnly --declaration --declarationMap",
-    "changeset:prepublish": "pnpm version:update && bun scripts/prepublishOnly.ts && pnpm build",
+    "changeset:prepublish": "pnpm version:update && bun .scripts/prepublishOnly.ts && pnpm build",
     "changeset:publish": "pnpm changeset:prepublish && changeset publish",
     "changeset:version": "changeset version && pnpm install --lockfile-only && pnpm version:update && pnpm format",
     "clean": "rm -rf *.tsbuildinfo src/*.tsbuildinfo src/_esm src/_cjs src/_types",
-    "contracts:build": "forge build --config-path ./test/foundry.toml && bun ./scripts/generateTypedArtifacts.ts",
+    "contracts:build": "forge build --config-path ./contracts/foundry.toml && bun .scripts/generateTypedArtifacts.ts",
     "deps": "pnpx taze -r",
     "docs:dev": "pnpm --filter site dev",
     "docs:build": "pnpm --filter site build",
@@ -25,7 +25,7 @@
     "postinstall": "git submodule update --init --recursive && pnpm contracts:build",
     "preinstall": "pnpx only-allow pnpm",
     "prepare": "pnpm simple-git-hooks",
-    "prepublishOnly": "bun scripts/prepublishOnly.ts",
+    "prepublishOnly": "bun .scripts/prepublishOnly.ts",
     "size": "size-limit",
     "test": "vitest -c ./test/vitest.config.ts dev",
     "test:build": "publint --strict ./src && attw --pack ./src --ignore-rules false-esm",
@@ -43,7 +43,7 @@
     "typecheck": "tsc --noEmit",
     "vectors": "bun test vectors/**/*.test.ts",
     "vectors:generate": "bun vectors/generate.ts",
-    "version:update": "bun scripts/updateVersion.ts"
+    "version:update": "bun .scripts/updateVersion.ts"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.3",
@@ -89,7 +89,7 @@
     },
     "workspaces": {
       ".": {
-        "project": "scripts/*.ts"
+        "project": ".scripts/*.ts"
       },
       "src": {
         "entry": [

src/actions/public/call.test.ts

@@ -4,7 +4,7 @@ import {
   Mock4337Account,
   Mock4337AccountFactory,
   OffchainLookupExample,
-} from '~test/contracts/generated.js'
+} from '~contracts/generated.js'
 import {
   baycContractConfig,
   usdcContractConfig,

src/actions/public/estimateContractGas.test.ts

@@ -6,7 +6,7 @@
  */
 import { describe, expect, test } from 'vitest'
 
-import { ErrorsExample } from '~test/contracts/generated.js'
+import { ErrorsExample } from '~contracts/generated.js'
 import { baycContractConfig, wagmiContractConfig } from '~test/src/abis.js'
 import { accounts } from '~test/src/constants.js'
 import { deployBAYC, deployErrorExample } from '~test/src/utils.js'

src/actions/public/getEip712Domain.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest'
-import { Mock4337AccountFactory } from '../../../test/contracts/generated.js'
+import { Mock4337AccountFactory } from '~contracts/generated.js'
 import { anvilMainnet } from '../../../test/src/anvil.js'
 import { accounts } from '../../../test/src/constants.js'
 import { deployMock4337Account } from '../../../test/src/utils.js'

src/actions/public/getFilterChanges.test.ts

@@ -8,8 +8,9 @@ import {
   test,
 } from 'vitest'
 
-import { ERC20InvalidTransferEvent } from '~test/contracts/generated.js'
+import { ERC20InvalidTransferEvent } from '~contracts/generated.js'
 import { usdcContractConfig } from '~test/src/abis.js'
+import { anvilMainnet } from '~test/src/anvil.js'
 import { accounts, address } from '~test/src/constants.js'
 import { deployErc20InvalidTransferEvent } from '~test/src/utils.js'
 import type { Log } from '../../types/log.js'
@@ -22,8 +23,6 @@ import { setBalance } from '../test/setBalance.js'
 import { sendTransaction } from '../wallet/sendTransaction.js'
 import { writeContract } from '../wallet/writeContract.js'
 
-import { anvilMainnet } from '../../../test/src/anvil.js'
-
 import { createBlockFilter } from './createBlockFilter.js'
 import { createContractEventFilter } from './createContractEventFilter.js'
 import { createEventFilter } from './createEventFilter.js'

src/actions/public/getFilterLogs.test.ts

@@ -8,7 +8,7 @@ import {
   test,
 } from 'vitest'
 
-import { ERC20InvalidTransferEvent } from '~test/contracts/generated.js'
+import { ERC20InvalidTransferEvent } from '~contracts/generated.js'
 import { usdcContractConfig } from '~test/src/abis.js'
 import { accounts, address } from '~test/src/constants.js'
 import { deployErc20InvalidTransferEvent } from '~test/src/utils.js'

src/actions/public/getLogs.test.ts

@@ -7,7 +7,7 @@ import {
   test,
 } from 'vitest'
 
-import { ERC20InvalidTransferEvent } from '~test/contracts/generated.js'
+import { ERC20InvalidTransferEvent } from '~contracts/generated.js'
 import { usdcContractConfig } from '~test/src/abis.js'
 import { accounts, address } from '~test/src/constants.js'
 import { deployErc20InvalidTransferEvent } from '~test/src/utils.js'

src/actions/public/multicall.test.ts

@@ -5,7 +5,7 @@
  */
 import { describe, expect, test, vi } from 'vitest'
 
-import { ErrorsExample, GH434 } from '~test/contracts/generated.js'
+import { ErrorsExample, GH434 } from '~contracts/generated.js'
 import {
   baycContractConfig,
   usdcContractConfig,

src/actions/public/readContract.test.ts

@@ -10,7 +10,7 @@ import {
   ErrorsExample,
   Mock4337Account,
   Mock4337AccountFactory,
-} from '~test/contracts/generated.js'
+} from '~contracts/generated.js'
 import { baycContractConfig, wagmiContractConfig } from '~test/src/abis.js'
 import { accounts, address } from '~test/src/constants.js'
 import { deployErrorExample, deployMock4337Account } from '~test/src/utils.js'

src/actions/public/simulateContract.test.ts

@@ -9,7 +9,7 @@
  */
 import { describe, expect, test, vi } from 'vitest'
 
-import { ErrorsExample } from '~test/contracts/generated.js'
+import { ErrorsExample } from '~contracts/generated.js'
 import { baycContractConfig, wagmiContractConfig } from '~test/src/abis.js'
 import { accounts } from '~test/src/constants.js'
 import {

src/actions/public/verifyHash.test.ts

@@ -4,7 +4,7 @@ import { ensPublicResolverConfig, smartAccountConfig } from '~test/src/abis.js'
 import { accounts, address } from '~test/src/constants.js'
 import { anvilMainnet } from '../../../test/src/anvil.js'
 
-import { Mock4337AccountFactory } from '../../../test/contracts/generated.js'
+import { Mock4337AccountFactory } from '~contracts/generated.js'
 import { deployMock4337Account } from '../../../test/src/utils.js'
 import { privateKeyToAccount } from '../../accounts/privateKeyToAccount.js'
 import { zkSync } from '../../chains/index.js'

src/actions/public/watchContractEvent.test.ts

@@ -1,6 +1,6 @@
 import { assertType, beforeAll, describe, expect, test, vi } from 'vitest'
 
-import { ERC20InvalidTransferEvent } from '~test/contracts/generated.js'
+import { ERC20InvalidTransferEvent } from '~contracts/generated.js'
 import { usdcContractConfig } from '~test/src/abis.js'
 import { accounts, address } from '~test/src/constants.js'
 import { deployErc20InvalidTransferEvent } from '~test/src/utils.js'

src/actions/public/watchEvent.test.ts

@@ -1,6 +1,6 @@
 import { beforeAll, describe, expect, test, vi } from 'vitest'
 
-import { ERC20InvalidTransferEvent } from '~test/contracts/generated.js'
+import { ERC20InvalidTransferEvent } from '~contracts/generated.js'
 import { usdcContractConfig, wagmiContractConfig } from '~test/src/abis.js'
 import { accounts, address } from '~test/src/constants.js'
 import { deployErc20InvalidTransferEvent } from '~test/src/utils.js'

src/actions/wallet/writeContract.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test, vi } from 'vitest'
 
-import { Payable } from '~test/contracts/generated.js'
+import { Payable } from '~contracts/generated.js'
 import { wagmiContractConfig } from '~test/src/abis.js'
 import { accounts } from '~test/src/constants.js'
 import { deployPayable } from '~test/src/utils.js'

src/clients/decorators/public.test.ts

@@ -9,7 +9,7 @@ import { accounts, address, typedData } from '~test/src/constants.js'
 import { getBlockNumber } from '../../actions/public/getBlockNumber.js'
 import { parseEther } from '../../utils/unit/parseEther.js'
 
-import { Mock4337AccountFactory } from '../../../test/contracts/generated.js'
+import { Mock4337AccountFactory } from '~contracts/generated.js'
 import { anvilMainnet } from '../../../test/src/anvil.js'
 import { deployMock4337Account } from '../../../test/src/utils.js'
 import { privateKeyToAccount } from '../../accounts/privateKeyToAccount.js'

src/errors/contract.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest'
 
-import { ErrorsExample } from '~test/contracts/generated.js'
+import { ErrorsExample } from '~contracts/generated.js'
 import { baycContractConfig } from '~test/src/abis.js'
 import { address } from '~test/src/constants.js'
 import { polygon } from '../chains/index.js'

src/experimental/solady/actions/signMessage.test.ts

@@ -1,10 +1,10 @@
 import type { Address } from 'abitype'
 import { beforeAll, expect, test } from 'vitest'
 
+import { Mock4337AccountFactory } from '~contracts/generated.js'
+import { anvilMainnet } from '~test/src/anvil.js'
 import { accounts } from '~test/src/constants.js'
-import { Mock4337AccountFactory } from '../../../../test/contracts/generated.js'
-import { anvilMainnet } from '../../../../test/src/anvil.js'
-import { deployMock4337Account } from '../../../../test/src/utils.js'
+import { deployMock4337Account } from '~test/src/utils.js'
 import { privateKeyToAccount } from '../../../accounts/privateKeyToAccount.js'
 import {
   mine,

src/experimental/solady/actions/signTypedData.test.ts

@@ -1,10 +1,10 @@
 import type { Address } from 'abitype'
 import { beforeAll, describe, expect, test } from 'vitest'
 
+import { Mock4337AccountFactory } from '~contracts/generated.js'
+import { anvilMainnet } from '~test/src/anvil.js'
 import { accounts, typedData } from '~test/src/constants.js'
-import { Mock4337AccountFactory } from '../../../../test/contracts/generated.js'
-import { anvilMainnet } from '../../../../test/src/anvil.js'
-import { deployMock4337Account } from '../../../../test/src/utils.js'
+import { deployMock4337Account } from '~test/src/utils.js'
 import { privateKeyToAccount } from '../../../accounts/privateKeyToAccount.js'
 import {
   mine,

src/experimental/solady/decorators/solady.test.ts

@@ -1,10 +1,10 @@
 import type { Address } from 'abitype'
 import { beforeAll, expect, test } from 'vitest'
 
-import { Mock4337AccountFactory } from '../../../../test/contracts/generated.js'
-import { anvilMainnet } from '../../../../test/src/anvil.js'
-import { accounts, typedData } from '../../../../test/src/constants.js'
-import { deployMock4337Account } from '../../../../test/src/utils.js'
+import { Mock4337AccountFactory } from '~contracts/generated.js'
+import { anvilMainnet } from '~test/src/anvil.js'
+import { accounts, typedData } from '~test/src/constants.js'
+import { deployMock4337Account } from '~test/src/utils.js'
 import {
   mine,
   simulateContract,

src/experimental/solady/utils/hashMessage.test.ts

@@ -1,10 +1,10 @@
 import type { Address } from 'abitype'
 import { beforeAll, expect, test } from 'vitest'
 
-import { Mock4337AccountFactory } from '../../../../test/contracts/generated.js'
-import { anvilMainnet } from '../../../../test/src/anvil.js'
-import { accounts } from '../../../../test/src/constants.js'
-import { deployMock4337Account } from '../../../../test/src/utils.js'
+import { Mock4337AccountFactory } from '~contracts/generated.js'
+import { anvilMainnet } from '~test/src/anvil.js'
+import { accounts } from '~test/src/constants.js'
+import { deployMock4337Account } from '~test/src/utils.js'
 import { sign } from '../../../accounts/index.js'
 import {
   getEip712Domain,

src/experimental/solady/utils/hashTypedData.test.ts

@@ -1,10 +1,10 @@
 import type { Address } from 'abitype'
 import { beforeAll, expect, test } from 'vitest'
 
-import { Mock4337AccountFactory } from '../../../../test/contracts/generated.js'
-import { anvilMainnet } from '../../../../test/src/anvil.js'
-import { accounts, typedData } from '../../../../test/src/constants.js'
-import { deployMock4337Account } from '../../../../test/src/utils.js'
+import { Mock4337AccountFactory } from '~contracts/generated.js'
+import { anvilMainnet } from '~test/src/anvil.js'
+import { accounts, typedData } from '~test/src/constants.js'
+import { deployMock4337Account } from '~test/src/utils.js'
 import { serializeSignature, sign } from '../../../accounts/index.js'
 import {
   getEip712Domain,

src/utils/ccip.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest'
 
-import { OffchainLookupExample } from '~test/contracts/generated.js'
+import { OffchainLookupExample } from '~contracts/generated.js'
 import { createCcipServer } from '~test/src/ccip.js'
 import { accounts } from '~test/src/constants.js'
 import {