ci: update deployment scripts to use simplified environment variables

SeddikBellamine · SeddikBellamine · commit e7804fa1b0de · 2025-07-22T13:31:40.000+02:00
diff --git a/deployment-dapp/src/configureEnsNameScript.ts b/deployment-dapp/src/configureEnsNameScript.ts
@@ -1,61 +1,19 @@
-import {
-  DEPLOY_TARGET_CONFIGURE_ENS_DEV,
-  DEPLOY_TARGET_CONFIGURE_ENS_PROD,
-  DEPLOY_TARGET_DEV,
-  DEPLOY_TARGET_PROD,
-  WEB3_TELEGRAM_ENS_NAME_DEV,
-  WEB3_TELEGRAM_ENS_NAME_PROD,
-} from './config/config.js';
-import { getIExec, loadAppAddress } from './utils/utils.js';
 import { configureEnsName } from './singleFunction/configureEnsName.js';
+import { getIExec, loadAppAddress } from './utils/utils.js';
 
 const main = async () => {
-  // get env variables from GitHub Actions
-  const {
-    DEPLOY_ENVIRONMENT,
-    WALLET_PRIVATE_KEY_DEV,
-    WALLET_PRIVATE_KEY_PROD,
-    DEPLOYED_APP_ADDRESS, // if already deployed in a previous step and want to configure ENS promoting configure-ens pipeline
-    ENS_NAME,
-  } = process.env;
-
-  const deployTarget = DEPLOY_ENVIRONMENT;
-
-  if (
-    !deployTarget ||
-    (deployTarget !== DEPLOY_TARGET_DEV &&
-      deployTarget !== DEPLOY_TARGET_PROD &&
-      deployTarget !== DEPLOY_TARGET_CONFIGURE_ENS_DEV &&
-      deployTarget !== DEPLOY_TARGET_CONFIGURE_ENS_PROD)
-  )
-    throw Error(`Invalid promote target ${deployTarget}`);
-
-  const appAddress = DEPLOYED_APP_ADDRESS ?? (await loadAppAddress()); // use ALREADY_DEPLOYED_APP_ADDRESS when promoting configure-ens pipeline
-  let privateKey;
-  let ensName;
-  if (
-    deployTarget === DEPLOY_TARGET_DEV ||
-    deployTarget === DEPLOY_TARGET_CONFIGURE_ENS_DEV
-  ) {
-    privateKey = WALLET_PRIVATE_KEY_DEV;
-    ensName = ENS_NAME ?? WEB3_TELEGRAM_ENS_NAME_DEV;
-  } else if (
-    deployTarget === DEPLOY_TARGET_PROD ||
-    deployTarget === DEPLOY_TARGET_CONFIGURE_ENS_PROD
-  ) {
-    privateKey = WALLET_PRIVATE_KEY_PROD;
-    ensName = ENS_NAME ?? WEB3_TELEGRAM_ENS_NAME_PROD;
-  }
+  const { RPC_URL, WALLET_PRIVATE_KEY, DAPP_ENS_NAME } = process.env;
 
-  if (!privateKey)
-    throw Error(`Failed to get privateKey for target ${deployTarget}`);
+  const appAddress = await loadAppAddress();
 
-  if (!ensName)
-    throw Error(`Failed to get ens name for target ${deployTarget}`);
+  if (!WALLET_PRIVATE_KEY)
+    throw Error(`Failed to get privateKey from environment variables`);
 
-  const iexec = getIExec(privateKey);
+  if (!DAPP_ENS_NAME)
+    throw Error(`Failed to get DAPP_ENS_NAME from environment variables`);
 
-  await configureEnsName(iexec, appAddress, ensName);
+  const iexec = getIExec(WALLET_PRIVATE_KEY, RPC_URL);
+  await configureEnsName(iexec, appAddress, DAPP_ENS_NAME);
 };
 
 main().catch((e) => {
diff --git a/deployment-dapp/src/deployScript.ts b/deployment-dapp/src/deployScript.ts
@@ -1,65 +1,30 @@
 import { deployApp } from './singleFunction/deployApp.js';
-import {
-  DOCKER_IMAGE_DEV_TAG,
-  DOCKER_IMAGE_PROD_TAG,
-  DEPLOY_TARGET_DEV,
-  DEPLOY_TARGET_PROD,
-} from './config/config.js';
 import { getIExec, saveAppAddress } from './utils/utils.js';
 
 const main = async () => {
   // get env variables from GitHub Actions
   const {
-    DEPLOY_ENVIRONMENT,
-    WALLET_PRIVATE_KEY_DEV,
-    WALLET_PRIVATE_KEY_PROD,
-    DOCKER_IMAGE_CHECKSUM_DEV,
-    DOCKER_IMAGE_CHECKSUM_PROD,
+    RPC_URL,
+    WALLET_PRIVATE_KEY,
+    DOCKER_IMAGE_TAG,
+    CHECKSUM,
+    FINGERPRINT,
   } = process.env;
 
-  const deployTarget = DEPLOY_ENVIRONMENT;
+  if (!WALLET_PRIVATE_KEY)
+    throw Error(`Missing WALLET_PRIVATE_KEY environment variable`);
 
-  if (
-    !deployTarget ||
-    (deployTarget !== DEPLOY_TARGET_DEV && deployTarget !== DEPLOY_TARGET_PROD)
-  )
-    throw Error(`Invalid promote target ${deployTarget}`);
+  const iexec = getIExec(WALLET_PRIVATE_KEY, RPC_URL);
 
-  let privateKey;
-  let checksum;
-  if (deployTarget === DEPLOY_TARGET_DEV) {
-    privateKey = WALLET_PRIVATE_KEY_DEV;
-    checksum = DOCKER_IMAGE_CHECKSUM_DEV;
-  } else if (deployTarget === DEPLOY_TARGET_PROD) {
-    privateKey = WALLET_PRIVATE_KEY_PROD;
-    checksum = DOCKER_IMAGE_CHECKSUM_PROD;
+  if (!DOCKER_IMAGE_TAG) {
+    throw Error(`Missing DOCKER_IMAGE_TAG environment variable.`);
   }
 
-  if (!privateKey)
-    throw Error(`Failed to get privateKey for target ${deployTarget}`);
-
-  const iexec = getIExec(privateKey);
-
-  let dockerImageTag;
-  if (deployTarget === DEPLOY_TARGET_DEV) {
-    dockerImageTag = DOCKER_IMAGE_DEV_TAG;
-  } else if (deployTarget === DEPLOY_TARGET_PROD) {
-    dockerImageTag = DOCKER_IMAGE_PROD_TAG;
-  }
-
-  console.log(`Deploying with environment: ${deployTarget}`);
-  console.log(`Using image tag: ${dockerImageTag}`);
-  if (checksum) {
-    console.log(`Using pre-computed checksum: ${checksum}`);
-  } else {
-    console.log('Fetching checksum from Docker Hub...');
-  }
-
-  //deploy app
   const address = await deployApp({
     iexec,
-    dockerTag: dockerImageTag,
-    checksum,
+    dockerTag: DOCKER_IMAGE_TAG,
+    checksum: CHECKSUM,
+    fingerprint: FINGERPRINT,
   });
   await saveAppAddress(address);
 };
diff --git a/deployment-dapp/src/publishSellOrderScript.ts b/deployment-dapp/src/publishSellOrderScript.ts
@@ -1,83 +1,26 @@
-import { getIExec, loadAppAddress } from './utils/utils.js';
 import { publishSellOrder } from './singleFunction/publishSellOrder.js';
-import { resolveName } from './singleFunction/resolveName.js';
-import {
-  DEPLOY_TARGET_SELL_ORDER_DEV,
-  DEPLOY_TARGET_SELL_ORDER_PROD,
-  DEPLOY_TARGET_DEV,
-  DEPLOY_TARGET_PROD,
-  DEFAULT_APP_PRICE,
-  DEFAULT_APP_VOLUME,
-  WEB3_TELEGRAM_ENS_NAME_DEV,
-  WEB3_TELEGRAM_ENS_NAME_PROD,
-} from './config/config.js';
+import { getIExec, loadAppAddress } from './utils/utils.js';
 import {
-  positiveStrictIntegerSchema,
   positiveNumberSchema,
+  positiveStrictIntegerSchema,
 } from './utils/validator.js';
 
 const main = async () => {
-  // get env variables from GitHub Actions
-  const {
-    DEPLOY_ENVIRONMENT,
-    WALLET_PRIVATE_KEY_DEV,
-    WALLET_PRIVATE_KEY_PROD,
-    PRICE,
-    VOLUME,
-  } = process.env;
-
-  const deployTarget = DEPLOY_ENVIRONMENT;
-
-  if (
-    !deployTarget ||
-    ![
-      DEPLOY_TARGET_DEV,
-      DEPLOY_TARGET_SELL_ORDER_DEV,
-      DEPLOY_TARGET_PROD,
-      DEPLOY_TARGET_SELL_ORDER_PROD,
-    ].includes(deployTarget)
-  )
-    throw Error(`Invalid promote target ${deployTarget}`);
-
-  let privateKey;
-  if (
-    [DEPLOY_TARGET_DEV, DEPLOY_TARGET_SELL_ORDER_DEV].includes(deployTarget)
-  ) {
-    privateKey = WALLET_PRIVATE_KEY_DEV;
-  } else if (
-    [DEPLOY_TARGET_PROD, DEPLOY_TARGET_SELL_ORDER_PROD].includes(deployTarget)
-  ) {
-    privateKey = WALLET_PRIVATE_KEY_PROD;
-  }
-
-  if (!privateKey) {
-    throw Error(`Failed to get privateKey for target ${deployTarget}`);
-  }
+  const { RPC_URL, WALLET_PRIVATE_KEY, PRICE, VOLUME } = process.env;
 
-  const iexec = getIExec(privateKey);
+  const iexec = getIExec(WALLET_PRIVATE_KEY, RPC_URL);
 
-  const appAddress = await loadAppAddress().catch(() => {
-    console.log('No app address found falling back to ENS');
-    let ensName;
-    if (deployTarget === DEPLOY_TARGET_SELL_ORDER_DEV) {
-      ensName = WEB3_TELEGRAM_ENS_NAME_DEV;
-    } else if (deployTarget === DEPLOY_TARGET_SELL_ORDER_PROD) {
-      ensName = WEB3_TELEGRAM_ENS_NAME_PROD;
-    }
-    if (!ensName)
-      throw Error(`Failed to get ens name for target ${deployTarget}`);
-    return resolveName(iexec, ensName);
-  });
+  const appAddress = await loadAppAddress();
 
   if (!appAddress) throw Error('Failed to get app address'); // If the app was not deployed, do not continue
 
   // validate params
   const price = await positiveNumberSchema()
-    .default(DEFAULT_APP_PRICE)
+    .required()
     .label('PRICE')
     .validate(PRICE);
   const volume = await positiveStrictIntegerSchema()
-    .default(DEFAULT_APP_VOLUME)
+    .required()
     .label('VOLUME')
     .validate(VOLUME);
 
diff --git a/deployment-dapp/src/pushSecretScript.ts b/deployment-dapp/src/pushSecretScript.ts
@@ -1,78 +1,26 @@
-import {
-  DEPLOY_TARGET_DEV,
-  DEPLOY_TARGET_PROD,
-  DEPLOY_TARGET_PUSH_SECRET_DEV,
-  DEPLOY_TARGET_PUSH_SECRET_PROD,
-  WEB3_TELEGRAM_ENS_NAME_DEV,
-  WEB3_TELEGRAM_ENS_NAME_PROD,
-} from './config/config.js';
 import { pushSecret } from './singleFunction/pushSecret.js';
-import { resolveName } from './singleFunction/resolveName.js';
 import { getIExec, loadAppAddress } from './utils/utils.js';
 
 const main = async () => {
-  // get env variables from GitHub Actions
-  const {
-    DEPLOY_ENVIRONMENT,
-    WALLET_PRIVATE_KEY_DEV,
-    WALLET_PRIVATE_KEY_PROD,
-    TELEGRAM_BOT_TOKEN_DEV,
-    TELEGRAM_BOT_TOKEN_PROD,
-  } = process.env;
+  const { RPC_URL, WALLET_PRIVATE_KEY, TELEGRAM_BOT_TOKEN } = process.env;
 
-  const deployTarget = DEPLOY_ENVIRONMENT;
+  if (!WALLET_PRIVATE_KEY)
+    throw Error(`Missing WALLET_PRIVATE_KEY environment variable`);
+  if (!TELEGRAM_BOT_TOKEN) throw Error('Missing env TELEGRAM_BOT_TOKEN');
 
-  if (
-    !deployTarget ||
-    ![
-      DEPLOY_TARGET_DEV,
-      DEPLOY_TARGET_PROD,
-      DEPLOY_TARGET_PUSH_SECRET_DEV,
-      DEPLOY_TARGET_PUSH_SECRET_PROD,
-    ].includes(deployTarget)
-  )
-    throw Error(`Invalid promote target ${deployTarget}`);
+  if (!WALLET_PRIVATE_KEY)
+    throw Error(`Missing WALLET_PRIVATE_KEY environment variable`);
 
-  let telegramBotToken;
-  let privateKey;
-  if (
-    deployTarget === DEPLOY_TARGET_DEV ||
-    deployTarget === DEPLOY_TARGET_PUSH_SECRET_DEV
-  ) {
-    telegramBotToken = TELEGRAM_BOT_TOKEN_DEV;
-    privateKey = WALLET_PRIVATE_KEY_DEV;
-  } else if (
-    deployTarget === DEPLOY_TARGET_PROD ||
-    deployTarget === DEPLOY_TARGET_PUSH_SECRET_PROD
-  ) {
-    telegramBotToken = TELEGRAM_BOT_TOKEN_PROD;
-    privateKey = WALLET_PRIVATE_KEY_PROD;
-  }
-  if (!telegramBotToken) throw Error('Missing env TELEGRAM_BOT_TOKEN');
-  if (!privateKey)
-    throw Error(`Failed to get privateKey for target ${deployTarget}`);
+  const iexec = getIExec(WALLET_PRIVATE_KEY, RPC_URL);
 
-  const iexec = getIExec(privateKey);
-
-  const appAddress = await loadAppAddress().catch(() => {
-    console.log('No app address found falling back to ENS');
-    let ensName;
-    if (deployTarget === DEPLOY_TARGET_PUSH_SECRET_DEV) {
-      ensName = WEB3_TELEGRAM_ENS_NAME_DEV;
-    } else if (deployTarget === DEPLOY_TARGET_PUSH_SECRET_PROD) {
-      ensName = WEB3_TELEGRAM_ENS_NAME_PROD;
-    }
-    if (!ensName)
-      throw Error(`Failed to get ens name for target ${deployTarget}`);
-    return resolveName(iexec, ensName);
-  });
+  const appAddress = await loadAppAddress();
 
   if (!appAddress) throw Error('Failed to get app address'); // If the app was not deployed, do not continue
 
-  //push app secret to the secret management
   const jsonSecret = JSON.stringify({
-    TELEGRAM_BOT_TOKEN: telegramBotToken,
+    TELEGRAM_BOT_TOKEN,
   });
+
   await pushSecret(iexec, appAddress, jsonSecret);
 };
 
diff --git a/deployment-dapp/src/revokeSellOrderScript.ts b/deployment-dapp/src/revokeSellOrderScript.ts
