(feat) add the .env to hardhat with configurable network

NillionNetwork · Apr 16, 2024 · 56b4868 · 56b4868
1 parent 121f5ce
commit 56b4868
Show file tree

Hide file tree

Showing 7 changed files with 337 additions and 24 deletions.
diff --git a/packages/hardhat/.env.example b/packages/hardhat/.env.example
@@ -10,5 +10,7 @@ ALCHEMY_API_KEY=
 DEPLOYER_PRIVATE_KEY=
 ETHERSCAN_API_KEY=
 
-NEXT_PUBLIC_NILLION_BLOCKCHAIN_RPC_ENDPOINT=
-NEXT_PUBLIC_NILLION_WALLET_PRIVATE_KEY=
+# Auto populated by yarn nillion-devnet
+NILLION_CONFIG_RPC_URL=
+NILLION_CONFIG_DEPLOYER_PRIVATE_KEY=
+NILLION_CONFIG_CHAIN_ID=
diff --git a/packages/hardhat/deployments/configNetwork/.chainId b/packages/hardhat/deployments/configNetwork/.chainId
@@ -0,0 +1 @@
+31337
diff --git a/packages/hardhat/deployments/configNetwork/YourContract.json b/packages/hardhat/deployments/configNetwork/YourContract.json
diff --git a/packages/hardhat/deployments/configNetwork/solcInputs/93c68bd44761a49b132fa5800b71769d.json b/packages/hardhat/deployments/configNetwork/solcInputs/93c68bd44761a49b132fa5800b71769d.json
diff --git a/packages/hardhat/hardhat.config.ts b/packages/hardhat/hardhat.config.ts
@@ -19,6 +19,20 @@ const deployerPrivateKey =
 // If not set, it uses ours Etherscan default API key.
 const etherscanApiKey = process.env.ETHERSCAN_API_KEY || "DNXJA8RX2Q3VZ4URQIWP7Z68CJXQZSC6AW";
 
+// Add any other testnet from config
+const configNetwork =
+  process.env.NILLION_CONFIG_RPC_URL &&
+  process.env.NILLION_CONFIG_DEPLOYER_PRIVATE_KEY &&
+  process.env.NILLION_CONFIG_CHAIN_ID
+    ? {
+        configNetwork: {
+          url: process.env.NILLION_CONFIG_RPC_URL,
+          accounts: [process.env.NILLION_CONFIG_DEPLOYER_PRIVATE_KEY],
+          chainId: parseInt(process.env.NILLION_CONFIG_CHAIN_ID),
+        },
+      }
+    : {};
+
 const config: HardhatUserConfig = {
   solidity: {
     version: "0.8.17",
@@ -126,10 +140,7 @@ const config: HardhatUserConfig = {
       url: "https://sepolia.publicgoods.network",
       accounts: [deployerPrivateKey],
     },
-    configTestnet: {
-      url: process.env.NEXT_PUBLIC_NILLION_BLOCKCHAIN_RPC_ENDPOINT,
-      accounts: [process.env.NEXT_PUBLIC_NILLION_WALLET_PRIVATE_KEY || deployerPrivateKey],
-    },
+    ...configNetwork,
   },
   // configuration for harhdat-verify plugin
   etherscan: {

diff --git a/packages/nextjs/scaffold.config.ts b/packages/nextjs/scaffold.config.ts
@@ -10,7 +10,7 @@ export type ScaffoldConfig = {
   walletAutoConnect: boolean;
 };
 
-const fallbackChain = chains.sepolia;
+const fallbackChain = chains.hardhat;
 
 const rpcUrls = process.env.NEXT_PUBLIC_NILLION_BLOCKCHAIN_RPC_ENDPOINT
   ? {

diff --git a/packages/nillion/bootstrap-local-env.sh b/packages/nillion/bootstrap-local-env.sh
@@ -17,10 +17,10 @@ OUTFILE=$(mktemp);
 PIDFILE=$(mktemp);
 
 "$NILLION_DEVNET" --seed scaffold-nillion >"$OUTFILE" & echo $! >"$PIDFILE";
-ENV_TO_UPDATE=".env ../nextjs/.env"
-ENV_TO_UPDATE_WITH_HARDHAT=".env ../nextjs/.env ../hardhat/.env"
+NEXTJS_ENV=".env ../nextjs/.env"
+HARDHAT_ENV=".env ../hardhat/.env"
 echo "--------------------"
-echo "Updating your ${ENV_TO_UPDATE_WITH_HARDHAT} files with nillion-devnet environment info... This may take a minute."
+echo "Updating your .env files with nillion-devnet environment info... This may take a minute."
 echo "--------------------"
 time_limit=160
 while true; do
@@ -100,30 +100,35 @@ for ((i=1; i<=$num_node_keys; i++)); do
     nodekey_file=$(mktemp)
     "$NILLION_CLI" "$NILLION_CLI_COMMAND_NODE_KEYGEN" "$nodekey_file"
     NODEKEY_FILES+=("$nodekey_file")
-    update_env "NEXT_PUBLIC_NILLION_NODEKEY_PATH_PARTY_$i" "$nodekey_file" $ENV_TO_UPDATE
-    update_env "NEXT_PUBLIC_NILLION_NODEKEY_TEXT_PARTY_$i" "$(log_file_contents $nodekey_file)" $ENV_TO_UPDATE
+    update_env "NEXT_PUBLIC_NILLION_NODEKEY_PATH_PARTY_$i" "$nodekey_file" $NEXTJS_ENV
+    update_env "NEXT_PUBLIC_NILLION_NODEKEY_TEXT_PARTY_$i" "$(log_file_contents $nodekey_file)" $NEXTJS_ENV
 done
 
 # Generate user keys and add to .env - ex: NEXT_PUBLIC_NILLION_USERKEY_PATH_PARTY_1
 for ((i=1; i<=$num_user_keys; i++)); do
     userkey_file=$(mktemp)
     "$NILLION_CLI" "$NILLION_CLI_COMMAND_USER_KEYGEN" "$userkey_file"
     USERKEY_FILES+=("$userkey_file")
-    update_env "NEXT_PUBLIC_NILLION_USERKEY_PATH_PARTY_$i" "$userkey_file" $ENV_TO_UPDATE
-    update_env "NEXT_PUBLIC_NILLION_USERKEY_TEXT_PARTY_$i" "$(log_file_contents $userkey_file)" $ENV_TO_UPDATE
+    update_env "NEXT_PUBLIC_NILLION_USERKEY_PATH_PARTY_$i" "$userkey_file" $NEXTJS_ENV
+    update_env "NEXT_PUBLIC_NILLION_USERKEY_TEXT_PARTY_$i" "$(log_file_contents $userkey_file)" $NEXTJS_ENV
 done
 
 echo "🔑 Node key and user keys have been generated and added to .env"
 
-# Add environment variables to .env
-update_env "NEXT_PUBLIC_NILLION_WEBSOCKETS" "$WEBSOCKET" $ENV_TO_UPDATE
-update_env "NEXT_PUBLIC_NILLION_CLUSTER_ID" "$CLUSTER_ID" $ENV_TO_UPDATE
-update_env "NEXT_PUBLIC_NILLION_BLOCKCHAIN_RPC_ENDPOINT" "$PAYMENTS_RPC" $ENV_TO_UPDATE_WITH_HARDHAT
-update_env "NEXT_PUBLIC_NILLION_BLINDING_FACTORS_MANAGER_SC_ADDRESS" "$PAYMENTS_BF_ADDR" $ENV_TO_UPDATE
-update_env "NEXT_PUBLIC_NILLION_PAYMENTS_SC_ADDRESS" "$PAYMENTS_SC_ADDR" $ENV_TO_UPDATE
-update_env "NEXT_PUBLIC_NILLION_CHAIN_ID" "$PAYMENTS_CHAIN" $ENV_TO_UPDATE
-update_env "NEXT_PUBLIC_NILLION_WALLET_PRIVATE_KEY" "$WALLET_PRIVATE_KEY" $ENV_TO_UPDATE_WITH_HARDHAT
-update_env "NEXT_PUBLIC_NILLION_BOOTNODE_MULTIADDRESS" "$BOOT_MULTIADDR" $ENV_TO_UPDATE
+# Add environment variables to NextJs .env
+update_env "NEXT_PUBLIC_NILLION_WEBSOCKETS" "$WEBSOCKET" $NEXTJS_ENV
+update_env "NEXT_PUBLIC_NILLION_CLUSTER_ID" "$CLUSTER_ID" $NEXTJS_ENV
+update_env "NEXT_PUBLIC_NILLION_BLOCKCHAIN_RPC_ENDPOINT" "$PAYMENTS_RPC" $NEXTJS_ENV
+update_env "NEXT_PUBLIC_NILLION_BLINDING_FACTORS_MANAGER_SC_ADDRESS" "$PAYMENTS_BF_ADDR" $NEXTJS_ENV
+update_env "NEXT_PUBLIC_NILLION_PAYMENTS_SC_ADDRESS" "$PAYMENTS_SC_ADDR" $NEXTJS_ENV
+update_env "NEXT_PUBLIC_NILLION_CHAIN_ID" "$PAYMENTS_CHAIN" $NEXTJS_ENV
+update_env "NEXT_PUBLIC_NILLION_WALLET_PRIVATE_KEY" "$WALLET_PRIVATE_KEY" $NEXTJS_ENV
+update_env "NEXT_PUBLIC_NILLION_BOOTNODE_MULTIADDRESS" "$BOOT_MULTIADDR" $NEXTJS_ENV
+
+# Add environment variables to Hardhat .env
+update_env "NILLION_CONFIG_RPC_URL" "$PAYMENTS_RPC" $HARDHAT_ENV
+update_env "NILLION_CONFIG_DEPLOYER_PRIVATE_KEY" "$WALLET_PRIVATE_KEY" $HARDHAT_ENV
+update_env "NILLION_CONFIG_CHAIN_ID" "$PAYMENTS_CHAIN" $HARDHAT_ENV
 
 echo "Running at process pid: $(pgrep -f $NILLION_DEVNET)"
 
@@ -142,5 +147,5 @@ echo "-------------------------------------------------------"
 echo "-----------🦆 CONNECTED TO NILLION-DEVNET 🦆-----------"
 echo "-------------------------------------------------------"
 
-echo "ℹ️ Your $ENV_TO_UPDATE file configurations were updated with nillion-devnet connection variables: websocket, cluster id, keys, blockchain info"
+echo "ℹ️ Your NextJS and Hardhat .env file configurations were updated with nillion-devnet connection variables: websocket, cluster id, keys, blockchain info"
 echo "💻 The Nillion devnet is still running behind the scenes; to spin down the Nillion devnet at any time, run 'yarn nillion-devnet-stop'"