[pool-cache] Move packages/pool-cache-solidity under apps-node/pool-cache (#257)

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "apps-node/api/contracts/lib/forge-std"]
 	path = apps-node/api/contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "packages/pool-cache-solidity/lib/forge-std"]
+[submodule "apps-node/pool-cache/lib/forge-std"]
-	path = packages/pool-cache-solidity/lib/forge-std
+	path = apps-node/pool-cache/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "packages/pool-cache-solidity/lib/solmate"]
+[submodule "apps-node/pool-cache/lib/solmate"]
-	path = packages/pool-cache-solidity/lib/solmate
+	path = apps-node/pool-cache/lib/solmate
 	url = https://github.com/transmissions11/solmate

apps-node/pool-cache/.prettierignore

@@ -1,2 +1,9 @@
 __build__/
 node_modules/
+# foundry:
+lib
+out
+cache
+
+# generated code:
+src/typechain

apps-node/pool-cache/foundry.toml

@@ -1,6 +1,7 @@
 [profile.default]
-src = 'src'
+src = 'src/contracts'
+test = 'sol-test'
 out = 'out'
 libs = ['lib']
 
-# See more config options https://github.com/foundry-rs/foundry/tree/master/config
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config

apps-node/pool-cache/jest.config.js

@@ -3,4 +3,5 @@ module.exports = {
     preset: 'ts-jest',
     testEnvironment: 'node',
     testRegex: '\\.test\\.ts$',
+    modulePathIgnorePatterns: ['<rootDir>/lib/'],
 };

apps-node/pool-cache/lib/forge-std

@@ -0,0 +1 @@
+Subproject commit 2b58ecbcf3dfde7a75959dc7b4eb3d0670278de6

apps-node/pool-cache/package.json

@@ -4,12 +4,17 @@
     "private": true,
     "scripts": {
         "build": "tsc",
+        "build:forge": "./../../turbo-bin.sh forge build",
+        "generate": "yarn build:forge && yarn clean-typechain && yarn generate-typechain && yarn generate-typescript-artifacts",
+        "generate-typescript-artifacts": "ts-node src/scripts/generate-typescript-artifacts.ts && yarn prettier --write src/artifacts/*",
+        "generate-typechain": "typechain --target ethers-v6 --out-dir src/typechain 'out/PoolFetcher.sol/!(*metadata*).json'",
+        "clean-typechain": "rm -rf src/typechain",
         "dev:server": "nodemon src/main.ts",
         "examples:client": "tsx examples/client.ts",
         "fix": "prettier --write .",
         "lint:ci": "prettier --check . && eslint .",
-        "test:ci": "jest --runInBand --forceExit",
+        "test:ci": "./../../turbo-bin.sh forge test && jest --runInBand --forceExit",
-        "test": "jest"
+        "test": "./../../turbo-bin.sh forge test && jest"
     },
     "dependencies": {
         "@trpc/server": "^10.14.1",
@@ -18,14 +23,17 @@
         "zod": "^3.20.6"
     },
     "devDependencies": {
+        "@typechain/ethers-v6": "0.3.0",
         "@types/jest": "^29.5.0",
+        "eslint-config-common": "*",
+        "glob": "^9.2.1",
         "jest": "^29.5.0",
         "nodemon": "^2.0.21",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
         "tsconfig": "*",
         "tsx": "^3.12.3",
-        "typescript": "^4.9.5",
+        "typechain": "^8.1.1",
-        "eslint-config-common": "*"
+        "typescript": "^4.9.5"
     }
 }

packages/pool-cache-solidity/lib/forge-std

@@ -1 +0,0 @@
-Subproject commit c2236853aadb8e2d9909bbecdc490099519b70a4

packages/pool-cache-solidity/package.json

@@ -1,53 +0,0 @@
-{
-    "name": "pool-cache-solidity",
-    "version": "0.0.0",
-    "private": true,
-    "main": "__build__/index.js",
-    "types": "src/index.ts",
-    "scripts": {
-        "build": "tsc",
-        "build:forge": "./../../turbo-bin.sh forge build",
-        "clean-typechain": "rm -rf src/typechain",
-        "generate": "yarn build:forge && yarn clean-typechain && yarn generate-typechain && yarn generate-typescript-artifacts",
-        "generate-typescript-artifacts": "ts-node src/scripts/generate-typescript-artifacts.ts && yarn prettier --write src/artifacts/*",
-        "generate-typechain": "typechain --target ethers-v6 --out-dir src/typechain 'out/PoolFetcher.sol/!(*metadata*).json'",
-        "test:ci": "./../../turbo-bin.sh forge test"
-    },
-    "devDependencies": {
-        "@typechain/ethers-v6": "0.3.0",
-        "glob": "^9.2.1",
-        "prettier": "^2.8.4",
-        "ts-node": "^10.9.1",
-        "tsconfig": "*",
-        "typechain": "^8.1.1",
-        "typescript": "^4.9.5",
-        "ethers": "6.1.0"
-    },
-    "peerDependencies": {
-        "ethers": "^6.1.0"
-    },
-    "exports": {
-        ".": {
-            "import": "./__build__/index.js",
-            "types": "./src/index.ts"
-        },
-        "./typechain": {
-            "import": "./__build__/typechain/index.js",
-            "types": "./src/typechain/index.ts"
-        },
-        "./artifacts": {
-            "import": "./__build__/artifacts/index.js",
-            "types": "./src/artifacts/index.ts"
-        }
-    },
-    "typesVersions": {
-        "*": {
-            "typechain": [
-                "src/typechain/index.ts"
-            ],
-            "artifacts": [
-                "src/artifacts/index.ts"
-            ]
-        }
-    }
-}

packages/pool-cache-solidity/tsconfig.json

@@ -1,8 +0,0 @@
-{
-    "compilerOptions": {
-        "outDir": "__build__",
-        "rootDir": "src"
-    },
-    "extends": "tsconfig/tsconfig.common.json",
-    "include": ["src/**/*.ts"]
-}