[Refactor] Create shared directory for all network environments

e2e/src/helper/NetworkManager.ts

@@ -50,8 +50,12 @@ export const getViemPublicClient = async ({
   networkModule: any;
 }) => {
   const viemChainConfig = networkModule.getChainConfig();
+  const defaultRpcUrl = viemChainConfig.rpcUrls.default.http[0];
+  const isLocalNetwork = defaultRpcUrl.includes('127.0.0.1');
+  const customRpcUrl = isLocalNetwork
+    ? process.env['LOCAL_RPC_URL']
+    : process.env['LIT_YELLOWSTONE_PRIVATE_RPC_URL'];
 
-  const customRpcUrl = process.env['LIT_YELLOWSTONE_PRIVATE_RPC_URL'];
   if (customRpcUrl) {
     console.log(`🔧 Using custom E2E RPC URL: ***${customRpcUrl.slice(-6)}`);
   }

e2e/src/helper/fundAccount.ts

@@ -78,17 +78,24 @@ export const fundAccount = async (
     thenFundWith?: string;
   }
 ) => {
-  const customRpcUrl = process.env['LIT_YELLOWSTONE_PRIVATE_RPC_URL'];
+  const defaultRpcUrl = networkModule.getChainConfig().rpcUrls.default.http[0];
+  const isLocalNetwork = defaultRpcUrl.includes('127.0.0.1');
+  const customRpcUrl = isLocalNetwork
+    ? process.env['LOCAL_RPC_URL']
+    : process.env['LIT_YELLOWSTONE_PRIVATE_RPC_URL'];
+
   if (customRpcUrl) {
     console.log(`🔧 Using custom E2E RPC URL: ***${customRpcUrl.slice(-6)}`);
+  } else if (isLocalNetwork) {
+    console.log(`🔧 Using local Anvil RPC URL: ${defaultRpcUrl}`);
+  } else {
+    console.log(`🔧 Using default network RPC URL: ${defaultRpcUrl}`);
   }
 
   // check account balance
   const publicClient = createPublicClient({
     chain: networkModule.getChainConfig(),
-    transport: http(
-      customRpcUrl || networkModule.getChainConfig().rpcUrls.default.http[0]
-    ),
+    transport: http(customRpcUrl || defaultRpcUrl),
   });
 
   const balance = await publicClient.getBalance({
@@ -101,9 +108,7 @@ export const fundAccount = async (
 
     const walletClient = createWalletClient({
       account: sponsorAccount,
-      transport: http(
-        customRpcUrl || networkModule.getChainConfig().rpcUrls.default.http[0]
-      ),
+      transport: http(customRpcUrl || defaultRpcUrl),
     });
 
     // Get the next managed nonce for this sponsor account

nx.json

@@ -13,14 +13,9 @@
   },
   "targetDefaults": {
     "build": {
-      "dependsOn": ["auto-fix-deps", "^build"],
+      "dependsOn": ["^build"],
       "cache": true
     },
-    "auto-fix-deps": {
-      "cache": true,
-      "inputs": ["{projectRoot}/src/**/*", "{projectRoot}/package.json"],
-      "outputs": ["{projectRoot}/package.json"]
-    },
     "check-deps": {
       "executor": "nx:run-commands",
       "options": {

package.json

@@ -5,9 +5,8 @@
   "scripts": {
     "reset": "bun unlink-all && rimraf dist node_modules doc tmp yarn-error.log yarn.lock package-lock.json bun.lockb learn-debug.log tmp .nx lit-auth-storage pkp-tokens lit-auth-local ./e2e/dist ./e2e/node_modules",
     "go": "bun run build && bun link-all",
-    "build": "bun unlink-all && bun scripts/auto-fix-deps.mjs && nx run-many --parallel=false --target=build --all --exclude=wrapped-keys,wrapped-keys-lit-actions && bun run prettier",
-    "build:affected": "bun scripts/auto-fix-deps.mjs && nx affected --target=build --exclude=wrapped-keys,wrapped-keys-lit-actions",
-    "auto-fix-deps": "bun scripts/auto-fix-deps.mjs",
+    "build": "bun unlink-all && nx run-many --parallel=false --target=build --all --exclude=wrapped-keys,wrapped-keys-lit-actions && bun run prettier",
+    "build:affected": "nx affected --target=build --exclude=wrapped-keys,wrapped-keys-lit-actions",
     "check-deps": "npx nx run-many --target=check-deps --exclude=wrapped-keys,wrapped-keys-lit-actions",
     "validate": "npm run check-deps && npm run build",
     "test:local": "node ./local-tests/build.mjs && dotenvx run --env-file=.env -- node ./local-tests/build/test.mjs",
@@ -16,15 +15,15 @@
     "show:affected": "npx nx show projects --affected --uncommitted",
     "build:tinny": "node ./local-tests/build.mjs",
     "publish:tinny": "cd ./local-tests && npm publish",
-    "gen:local-network-context": "bun run packages/networks/src/networks/vNaga/envs/naga-local/scripts/00-generate-abi-signatures.ts",
+    "gen:local-network-context": "NETWORK_NAME=naga-develop DIRECTORY_NAME=naga-local bun run packages/networks/src/networks/vNaga/shared/scripts/generate-abi-signatures.ts",
     "gen:docs": "node ./tools/scripts/gen-doc.mjs",
     "gen:readme": "node ./tools/scripts/gen-readme.mjs",
     "prettier": "npx nx format:write --all",
     "format:check": "npx nx format:check --all",
     "link-all": "for dir in packages/*/; do echo \"Linking in $dir\"; (cd \"$dir\" && bun link) || { echo \"ERROR: Failed to link in $dir\"; exit 1; }; done",
     "unlink-all": "for dir in packages/*/; do echo \"Unlinking in $dir\"; (cd \"$dir\" && bun unlink) || { echo \"ERROR: Failed to unlink in $dir\"; exit 1; }; done",
     "auth-services": "cd packages/auth-services && bun run start",
-    "test:e2e": "bun test ./e2e/src/e2e.spec.ts -t",
+    "test:e2e": "bun test ./e2e/src/e2e.spec.ts --timeout 50000000 -t",
     "artillery:init": "bun run ./e2e/artillery/src/init.ts",
     "artillery:balance-status": "LOG_LEVEL=silent bun run ./e2e/artillery/src/balance-status.ts",
     "artillery:pkp-sign": "DEBUG_HTTP=true LOG_LEVEL=silent dotenvx run --env-file=.env -- sh -c 'artillery run ./e2e/artillery/configs/pkp-sign.yml ${ARTILLERY_KEY:+--record --key $ARTILLERY_KEY}'",

packages/networks/project.json

@@ -21,12 +21,6 @@
         "command": "depcheck"
       }
     },
-    "auto-fix-deps": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "echo 'Dependencies auto-fixed by global script'"
-      }
-    },
     "lint": {
       "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],

packages/networks/src/index.ts

@@ -34,8 +34,8 @@ export type LitNetworkModule =
 // | DatilLocalModule
 
 // ----- types
-export type { ConnectionInfo } from './networks/vNaga/LitChainClient/types';
+export type { ConnectionInfo } from './networks/vNaga/shared/managers/LitChainClient/types';
 export type { PKPStorageProvider } from './storage/types';
 
 // Schema types
-export type { MintRequestRaw } from './networks/vNaga/LitChainClient/schemas/MintRequestSchema';
+export type { MintRequestRaw } from './networks/vNaga/shared/managers/LitChainClient/schemas/MintRequestSchema';

packages/networks/src/networks/shared/README.md

@@ -0,0 +1 @@
+This directory contains shared code for all networks.

packages/networks/src/networks/shared/helpers/createRequestId.ts → packages/networks/src/networks/shared/utils/createRequestId.ts

@@ -1,5 +1,4 @@
 /**
- *
  * use the one in networks package
  */
 export const createRequestId = () => {