From 00a070945a8ce84cafa651b68f7634693b51aa81 Mon Sep 17 00:00:00 2001 From: Marat Idrisov Date: Thu, 14 Nov 2024 21:55:40 -0500 Subject: [PATCH] fix auto TEE offer processing and deploy --- .../register/offer-builder/common-info.builder.ts | 4 ++-- src/commands/register/offer-builder/types.ts | 11 ++++++++++- src/services/check-tee-offer-ready.ts | 4 ++-- src/services/spctl/types.ts | 1 - 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/commands/register/offer-builder/common-info.builder.ts b/src/commands/register/offer-builder/common-info.builder.ts index 6857c85..9e7cb5d 100644 --- a/src/commands/register/offer-builder/common-info.builder.ts +++ b/src/commands/register/offer-builder/common-info.builder.ts @@ -1,12 +1,12 @@ -import { ICommonOfferInfo } from './types'; +import { ICommonOfferInfo, TeeOfferSubtype } from './types'; const build = (): ICommonOfferInfo => { return { name: 'TEE Offer', description: 'My TEE offer', teeType: '0', + subType: TeeOfferSubtype.Default, properties: '0', - tlb: '', }; }; diff --git a/src/commands/register/offer-builder/types.ts b/src/commands/register/offer-builder/types.ts index daf21da..b55c6b5 100644 --- a/src/commands/register/offer-builder/types.ts +++ b/src/commands/register/offer-builder/types.ts @@ -17,13 +17,22 @@ export interface IHardwareInfo { optionInfo: IOptionInfo; } +export enum TeeOfferSubtype { + Default = '0', + TeeSubtypeSGX = '1', + TeeSubtypeTDX = '2', + TeeSubtypeSEV = '3', + TeeSubtypeARM = '4', +} + export interface ICommonOfferInfo { name: string; description: string; teeType: string; + subType: TeeOfferSubtype; properties: string; - tlb: string; } + export interface IOfferInfo extends ICommonOfferInfo { hardwareInfo: IHardwareInfo; } diff --git a/src/services/check-tee-offer-ready.ts b/src/services/check-tee-offer-ready.ts index 1727a93..c04c8df 100644 --- a/src/services/check-tee-offer-ready.ts +++ b/src/services/check-tee-offer-ready.ts @@ -9,8 +9,8 @@ const checkTeeOfferReady = async (params: { const { offerId, service, logger } = params; try { const offerInfo = await service.getOfferInfo(offerId, 'tee'); - - return Boolean(offerInfo?.tlb); + // TODO check TCB created with spctl + return Boolean(offerInfo); } catch (err) { logger?.debug({ err }, `Failed to get offer info ${offerId}`); return false; diff --git a/src/services/spctl/types.ts b/src/services/spctl/types.ts index d75a766..6675095 100644 --- a/src/services/spctl/types.ts +++ b/src/services/spctl/types.ts @@ -13,7 +13,6 @@ export interface IOfferInfo { description?: string; teeType: number; properties: number; - tlb: string; argsPublicKey: string; hardwareInfo: { slotInfo: {