refactor: use TEE_FRAMEWORK as var

Author: abbesBenayache

.github/workflows/dapp-deploy.yml

@@ -140,6 +140,7 @@ jobs:
           PRICE: ${{ vars.SELL_ORDER_PRICE }}
           VOLUME: ${{ vars.SELL_ORDER_VOLUME }}
           RPC_URL: ${{ secrets.RPC_URL }}
+          TEE_FRAMEWORK: ${{ vars.TEE_FRAMEWORK }}
         run: |
           cd deployment-dapp
           npm run publish-sell-order
@@ -210,7 +211,7 @@ jobs:
           PRICE: ${{ vars.SELL_ORDER_PRICE }}
           VOLUME: ${{ vars.SELL_ORDER_VOLUME }}
           RPC_URL: ${{ secrets.RPC_URL }}
-          SCONIFY_VERSION: ${{ vars.SCONIFY_VERSION }}
+          TEE_FRAMEWORK: ${{ vars.TEE_FRAMEWORK }}
         run: |
           cd deployment-dapp
           npm run publish-sell-order

deployment-dapp/src/config/config.ts

@@ -3,9 +3,6 @@
 //deployment parameters
 export const APP_NAME = 'web3mail';
 export const APP_TYPE = 'DOCKER';
-export const FRAMEWORK = 'TDX';
-
-export const APP_TAG = ['tee', FRAMEWORK.toLowerCase()];
 
 export const DOCKER_IMAGE_NAMESPACE = 'iexechub';
 export const DOCKER_IMAGE_REPOSITORY = 'web3mail-dapp';

deployment-dapp/src/publishSellOrderScript.ts

@@ -6,14 +6,17 @@ import {
 } from './utils/validator.js';
 
 const main = async () => {
-  const { RPC_URL, WALLET_PRIVATE_KEY, PRICE, VOLUME } = process.env;
+  const { RPC_URL, WALLET_PRIVATE_KEY, PRICE, VOLUME, TEE_FRAMEWORK } =
+    process.env;
 
   const iexec = getIExec(WALLET_PRIVATE_KEY, RPC_URL);
 
   const appAddress = await loadAppAddress();
 
   if (!appAddress) throw Error('Failed to get app address'); // If the app was not deployed, do not continue
 
+  const teeFramework = TEE_FRAMEWORK ?? 'tdx';
+
   // validate params
   const price = await positiveNumberSchema()
     .required()
@@ -29,7 +32,7 @@ const main = async () => {
 
   try {
     // Publish sell order for TEE app
-    await publishSellOrder(iexec, appAddress, price, volume);
+    await publishSellOrder(iexec, appAddress, price, volume, teeFramework);
   } catch (e) {
     throw Error(`Failed to publish app sell order: ${e}`);
   }

deployment-dapp/src/singleFunction/publishSellOrder.ts

@@ -1,21 +1,13 @@
-import { IExec } from 'iexec';
-import { APP_TAG } from '../config/config.js';
+import { IExec, TeeFramework } from 'iexec';
 
 export const publishSellOrder = async (
   iexec: IExec,
   appAddress: string,
   price?: number,
-  volume?: number
+  volume?: number,
+  teeFramework: TeeFramework = 'tdx'
 ): Promise<string> => {
-  let teeTag = APP_TAG;
-  // TODO: to be deleted after migration to TDX
-  const sconifyVersion = process.env.SCONIFY_VERSION;
-  if (sconifyVersion) {
-    console.log(
-      `Using SCONE framework with SCONIFY version: ${sconifyVersion}`
-    );
-    teeTag = ['tee', 'scone'];
-  }
+  const teeTag = ['tee', teeFramework];
   console.log(
     `Publishing apporder for app ${appAddress} with price ${price} xRLC and volume ${volume} on ${teeTag}`
   );

deployment-dapp/src/singleFunction/pushSecret.ts

@@ -5,21 +5,8 @@ export const pushSecret = async (
   appAddress: string,
   secret: string
 ): Promise<boolean> => {
-  // TODO: to be deleted after migration to TDX
-  const sconifyVersion = process.env.SCONIFY_VERSION;
-  let teeFramework = 'tdx';
-  if (sconifyVersion) {
-    console.log(
-      `Using SCONE framework with SCONIFY version: ${sconifyVersion}`
-    );
-    teeFramework = 'scone';
-  }
-  console.log(
-    `Pushing app secret for app ${appAddress} on SMS ${teeFramework}`
-  );
-  const isPushed = await iexec.app.pushAppSecret(appAddress, secret, {
-    teeFramework,
-  });
+  console.log(`Pushing app secret for app ${appAddress}`);
+  const isPushed = await iexec.app.pushAppSecret(appAddress, secret);
   console.log(`success: ${isPushed}`);
   return isPushed;
 };