From f0f7d2ea56615adeb9405735acae58e7a1f4b13c Mon Sep 17 00:00:00 2001 From: Viki Val Date: Mon, 16 Sep 2024 13:02:57 +0200 Subject: [PATCH] Revert "Ready for split" --- basick.yaml | 2 +- db/migrations/1726484389986-Data.js | 15 --------------- package-lock.json | 14 +++++++------- package.json | 2 +- schema.graphql | 13 +------------ src/mappings/shared/metadata.ts | 5 ++--- src/model/generated/_kind.ts | 6 ------ src/model/generated/collectionEntity.model.ts | 4 ---- src/model/generated/index.ts | 1 - src/model/generated/metadataEntity.model.ts | 7 ------- src/processable.ts | 3 +-- 11 files changed, 13 insertions(+), 59 deletions(-) delete mode 100644 db/migrations/1726484389986-Data.js delete mode 100644 src/model/generated/_kind.ts diff --git a/basick.yaml b/basick.yaml index 3a1f346..6920dfe 100644 --- a/basick.yaml +++ b/basick.yaml @@ -1,6 +1,6 @@ manifestVersion: subsquid.io/v0.1 name: basick -version: 13 +version: 12 description: 'SubSquid indexer for Base' build: deploy: diff --git a/db/migrations/1726484389986-Data.js b/db/migrations/1726484389986-Data.js deleted file mode 100644 index 4ac83a2..0000000 --- a/db/migrations/1726484389986-Data.js +++ /dev/null @@ -1,15 +0,0 @@ -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"`) - } -} diff --git a/package-lock.json b/package-lock.json index 70f7848..23702f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "@kodadot1/synck", "dependencies": { - "@kodadot1/hyperdata": "^0.0.1-rc.5", + "@kodadot1/hyperdata": "^0.0.1-rc.4", "@kodadot1/metasquid": "^0.3.0-rc.0", "@kodadot1/minipfs": "^0.4.3-rc.2", "@subsquid/archive-registry": "^3.3.2", @@ -407,9 +407,9 @@ } }, "node_modules/@kodadot1/hyperdata": { - "version": "0.0.1-rc.5", - "resolved": "https://registry.npmjs.org/@kodadot1/hyperdata/-/hyperdata-0.0.1-rc.5.tgz", - "integrity": "sha512-p6tNXWc+Obll/hpPs9wrru2csK9DBWDL6JSXYPojt3cxIerwDB7gj6ZyQfdzTN9ThM9HU6H/uheKXcXiHytdEg==" + "version": "0.0.1-rc.4", + "resolved": "https://registry.npmjs.org/@kodadot1/hyperdata/-/hyperdata-0.0.1-rc.4.tgz", + "integrity": "sha512-8vBamHWimmZ/ew1Z0iUJPDdW2fkNiPC5S1Ezklsy5BjG0AvA+7t+cwpi2gD33sMrfkzAAHcg30B3EHA98sgUzw==" }, "node_modules/@kodadot1/metasquid": { "version": "0.3.0-rc.0", @@ -4979,9 +4979,9 @@ } }, "@kodadot1/hyperdata": { - "version": "0.0.1-rc.5", - "resolved": "https://registry.npmjs.org/@kodadot1/hyperdata/-/hyperdata-0.0.1-rc.5.tgz", - "integrity": "sha512-p6tNXWc+Obll/hpPs9wrru2csK9DBWDL6JSXYPojt3cxIerwDB7gj6ZyQfdzTN9ThM9HU6H/uheKXcXiHytdEg==" + "version": "0.0.1-rc.4", + "resolved": "https://registry.npmjs.org/@kodadot1/hyperdata/-/hyperdata-0.0.1-rc.4.tgz", + "integrity": "sha512-8vBamHWimmZ/ew1Z0iUJPDdW2fkNiPC5S1Ezklsy5BjG0AvA+7t+cwpi2gD33sMrfkzAAHcg30B3EHA98sgUzw==" }, "@kodadot1/metasquid": { "version": "0.3.0-rc.0", diff --git a/package.json b/package.json index 025ae7a..70aea3c 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "update": "npx npm-check-updates --filter /subsquid/ --upgrade && npm i -f" }, "dependencies": { - "@kodadot1/hyperdata": "^0.0.1-rc.5", + "@kodadot1/hyperdata": "^0.0.1-rc.4", "@kodadot1/metasquid": "^0.3.0-rc.0", "@kodadot1/minipfs": "^0.4.3-rc.2", "@subsquid/archive-registry": "^3.3.2", diff --git a/schema.graphql b/schema.graphql index e958ac2..f2eeaf0 100644 --- a/schema.graphql +++ b/schema.graphql @@ -12,7 +12,6 @@ type CollectionEntity @entity { id: ID! image: String issuer: String! - kind: Kind max: Int media: String meta: MetadataEntity @@ -76,8 +75,7 @@ type MetadataEntity @entity { attributes: [Attribute!] animationUrl: String type: String - banner: String - kind: Kind + # banner: String } type Attribute @jsonField { @@ -137,15 +135,6 @@ enum Interaction { # LOCK } -enum Kind { - poap - pfp - genart - mixed - # audio - # video -} - # type AssetEntity @entity { # id: ID! # name: String diff --git a/src/mappings/shared/metadata.ts b/src/mappings/shared/metadata.ts index 054e6ea..3722a96 100644 --- a/src/mappings/shared/metadata.ts +++ b/src/mappings/shared/metadata.ts @@ -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 { Kind, MetadataEntity as Metadata } from '../../model/generated' +import { MetadataEntity as Metadata } from '../../model/generated' import { fetchMetadata } from '../utils/metadata' export async function handleMetadata(id: string, store: Store): Promise> { @@ -31,8 +31,7 @@ export async function handleMetadata(id: string, store: Store): Promise(Metadata, id, partial) diff --git a/src/model/generated/_kind.ts b/src/model/generated/_kind.ts deleted file mode 100644 index 67fc9d5..0000000 --- a/src/model/generated/_kind.ts +++ /dev/null @@ -1,6 +0,0 @@ -export enum Kind { - poap = "poap", - pfp = "pfp", - genart = "genart", - mixed = "mixed", -} diff --git a/src/model/generated/collectionEntity.model.ts b/src/model/generated/collectionEntity.model.ts index 5646a4f..d10aced 100644 --- a/src/model/generated/collectionEntity.model.ts +++ b/src/model/generated/collectionEntity.model.ts @@ -1,6 +1,5 @@ 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" @@ -50,9 +49,6 @@ 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 diff --git a/src/model/generated/index.ts b/src/model/generated/index.ts index a22631a..5a23a03 100644 --- a/src/model/generated/index.ts +++ b/src/model/generated/index.ts @@ -1,5 +1,4 @@ export * from "./collectionEntity.model" -export * from "./_kind" export * from "./_collectionType" export * from "./nftEntity.model" export * from "./tokenEntity.model" diff --git a/src/model/generated/metadataEntity.model.ts b/src/model/generated/metadataEntity.model.ts index 76656ff..d7af54b 100644 --- a/src/model/generated/metadataEntity.model.ts +++ b/src/model/generated/metadataEntity.model.ts @@ -1,7 +1,6 @@ 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 { @@ -29,10 +28,4 @@ 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 } diff --git a/src/processable.ts b/src/processable.ts index 420d325..526b854 100644 --- a/src/processable.ts +++ b/src/processable.ts @@ -1,4 +1,4 @@ -import { CollectionEntity, CollectionType, Kind } from "./model"; +import { CollectionEntity, CollectionType } from "./model"; // https://sphere.market/immutable/collection/0x4cd9d7819c01c85F0130Aef429ab32D0465672A2 // export enum Contracts { @@ -116,6 +116,5 @@ function toMap( supply: 0, volume: BigInt(0), version: 721, - kind: Kind.genart, }; }