feat(api): add support for fetching blocks by slot #700
+115
−29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
🦋 Changeset detectedLatest commit: 66093fb The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
| }; | ||
| } | ||
|
|
||
| const blockHashResult = blockHashSchema.safeParse(id); |
There was a problem hiding this comment.
The blockHashSchema will never succeed if the blockNumberOrSlotSchema has already failed.
Comment on lines
+28
to
+71
| const blockNumberOrSlotSchema = z.union([ | ||
| z | ||
| .string() | ||
| .refine((value) => !hashSchema.safeParse(value).success) | ||
| .pipe(z.coerce.number().positive().int()), | ||
| z.number().positive().int(), | ||
| ]); | ||
| const blockIdSchema = z.union([blockHashSchema, blockNumberOrSlotSchema]); | ||
|
|
||
| const inputSchema = z | ||
| .object({ | ||
| id: blockIdSchema, | ||
| slot: z.boolean().optional(), | ||
| }) | ||
| .merge(withTypeFilterSchema) | ||
| .merge(createExpandsSchema(["transaction", "blob", "blob_data"])); | ||
|
|
||
| const outputSchema = serializedBlockSchema; | ||
|
|
||
| function buildBlockWhereClause( | ||
| { id, slot: isSlot }: z.output<typeof inputSchema>, | ||
| filters: Filters | ||
| ): Prisma.BlockWhereInput { | ||
| const blockNumberOrSlotRes = blockNumberOrSlotSchema.safeParse(id); | ||
|
|
||
| if (blockNumberOrSlotRes.success) { | ||
| return { | ||
| [isSlot ? "slot" : "number"]: blockNumberOrSlotRes.data, | ||
| transactionForks: filters.blockType, | ||
| }; | ||
| } | ||
|
|
||
| const blockHashResult = blockHashSchema.safeParse(id); | ||
|
|
||
| if (blockHashResult.data) { | ||
| return { hash: blockHashResult.data }; | ||
| } | ||
|
|
||
| throw new TRPCError({ | ||
| code: "BAD_REQUEST", | ||
| message: `Invalid block id "${id}"`, | ||
| }); | ||
| } | ||
|
|
There was a problem hiding this comment.
Suggested change
| const blockNumberOrSlotSchema = z.union([ | |
| z | |
| .string() | |
| .refine((value) => !hashSchema.safeParse(value).success) | |
| .pipe(z.coerce.number().positive().int()), | |
| z.number().positive().int(), | |
| ]); | |
| const blockIdSchema = z.union([blockHashSchema, blockNumberOrSlotSchema]); | |
| const inputSchema = z | |
| .object({ | |
| id: blockIdSchema, | |
| slot: z.boolean().optional(), | |
| }) | |
| .merge(withTypeFilterSchema) | |
| .merge(createExpandsSchema(["transaction", "blob", "blob_data"])); | |
| const outputSchema = serializedBlockSchema; | |
| function buildBlockWhereClause( | |
| { id, slot: isSlot }: z.output<typeof inputSchema>, | |
| filters: Filters | |
| ): Prisma.BlockWhereInput { | |
| const blockNumberOrSlotRes = blockNumberOrSlotSchema.safeParse(id); | |
| if (blockNumberOrSlotRes.success) { | |
| return { | |
| [isSlot ? "slot" : "number"]: blockNumberOrSlotRes.data, | |
| transactionForks: filters.blockType, | |
| }; | |
| } | |
| const blockHashResult = blockHashSchema.safeParse(id); | |
| if (blockHashResult.data) { | |
| return { hash: blockHashResult.data }; | |
| } | |
| throw new TRPCError({ | |
| code: "BAD_REQUEST", | |
| message: `Invalid block id "${id}"`, | |
| }); | |
| } | |
| const blockIdSchema = z.string().pipe(z.coerce.number().positive().int()); | |
| const inputSchema = z | |
| .object({ | |
| id: blockIdSchema, | |
| slot: z.boolean().optional(), | |
| }) | |
| .merge(withTypeFilterSchema) | |
| .merge(createExpandsSchema(["transaction", "blob", "blob_data"])); | |
| const outputSchema = serializedBlockSchema; | |
| function buildBlockWhereClause( | |
| { id, slot: isSlot }: z.output<typeof inputSchema>, | |
| filters: Filters | |
| ): Prisma.BlockWhereInput { | |
| const blockHashResult = blockHashSchema.safeParse(id); | |
| if (blockHashResult.success) { | |
| return { hash: blockHashResult.data }; | |
| } | |
| const blockId = blockIdSchema.safeParse(id); | |
| if (blockId.success) { | |
| return { | |
| [isSlot ? "slot" : "number"]: blockId.data, | |
| transactionForks: filters.blockType, | |
| }; | |
| } | |
| throw new TRPCError({ | |
| code: "BAD_REQUEST", | |
| message: `Invalid block id "${id}"`, | |
| }); | |
| } |
I prefer this too |
Because I want to expose this procedure as a REST endpoint, having two endpoints that essentially perform the same function—returning a block based on an ID—feels redundant. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
Description
It adds a new boolean query parameter called
slotto thegetByBlockIdprocedure. When set, the provided block ID is treated as a slot.Motivation and Context (Optional)
Related Issue (Optional)
Screenshots (if appropriate):