Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [PLA-922] Upgrade to ArrowSquid #724

Closed
wants to merge 11 commits into from
Closed

feat: [PLA-922] Upgrade to ArrowSquid #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d61703
upgrade to arrowsquid
justraman Nov 28, 2023
009b47d
fix
justraman Nov 28, 2023
710394b
save progress
justraman Nov 28, 2023
a5904d3
new types
justraman Nov 28, 2023
b4c9f42
typegen
justraman Nov 30, 2023
21aa37d
new lock file
justraman Nov 30, 2023
96ecc83
seperate processor and entry point
justraman Nov 30, 2023
138bf64
fix
justraman Nov 30, 2023
fccd6ba
save progress
justraman Dec 9, 2023
ae6a857
new types
justraman Dec 9, 2023
bd13901
typegen
justraman Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,035 changes: 601 additions & 434 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"@subsquid/archive-registry": "^3.3.0",
"@subsquid/cli": "^2.6.1",
"@subsquid/graphql-server": "^4.3.1",
"@subsquid/ss58": "^0.1.4",
"@subsquid/substrate-processor": "^2.4.1",
"@subsquid/ss58": "^2.0.1",
"@subsquid/substrate-processor": "^7.2.1",
"@subsquid/typeorm-migration": "^1.2.2",
"@subsquid/typeorm-store": "^0.2.1",
"axios": "^1.6.2",
"bull": "^4.11.0",
"@subsquid/typeorm-store": "^1.2.4",
"axios": "^1.6.0",
"bull": "^4.11.4",
"cacheable-request": "^8.3.1",
"class-validator": "^0.14.0",
"dotenv": "^16.3.1",
Expand All @@ -45,8 +45,8 @@
"web3-validator": "^2.0.3"
},
"devDependencies": {
"@subsquid/substrate-metadata-explorer": "^3.1.0",
"@subsquid/substrate-typegen": "^2.2.1",
"@subsquid/substrate-metadata-explorer": "^3.1.1",
"@subsquid/substrate-typegen": "^8.0.1",
"@subsquid/typeorm-codegen": "^1.3.2",
"@types/bull": "^4.10.0",
"@types/lodash": "^4.14.202",
Expand Down
11 changes: 5 additions & 6 deletions src/chainState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
import { ApiPromise, WsProvider } from '@polkadot/api'
import { SubstrateBlock } from '@subsquid/substrate-processor'
import { BlockHeader } from '@subsquid/substrate-processor'
import { ChainInfo, Marketplace } from './model'
import config from './config'
import { CommonContext } from './mappings/types/contexts'

const wsProvider = new WsProvider(config.dataSource.chain)
const wsProvider = new WsProvider(config.dataSource.chain as string)
const apiPromise = ApiPromise.create({ provider: wsProvider })

export async function chainState(ctx: CommonContext, block: SubstrateBlock) {
export async function chainState(ctx: CommonContext, block: BlockHeader<{ block: { timestamp: true } }>) {
const state = new ChainInfo({ id: block.hash })
const api = await apiPromise
// const apiAt = await api.at(block.hash)

const [runtime] = await Promise.all<any>([api.rpc.state.getRuntimeVersion(block.hash)])

state.genesisHash = config.genesisHash
state.transactionVersion = runtime.transactionVersion
state.specVersion = Number(block.specId.split('@')[1])
state.specVersion = Number(block.specVersion)
state.blockNumber = block.height
state.blockHash = block.hash
state.existentialDeposit = BigInt(api.consts.balances.existentialDeposit.toString())
state.timestamp = new Date(block.timestamp)
state.timestamp = new Date(block.timestamp ?? 0)
state.marketplace = new Marketplace({
protocolFee: 25_000000,
listingActiveDelay: Number(api.consts.marketplace.listingActiveDelay.toString()),
Expand Down
2 changes: 1 addition & 1 deletion src/common/tools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function isValidAddress(address: any) {
}
}

export function encodeId(id: Uint8Array) {
export function encodeId(id: Uint8Array | string) {
return ss58.codec(config.prefix).encode(id)
}

Expand Down
12 changes: 6 additions & 6 deletions src/createEnjToken.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { SubstrateBlock } from '@subsquid/substrate-processor'
import { BlockHeader } from '@subsquid/substrate-processor'
import { CommonContext } from './mappings/types/contexts'
import { getOrCreateAccount } from './mappings/util/entities'
import { Collection, CollectionFlags, CollectionSocials, CollectionStats, MintPolicy, Token, TransferPolicy } from './model'
import { isMainnet } from './common/tools'

export async function createEnjToken(ctx: CommonContext, block: SubstrateBlock) {
export async function createEnjToken(ctx: CommonContext, block: BlockHeader<{ block: { timestamp: true } }>) {
const enj = await ctx.store.findOneBy(Token, { id: '0-0' })

if (!enj) {
Expand Down Expand Up @@ -48,10 +48,10 @@ export async function createEnjToken(ctx: CommonContext, block: SubstrateBlock)
attributePolicy: null,
attributeCount: 0,
totalDeposit: 0n,
createdAt: new Date(block.timestamp),
createdAt: new Date(block.timestamp ?? 0),
})

await ctx.store.insert(Collection, collection as any)
await ctx.store.insert(collection)

const token = new Token({
id: `0-0`,
Expand All @@ -66,9 +66,9 @@ export async function createEnjToken(ctx: CommonContext, block: SubstrateBlock)
attributeCount: 0,
collection,
nonFungible: false,
createdAt: new Date(block.timestamp),
createdAt: new Date(block.timestamp ?? 0),
})

await ctx.store.insert(Token, token as any)
await ctx.store.insert(token)
}
}
Loading
Loading