Merge of #2156

Author: mergify[bot]

gateway-contracts/tasks/utils/loadVariables.ts

@@ -5,17 +5,19 @@ import path from "path";
 import { ADDRESSES_DIR, GATEWAY_ADDRESSES_ENV_FILE_NAME } from "../../hardhat.config";
 import { pascalCaseToAddressEnvVar } from "../utils";
 
-// Get the required environment variable, throw an error if it's not set
-// We only check if the variable is set, not if it's empty
+// Get the required environment variable, throw an error if it's not set or empty
 export function getRequiredEnvVar(name: string): string {
   if (!(name in process.env)) {
     throw new Error(`"${name}" env variable is not set`);
   }
-  return process.env[name]!;
+  const value = process.env[name]!;
+  if (value.trim() === "") {
+    throw new Error(`"${name}" env variable is set but empty`);
+  }
+  return value;
 }
 
-// Get the required address from the environment variable, throw an error if it's not set
-// We only check if the variable is set, not if it's empty
+// Get the required address from the environment variable, throw an error if it's not set or empty
 export function getRequiredAddressEnvVar(name: string): string {
   const addressEnvVarName = pascalCaseToAddressEnvVar(name);
   return getRequiredEnvVar(addressEnvVarName);

host-contracts/tasks/utils/loadVariables.ts

@@ -4,13 +4,16 @@ import path from 'path';
 
 import { ADDRESSES_DIR, HOST_ADDRESSES_ENV_FILE_NAME } from '../../hardhat.config';
 
-// Get the required environment variable, throw an error if it's not set
-// We only check if the variable is set, not if it's empty
+// Get the required environment variable, throw an error if it's not set or empty
 export function getRequiredEnvVar(name: string): string {
   if (!(name in process.env)) {
     throw new Error(`"${name}" env variable is not set`);
   }
-  return process.env[name]!;
+  const value = process.env[name]!;
+  if (value.trim() === '') {
+    throw new Error(`"${name}" env variable is set but empty`);
+  }
+  return value;
 }
 
 // Load the addresses as environment variables from the env file

library-solidity/tasks/utils/loadVariables.ts

@@ -5,13 +5,16 @@ import path from 'path';
 const ADDRESSES_DIR = path.resolve(__dirname, '../../fhevmTemp/addresses');
 const HOST_ADDRESSES_ENV_FILE_NAME = '.env.host';
 
-// Get the required environment variable, throw an error if it's not set
-// We only check if the variable is set, not if it's empty
+// Get the required environment variable, throw an error if it's not set or empty
 export function getRequiredEnvVar(name: string): string {
   if (!(name in process.env)) {
     throw new Error(`"${name}" env variable is not set`);
   }
-  return process.env[name]!;
+  const value = process.env[name]!;
+  if (value.trim() === '') {
+    throw new Error(`"${name}" env variable is set but empty`);
+  }
+  return value;
 }
 
 // Load the addresses as environment variables from the env file