Skip to content

merge queue: embarking main (7b38b46) and #2156 together #2199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 3 commits into from
Closed

merge queue: embarking main (7b38b46) and #2156 together #2199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8574c21
hore(common): extend getRequiredEnvVar method to check empty values
isaacdecoded Mar 23, 2026
08358a5
refactor(common): implement same empty values check for the library s…
isaacdecoded Mar 25, 2026
cbe2610
Merge of #2156
mergify[bot] Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions gateway-contracts/tasks/utils/loadVariables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 6 additions & 3 deletions host-contracts/tasks/utils/loadVariables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions library-solidity/tasks/utils/loadVariables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading