@subsquid/solana-stream 0.2.0-2-0.a5e4b7 → 0.2.0

package/lib/schema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"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"}

package/src/objects/index.ts

@@ -1,3 +0,0 @@
-export * from './types'
-export {setUpRelations} from './relations'
-export {blockFromPartial} from './items'

package/src/objects/items.ts

@@ -1,296 +0,0 @@
-import {Base58, Bytes} from '@subsquid/util-internal'
-import {getInstructionDescriptor} from '../instruction'
-import type * as base from './types'
-
-// TODO: is it needed?
-export {
-    AddressTableLookup,
-    BalanceFields,
-    BalanceFieldSelection,
-    BlockHeaderFields,
-    BlockHeaderFieldSelection,
-    Discriminator,
-    InstructionFields,
-    InstructionFieldSelection,
-    LogMessageFields,
-    LogMessageFieldSelection,
-    PostTokenBalanceFields,
-    PrePostTokenBalanceFields,
-    PreTokenBalanceFields,
-    RewardFields,
-    RewardFieldSelection,
-    TokenBalanceFields,
-    TokenBalanceFieldSelection,
-    TransactionFields,
-    TransactionFieldSelection,
-} from '@subsquid/portal-client/lib/query/solana'
-
-export function blockFromPartial<F extends base.ReqiredFieldSelection>(src: base.BlockPartial<F>): base.Block<F> {
-    // FIXME: why types are broken
-    return Object.assign(new Block(), {
-        header: Object.assign(new BlockHeader(), src.header),
-        transactions: src.transactions?.map((i) => Object.assign(new Transaction(), i)) || [],
-        instructions: src.instructions?.map((i) => Object.assign(new Instruction(), i)) || [],
-        logs: src.logs?.map((i) => Object.assign(new LogMessage(), i)) || [],
-        balances: src.balances?.map((i) => Object.assign(new Balance(), i)) || [],
-        tokenBalances: src.tokenBalances?.map((i) => Object.assign(new TokenBalance(), i)) || [],
-        rewards: src.rewards?.map((i) => Object.assign(new Reward(), i)) || [],
-    }) as unknown as base.Block<F>
-}
-
-export interface Block extends base.Block {}
-export class Block {}
-
-export interface BlockHeader extends base.BlockHeader {}
-export class BlockHeader {}
-
-export interface Transaction extends base.Transaction {}
-export class Transaction {
-    #block!: Block
-    #instructions?: Instruction[]
-    #balances?: Balance[]
-    #tokenBalances?: TokenBalance[]
-
-    get block(): Block {
-        return this.#block
-    }
-
-    set block(value: Block) {
-        this.#block = value
-    }
-
-    get instructions(): Instruction[] {
-        if (this.#instructions == null) {
-            this.#instructions = []
-        }
-        return this.#instructions
-    }
-
-    set instructions(value: Instruction[]) {
-        this.#instructions = value
-    }
-
-    get balances(): Balance[] {
-        if (this.#balances == null) {
-            this.#balances = []
-        }
-        return this.#balances
-    }
-
-    set balances(value: Balance[]) {
-        this.#balances = value
-    }
-
-    get tokenBalances(): TokenBalance[] {
-        if (this.#tokenBalances == null) {
-            this.#tokenBalances = []
-        }
-        return this.#tokenBalances
-    }
-
-    set tokenBalances(value: TokenBalance[]) {
-        this.#tokenBalances = value
-    }
-}
-
-export interface Instruction extends base.Instruction {}
-export class Instruction {
-    #block!: Block
-    #transaction?: Transaction
-    #inner?: Instruction[]
-    #parent?: Instruction
-    #logs?: LogMessage[]
-    #d1?: string
-    #d2?: string
-    #d4?: string
-    #d8?: string
-
-    get block(): Block {
-        return this.#block
-    }
-
-    set block(value: Block) {
-        this.#block = value
-    }
-
-    get transaction(): Transaction | undefined {
-        return this.#transaction
-    }
-
-    set transaction(value: Transaction | undefined) {
-        this.#transaction = value
-    }
-
-    getTransaction(): Transaction {
-        if (this.#transaction == null) {
-            throw new Error(`Transaction is not set on instruction`)
-        } else {
-            return this.#transaction
-        }
-    }
-
-    get inner(): Instruction[] {
-        if (this.#inner == null) {
-            this.#inner = []
-        }
-        return this.#inner
-    }
-
-    set inner(instructions: Instruction[]) {
-        this.#inner = instructions
-    }
-
-    get parent(): Instruction | undefined {
-        return this.#parent
-    }
-
-    set parent(value: Instruction | undefined) {
-        this.#parent = value
-    }
-
-    get logs(): LogMessage[] {
-        if (this.#logs == null) {
-            this.#logs = []
-        }
-        return this.#logs
-    }
-
-    set logs(value: LogMessage[]) {
-        this.#logs = value
-    }
-
-    get d1(): Bytes {
-        return this.#d1 ?? (this.#d1 = this.d8.slice(0, 4))
-    }
-
-    get d2(): Bytes {
-        return this.#d2 ?? (this.#d2 = this.d8.slice(0, 6))
-    }
-
-    get d4(): Bytes {
-        return this.#d4 ?? (this.#d4 = this.d8.slice(0, 10))
-    }
-
-    get d8(): Bytes {
-        if (this.#d8) {
-            return this.#d8
-        } else {
-            if (this.data == null) {
-                throw new Error(`.data field is not available`)
-            }
-            return (this.#d8 = getInstructionDescriptor(this as {data: Base58}))
-        }
-    }
-}
-
-export interface LogMessage extends base.LogMessage {}
-export class LogMessage {
-    #block!: Block
-    #transaction?: Transaction
-    #instruction?: Instruction
-
-    get block(): Block {
-        return this.#block
-    }
-
-    set block(value: Block) {
-        this.#block = value
-    }
-
-    get transaction(): Transaction | undefined {
-        return this.#transaction
-    }
-
-    set transaction(value: Transaction | undefined) {
-        this.#transaction = value
-    }
-
-    getTransaction(): Transaction {
-        if (this.#transaction == null) {
-            throw new Error(`Transaction is not set on log message`)
-        } else {
-            return this.#transaction
-        }
-    }
-
-    get instruction(): Instruction | undefined {
-        return this.#instruction
-    }
-
-    set instruction(value: Instruction | undefined) {
-        this.#instruction = value
-    }
-
-    getInstruction(): Instruction {
-        if (this.#instruction == null) {
-            throw new Error(`Instruction is not set on log message`)
-        } else {
-            return this.#instruction
-        }
-    }
-}
-
-export interface Balance extends base.Balance {}
-export class Balance {
-    #block!: Block
-    #transaction?: Transaction
-
-    get block(): Block {
-        return this.#block
-    }
-
-    set block(value: Block) {
-        this.#block = value
-    }
-
-    get transaction(): Transaction | undefined {
-        return this.#transaction
-    }
-
-    set transaction(value: Transaction | undefined) {
-        this.#transaction = value
-    }
-
-    getTransaction(): Transaction {
-        if (this.#transaction == null) {
-            throw new Error(`Transaction is not set on balance change record`)
-        } else {
-            return this.#transaction
-        }
-    }
-}
-
-type A = base.TokenBalance
-
-export interface TokenBalance extends base.TokenBalance {}
-export class TokenBalance {
-    #block!: Block
-    #transaction?: Transaction
-
-    get block(): Block {
-        return this.#block
-    }
-
-    set block(value: Block) {
-        this.#block = value
-    }
-
-    get transaction(): Transaction | undefined {
-        return this.#transaction
-    }
-
-    set transaction(value: Transaction | undefined) {
-        this.#transaction = value
-    }
-
-    getTransaction(): Transaction {
-        if (this.#transaction == null) {
-            throw new Error(`Transaction is not set on balance change record`)
-        } else {
-            return this.#transaction
-        }
-    }
-}
-
-export interface Reward extends base.Reward {}
-export class Reward {}

package/src/objects/relations.ts

@@ -1,90 +0,0 @@
-import {bisect, maybeLast} from '@subsquid/util-internal'
-import {Block, ReqiredFieldSelection, Transaction} from './types'
-
-export function setUpRelations(block: Block<ReqiredFieldSelection>): void {
-    block.transactions.sort((a, b) => a.transactionIndex - b.transactionIndex)
-    block.instructions.sort(instructionCompare)
-    block.logs.sort((a, b) => a.transactionIndex - b.transactionIndex || a.logIndex - b.logIndex)
-
-    let txs: (Transaction<ReqiredFieldSelection> | undefined)[] = new Array(
-        (maybeLast(block.transactions)?.transactionIndex ?? -1) + 1
-    )
-    for (let tx of block.transactions) {
-        txs[tx.transactionIndex] = tx
-    }
-
-    for (let i = 0; i < block.instructions.length; i++) {
-        let ins = block.instructions[i]
-        let tx = txs[ins.transactionIndex]
-        if (tx) {
-            ins.transaction = tx
-            tx.instructions.push(ins)
-        }
-        for (let j = i + 1; j < block.instructions.length; j++) {
-            let next = block.instructions[j]
-            if (isInner(ins, next)) {
-                ins.inner.push(next)
-                if (ins.instructionAddress.length + 1 == next.instructionAddress.length) {
-                    next.parent = ins
-                }
-            } else {
-                break
-            }
-        }
-    }
-
-    for (let log of block.logs) {
-        log.transaction = txs[log.transactionIndex]
-        for (let i = bisect(block.instructions, log, instructionCompare); i < block.instructions.length; i++) {
-            let ins = block.instructions[i]
-            if (isInner(ins, log)) {
-                ins.logs.push(log)
-                if (ins.instructionAddress.length == log.instructionAddress.length) {
-                    log.instruction = ins
-                }
-            }
-        }
-    }
-
-    for (let balance of block.balances) {
-        let transaction = txs[balance.transactionIndex]
-        if (transaction) {
-            balance.transaction = transaction
-            transaction.balances.push(balance)
-        }
-    }
-
-    for (let tokenBalance of block.tokenBalances) {
-        let transaction = txs[tokenBalance.transactionIndex]
-        if (transaction) {
-            tokenBalance.transaction = transaction
-            transaction.tokenBalances.push(tokenBalance)
-        }
-    }
-}
-
-interface InstructionAddress {
-    transactionIndex: number
-    instructionAddress: number[]
-}
-
-function isInner(parent: InstructionAddress, inner: InstructionAddress): boolean {
-    if (parent.transactionIndex != inner.transactionIndex) return false
-    if (parent.instructionAddress.length > inner.instructionAddress.length) return false
-    for (let i = 0; i < parent.instructionAddress.length; i++) {
-        if (parent.instructionAddress[i] != inner.instructionAddress[i]) return false
-    }
-    return true
-}
-
-function instructionCompare(a: InstructionAddress, b: InstructionAddress): number {
-    return a.transactionIndex - b.transactionIndex || addressCompare(a.instructionAddress, b.instructionAddress)
-}
-
-function addressCompare(a: number[], b: number[]): number {
-    for (let i = 0; i < Math.min(a.length, b.length); i++) {
-        let order = a[i] - b[i]
-        if (order) return order
-    }
-    return a.length - b.length
-}

package/src/objects/types.ts

@@ -1,88 +0,0 @@
-import type {Solana} from '@subsquid/portal-client'
-import type {Bytes, Simplify, Trues} from '@subsquid/util-internal'
-
-export type FieldSelection = Solana.FieldSelection
-
-export type BlockPartial<F extends FieldSelection = Trues<FieldSelection>> = Solana.BlockData<F>
-
-export type Block<F extends FieldSelection = Trues<FieldSelection>> = {
-    header: BlockHeader<F>
-    transactions: Transaction<F>[]
-    instructions: Instruction<F>[]
-    logs: LogMessage<F>[]
-    balances: Balance<F>[]
-    tokenBalances: TokenBalance<F>[]
-    rewards: Reward<F>[]
-}
-export type BlockHeader<F extends FieldSelection = Trues<FieldSelection>> = Solana.BlockHeader<F['block'] & {}>
-export type Transaction<F extends FieldSelection = Trues<FieldSelection>> = Simplify<
-    Solana.Transaction<F['transaction'] & {}> & {
-        block: Block<F>
-        instructions: Instruction<F>[]
-        logs: LogMessage<F>[]
-        balances: Balance<F>[]
-        tokenBalances: TokenBalance<F>[]
-    }
->
-export type Instruction<F extends FieldSelection = Trues<FieldSelection>> = Simplify<
-    Solana.Instruction<F['instruction'] & {}> &
-        ((F['instruction'] & {})['data'] extends true ? {d1: Bytes; d2: Bytes; d4: Bytes; d8: Bytes} : {}) & {
-            block: Block<F>
-            transaction?: Transaction<F>
-            parent?: Instruction<F>
-            inner: Instruction<F>[]
-            logs: LogMessage<F>[]
-        }
->
-export type LogMessage<F extends FieldSelection = Trues<FieldSelection>> = Simplify<
-    Solana.LogMessage<F['log'] & {}> & {
-        block: Block<F>
-        transaction?: Transaction<F>
-        instruction?: Instruction<F>
-    }
->
-export type Balance<F extends FieldSelection = Trues<FieldSelection>> = Simplify<
-    Solana.Balance<F['balance'] & {}> & {
-        block: Block<F>
-        transaction?: Transaction<F>
-    }
->
-export type TokenBalance<F extends FieldSelection = Trues<FieldSelection>> = Simplify<
-    Solana.TokenBalance<F['tokenBalance'] & {}> & {
-        block: Block<F>
-        transaction?: Transaction<F>
-    }
->
-export type Reward<F extends FieldSelection = Trues<FieldSelection>> = Solana.Reward<
-    F['reward'] & {
-        block: Block<F>
-    }
->
-
-export const REQUIRED_FIELDS = {
-    block: {
-        number: true,
-        hash: true,
-        parentHash: true,
-    },
-    transaction: {
-        transactionIndex: true,
-    },
-    log: {
-        transactionIndex: true,
-        instructionAddress: true,
-        logIndex: true,
-    },
-    instruction: {
-        transactionIndex: true,
-        instructionAddress: true,
-    },
-    balance: {
-        transactionIndex: true,
-    },
-    tokenBalance: {
-        transactionIndex: true,
-    },
-} as const satisfies Solana.FieldSelection
-
-export type ReqiredFieldSelection = typeof REQUIRED_FIELDS

package/src/query.ts

@@ -1,149 +0,0 @@
-import type {Solana} from '@subsquid/portal-client'
-import {Bytes, mergeSelection, Simplify, Trues, type MergeSelection} from '@subsquid/util-internal'
-import {applyRangeBound, mergeRangeRequests, type Range, type RangeRequest} from '@subsquid/util-internal-range'
-
-// TODO: is it needed?
-export {
-    DataRequest,
-    TransactionRequest,
-    InstructionRequest,
-    LogRequest,
-    BalanceRequest,
-    TokenBalanceRequest,
-    RewardRequest,
-} from '@subsquid/portal-client/lib/query/solana'
-
-export type RequestOptions<R> = {range?: Range; request: R}
-export type LogRequestOptions = RequestOptions<Solana.LogRequest>
-export type TransactionRequestOptions = RequestOptions<Solana.TransactionRequest>
-export type InstructionRequestOptions = RequestOptions<Solana.InstructionRequest>
-export type TokenBalanceRequestOptions = RequestOptions<Solana.TokenBalanceRequest>
-export type BalanceRequestOptions = RequestOptions<Solana.BalanceRequest>
-export type RewardRequestOptions = RequestOptions<Solana.RewardRequest>
-
-export type SolanaQueryOptions<F extends Solana.FieldSelection = Solana.FieldSelection> = {
-    fields: F
-    requests: RangeRequest<Solana.DataRequest>[]
-}
-
-export class SolanaQueryBuilder<F extends Solana.FieldSelection = {block: {number: true; hash: true}}> {
-    private range: Range = {from: 0}
-    private requests: RangeRequest<Solana.DataRequest>[] = []
-    private fields: F = {
-        block: {number: true, hash: true},
-    } as F
-
-    private addRequest(type: keyof Solana.DataRequest, options: RequestOptions<any>): this {
-        this.requests.push({
-            range: options.range ?? {from: 0},
-            request: {
-                [type]: [mapRequest(options)],
-            },
-        })
-        return this
-    }
-
-    includeAllBlocks(range?: Range): this {
-        this.requests.push({range: range ?? {from: 0}, request: {includeAllBlocks: true}})
-        return this
-    }
-
-    addLog(options: LogRequestOptions): this {
-        return this.addRequest('logs', options)
-    }
-
-    addTransaction(options: TransactionRequestOptions): this {
-        return this.addRequest('transactions', options)
-    }
-
-    addReward(options: RewardRequestOptions): this {
-        return this.addRequest('rewards', options)
-    }
-
-    addBalance(options: BalanceRequestOptions): this {
-        return this.addRequest('balances', options)
-    }
-
-    addTokenBalance(options: TokenBalanceRequestOptions): this {
-        return this.addRequest('tokenBalances', options)
-    }
-
-    addInstruction(options: InstructionRequestOptions): this {
-        return this.addRequest('instructions', options)
-    }
-
-    setRange(range: Range): this {
-        this.range = range
-        return this
-    }
-
-    setFields<F extends Solana.FieldSelection>(fields: F): SolanaQueryBuilder<F> {
-        this.fields = fields as any
-        return this as any
-    }
-
-    build(): SolanaQueryOptions<F> {
-        let requests = mergeRangeRequests(this.requests, mergeDataRequests)
-        return {
-            fields: this.fields,
-            requests: applyRangeBound(requests, this.range),
-        }
-    }
-}
-
-export function mergeDataRequests(...requests: Solana.DataRequest[]): Solana.DataRequest {
-    let res: Solana.DataRequest = {}
-    for (let req of requests) {
-        res.transactions = concatRequestLists(res.transactions, req.transactions)
-        res.logs = concatRequestLists(res.logs, req.logs)
-        res.balances = concatRequestLists(res.balances, req.balances)
-        res.tokenBalances = concatRequestLists(res.tokenBalances, req.tokenBalances)
-        res.rewards = concatRequestLists(res.rewards, req.rewards)
-        res.instructions = concatRequestLists(res.instructions, req.instructions)
-        if (res.includeAllBlocks || req.includeAllBlocks) {
-            res.includeAllBlocks = true
-        }
-    }
-    return res
-}
-
-export type MergeQueryOptions<T extends SolanaQueryOptions, U extends SolanaQueryOptions> = SolanaQueryOptions<
-    MergeSelection<T['fields'], U['fields']>
-> extends infer R
-    ? R
-    : never
-
-export type MergeQueryOptionsAll<T extends readonly SolanaQueryOptions[]> = T extends readonly [infer F, ...infer R]
-    ? F extends SolanaQueryOptions
-        ? R extends [SolanaQueryOptions, ...SolanaQueryOptions[]]
-            ? MergeQueryOptions<F, MergeQueryOptionsAll<R>>
-            : F
-        : never
-    : never
-
-export function mergeRequests(...requests: RangeRequest<Solana.DataRequest>[]): RangeRequest<Solana.DataRequest>[] {
-    return mergeRangeRequests(requests, mergeDataRequests)
-}
-
-export function mergeQueries<T extends SolanaQueryOptions, U extends SolanaQueryOptions>(
-    a: T,
-    b: U
-): MergeQueryOptions<T, U>
-export function mergeQueries<T extends readonly SolanaQueryOptions[]>(...queries: T): MergeQueryOptionsAll<T>
-export function mergeQueries<T extends readonly SolanaQueryOptions[]>(...queries: T) {
-    return {
-        fields: mergeSelection(...queries.map((q) => q.fields)),
-        requests: mergeRequests(...queries.flatMap((q) => q.requests)),
-    }
-}
-
-function concatRequestLists<T extends object>(a?: T[], b?: T[]): T[] | undefined {
-    let result = [...(a || []), ...(b || [])]
-    return result.length ? result : undefined
-}
-
-function mapRequest<T>(options: RequestOptions<T>): T {
-    return {...options.request}
-}
-
-