@subsquid/portal-client 0.3.2 → 0.4.0

package/lib/query/index.d.ts

@@ -1,12 +1,580 @@
-import { Simplify } from './common';
 import * as evm from './evm';
 import * as solana from './solana';
 import * as substrate from './substrate';
-import { Validator } from '@subsquid/util-internal-validation';
-export type { PortalBlock, PortalQuery } from './common';
-export type { evm, solana, substrate };
-export type Query = evm.Query | solana.Query | substrate.Query;
-export type GetBlock<Q extends Query> = Q extends evm.Query ? evm.Block<Q['fields']> : Q extends solana.Query ? solana.Block<Q['fields']> : substrate.Block<Q['fields']>;
-export declare function createQuery<Q extends Query>(query: Q): Simplify<Q & Query>;
-export declare function getBlockSchema<Q extends Query>(query: Q): Validator<GetBlock<Q>, any>;
+export { evm, solana, substrate };
+export type GetQueryBlock<Q> = Q extends evm.Query<infer F> ? evm.Block<F> : Q extends solana.Query<infer F> ? solana.Block<F> : Q extends substrate.Query<infer F> ? substrate.Block<F> : never;
+export type AnyQuery = evm.Query | solana.Query | substrate.Query;
+export declare function getQuery<Q extends AnyQuery>(query: Q): readonly [Q, import("@subsquid/util-internal-validation").Validator<{
+    header: {
+        number: number;
+        hash: string;
+        parentHash: string;
+        nonce?: string | undefined;
+        sha3Uncles?: string | undefined;
+        logsBloom?: string | undefined;
+        transactionsRoot?: string | undefined;
+        stateRoot?: string | undefined;
+        receiptsRoot?: string | undefined;
+        mixHash?: string | undefined;
+        miner?: string | undefined;
+        extraData?: string | undefined;
+        size?: number | undefined;
+        gasLimit?: bigint | undefined;
+        gasUsed?: bigint | undefined;
+        timestamp?: number | undefined;
+        difficulty?: bigint | undefined;
+        totalDifficulty?: bigint | undefined;
+        baseFeePerGas?: bigint | undefined;
+        l1BlockNumber?: number | undefined;
+    };
+    transactions: {
+        transactionIndex?: number | undefined;
+        hash?: string | undefined;
+        from?: string | undefined;
+        to?: string | undefined;
+        gas?: bigint | undefined;
+        gasPrice?: bigint | undefined;
+        maxFeePerGas?: bigint | undefined;
+        maxPriorityFeePerGas?: bigint | undefined;
+        input?: string | undefined;
+        sighash?: string | undefined;
+        nonce?: number | undefined;
+        value?: bigint | undefined;
+        v?: bigint | undefined;
+        r?: string | undefined;
+        s?: string | undefined;
+        yParity?: number | undefined;
+        chainId?: number | undefined;
+        authorizationList?: {
+            chainId: number;
+            nonce: number;
+            address: string;
+            yParity: number;
+            r: string;
+            s: string;
+        }[] | undefined;
+        gasUsed?: bigint | undefined;
+        cumulativeGasUsed?: bigint | undefined;
+        effectiveGasPrice?: bigint | undefined;
+        contractAddress?: string | undefined;
+        type?: number | undefined;
+        status?: number | undefined;
+        l1Fee?: bigint | undefined;
+        l1FeeScalar?: number | undefined;
+        l1GasPrice?: bigint | undefined;
+        l1GasUsed?: bigint | undefined;
+        l1BlobBaseFee?: bigint | undefined;
+        l1BlobBaseFeeScalar?: number | undefined;
+        l1BaseFeeScalar?: number | undefined;
+    }[];
+    logs: {
+        logIndex?: number | undefined;
+        transactionIndex?: number | undefined;
+        transactionHash?: string | undefined;
+        address?: string | undefined;
+        data?: string | undefined;
+        topics?: string[] | undefined;
+    }[];
+    traces: ({
+        action?: {
+            from?: string | undefined;
+            value?: bigint | undefined;
+            gas?: bigint | undefined;
+            init?: string | undefined;
+        } | undefined;
+        result?: {
+            gasUsed?: bigint | undefined;
+            code?: string | undefined;
+            address?: string | undefined;
+        } | undefined;
+        transactionIndex?: number | undefined;
+        traceAddress?: number[] | undefined;
+        subtraces?: number | undefined;
+        error?: string | undefined;
+        revertReason?: string | undefined;
+        type: "create";
+    } | {
+        action?: {
+            callType?: string | undefined;
+            from?: string | undefined;
+            to?: string | undefined;
+            value?: bigint | undefined;
+            gas?: bigint | undefined;
+            input?: string | undefined;
+            sighash?: string | undefined;
+        } | undefined;
+        result?: {
+            gasUsed?: bigint | undefined;
+            output?: string | undefined;
+        } | undefined;
+        transactionIndex?: number | undefined;
+        traceAddress?: number[] | undefined;
+        subtraces?: number | undefined;
+        error?: string | undefined;
+        revertReason?: string | undefined;
+        type: "call";
+    } | {
+        action?: {
+            address?: string | undefined;
+            refundAddress?: string | undefined;
+            balance?: bigint | undefined;
+        } | undefined;
+        transactionIndex?: number | undefined;
+        traceAddress?: number[] | undefined;
+        subtraces?: number | undefined;
+        error?: string | undefined;
+        revertReason?: string | undefined;
+        type: "suicide";
+    } | {
+        action?: {
+            author?: string | undefined;
+            value?: bigint | undefined;
+            type?: string | undefined;
+        } | undefined;
+        transactionIndex?: number | undefined;
+        traceAddress?: number[] | undefined;
+        subtraces?: number | undefined;
+        error?: string | undefined;
+        revertReason?: string | undefined;
+        type: "reward";
+    })[];
+    stateDiffs: ({
+        transactionIndex?: number | undefined;
+        address?: string | undefined;
+        key?: string | undefined;
+        kind: "=";
+    } | {
+        next?: string | undefined;
+        transactionIndex?: number | undefined;
+        address?: string | undefined;
+        key?: string | undefined;
+        kind: "+";
+    } | {
+        prev?: string | undefined;
+        next?: string | undefined;
+        transactionIndex?: number | undefined;
+        address?: string | undefined;
+        key?: string | undefined;
+        kind: "*";
+    } | {
+        prev?: string | undefined;
+        transactionIndex?: number | undefined;
+        address?: string | undefined;
+        key?: string | undefined;
+        kind: "-";
+    })[];
+}, {
+    header: {
+        number: number;
+        hash: string;
+        parentHash: string;
+        nonce?: string | undefined;
+        sha3Uncles?: string | undefined;
+        logsBloom?: string | undefined;
+        transactionsRoot?: string | undefined;
+        stateRoot?: string | undefined;
+        receiptsRoot?: string | undefined;
+        mixHash?: string | undefined;
+        miner?: string | undefined;
+        extraData?: string | undefined;
+        size?: number | undefined;
+        gasLimit?: string | undefined;
+        gasUsed?: string | undefined;
+        timestamp?: number | undefined;
+        difficulty?: string | undefined;
+        totalDifficulty?: string | null | undefined;
+        baseFeePerGas?: string | null | undefined;
+        l1BlockNumber?: number | null | undefined;
+    };
+    transactions?: {
+        transactionIndex?: number | undefined;
+        hash?: string | undefined;
+        from?: string | undefined;
+        to?: string | null | undefined;
+        gas?: string | undefined;
+        gasPrice?: string | null | undefined;
+        maxFeePerGas?: string | null | undefined;
+        maxPriorityFeePerGas?: string | null | undefined;
+        input?: string | undefined;
+        sighash?: string | null | undefined;
+        nonce?: number | undefined;
+        value?: string | undefined;
+        v?: string | null | undefined;
+        r?: string | null | undefined;
+        s?: string | null | undefined;
+        yParity?: number | null | undefined;
+        chainId?: number | null | undefined;
+        authorizationList?: {
+            chainId: number;
+            nonce: number;
+            address: string;
+            yParity: number;
+            r: string;
+            s: string;
+        }[] | null | undefined;
+        gasUsed?: string | undefined;
+        cumulativeGasUsed?: string | undefined;
+        effectiveGasPrice?: string | undefined;
+        contractAddress?: string | null | undefined;
+        type?: number | null | undefined;
+        status?: number | null | undefined;
+        l1Fee?: string | null | undefined;
+        l1FeeScalar?: string | null | undefined;
+        l1GasPrice?: string | null | undefined;
+        l1GasUsed?: string | null | undefined;
+        l1BlobBaseFee?: string | null | undefined;
+        l1BlobBaseFeeScalar?: number | null | undefined;
+        l1BaseFeeScalar?: number | null | undefined;
+    }[] | null | undefined;
+    logs?: {
+        logIndex?: number | undefined;
+        transactionIndex?: number | undefined;
+        transactionHash?: string | undefined;
+        address?: string | undefined;
+        data?: string | undefined;
+        topics?: string[] | undefined;
+    }[] | null | undefined;
+    traces?: ({
+        action?: {
+            from?: string | undefined;
+            value?: string | undefined;
+            gas?: string | undefined;
+            init?: string | null | undefined;
+        } | undefined;
+        result?: {
+            gasUsed?: string | undefined;
+            code?: string | null | undefined;
+            address?: string | null | undefined;
+        } | null | undefined;
+        transactionIndex?: number | undefined;
+        traceAddress?: number[] | undefined;
+        subtraces?: number | undefined;
+        error?: string | null | undefined;
+        revertReason?: string | null | undefined;
+        type: "create";
+    } | {
+        action?: {
+            callType?: string | undefined;
+            from?: string | undefined;
+            to?: string | undefined;
+            value?: string | null | undefined;
+            gas?: string | undefined;
+            input?: string | undefined;
+            sighash?: string | null | undefined;
+        } | undefined;
+        result?: {
+            gasUsed?: string | undefined;
+            output?: string | null | undefined;
+        } | null | undefined;
+        transactionIndex?: number | undefined;
+        traceAddress?: number[] | undefined;
+        subtraces?: number | undefined;
+        error?: string | null | undefined;
+        revertReason?: string | null | undefined;
+        type: "call";
+    } | {
+        action?: {
+            address?: string | undefined;
+            refundAddress?: string | undefined;
+            balance?: string | undefined;
+        } | undefined;
+        transactionIndex?: number | undefined;
+        traceAddress?: number[] | undefined;
+        subtraces?: number | undefined;
+        error?: string | null | undefined;
+        revertReason?: string | null | undefined;
+        type: "suicide";
+    } | {
+        action?: {
+            author?: string | undefined;
+            value?: string | undefined;
+            type?: string | undefined;
+        } | undefined;
+        transactionIndex?: number | undefined;
+        traceAddress?: number[] | undefined;
+        subtraces?: number | undefined;
+        error?: string | null | undefined;
+        revertReason?: string | null | undefined;
+        type: "reward";
+    })[] | null | undefined;
+    stateDiffs?: ({
+        transactionIndex?: number | undefined;
+        address?: string | undefined;
+        key?: string | undefined;
+        kind: "=";
+    } | {
+        next?: string | undefined;
+        transactionIndex?: number | undefined;
+        address?: string | undefined;
+        key?: string | undefined;
+        kind: "+";
+    } | {
+        prev?: string | undefined;
+        next?: string | undefined;
+        transactionIndex?: number | undefined;
+        address?: string | undefined;
+        key?: string | undefined;
+        kind: "*";
+    } | {
+        prev?: string | undefined;
+        transactionIndex?: number | undefined;
+        address?: string | undefined;
+        key?: string | undefined;
+        kind: "-";
+    })[] | null | undefined;
+}>] | readonly [Q, import("@subsquid/util-internal-validation").Validator<{
+    header: {
+        number: number;
+        hash: string;
+        parentHash: string;
+        parentSlot?: number | undefined;
+        height?: number | undefined;
+        timestamp?: number | undefined;
+    };
+    transactions: {
+        transactionIndex?: number | undefined;
+        version?: number | "legacy" | undefined;
+        accountKeys?: string[] | undefined;
+        addressTableLookups?: {
+            accountKey: string;
+            readonlyIndexes: number[];
+            writableIndexes: number[];
+        }[] | undefined;
+        numReadonlySignedAccounts?: number | undefined;
+        numReadonlyUnsignedAccounts?: number | undefined;
+        numRequiredSignatures?: number | undefined;
+        recentBlockhash?: string | undefined;
+        signatures?: string[] | undefined;
+        err?: object | null | undefined;
+        computeUnitsConsumed?: bigint | undefined;
+        fee?: bigint | undefined;
+        loadedAddresses?: {
+            readonly: string[];
+            writable: string[];
+        } | undefined;
+        hasDroppedLogMessages?: boolean | undefined;
+    }[];
+    instructions: {
+        transactionIndex?: number | undefined;
+        instructionAddress?: number[] | undefined;
+        programId?: string | undefined;
+        accounts?: string[] | undefined;
+        data?: string | undefined;
+        computeUnitsConsumed?: bigint | undefined;
+        error?: string | undefined;
+        isCommitted?: boolean | undefined;
+        hasDroppedLogMessages?: boolean | undefined;
+    }[];
+    logs: {
+        transactionIndex?: number | undefined;
+        logIndex?: number | undefined;
+        instructionAddress?: number[] | undefined;
+        programId?: string | undefined;
+        kind?: "data" | "log" | "other" | undefined;
+        message?: string | undefined;
+    }[];
+    balances: {
+        transactionIndex?: number | undefined;
+        account?: string | undefined;
+        pre?: bigint | undefined;
+        post?: bigint | undefined;
+    }[];
+    tokenBalances: {
+        transactionIndex?: number | undefined;
+        account?: string | undefined;
+        preProgramId?: string | undefined;
+        postProgramId?: string | undefined;
+        preMint?: string | undefined;
+        postMint?: string | undefined;
+        preDecimals?: number | undefined;
+        postDecimals?: number | undefined;
+        preOwner?: string | undefined;
+        postOwner?: string | undefined;
+        preAmount?: bigint | undefined;
+        postAmount?: bigint | undefined;
+    }[];
+    rewards: {
+        pubkey?: string | undefined;
+        lamports?: bigint | undefined;
+        postBalance?: bigint | undefined;
+        rewardType?: string | undefined;
+        commission?: number | undefined;
+    }[];
+}, {
+    header: {
+        number: number;
+        hash: string;
+        parentHash: string;
+        parentSlot?: number | undefined;
+        height?: number | undefined;
+        timestamp?: number | undefined;
+    };
+    transactions?: {
+        transactionIndex?: number | undefined;
+        version?: number | "legacy" | undefined;
+        accountKeys?: string[] | undefined;
+        addressTableLookups?: {
+            accountKey: string;
+            readonlyIndexes: number[];
+            writableIndexes: number[];
+        }[] | undefined;
+        numReadonlySignedAccounts?: number | undefined;
+        numReadonlyUnsignedAccounts?: number | undefined;
+        numRequiredSignatures?: number | undefined;
+        recentBlockhash?: string | undefined;
+        signatures?: string[] | undefined;
+        err?: object | null | undefined;
+        computeUnitsConsumed?: string | undefined;
+        fee?: string | undefined;
+        loadedAddresses?: {
+            readonly: string[];
+            writable: string[];
+        } | null | undefined;
+        hasDroppedLogMessages?: boolean | undefined;
+    }[] | null | undefined;
+    instructions?: {
+        transactionIndex?: number | undefined;
+        instructionAddress?: number[] | undefined;
+        programId?: string | undefined;
+        accounts?: string[] | undefined;
+        data?: string | undefined;
+        computeUnitsConsumed?: string | null | undefined;
+        error?: string | null | undefined;
+        isCommitted?: boolean | undefined;
+        hasDroppedLogMessages?: boolean | undefined;
+    }[] | null | undefined;
+    logs?: {
+        transactionIndex?: number | undefined;
+        logIndex?: number | undefined;
+        instructionAddress?: number[] | undefined;
+        programId?: string | undefined;
+        kind?: "data" | "log" | "other" | undefined;
+        message?: string | undefined;
+    }[] | null | undefined;
+    balances?: {
+        transactionIndex?: number | undefined;
+        account?: string | undefined;
+        pre?: string | undefined;
+        post?: string | undefined;
+    }[] | null | undefined;
+    tokenBalances?: {
+        transactionIndex?: number | undefined;
+        account?: string | undefined;
+        preProgramId?: string | null | undefined;
+        postProgramId?: string | null | undefined;
+        preMint?: string | null | undefined;
+        postMint?: string | null | undefined;
+        preDecimals?: number | null | undefined;
+        postDecimals?: number | null | undefined;
+        preOwner?: string | null | undefined;
+        postOwner?: string | null | undefined;
+        preAmount?: string | null | undefined;
+        postAmount?: string | null | undefined;
+    }[] | null | undefined;
+    rewards?: {
+        pubkey?: string | undefined;
+        lamports?: string | undefined;
+        postBalance?: string | undefined;
+        rewardType?: string | null | undefined;
+        commission?: number | null | undefined;
+    }[] | null | undefined;
+}>] | readonly [Q, import("@subsquid/util-internal-validation").Validator<{
+    header: {
+        number: number;
+        hash: string;
+        parentHash?: string | undefined;
+        stateRoot?: string | undefined;
+        extrinsicsRoot?: string | undefined;
+        digest?: {
+            logs: string[];
+        } | undefined;
+        specName?: string | undefined;
+        specVersion?: number | undefined;
+        implName?: string | undefined;
+        implVersion?: number | undefined;
+        timestamp?: number | undefined;
+        validator?: string | undefined;
+    };
+    extrinsics: {
+        index?: number | undefined;
+        version?: number | undefined;
+        signature?: {
+            address: string;
+            signature: object;
+            signedExtensions: object;
+        } | undefined;
+        fee?: bigint | undefined;
+        tip?: bigint | undefined;
+        error?: any;
+        success?: boolean | undefined;
+        hash?: string | undefined;
+    }[];
+    calls: {
+        extrinsicIndex?: number | undefined;
+        address?: number[] | undefined;
+        name?: string | undefined;
+        args?: any;
+        origin?: any;
+        error?: any;
+        success?: boolean | undefined;
+    }[];
+    events: {
+        index?: number | undefined;
+        name?: string | undefined;
+        args?: any;
+        phase?: "Initialization" | "ApplyExtrinsic" | "Finalization" | undefined;
+        extrinsicIndex?: number | undefined;
+        callAddress?: number[] | undefined;
+        topics?: string[] | undefined;
+    }[];
+}, {
+    header: {
+        number: number;
+        hash: string;
+        parentHash?: string | undefined;
+        stateRoot?: string | undefined;
+        extrinsicsRoot?: string | undefined;
+        digest?: {
+            logs: string[];
+        } | undefined;
+        specName?: string | undefined;
+        specVersion?: number | undefined;
+        implName?: string | undefined;
+        implVersion?: number | undefined;
+        timestamp?: number | null | undefined;
+        validator?: string | null | undefined;
+    };
+    extrinsics?: {
+        index?: number | undefined;
+        version?: number | undefined;
+        signature?: {
+            address: string;
+            signature: object;
+            signedExtensions: object;
+        } | null | undefined;
+        fee?: string | null | undefined;
+        tip?: string | null | undefined;
+        error?: any;
+        success?: boolean | null | undefined;
+        hash?: string | null | undefined;
+    }[] | null | undefined;
+    calls?: {
+        extrinsicIndex?: number | undefined;
+        address?: number[] | undefined;
+        name?: string | undefined;
+        args?: any;
+        origin?: any;
+        error?: any;
+        success?: boolean | null | undefined;
+    }[] | null | undefined;
+    events?: {
+        index?: number | undefined;
+        name?: string | undefined;
+        args?: any;
+        phase?: "Initialization" | "ApplyExtrinsic" | "Finalization" | undefined;
+        extrinsicIndex?: number | null | undefined;
+        callAddress?: number[] | null | undefined;
+        topics?: string[] | undefined;
+    }[] | null | undefined;
+}>];
 //# sourceMappingURL=index.d.ts.map

package/lib/query/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAA;AACjC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAA;AAC5B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,EAAC,SAAS,EAAC,MAAM,oCAAoC,CAAA;AAE5D,YAAY,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,UAAU,CAAA;AACtD,YAAY,EAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAC,CAAA;AAEpC,MAAM,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;AAE9D,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,GAAG,CAAC,KAAK,GACrD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GACtB,CAAC,SAAS,MAAM,CAAC,KAAK,GACtB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GACzB,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;AAElC,wBAAgB,WAAW,CAAC,CAAC,SAAS,KAAK,EAAE,KAAK,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,KAAK,CAAC,CAM1E;AAID,wBAAgB,cAAc,CAAC,CAAC,SAAS,KAAK,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAqBrF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,OAAO,CAAA;AAC5B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AAExC,OAAO,EAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAC,CAAA;AAE/B,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GACrD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GACZ,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GACf,CAAC,SAAS,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAClC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,GAClB,KAAK,CAAA;AAEX,MAAM,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;AAEjE,wBAAgB,QAAQ,CAAC,CAAC,SAAS,QAAQ,EAAE,KAAK,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAepD"}

package/lib/query/index.js

@@ -23,38 +23,29 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createQuery = createQuery;
-exports.getBlockSchema = getBlockSchema;
+exports.substrate = exports.solana = exports.evm = void 0;
+exports.getQuery = getQuery;
 const util_internal_1 = require("@subsquid/util-internal");
 const evm = __importStar(require("./evm"));
+exports.evm = evm;
 const solana = __importStar(require("./solana"));
+exports.solana = solana;
 const substrate = __importStar(require("./substrate"));
-function createQuery(query) {
-    return {
-        ...query,
-        type: query.type,
-        fields: query.fields,
-    };
-}
-const BLOCK_SCHEMAS = new WeakMap();
-function getBlockSchema(query) {
-    let schema = BLOCK_SCHEMAS.get(query);
-    if (schema)
-        return schema;
+exports.substrate = substrate;
+function getQuery(query) {
+    query = { ...query };
     switch (query.type) {
-        case 'solana':
-            schema = solana.getBlockSchema(query.fields);
-            break;
         case 'evm':
-            schema = evm.getBlockSchema(query.fields);
-            break;
+            query.fields = evm.patchQueryFields(query.fields ?? {});
+            return [query, evm.getBlockSchema(query.fields)];
+        case 'solana':
+            query.fields = solana.patchQueryFields(query.fields ?? {});
+            return [query, solana.getBlockSchema(query.fields)];
         case 'substrate':
-            schema = substrate.getBlockSchema(query.fields);
-            break;
+            query.fields = substrate.patchQueryFields(query.fields ?? {});
+            return [query, substrate.getBlockSchema(query.fields)];
         default:
-            throw (0, util_internal_1.unexpectedCase)(query['type']);
+            throw (0, util_internal_1.unexpectedCase)(query.type);
     }
-    BLOCK_SCHEMAS.set(query, schema);
-    return schema;
 }
 //# sourceMappingURL=index.js.map

package/lib/query/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAkBA,kCAMC;AAID,wCAqBC;AAjDD,2DAAsD;AAEtD,2CAA4B;AAC5B,iDAAkC;AAClC,uDAAwC;AAcxC,SAAgB,WAAW,CAAkB,KAAQ;IACjD,OAAO;QACH,GAAG,KAAK;QACR,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;KACvB,CAAA;AACL,CAAC;AAED,MAAM,aAAa,GAAG,IAAI,OAAO,EAA8B,CAAA;AAE/D,SAAgB,cAAc,CAAkB,KAAQ;IACpD,IAAI,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACrC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IAEzB,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,QAAQ;YACT,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YAC5C,MAAK;QACT,KAAK,KAAK;YACN,MAAM,GAAG,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YACzC,MAAK;QACT,KAAK,WAAW;YACZ,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YAC/C,MAAK;QACT;YACI,MAAM,IAAA,8BAAc,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IAEhC,OAAO,MAAM,CAAA;AACjB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAiBA,4BAeC;AAhCD,2DAAsD;AACtD,2CAA4B;AAIpB,kBAAG;AAHX,iDAAkC;AAGrB,wBAAM;AAFnB,uDAAwC;AAEnB,8BAAS;AAY9B,SAAgB,QAAQ,CAAqB,KAAQ;IACjD,KAAK,GAAG,EAAC,GAAG,KAAK,EAAC,CAAA;IAClB,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,KAAK;YACN,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;YACvD,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAU,CAAA;QAC7D,KAAK,QAAQ;YACT,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;YAC1D,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAU,CAAA;QAChE,KAAK,WAAW;YACZ,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;YAC7D,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAU,CAAA;QACnE;YACI,MAAM,IAAA,8BAAc,EAAE,KAAa,CAAC,IAAI,CAAC,CAAA;IACjD,CAAC;AACL,CAAC"}