chore(portfolio): updated TokenDiscovery

Emurgo · May 6, 2024 · aa06667 · aa06667
1 parent 3e9df52
commit aa06667
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 80 deletions.
diff --git a/packages/portfolio/src/adapters/token-discovery.mocks.ts b/packages/portfolio/src/adapters/token-discovery.mocks.ts
@@ -6,89 +6,55 @@ import {tokenInfoMocks} from './token-info.mocks'
 
 const primaryETH: Portfolio.Token.Discovery = {
   id: '.',
-  counters: {
-    items: 1,
-    totalItems: 1,
-    supply: 45_000_000_000_000n,
-  },
+  supply: 45_000_000_000_000n,
   originalMetadata: {
     filteredMintMetadatum: null,
     referenceDatum: null,
     tokenRegistry: null,
   },
-  properties: {},
   source: {
     decimals: Portfolio.Token.Source.Metadata,
     image: Portfolio.Token.Source.Metadata,
     name: Portfolio.Token.Source.Metadata,
     symbol: Portfolio.Token.Source.Metadata,
     ticker: Portfolio.Token.Source.Metadata,
+    description: Portfolio.Token.Source.Metadata,
   },
 }
 
 const nftCryptoKitty: Portfolio.Token.Discovery = {
   id: tokenInfoMocks.nftCryptoKitty.id,
-  counters: {
-    items: 1,
-    totalItems: 1,
-    supply: 0n,
-  },
+  supply: 0n,
   originalMetadata: {
     filteredMintMetadatum: null,
     referenceDatum: null,
     tokenRegistry: null,
   },
-  properties: {
-    eyes: {
-      detectedType: Portfolio.Token.PropertyType.String,
-      rarity: 0.9,
-      value: 'green',
-    },
-    hair: {
-      detectedType: Portfolio.Token.PropertyType.String,
-      rarity: 0.001,
-      value: 'black',
-    },
-  },
   source: {
     decimals: Portfolio.Token.Source.Metadata,
     image: Portfolio.Token.Source.Metadata,
     name: Portfolio.Token.Source.Metadata,
     symbol: Portfolio.Token.Source.Metadata,
     ticker: Portfolio.Token.Source.Metadata,
+    description: Portfolio.Token.Source.Metadata,
   },
 }
 
 const rnftWhatever: Portfolio.Token.Discovery = {
   id: tokenInfoMocks.rnftWhatever.id,
-  counters: {
-    items: 1,
-    totalItems: 1,
-    supply: 0n,
-  },
+  supply: 0n,
   originalMetadata: {
     filteredMintMetadatum: null,
     referenceDatum: null,
     tokenRegistry: null,
   },
-  properties: {
-    head: {
-      detectedType: Portfolio.Token.PropertyType.String,
-      rarity: 0.9,
-      value: 'alien',
-    },
-    neck: {
-      detectedType: Portfolio.Token.PropertyType.String,
-      rarity: 0.001,
-      value: true,
-    },
-  },
   source: {
     decimals: Portfolio.Token.Source.Metadata,
     image: Portfolio.Token.Source.Metadata,
     name: Portfolio.Token.Source.Metadata,
     symbol: Portfolio.Token.Source.Metadata,
     ticker: Portfolio.Token.Source.Metadata,
+    description: Portfolio.Token.Source.Metadata,
   },
 }
 

diff --git a/packages/portfolio/src/validators/token-discovery.ts b/packages/portfolio/src/validators/token-discovery.ts
@@ -3,7 +3,6 @@ import {z} from 'zod'
 
 import {responseRecordWithCacheSchemaMaker} from './response-record-with-cache-schema-maker'
 import {TokenSourceSchema} from './token-source'
-import {TokenPropertyTypeSchema} from './token-property-type'
 import {TokenIdSchema} from './token-id'
 import {cacheRecordSchemaMaker} from '@yoroi/common'
 
@@ -13,6 +12,7 @@ const DiscoverySourceSchema = z.object({
   ticker: TokenSourceSchema,
   symbol: TokenSourceSchema,
   image: TokenSourceSchema,
+  description: TokenSourceSchema,
 })
 
 const DiscoveryOriginalMetadataSchema = z.object({
@@ -21,29 +21,11 @@ const DiscoveryOriginalMetadataSchema = z.object({
   tokenRegistry: z.record(z.unknown()).nullable(),
 })
 
-const DiscoveryCountersSchema = z.object({
-  supply: z.bigint(),
-  items: z.number(),
-  totalItems: z.number(),
-})
-
-const DiscoveryPropertiesSchema = z.record(
-  z.union([
-    z.object({
-      rarity: z.number(),
-      detectedType: TokenPropertyTypeSchema,
-      value: z.unknown(),
-    }),
-    z.object({}),
-  ]),
-)
-
 export const TokenDiscoverySchema = z.object({
   id: TokenIdSchema,
   source: DiscoverySourceSchema,
   originalMetadata: DiscoveryOriginalMetadataSchema,
-  counters: DiscoveryCountersSchema,
-  properties: DiscoveryPropertiesSchema,
+  supply: z.bigint(),
 })
 
 export const isTokenDiscovery = (data: unknown): data is Portfolio.Token.Info =>

diff --git a/packages/types/src/portfolio/discovery.ts b/packages/types/src/portfolio/discovery.ts
@@ -1,8 +1,4 @@
-import {
-  PortfolioTokenId,
-  PortfolioTokenPropertyType,
-  PortfolioTokenSource,
-} from './token'
+import {PortfolioTokenId, PortfolioTokenSource} from './token'
 
 export type PortfolioTokenDiscovery = {
   id: PortfolioTokenId
@@ -13,6 +9,7 @@ export type PortfolioTokenDiscovery = {
     ticker: PortfolioTokenSource
     symbol: PortfolioTokenSource
     image: PortfolioTokenSource
+    description: PortfolioTokenSource
   }
 
   originalMetadata: {
@@ -21,19 +18,5 @@ export type PortfolioTokenDiscovery = {
     tokenRegistry: null | Record<string, unknown>
   }
 
-  counters: {
-    supply: bigint
-    items: number
-    totalItems: number
-  }
-
-  properties:
-    | {
-        [property: string]: {
-          rarity: number
-          detectedType: PortfolioTokenPropertyType
-          value: any
-        }
-      }
-    | {}
+  supply: bigint
 }