From a62c304c69b143f83bb27c6050ab6898d3d8fa72 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+shaspitz@users.noreply.github.com>
Date: Tue, 26 Dec 2023 18:19:33 -0800
Subject: [PATCH] env var name change "l2" -> "settlement"

---
 geth-poa/Makefile               | 12 ++++++------
 geth-poa/docker-compose.yml     |  2 +-
 geth-poa/frontend/entrypoint.sh |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/geth-poa/Makefile b/geth-poa/Makefile
index 8511197a0d..5f40e55591 100644
--- a/geth-poa/Makefile
+++ b/geth-poa/Makefile
@@ -3,26 +3,26 @@
 
 up-prod-settlement:
 	@if [ ! -f .env ]; then echo "Error: .env file not found. Please populate the .env file before running this command."; exit 1; fi
-	AGENT_BASE_IMAGE=nil L2_NODE_URL=nil docker compose --profile settlement up -d --build	
+	AGENT_BASE_IMAGE=nil SETTLEMENT_RPC_URL=nil docker compose --profile settlement up -d --build	
 
 up-dev-settlement:
 	@if [ ! -f .env ]; then echo "Error: .env file not found. Please populate the .env file before running this command."; exit 1; fi
-	AGENT_BASE_IMAGE=shaspitz/hyperlane-agent-mac:6985064 L2_NODE_URL=http://localhost:8545 docker compose --profile settlement up -d --build
+	AGENT_BASE_IMAGE=shaspitz/hyperlane-agent-mac:6985064 SETTLEMENT_RPC_URL=http://localhost:8545 docker compose --profile settlement up -d --build
 
 up-dev-bridge:
 	@if [ ! -f .env ]; then echo "Error: .env file not found. Please populate the .env file before running this command."; exit 1; fi
-	AGENT_BASE_IMAGE=shaspitz/hyperlane-agent-mac:6985064 L2_NODE_URL=http://localhost:8545 docker compose --profile bridge up -d --build
+	AGENT_BASE_IMAGE=shaspitz/hyperlane-agent-mac:6985064 SETTLEMENT_RPC_URL=http://localhost:8545 docker compose --profile bridge up -d --build
 
 up-prod-bridge:
 	@if [ ! -f .env ]; then echo "Error: .env file not found. Please populate the .env file before running this command."; exit 1; fi
-	AGENT_BASE_IMAGE=gcr.io/abacus-labs-dev/hyperlane-agent@sha256:854f92966eac6b49e5132e152cc58168ecdddc76c2d390e657b81bdaf1396af0 L2_NODE_URL=http://34.215.163.180:8545 docker compose --profile bridge up -d --build
+	AGENT_BASE_IMAGE=gcr.io/abacus-labs-dev/hyperlane-agent@sha256:854f92966eac6b49e5132e152cc58168ecdddc76c2d390e657b81bdaf1396af0 SETTLEMENT_RPC_URL=http://34.215.163.180:8545 docker compose --profile bridge up -d --build
 
 up-dev-local-l1:
 	@if [ ! -f .env ]; then echo "Error: .env file not found. Please populate the .env file before running this command."; exit 1; fi
-	AGENT_BASE_IMAGE=shaspitz/hyperlane-agent-mac:6985064 L2_NODE_URL=http://localhost:8545 docker compose --profile settlement --profile local_l1 up -d
+	AGENT_BASE_IMAGE=shaspitz/hyperlane-agent-mac:6985064 SETTLEMENT_RPC_URL=http://localhost:8545 docker compose --profile settlement --profile local_l1 up -d
 
 down:
-	AGENT_BASE_IMAGE=nil L2_NODE_URL=nil docker compose --profile settlement --profile bridge --profile prod_agents --profile local_l1 down
+	AGENT_BASE_IMAGE=nil SETTLEMENT_RPC_URL=nil docker compose --profile settlement --profile bridge --profile prod_agents --profile local_l1 down
 
 clean-dbs:
 	@read -p "WARNING: This command will wipe all persistent disk data relevant to the containers. Press enter to continue or Ctrl+C to cancel." _ 
diff --git a/geth-poa/docker-compose.yml b/geth-poa/docker-compose.yml
index 3da4a25dc6..d853db19c0 100644
--- a/geth-poa/docker-compose.yml
+++ b/geth-poa/docker-compose.yml
@@ -276,7 +276,7 @@ services:
         condition: service_healthy
     environment:
       - NEXT_PUBLIC_WALLET_CONNECT_ID=${NEXT_PUBLIC_WALLET_CONNECT_ID}
-      - L2_NODE_URL=${L2_NODE_URL}
+      - SETTLEMENT_RPC_URL=${SETTLEMENT_RPC_URL}
     networks:
       primev_net:
         ipv4_address: '172.29.0.90'
diff --git a/geth-poa/frontend/entrypoint.sh b/geth-poa/frontend/entrypoint.sh
index 6d63145d77..16e5dcb710 100644
--- a/geth-poa/frontend/entrypoint.sh
+++ b/geth-poa/frontend/entrypoint.sh
@@ -9,6 +9,6 @@ sed -i "/hypNativeAddress/c\    hypNativeAddress: \"$HYP_NATIVE_ADDR\"," $SRC_TO
 
 # Update src chains.ts file with L2 node url depending on dev vs prod 
 SRC_CHAINS_PATH="/hyperlane-ui/src/consts/chains.ts"
-sed -i "s|http: 'http://[^']*'|http: '$L2_NODE_URL'|g" "$SRC_CHAINS_PATH"
+sed -i "s|http: 'http://[^']*'|http: '$SETTLEMENT_RPC_URL'|g" "$SRC_CHAINS_PATH"
 
 exec yarn dev