pr feedback

Author: jackchuma

base/Makefile

@@ -30,17 +30,19 @@ USER_REMOTE_ETH_ATA ?= 0x3e506b04e88dab39a3687fc5eb822c18f8301fc09cfe945c3394fc6
 
 AMOUNT ?= 1000000000
 
-# Contract addresses (read from deployment file)
+# Contract addresses (read from deployment file, only when ENV is set)
+LOCAL_ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE
+
+ifdef DEPLOYMENT_FILE
 BRIDGE = $(shell jq -r '.Bridge' $(DEPLOYMENT_FILE))
 LOCAL_SOL = $(shell jq -r '.WrappedSOL' $(DEPLOYMENT_FILE))
 REMOTE_SOL = $(shell jq -r '.RemoteSOL' $(DEPLOYMENT_FILE))
 LOCAL_SPL = $(shell jq -r '.WrappedSPL' $(DEPLOYMENT_FILE))
 REMOTE_SPL = $(shell jq -r '.RemoteSPL' $(DEPLOYMENT_FILE))
 REMOTE_ERC20 = $(shell jq -r '.RemoteERC20' $(DEPLOYMENT_FILE))
 REMOTE_ETH = $(shell jq -r '.RemoteETH' $(DEPLOYMENT_FILE))
-
-LOCAL_ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE
-LOCAL_ERC20 = 0x4870D23984Dd663005EB8E2b616e4Ef62630183c
+LOCAL_ERC20 = $(shell jq -r '.LocalERC20' $(DEPLOYMENT_FILE))
+endif
 
 # Environment validation
 .PHONY: validate-env
@@ -70,7 +72,6 @@ help:
 	@echo "Deployment targets (require ENV):"
 	@echo "  deploy                  Deploy bridge contracts"
 	@echo "  upgrade                 Upgrade bridge contracts"
-	@echo "  dev-deploy              Deploy + create wrapped tokens"
 	@echo "  create-wrapped-spl      Create wrapped SPL token"
 	@echo "  create-mock-token       Deploy a mock ERC20"
 	@echo ""
@@ -88,7 +89,7 @@ help:
 	@echo "  SOLANA_SOL_RECEIVER     SOL recipient address"
 	@echo "  LEDGER_ACCOUNT          Ledger HD account index (default: 0)"
 
-check:
+check: validate-env
 	@echo $(REMOTE_ERC20)
 
 .PHONY: deps
@@ -116,9 +117,6 @@ bindings:
 coverage:
 	@ forge coverage --no-match-coverage "(script|test)"
 
-.PHONY: dev-deploy
-dev-deploy: deploy create-wrapped-sol create-wrapped-spl
-
 .PHONY: deploy
 deploy: validate-env
 	BRIDGE_ENVIRONMENT=$(BRIDGE_ENV) forge script DeployScript --account testnet-admin --rpc-url $(BASE_RPC) --sender $(shell cast wallet address --account testnet-admin) --broadcast -vvvv

base/deployments/base_mainnet.json

@@ -9,5 +9,6 @@
   "RemoteERC20": "",
   "RemoteETH": "",
   "WrappedSOL": "0x311935Cd80B76769bF2ecC9D8Ab7635b2139cf82",
-  "WrappedSPL": ""
+  "WrappedSPL": "",
+  "LocalERC20": "0x4870D23984Dd663005EB8E2b616e4Ef62630183c"
 }

base/deployments/base_sepolia_alpha.json

@@ -9,5 +9,6 @@
   "RemoteERC20": "0xba6a03ad9fe4921c8a5a4e8d3ef0a8d76ac6137ea1213879512abc24c6ab4376",
   "RemoteETH": "0x79f4f1fa82df5ae874eaff38c8288c15a0317eab263a6a2f4ed32ca9224ba62c",
   "WrappedSOL": "0x003512146Fd54b71f926C7Fd4B7bd20Fc84E22c5",
-  "WrappedSPL": "0x80351342c4dd23C78c0837C640E041a239e67cD8"
+  "WrappedSPL": "0x80351342c4dd23C78c0837C640E041a239e67cD8",
+  "LocalERC20": "0x62C1332822983B8412A6Ffda0fd77cd7d5733Ee9"
 }

base/deployments/base_sepolia_prod.json

@@ -9,5 +9,6 @@
   "RemoteERC20": "0xc7cfe164b0b61064d6f23734f906c8141788be442d94495852d8af53b40e3212",
   "RemoteETH": "0xcb3d6f70c63eee106144cdf6cf934901b684be88171380e87a3f8d03f720a185",
   "WrappedSOL": "0xCace0c896714DaF7098FFD8CC54aFCFe0338b4BC",
-  "WrappedSPL": "0x955C7356776F9304feD38ed5AeC5699436C7C614"
+  "WrappedSPL": "0x955C7356776F9304feD38ed5AeC5699436C7C614",
+  "LocalERC20": "0x62C1332822983B8412A6Ffda0fd77cd7d5733Ee9"
 }

base/deployments/template.json

@@ -9,5 +9,6 @@
   "WrappedSOL": "",
   "WrappedSPL": "",
   "RemoteERC20": "",
-  "RemoteETH": ""
+  "RemoteETH": "",
+  "LocalERC20": ""
 }