@subsquid/evm-stream 0.0.1-2-0.3887d2

package/lib/source.js

@@ -0,0 +1,193 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBlockValidator = exports.EvmPortalDataSource = void 0;
+exports.mapBlock = mapBlock;
+const util_internal_range_1 = require("@subsquid/util-internal-range");
+const portal_client_1 = require("@subsquid/portal-client");
+const util_internal_1 = require("@subsquid/util-internal");
+const util_internal_validation_1 = require("@subsquid/util-internal-validation");
+const schema_1 = require("./schema");
+const query_1 = require("./query");
+const data_source_1 = require("@subsquid/data-source");
+class EvmPortalDataSource {
+    constructor(options) {
+        this.portal = typeof options.portal === 'string' ? new portal_client_1.PortalClient({ url: options.portal }) : options.portal;
+        this.fields = options.query.fields;
+        this.requests = (0, util_internal_range_1.mergeRangeRequests)(options.query.requests, query_1.mergeDataRequests);
+    }
+    getHeight() {
+        return this.portal.getFinalizedHeight();
+    }
+    getFinalizedHeight() {
+        return this.portal.getFinalizedHeight();
+    }
+    getBlockStream(range, stopOnHead) {
+        let fields = getFields(this.fields);
+        let requests = (0, util_internal_range_1.applyRangeBound)(this.requests, range);
+        let { writable, readable } = new TransformStream({
+            transform: async (data, controller) => {
+                let blocks = data.map((b) => {
+                    let block = mapBlock(b, fields);
+                    Object.defineProperty(block, data_source_1.DataSource.blockRef, {
+                        value: { hash: block.header.hash, number: block.header.number },
+                    });
+                    return block;
+                });
+                Object.defineProperty(blocks, data_source_1.DataSource.finalizedHead, {
+                    value: data[portal_client_1.PortalClient.finalizedHead],
+                });
+                controller.enqueue(blocks);
+            },
+        });
+        const ingest = async () => {
+            for (let request of requests) {
+                let query = {
+                    type: 'evm',
+                    fromBlock: request.range.from,
+                    toBlock: request.range.to,
+                    fields,
+                    ...request.request,
+                };
+                await this.portal.getFinalizedStream(query, { stopOnHead }).pipeTo(writable, {
+                    preventClose: true,
+                });
+            }
+        };
+        ingest()
+            .then(() => writable.close(), (reason) => writable.abort(reason))
+            .catch(() => { });
+        return readable;
+    }
+}
+exports.EvmPortalDataSource = EvmPortalDataSource;
+exports.getBlockValidator = (0, util_internal_1.weakMemo)((fields) => {
+    let BlockHeader = (0, util_internal_validation_1.object)((0, schema_1.getBlockHeaderProps)(fields.block, true));
+    let Transaction = (0, util_internal_validation_1.object)({
+        hash: fields.transaction?.hash ? util_internal_validation_1.BYTES : undefined,
+        ...(0, schema_1.getTxProps)(fields.transaction, true),
+        sighash: fields.transaction?.sighash ? (0, util_internal_validation_1.withDefault)('0x', util_internal_validation_1.BYTES) : undefined,
+        ...(0, schema_1.getTxReceiptProps)(fields.transaction, true),
+    });
+    let Log = (0, util_internal_validation_1.object)((0, schema_1.getLogProps)(fields.log, true));
+    let Trace = (0, schema_1.getTraceFrameValidator)(fields.trace, true);
+    let stateDiffBase = {
+        transactionIndex: util_internal_validation_1.NAT,
+        address: util_internal_validation_1.BYTES,
+        key: util_internal_validation_1.STRING,
+    };
+    let StateDiff = (0, util_internal_validation_1.taggedUnion)('kind', {
+        ['=']: (0, util_internal_validation_1.object)({ ...stateDiffBase }),
+        ['+']: (0, util_internal_validation_1.object)({ ...stateDiffBase, ...(0, schema_1.project)(fields.stateDiff, { next: util_internal_validation_1.BYTES }) }),
+        ['*']: (0, util_internal_validation_1.object)({ ...stateDiffBase, ...(0, schema_1.project)(fields.stateDiff, { prev: util_internal_validation_1.BYTES, next: util_internal_validation_1.BYTES }) }),
+        ['-']: (0, util_internal_validation_1.object)({ ...stateDiffBase, ...(0, schema_1.project)(fields.stateDiff, { prev: util_internal_validation_1.BYTES }) }),
+    });
+    return (0, util_internal_validation_1.object)({
+        header: BlockHeader,
+        transactions: (0, util_internal_validation_1.withDefault)([], (0, util_internal_validation_1.array)(Transaction)),
+        logs: (0, util_internal_validation_1.withDefault)([], (0, util_internal_validation_1.array)(Log)),
+        traces: (0, util_internal_validation_1.withDefault)([], (0, util_internal_validation_1.array)(Trace)),
+        stateDiffs: (0, util_internal_validation_1.withDefault)([], (0, util_internal_validation_1.array)(StateDiff)),
+    });
+});
+function mapBlock(rawBlock, fields) {
+    let validator = (0, exports.getBlockValidator)(fields);
+    let block = (0, util_internal_validation_1.cast)(validator, rawBlock);
+    // let {number, hash, parentHash, ...hdr} = src.header
+    // if (hdr.timestamp) {
+    //     hdr.timestamp = hdr.timestamp * 1000 // convert to ms
+    // }
+    // let header = new BlockHeader(number, hash, parentHash)
+    // Object.assign(header, hdr)
+    // let block = new Block(header)
+    // if (src.transactions) {
+    //     for (let {transactionIndex, ...props} of src.transactions) {
+    //         let tx = new Transaction(header, transactionIndex)
+    //         Object.assign(tx, props)
+    //         block.transactions.push(tx)
+    //     }
+    // }
+    // if (src.logs) {
+    //     for (let {logIndex, transactionIndex, ...props} of src.logs) {
+    //         let log = new Log(header, logIndex, transactionIndex)
+    //         Object.assign(log, props)
+    //         block.logs.push(log)
+    //     }
+    // }
+    // if (src.traces) {
+    //     for (let {transactionIndex, traceAddress, type, ...props} of src.traces) {
+    //         transactionIndex = assertNotNull(transactionIndex)
+    //         let trace: Trace
+    //         switch (type) {
+    //             case 'create':
+    //                 trace = new TraceCreate(header, transactionIndex, traceAddress)
+    //                 break
+    //             case 'call':
+    //                 trace = new TraceCall(header, transactionIndex, traceAddress)
+    //                 break
+    //             case 'suicide':
+    //                 trace = new TraceSuicide(header, transactionIndex, traceAddress)
+    //                 break
+    //             case 'reward':
+    //                 trace = new TraceReward(header, transactionIndex, traceAddress)
+    //                 break
+    //             default:
+    //                 throw unexpectedCase()
+    //         }
+    //         Object.assign(trace, props)
+    //         block.traces.push(trace)
+    //     }
+    // }
+    // if (src.stateDiffs) {
+    //     for (let {transactionIndex, address, key, kind, ...props} of src.stateDiffs) {
+    //         let diff: StateDiff
+    //         switch (kind) {
+    //             case '=':
+    //                 diff = new StateDiffNoChange(header, transactionIndex, address, key)
+    //                 break
+    //             case '+':
+    //                 diff = new StateDiffAdd(header, transactionIndex, address, key)
+    //                 break
+    //             case '*':
+    //                 diff = new StateDiffChange(header, transactionIndex, address, key)
+    //                 break
+    //             case '-':
+    //                 diff = new StateDiffDelete(header, transactionIndex, address, key)
+    //                 break
+    //             default:
+    //                 throw unexpectedCase()
+    //         }
+    //         Object.assign(diff, props)
+    //         block.stateDiffs.push(diff)
+    //     }
+    // }
+    // setUpRelations(block)
+    return block;
+}
+function getFields(fields) {
+    return (0, query_1.mergeSelection)(REQUIRED_FIELDS, fields);
+}
+const REQUIRED_FIELDS = {
+    block: {
+        number: true,
+        hash: true,
+        parentHash: true,
+    },
+    // transaction: {
+    //     transactionIndex: true,
+    // },
+    // log: {
+    //     logIndex: true,
+    //     transactionIndex: true,
+    // },
+    // trace: {
+    //     transactionIndex: true,
+    //     traceAddress: true,
+    //     type: true,
+    // },
+    // stateDiff: {
+    //     transactionIndex: true,
+    //     address: true,
+    //     key: true,
+    // },
+};
+//# sourceMappingURL=source.js.map

package/lib/source.js.map

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

package/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "@subsquid/evm-stream",
+  "version": "0.0.1-2-0.3887d2",
+  "description": "EVM block data streamer",
+  "license": "GPL-3.0-or-later",
+  "repository": "git@github.com:subsquid/squid.git",
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "lib",
+    "src"
+  ],
+  "main": "lib/index.js",
+  "dependencies": {
+    "@subsquid/logger": "^1.3.3",
+    "@subsquid/portal-client": "0.1.0-2-0.3887d2",
+    "@subsquid/util-internal": "3.3.0-2-0.3887d2",
+    "@subsquid/util-internal-range": "~0.3.0",
+    "@subsquid/http-client": "1.7.0-2-0.3887d2",
+    "@subsquid/util-internal-validation": "~0.7.0",
+    "@subsquid/data-source": "0.0.1-2-0.3887d2"
+  },
+  "devDependencies": {
+    "@types/node": "^18.18.14",
+    "typescript": "~5.5.4"
+  },
+  "scripts": {
+    "build": "rm -rf lib && tsc"
+  }
+}

package/src/index.ts

@@ -0,0 +1,2 @@
+export * from './source'
+export * from './query'

package/src/query.ts

@@ -0,0 +1,195 @@
+import {applyRangeBound, mergeRangeRequests, Range, RangeRequest} from '@subsquid/util-internal-range'
+import type {Evm} from '@subsquid/portal-client'
+import type {MergeSelection, MergeSelectionAll, Selection} from '@subsquid/util-internal'
+
+export * from '@subsquid/portal-client/lib/query/evm'
+
+export type RequestOptions<R> = {range?: Range; request: R}
+export type LogRequestOptions = RequestOptions<Evm.LogRequest>
+export type TransactionRequestOptions = RequestOptions<Evm.TransactionRequest>
+export type TraceRequestOptions = RequestOptions<Evm.TraceRequest>
+export type StateDiffRequestOptions = RequestOptions<Evm.StateDiffRequest>
+
+export type EvmQueryOptions<F extends Evm.FieldSelection = Evm.FieldSelection> = {
+    fields: F
+    requests: RangeRequest<Evm.DataRequest>[]
+}
+
+export class EvmQueryBuilder<F extends Evm.FieldSelection = {block: {number: true; hash: true}}> {
+    private range: Range = {from: 0}
+    private requests: RangeRequest<Evm.DataRequest>[] = []
+    private fields: F = {
+        block: {number: true, hash: true},
+    } as F
+
+    addLog(options: LogRequestOptions): this {
+        this.requests.push({
+            range: options.range ?? {from: 0},
+            request: {
+                logs: [mapRequest(options)],
+            },
+        })
+        return this
+    }
+
+    addTransaction(options: TransactionRequestOptions): this {
+        this.requests.push({
+            range: options.range ?? {from: 0},
+            request: {
+                transactions: [mapRequest(options)],
+            },
+        })
+        return this
+    }
+
+    addTrace(options: TraceRequestOptions): this {
+        this.requests.push({
+            range: options.range ?? {from: 0},
+            request: {
+                traces: [mapRequest(options)],
+            },
+        })
+        return this
+    }
+
+    addStateDiff(options: StateDiffRequestOptions): this {
+        this.requests.push({
+            range: options.range ?? {from: 0},
+            request: {
+                stateDiffs: [mapRequest(options)],
+            },
+        })
+        return this
+    }
+
+    setRange(range: Range): this {
+        this.range = range
+        return this
+    }
+
+    setFields<F extends Evm.FieldSelection>(fields: F): EvmQueryBuilder<F> {
+        this.fields = fields as any
+        return this as any
+    }
+
+    build(): EvmQueryOptions<F> {
+        let requests = mergeRangeRequests(this.requests, mergeDataRequests)
+
+        return {
+            fields: this.fields,
+            requests: applyRangeBound(requests, this.range),
+        }
+    }
+}
+
+export function mergeDataRequests(...requests: Evm.DataRequest[]): Evm.DataRequest {
+    let res: Evm.DataRequest = {}
+
+    for (let req of requests) {
+        res.transactions = concatRequestLists(res.transactions, req.transactions)
+        res.logs = concatRequestLists(res.logs, req.logs)
+        res.traces = concatRequestLists(res.traces, req.traces)
+        res.stateDiffs = concatRequestLists(res.stateDiffs, req.stateDiffs)
+        if (res.includeAllBlocks || req.includeAllBlocks) {
+            res.includeAllBlocks = true
+        }
+    }
+
+    return res
+}
+
+export type MergeFieldSelection<T extends Evm.FieldSelection, U extends Evm.FieldSelection> = MergeSelection<T, U>
+
+// NOTE: without condition creates ugly type for some reason
+export type MergeQueryOptions<T extends EvmQueryOptions, U extends EvmQueryOptions> = EvmQueryOptions<
+    MergeSelection<T['fields'], U['fields']>
+> extends infer R
+    ? R
+    : never
+
+export type MergeQueryOptionsAll<T extends readonly EvmQueryOptions[]> = T extends readonly [infer F, ...infer R]
+    ? F extends EvmQueryOptions
+        ? R extends [EvmQueryOptions, ...EvmQueryOptions[]]
+            ? MergeQueryOptions<F, MergeQueryOptionsAll<R>>
+            : F
+        : never
+    : never
+
+type Test = MergeQueryOptionsAll<
+    [
+        EvmQueryOptions<{
+            block: {number: true; hash: true}
+            transaction: {from: true; to: true; hash: true}
+        }>,
+        EvmQueryOptions<{block: {number: true; hash: true; difficulty: true}}>,
+        EvmQueryOptions<{block: {number: true; hash: true; nonce: true}}>
+    ]
+>
+
+export function mergeRequests(...requests: RangeRequest<Evm.DataRequest>[]): RangeRequest<Evm.DataRequest>[] {
+    return mergeRangeRequests(requests, mergeDataRequests)
+}
+export function mergeQueries<T extends EvmQueryOptions, U extends EvmQueryOptions>(a: T, b: U): MergeQueryOptions<T, U>
+export function mergeQueries<T extends readonly EvmQueryOptions[]>(...queries: T): MergeQueryOptionsAll<T>
+export function mergeQueries<T extends readonly EvmQueryOptions[]>(...queries: T) {
+    return {
+        fields: mergeSelection(...queries.map((q) => q.fields)),
+        requests: mergeRequests(...queries.flatMap((q) => q.requests)),
+    }
+}
+
+let test = mergeQueries(
+    {} as EvmQueryOptions<{
+        block: {number: true; hash: true}
+        transaction: {from: true; to: true; hash: true}
+    }>,
+    {} as EvmQueryOptions<{
+        transaction: {from: true}
+        block: {number: true; hash: true; difficulty: true}
+    }>,
+    {} as EvmQueryOptions<{block: {number: true; hash: true; nonce: true}}>
+)
+
+function concatRequestLists<T extends object>(a?: T[], b?: T[]): T[] | undefined {
+    let result: T[] = []
+    if (a) {
+        result.push(...a)
+    }
+    if (b) {
+        result.push(...b)
+    }
+    return result.length == 0 ? undefined : result
+}
+
+function mapRequest<T>(options: RequestOptions<T>): T {
+    let req = {...options.request}
+    for (let key in req) {
+        let val = (req as any)[key]
+        if (Array.isArray(val)) {
+            ;(req as any)[key] = val.map((s) => {
+                return typeof s == 'string' ? s.toLowerCase() : s
+            })
+        }
+    }
+    return req
+}
+
+export function mergeSelection<T extends Selection, U extends Selection>(a: T, b: U): MergeSelection<T, U>
+export function mergeSelection<T extends readonly Selection[]>(...selections: T): MergeSelectionAll<T>
+export function mergeSelection<T extends readonly Selection[]>(...selections: T) {
+    let res: Selection = {}
+
+    for (let selection of selections) {
+        for (let key in selection) {
+            if (res[key] == null) {
+                res[key] = selection[key]
+            } else if (res[key] === true || selection[key] === true) {
+                res[key] === true
+            } else if (typeof res[key] === 'object' && typeof selection[key] === 'object') {
+                res[key] = mergeSelection(res[key], selection[key])
+            }
+        }
+    }
+
+    return res
+}