Skip to content

Commit 6d369e2

Browse files
authored
Merge pull request #66 from kodadot/revert-65-feat/split
Need to release v12 first
2 parents 8d53eb9 + f0f7d2e commit 6d369e2

11 files changed

+13
-59
lines changed

basick.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
manifestVersion: subsquid.io/v0.1
22
name: basick
3-
version: 13
3+
version: 12
44
description: 'SubSquid indexer for Base'
55
build:
66
deploy:

db/migrations/1726484389986-Data.js

-15
This file was deleted.

package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"update": "npx npm-check-updates --filter /subsquid/ --upgrade && npm i -f"
77
},
88
"dependencies": {
9-
"@kodadot1/hyperdata": "^0.0.1-rc.5",
9+
"@kodadot1/hyperdata": "^0.0.1-rc.4",
1010
"@kodadot1/metasquid": "^0.3.0-rc.0",
1111
"@kodadot1/minipfs": "^0.4.3-rc.2",
1212
"@subsquid/archive-registry": "^3.3.2",

schema.graphql

+1-12
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ type CollectionEntity @entity {
1212
id: ID!
1313
image: String
1414
issuer: String!
15-
kind: Kind
1615
max: Int
1716
media: String
1817
meta: MetadataEntity
@@ -76,8 +75,7 @@ type MetadataEntity @entity {
7675
attributes: [Attribute!]
7776
animationUrl: String
7877
type: String
79-
banner: String
80-
kind: Kind
78+
# banner: String
8179
}
8280

8381
type Attribute @jsonField {
@@ -137,15 +135,6 @@ enum Interaction {
137135
# LOCK
138136
}
139137

140-
enum Kind {
141-
poap
142-
pfp
143-
genart
144-
mixed
145-
# audio
146-
# video
147-
}
148-
149138
# type AssetEntity @entity {
150139
# id: ID!
151140
# name: String

src/mappings/shared/metadata.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { Content } from '@kodadot1/hyperdata'
55
import { logger } from '@kodadot1/metasquid/logger'
66
import { Store } from '@subsquid/typeorm-store'
77
// import md5 from 'md5'
8-
import { Kind, MetadataEntity as Metadata } from '../../model/generated'
8+
import { MetadataEntity as Metadata } from '../../model/generated'
99
import { fetchMetadata } from '../utils/metadata'
1010

1111
export async function handleMetadata(id: string, store: Store): Promise<Optional<Metadata>> {
@@ -31,8 +31,7 @@ export async function handleMetadata(id: string, store: Store): Promise<Optional
3131
attributes: [], // metadata.attributes?.map(attributeFrom) || [],
3232
name: metadata.name || '',
3333
type: metadata.type || '',
34-
banner: metadata.banner,
35-
kind: metadata.kind as Kind || Kind.genart,
34+
// banner: metadata.banner || '',
3635
}
3736

3837
const final = create<Metadata>(Metadata, id, partial)

src/model/generated/_kind.ts

-6
This file was deleted.

src/model/generated/collectionEntity.model.ts

-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
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"
22
import {CollectionEvent} from "./collectionEvent.model"
3-
import {Kind} from "./_kind"
43
import {MetadataEntity} from "./metadataEntity.model"
54
import {NFTEntity} from "./nftEntity.model"
65
import {CollectionType} from "./_collectionType"
@@ -50,9 +49,6 @@ export class CollectionEntity {
5049
@StringColumn_({nullable: false})
5150
issuer!: string
5251

53-
@Column_("varchar", {length: 6, nullable: true})
54-
kind!: Kind | undefined | null
55-
5652
@IntColumn_({nullable: true})
5753
max!: number | undefined | null
5854

src/model/generated/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export * from "./collectionEntity.model"
2-
export * from "./_kind"
32
export * from "./_collectionType"
43
export * from "./nftEntity.model"
54
export * from "./tokenEntity.model"

src/model/generated/metadataEntity.model.ts

-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, StringColumn as StringColumn_} from "@subsquid/typeorm-store"
22
import * as marshal from "./marshal"
33
import {Attribute} from "./_attribute"
4-
import {Kind} from "./_kind"
54

65
@Entity_()
76
export class MetadataEntity {
@@ -29,10 +28,4 @@ export class MetadataEntity {
2928

3029
@StringColumn_({nullable: true})
3130
type!: string | undefined | null
32-
33-
@StringColumn_({nullable: true})
34-
banner!: string | undefined | null
35-
36-
@Column_("varchar", {length: 6, nullable: true})
37-
kind!: Kind | undefined | null
3831
}

src/processable.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CollectionEntity, CollectionType, Kind } from "./model";
1+
import { CollectionEntity, CollectionType } from "./model";
22

33
// https://sphere.market/immutable/collection/0x4cd9d7819c01c85F0130Aef429ab32D0465672A2
44
// export enum Contracts {
@@ -116,6 +116,5 @@ function toMap(
116116
supply: 0,
117117
volume: BigInt(0),
118118
version: 721,
119-
kind: Kind.genart,
120119
};
121120
}

0 commit comments

Comments
 (0)