Merge pull request #102 from oasisprotocol/lw/offer

Remove offers that don't fit template requirements and select smallest

Author: lukaw3d

src/nexus/generated/api.ts

@@ -66,6 +66,7 @@ import GetRuntimeRoflmarketProvidersAddressInstancesIdMutator from '../replaceNe
 import GetRuntimeRoflmarketInstancesMutator from '../replaceNetworkWithBaseURL'
 import GetLayerStatsTxVolumeMutator from '../replaceNetworkWithBaseURL'
 import GetLayerStatsActiveAccountsMutator from '../replaceNetworkWithBaseURL'
+import * as oasisRT from '@oasisprotocol/client-rt'
 export type Layer = (typeof Layer)[keyof typeof Layer]
 
 export const Layer = {
@@ -1837,7 +1838,12 @@ export type RoflMarketProviderList = List & RoflMarketProviderListAllOf
 /**
  * The offered resources by this offer.
  */
-export type RoflMarketOfferResources = { [key: string]: unknown }
+export type RoflMarketOfferResources = {
+  cpus: number /* manually changed */
+  memory: number /* manually changed */
+  storage: number /* manually changed */
+  tee: oasisRT.types.RoflmarketTeeType /* manually changed */
+}
 
 /**
  * The payment configuration for this offer.

src/pages/CreateApp/BuildStep.tsx

@@ -25,6 +25,12 @@ type AgentStepProps = {
   build?: BuildFormData
   setAppDataForm: (data: { build: BuildFormData }) => void
   selectedTemplateName?: string
+  selectedTemplateRequirements: {
+    tee: 'tdx' | 'sgx' | undefined
+    cpus: number | undefined
+    memory: number | undefined
+    storage: number | undefined
+  }
 }
 
 export const BuildStep: FC<AgentStepProps> = ({
@@ -33,6 +39,7 @@ export const BuildStep: FC<AgentStepProps> = ({
   build,
   setAppDataForm,
   selectedTemplateName,
+  selectedTemplateRequirements,
 }) => {
   const network = useNetwork()
   const providersQuery = useGetRuntimeRoflmarketProviders(network, 'sapphire')
@@ -70,9 +77,40 @@ export const BuildStep: FC<AgentStepProps> = ({
     'sapphire',
     providerValue,
   )
-  const offers = providersOffersQuery.data?.data.offers.filter(
-    offer => offer.resources.tee === oasisRT.types.RoflmarketTeeType.TDX,
-  )
+  const offers = providersOffersQuery.data?.data.offers
+    .filter(offer => {
+      if (
+        selectedTemplateRequirements.tee === 'tdx' &&
+        offer.resources.tee !== oasisRT.types.RoflmarketTeeType.TDX
+      )
+        return false
+      if (
+        selectedTemplateRequirements.tee === 'sgx' &&
+        offer.resources.tee !== oasisRT.types.RoflmarketTeeType.SGX
+      )
+        return false
+      if (selectedTemplateRequirements.cpus && offer.resources.cpus < selectedTemplateRequirements.cpus)
+        return false
+      if (selectedTemplateRequirements.memory && offer.resources.memory < selectedTemplateRequirements.memory)
+        return false
+      if (
+        selectedTemplateRequirements.storage &&
+        offer.resources.storage < selectedTemplateRequirements.storage
+      )
+        return false
+      return true
+    })
+    .sort(sortOffersByPaymentTerms)
+
+  useEffect(() => {
+    form.resetField('resources') // Clear offer selection if provider changes
+  }, [providerValue, form])
+
+  useEffect(() => {
+    if (!form.getValues('resources') && offers && offers.length > 0) {
+      form.setValue('resources', offers[0].id) // Preselect smallest offer
+    }
+  }, [offers, form])
 
   // API terms are like 1=hour, 2=month, 3=year, but only hour is mandatory
   // Testnet provider provide only hourly terms
@@ -164,7 +202,7 @@ export const BuildStep: FC<AgentStepProps> = ({
             render={({ field, fieldState }) => (
               <>
                 <RadioGroup onValueChange={field.onChange} value={field.value} className="space-y-2">
-                  {offers?.sort(sortOffersByPaymentTerms).map(offer => (
+                  {offers?.map(offer => (
                     <BuildStepOffers
                       key={offer.id}
                       offer={offer}

src/pages/CreateApp/index.tsx

@@ -67,6 +67,12 @@ export const Create: FC = () => {
           build={appData?.build}
           setAppDataForm={setAppDataForm}
           selectedTemplateName={selectedTemplate?.name}
+          selectedTemplateRequirements={{
+            tee: selectedTemplate?.yaml.rofl.tee as 'tdx' | 'sgx' | undefined,
+            cpus: selectedTemplate?.yaml.rofl.resources.cpus as number | undefined,
+            memory: selectedTemplate?.yaml.rofl.resources.memory as number | undefined,
+            storage: selectedTemplate?.yaml.rofl.resources.storage.size as number | undefined,
+          }}
         />
       )}
       {currentStep === 4 && (