diff --git a/.vscode/launch.json b/.vscode/launch.json index f3f8069ea..d07ae3752 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -63,30 +63,10 @@ "console": "integratedTerminal", }, { - "name": "Jest: current file in 'packages/sdk/' (single ne)", + "name": "Jest: current file in 'packages/stress/' (multi entitlements)", "type": "node", "request": "launch", - "env": { "NODE_ENV": "development", "NODE_TLS_REJECT_UNAUTHORIZED": "0", "RIVER_ENV": "local_single_ne", "DEBUG": "csb:*,test:*", "DEBUG_DEPTH":"10" }, - "program": "${workspaceFolder}/node_modules/.bin/jest", - "runtimeArgs": ["--experimental-vm-modules", "--experimental-wasm-modules"], - "args": ["${file}", "--config", "${workspaceFolder}/packages/sdk/jest.config.ts", "-i", "--no-cache", "--forceExit"], - "console": "integratedTerminal", - }, - { - "name": "Jest: current file in 'packages/sdk/' (single entitlements)", - "type": "node", - "request": "launch", - "env": { "NODE_ENV": "development", "NODE_TLS_REJECT_UNAUTHORIZED": "0", "RIVER_ENV": "local_single", "DEBUG": "csb:*,test:*", "DEBUG_DEPTH":"1" }, - "program": "${workspaceFolder}/node_modules/.bin/jest", - "runtimeArgs": ["--experimental-vm-modules", "--experimental-wasm-modules"], - "args": ["${file}", "--config", "${workspaceFolder}/packages/sdk/jest.config.ts", "-i", "--no-cache", "--forceExit"], - "console": "integratedTerminal", - }, - { - "name": "Jest: current file in 'packages/stress/' (single entitlements)", - "type": "node", - "request": "launch", - "env": { "NODE_ENV": "development", "NODE_TLS_REJECT_UNAUTHORIZED": "0", "RIVER_ENV": "local_single", "DEBUG": "csb:*,test:*", "DEBUG_DEPTH":"1" }, + "env": { "NODE_ENV": "development", "NODE_TLS_REJECT_UNAUTHORIZED": "0", "RIVER_ENV": "local_multi", "DEBUG": "csb:*,test:*", "DEBUG_DEPTH":"1" }, "program": "${workspaceFolder}/node_modules/.bin/jest", "runtimeArgs": ["--experimental-vm-modules", "--experimental-wasm-modules"], "args": ["${file}", "--config", "${workspaceFolder}/packages/stress/jest.config.ts", "-i", "--no-cache", "--forceExit"], diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4ef9e3a9c..eb8436293 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -275,7 +275,7 @@ { "label": "CasablancaConfigureNodes", "type": "shell", - "command": "RIVER_BLOCK_TIME=1 ./scripts/configure-nodes.sh --single && RIVER_BLOCK_TIME=1 ./scripts/configure-nodes.sh --single_ne", + "command": "RIVER_BLOCK_TIME=1 ./scripts/configure-nodes.sh --multi && RIVER_BLOCK_TIME=1 ./scripts/configure-nodes.sh --multi_ne", "isBackground": true, "problemMatcher": [], "presentation": { @@ -284,16 +284,6 @@ "panel": "shared", } }, - { - "label": "XChain-Single", - "type": "shell", - "command": "sleep 1 && RUN_ENV=single ./core/xchain/launch_multi.sh", - "isBackground": true, - "problemMatcher": [], - "presentation": { - "group": "xchain" - } - }, { "label": "XChain-Multi", "type": "shell", diff --git a/contracts/README.md b/contracts/README.md index e38fb4a21..49b0ce900 100644 --- a/contracts/README.md +++ b/contracts/README.md @@ -72,7 +72,7 @@ with `ChainID=1337` 1. duplicate `.env.localhost` file in the [contracts](.) folder of the project and rename it to `.env` (this is excluded from git via .gitignore) -2. run `export RIVER_ENV="local_single"` from your terminal +2. run `export RIVER_ENV="local_multi"` from your terminal 3. you will then run `./scripts/deploy-contracts.sh` to deploy the entire suite of contracts to your local base-anvil and river-anvil chains. diff --git a/core/env/local/single/env.env b/core/env/local/single/env.env deleted file mode 100644 index e5de0005f..000000000 --- a/core/env/local/single/env.env +++ /dev/null @@ -1,4 +0,0 @@ -RUN_ENV=single -DISABLE_BASE_CHAIN=false -NUM_INSTANCES=1 -RPC_PORT=5157 diff --git a/core/env/local/single_ne/env.env b/core/env/local/single_ne/env.env deleted file mode 100644 index e208ebfdf..000000000 --- a/core/env/local/single_ne/env.env +++ /dev/null @@ -1,4 +0,0 @@ -RUN_ENV=single_ne -DISABLE_BASE_CHAIN=true -NUM_INSTANCES=1 -RPC_PORT=5158 diff --git a/core/node/run_single.sh b/core/node/run_single.sh deleted file mode 100755 index 2841c4a72..000000000 --- a/core/node/run_single.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -euo pipefail -cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" - -export RUN_ENV="single" - -# Parse command-line options -args=() # Collect arguments to pass to the last command -while [[ "$#" -gt 0 ]]; do - case "$1" in - --disable_entitlements|--de) - RUN_ENV="single_ne" - shift - ;; - *) - args+=("$1") - shift - ;; - esac -done - -./run_impl.sh "${args[@]:-}" diff --git a/core/scripts/start_node.sh b/core/scripts/start_node.sh index caef2e2c7..857443044 100755 --- a/core/scripts/start_node.sh +++ b/core/scripts/start_node.sh @@ -1,4 +1,4 @@ #!/bin/bash -ue cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" -../node/run_single.sh "$@" +../node/run_multi.sh "$@" diff --git a/packages/playground/src/components/dialog/env-switcher.tsx b/packages/playground/src/components/dialog/env-switcher.tsx index 33015fccb..87231bf2a 100644 --- a/packages/playground/src/components/dialog/env-switcher.tsx +++ b/packages/playground/src/components/dialog/env-switcher.tsx @@ -27,7 +27,7 @@ import { const environments = [ { id: 'gamma', name: 'Gamma', chainId: baseSepolia.id }, { id: 'omega', name: 'Omega', chainId: base.id }, - { id: 'local_single', name: 'Local Single', chainId: foundry.id }, + { id: 'local_multi', name: 'Local Multi', chainId: foundry.id }, ] as const export type Env = (typeof environments)[number] @@ -89,7 +89,7 @@ export const RiverEnvSwitcher = (props: RiverEnvSwitcherProps) => { ))} - {currentEnv === 'local_single' && } + {currentEnv === 'local_multi' && } {isConnected && (