Delete single envs from local configs (#707)

In preparation for #532 and
to free up space for new replicated CI tests.

.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"],

.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",

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.
 

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 "$@"

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) => {
                             </Button>
                         </DialogClose>
                     ))}
-                    {currentEnv === 'local_single' && <FundWallet />}
+                    {currentEnv === 'local_multi' && <FundWallet />}
                     {isConnected && (
                         <Button
                             variant="destructive"

packages/sdk/package.json

@@ -14,11 +14,11 @@
         "lint:fix": "yarn lint --fix",
         "my-jest": "yarn node -r ../../scripts/node-no-warn.js --experimental-vm-modules $(yarn bin jest) --testTimeout=300000",
         "my-node": "yarn node -r ../../scripts/node-no-warn.js --loader ts-node/esm --experimental-specifier-resolution=node --experimental-vm-modules",
-        "test": "yarn test:ci",
-        "test:ci": "RIVER_ENV=local_single_ne yarn my-jest --group=main",
+        "test": "yarn test:ci:multi:ne",
+        "test:ci": "yarn test:ci:multi:ne",
         "test:ci:multi:ent": "RIVER_ENV=local_multi yarn my-jest --group=with-entitilements",
         "test:ci:multi:ne": "RIVER_ENV=local_multi_ne yarn my-jest --group=main",
-        "test:ci:with-entitlements": "RIVER_ENV=local_single yarn my-jest --group=with-entitilements",
+        "test:ci:with-entitlements": "yarn test:ci:multi:ent",
         "watch": "tsc --watch"
     },
     "dependencies": {

packages/sdk/src/riverConfig.ts

@@ -11,9 +11,9 @@ import { check } from '@river-build/dlog'
 
 function getEnvironmentId(): string {
     if (typeof process === 'object') {
-        return process.env.RIVER_ENV || 'local_single'
+        return process.env.RIVER_ENV || 'local_multi'
     }
-    return 'local_single'
+    return 'local_multi'
 }
 
 function getBaseRpcUrlForChain(chainId: number): string {

packages/sdk/src/sync-agent/entitlements/entitlements.ts

@@ -11,7 +11,7 @@ export class Entitlements implements EntitlementsDelegate {
         user: string,
         permission: Permission,
     ) {
-        if (this.config.environmentId === 'local_single_ne') {
+        if (this.config.environmentId === 'local_multi_ne') {
             return true
         } else if (channelId && spaceId) {
             return this.spaceDapp.isEntitledToChannel(spaceId, channelId, user, permission)

packages/stress/package.json

@@ -11,7 +11,7 @@
         "my-jest": "NODE_TLS_REJECT_UNAUTHORIZED=0 yarn node -r ../../scripts/node-no-warn.js --experimental-vm-modules $(yarn bin jest)",
         "start": "node ./dist/start.cjs",
         "demo": "node ./dist/demo.cjs",
-        "test:ci:with-entitlements": "RIVER_ENV=local_single DEBUG='stress:*,csb:enc*,csb:dec*' DEBUG_DEPTH='10' yarn my-jest"
+        "test:ci:with-entitlements": "RIVER_ENV=local_multi DEBUG='stress:*,csb:enc*,csb:dec*' DEBUG_DEPTH='10' yarn my-jest"
     },
     "dependencies": {
         "@babel/node": "^7.23.9",

packages/stress/scripts/localhost_chat.sh

@@ -12,7 +12,7 @@ echo "stress/scripts/localhost_chat.sh"
 # stress mode=chat requires the following environment variables
 # SPACE_ID
 # CHANNEL_IDS
-# RIVER_ENV (default=local_single) 
+# RIVER_ENV (default=local_multi) 
 # STRESS_MODE (default=chat)
 # STRESS_DURATION (default=120)
 #
@@ -24,7 +24,7 @@ export SPACE_ID="${SPACE_ID}"
 export CHANNEL_IDS="${CHANNEL_IDS}"
 export ANNOUNCE_CHANNEL_ID="${ANNOUNCE_CHANNEL_ID:-}"
 
-export RIVER_ENV="${RIVER_ENV:-local_single}"
+export RIVER_ENV="${RIVER_ENV:-local_multi}"
 export STRESS_MODE="${STRESS_MODE:-chat}"
 export STRESS_DURATION="${STRESS_DURATION:-360}"
 export SESSION_ID="${SESSION_ID:-$(uuidgen)}"

packages/stress/scripts/localhost_chat_setup.sh

@@ -8,7 +8,7 @@ echo "stress/scripts/localhost_setup_chat.sh"
 #
 # create space and channels for stress testing
 #
-export RIVER_ENV="${RIVER_ENV:-local_single}"
+export RIVER_ENV="${RIVER_ENV:-local_multi}"
 export STRESS_MODE="${STRESS_MODE:-setup_chat}"
 export SESSION_ID="${SESSION_ID:-$(uuidgen)}"
 export MNEMONIC="toy alien remain valid print employ age multiply claim student story aware" 

packages/stress/scripts/localhost_demo.sh

@@ -9,7 +9,7 @@ echo "stress/scripts/localhost_demo.sh"
 # simple test that runs in ci to ensure that the stress test can run in node against local env
 #
 
-export RIVER_ENV="${RIVER_ENV:-local_single}"
+export RIVER_ENV="${RIVER_ENV:-local_multi}"
 export STRESS_MODE="${STRESS_MODE:-test}"
 export SESSION_ID="${SESSION_ID:-$(uuidgen)}"
 

packages/stress/src/utils/stressClient.ts

@@ -52,7 +52,7 @@ export async function makeStressClient(
             user: string,
             permission: Permission,
         ) => {
-            if (config.environmentId === 'local_single_ne') {
+            if (config.environmentId === 'local_multi_ne') {
                 return true
             } else if (channelId && spaceId) {
                 return spaceDapp.isEntitledToChannel(spaceId, channelId, user, permission)

scripts/configure-nodes.sh

@@ -5,13 +5,7 @@ cd ..
 
 export RIVER_BLOCK_TIME="${RIVER_BLOCK_TIME:-1}"
 
-# check to see if the user passed a --single or --multi flag
-# if not, default to --single
-if [ "$1" == "--single" ]; then
-  ./core/node/run_single.sh -c
-elif [ "$1" == "--single_ne" ]; then
-  ./core/node/run_single.sh -c --de
-elif [ "$1" == "--multi" ]; then
+if [ "$1" == "--multi" ]; then
   ./core/node/run_multi.sh -c
 elif [ "$1" == "--multi_ne" ]; then
   ./core/node/run_multi.sh -c --de

scripts/kill-all-local-dev.sh

@@ -81,8 +81,6 @@ fi
 
 if prompt 'Stop XChain?:y/n '
 then
-    RUN_ENV=single ./core/xchain/stop_multi.sh
-    RUN_ENV=single_ne ./core/xchain/stop_multi.sh
     RUN_ENV=multi ./core/xchain/stop_multi.sh
     RUN_ENV=multi_ne ./core/xchain/stop_multi.sh
 

scripts/start_dev.sh

@@ -101,10 +101,8 @@ wait_for_process "$BUILD_PID" "build"
 echo "STARTED ALL CHAINS AND BUILT ALL CONTRACTS"
 
 # Now generate the core server config
-./scripts/configure-nodes.sh --single
-./scripts/configure-nodes.sh --single_ne
 ./scripts/configure-nodes.sh --multi
-#./scripts/configure-nodes.sh --multi_ne
+./scripts/configure-nodes.sh --multi_ne
 
 # Continue with rest of the script
 echo "Continuing with the rest of the script..."
@@ -119,11 +117,8 @@ commands=(
     "watch_proto:cd packages/proto && yarn watch"
     "watch_web3:cd packages/web3 && yarn watch"
     "watch_go:cd protocol && yarn watch:go"
-    "core_single:./core/node/run_single.sh -r"
-    "core_single_ne:./core/node/run_single.sh -r --de"
     "core_multi:./core/node/run_multi.sh -r"
-    #"core_multi_ne:./core/node/run_multi.sh -r --de"
-    "xchain_single:RUN_ENV=single ./core/xchain/launch_multi.sh"
+    "core_multi_ne:./core/node/run_multi.sh -r --de"
     "xchain_multi:RUN_ENV=multi ./core/xchain/launch_multi.sh"
 )
 

services/fetch-image/.env.localhost

@@ -1,5 +1,5 @@
 # Required.
-RIVER_ENV=local_single
+RIVER_ENV=local_multi
 # IMPORTANT: disable tls cert validation in localhost env ONLY
 # in all other environments, comment out this line.
 NODE_TLS_REJECT_UNAUTHORIZED=0