Improved onboarding flow with just-foundry

.env.example

@@ -1,20 +1,34 @@
-# REQUIRED
+# SECRETS (supply locally, never commit — also configurable via `vars`)
 # ---------------------------------------------------
-DEPLOYMENT_PRIVATE_KEY="0x..."
+DEPLOYER_KEY="0x..."
 ETHERSCAN_API_KEY=""
 
 # OPTIONAL
 # ---------------------------------------------------
 
-# If the network's RPC_URL uses an Alchemy endpoint
-# ALCHEMY_API_KEY=
+# Burner wallet: destination for `just refund`
+# REFUND_ADDRESS="0x..."
 
-# If using a burner wallet to deploy
-# REFUND_ADDRESS=
-
-# If running fork tests on a certain block
+# Pin fork tests to a specific block
 # FORK_BLOCK_NUMBER=
 
+# PLUGIN SETTINGS (read by the deploy scripts under script/)
+# ---------------------------------------------------
+
+# Required by DeploySimple: address that maintains the published plugin repo
+PLUGIN_REPO_MAINTAINER_ADDRESS="0x..."
+
+# ENS subdomain for the plugin repo (optional)
+# PLUGIN_ENS_SUBDOMAIN="my-plugin"
+
+# Used by DeployDaoWithPlugins / DeployViaFactory (optional)
+# DAO_ENS_SUBDOMAIN="my-dao"
+# DAO_METADATA_URI="ipfs://..."
 
-# YOUR CUSTOM SETTINGS
+# NETWORK CONFIG
 # ---------------------------------------------------
+# RPC_URL, CHAIN_ID, VERIFIER and the Aragon OSx addresses come from the active
+# network in lib/just-foundry/networks/<network>.env — select it with
+# `just init <network>` or `just switch <network>`, and inspect it with `just env`.
+# To override a value for one network: `just switch <network> override`,
+# then edit the generated .env.<network> file at the repo root.

.gitignore

@@ -2,9 +2,13 @@
 cache
 coverage
 out
+artifacts
+logs
 
 # Files
-*.env
+.env
+.env.*
+!.env.example
 *.log
 .DS_Store
 lcov.info

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "lib/osx"]
 	path = lib/osx
 	url = https://github.com/aragon/osx
-[submodule "lib/osx-commons"]
-	path = lib/osx-commons
-	url = https://github.com/aragon/osx-commons
 [submodule "lib/ens-contracts"]
 	path = lib/ens-contracts
 	url = https://github.com/ensdomains/ens-contracts
@@ -19,6 +16,6 @@
 [submodule "lib/buffer"]
 	path = lib/buffer
 	url = https://github.com/ensdomains/buffer
-[submodule "lib/foundry-env"]
-	path = lib/foundry-env
-	url = https://github.com/aragon/foundry-env.git
+[submodule "lib/just-foundry"]
+	path = lib/just-foundry
+	url = https://github.com/aragon/just-foundry.git