Merge pull request #67 from kodadot/revert-66-revert-65-feat/split

Revert "Need to release v12 first"

Author: vikiival

basick.yaml

@@ -1,6 +1,6 @@
 manifestVersion: subsquid.io/v0.1
 name: basick
-version: 12
+version: 13
 description: 'SubSquid indexer for Base'
 build: 
 deploy:

db/migrations/1726484389986-Data.js

@@ -0,0 +1,15 @@
+module.exports = class Data1726484389986 {
+    name = 'Data1726484389986'
+
+    async up(db) {
+        await db.query(`ALTER TABLE "metadata_entity" ADD "banner" text`)
+        await db.query(`ALTER TABLE "metadata_entity" ADD "kind" character varying(6)`)
+        await db.query(`ALTER TABLE "collection_entity" ADD "kind" character varying(6)`)
+    }
+
+    async down(db) {
+        await db.query(`ALTER TABLE "metadata_entity" DROP COLUMN "banner"`)
+        await db.query(`ALTER TABLE "metadata_entity" DROP COLUMN "kind"`)
+        await db.query(`ALTER TABLE "collection_entity" DROP COLUMN "kind"`)
+    }
+}

package-lock.json

@@ -6,7 +6,7 @@
     "update": "npx npm-check-updates --filter /subsquid/ --upgrade && npm i -f"
   },
   "dependencies": {
-    "@kodadot1/hyperdata": "^0.0.1-rc.4",
+    "@kodadot1/hyperdata": "^0.0.1-rc.5",
     "@kodadot1/metasquid": "^0.3.0-rc.0",
     "@kodadot1/minipfs": "^0.4.3-rc.2",
     "@subsquid/archive-registry": "^3.3.2",

package.json

@@ -12,6 +12,7 @@ type CollectionEntity @entity {
   id: ID!
   image: String
   issuer: String!
+  kind: Kind
   max: Int
   media: String
   meta: MetadataEntity
@@ -75,7 +76,8 @@ type MetadataEntity @entity {
   attributes: [Attribute!]
   animationUrl: String
   type: String
-  # banner: String
+  banner: String
+  kind: Kind
 }
 
 type Attribute @jsonField {
@@ -135,6 +137,15 @@ enum Interaction {
   # LOCK
 }
 
+enum Kind {
+  poap
+  pfp
+  genart
+  mixed
+  # audio
+  # video
+}
+
 # type AssetEntity @entity {
 #   id: ID!
 #   name: String

schema.graphql

@@ -5,7 +5,7 @@ import type { Content } from '@kodadot1/hyperdata'
 import { logger } from '@kodadot1/metasquid/logger'
 import { Store } from '@subsquid/typeorm-store'
 // import md5 from 'md5'
-import { MetadataEntity as Metadata } from '../../model/generated'
+import { Kind, MetadataEntity as Metadata } from '../../model/generated'
 import { fetchMetadata } from '../utils/metadata'
 
 export async function handleMetadata(id: string, store: Store): Promise<Optional<Metadata>> {
@@ -31,7 +31,8 @@ export async function handleMetadata(id: string, store: Store): Promise<Optional
     attributes: [], // metadata.attributes?.map(attributeFrom) || [],
     name: metadata.name || '',
     type: metadata.type || '',
-    // banner: metadata.banner || '',
+    banner: metadata.banner,
+    kind: metadata.kind as Kind || Kind.genart,
   }
 
   const final = create<Metadata>(Metadata, id, partial)

src/mappings/shared/metadata.ts

@@ -0,0 +1,6 @@
+export enum Kind {
+    poap = "poap",
+    pfp = "pfp",
+    genart = "genart",
+    mixed = "mixed",
+}

src/model/generated/_kind.ts

@@ -1,5 +1,6 @@
 import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, StringColumn as StringColumn_, BigIntColumn as BigIntColumn_, Index as Index_, DateTimeColumn as DateTimeColumn_, IntColumn as IntColumn_, OneToMany as OneToMany_, ManyToOne as ManyToOne_} from "@subsquid/typeorm-store"
 import {CollectionEvent} from "./collectionEvent.model"
+import {Kind} from "./_kind"
 import {MetadataEntity} from "./metadataEntity.model"
 import {NFTEntity} from "./nftEntity.model"
 import {CollectionType} from "./_collectionType"
@@ -49,6 +50,9 @@ export class CollectionEntity {
     @StringColumn_({nullable: false})
     issuer!: string
 
+    @Column_("varchar", {length: 6, nullable: true})
+    kind!: Kind | undefined | null
+
     @IntColumn_({nullable: true})
     max!: number | undefined | null
 

src/model/generated/collectionEntity.model.ts

@@ -1,4 +1,5 @@
 export * from "./collectionEntity.model"
+export * from "./_kind"
 export * from "./_collectionType"
 export * from "./nftEntity.model"
 export * from "./tokenEntity.model"

src/model/generated/index.ts

@@ -1,6 +1,7 @@
 import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, StringColumn as StringColumn_} from "@subsquid/typeorm-store"
 import * as marshal from "./marshal"
 import {Attribute} from "./_attribute"
+import {Kind} from "./_kind"
 
 @Entity_()
 export class MetadataEntity {
@@ -28,4 +29,10 @@ export class MetadataEntity {
 
     @StringColumn_({nullable: true})
     type!: string | undefined | null
+
+    @StringColumn_({nullable: true})
+    banner!: string | undefined | null
+
+    @Column_("varchar", {length: 6, nullable: true})
+    kind!: Kind | undefined | null
 }

src/model/generated/metadataEntity.model.ts

@@ -1,4 +1,4 @@
-import { CollectionEntity, CollectionType } from "./model";
+import { CollectionEntity, CollectionType, Kind } from "./model";
 
 // https://sphere.market/immutable/collection/0x4cd9d7819c01c85F0130Aef429ab32D0465672A2
 // export enum Contracts {
@@ -116,5 +116,6 @@ function toMap(
     supply: 0,
     volume: BigInt(0),
     version: 721,
+    kind: Kind.genart,
   };
 }