feat(idea/squid) merge voucher and squid indexers #1647
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
fix squid event handler types
add voucher jsonrpc handlers to explorer
Zewasik
changed the title
osipov-mit
reviewed
Oct 3, 2024
idea/squid/src/event.route.ts
Outdated
|
|
||
| const VOUCHERS_FROM_SPEC_VERSION = 1100; | ||
|
|
||
| export function handleIsVoucherIssued({ event, block, tempState, common }: IHandleEventProps<EVoucherIssued>) { |
There was a problem hiding this comment.
Suggested change
| export function handleIsVoucherIssued({ event, block, tempState, common }: IHandleEventProps<EVoucherIssued>) { | |
| export function handleVoucherIssued({ event, block, tempState, common }: IHandleEventProps<EVoucherIssued>) { |
I'd suggest using such naming
idea/squid/src/temp-state.ts
Outdated
| @@ -49,6 +51,9 @@ export class TempState { | |||
| private messagesFromProgram: Map<string, MessageFromProgram>; | |||
| private messagesToProgram: Map<string, MessageToProgram>; | |||
| private events: Map<string, Event>; | |||
| private vouchers: Map<string, Voucher>; | |||
| private revoked: Set<string>; | |||
There was a problem hiding this comment.
Suggested change
| private revoked: Set<string>; | |
| private revokedVouchers: Set<string>; |
Perhaps it's better for understanding
idea/explorer/src/jsonrpc.ts
Outdated
| } | ||
|
|
||
| @JsonRpcMethod('voucher.data') | ||
| @Cache(15) |
There was a problem hiding this comment.
Suggested change
| @Cache(15) | |
| @Cache(300) |
idea/explorer/src/jsonrpc.ts
Outdated
| @@ -110,4 +159,16 @@ export class JsonRpcServer extends JsonRpc(JsonRpcBase) { | |||
| async eventData(params: ParamGetEvent) { | |||
| return this._services.get(params.genesis).event.getEvent(params); | |||
| } | |||
|
|
|||
| @JsonRpcMethod('voucher.all') | |||
| @Cache(15) | |||
There was a problem hiding this comment.
Suggested change
| @Cache(15) | |
| @Cache(60) |
idea/explorer/src/jsonrpc.ts
Outdated
Comment on lines
37
to
80
| this._app.get('/api/voucher/:id', async (req, res) => { | ||
| const { genesis } = req.query; | ||
| if (!genesis) { | ||
| res.status(400).json({ error: 'Genesis not found in the request' }); | ||
| return; | ||
| } | ||
|
|
||
| const voucherService = this._services.get(genesis.toString())?.voucher; | ||
| if (!voucherService) { | ||
| res.status(400).json({ error: 'Network is not supported' }); | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| const voucher = await voucherService.getVoucher({ id: req.params.id, genesis: genesis.toString() }); | ||
| res.json(voucher); | ||
| } catch (error) { | ||
| if (error instanceof VoucherNotFound) { | ||
| res.json(null); | ||
| return; | ||
| } | ||
| res.status(500).json({ error: 'Internal server error' }); | ||
| } | ||
| }); | ||
|
|
||
| this._app.post('/api/vouchers', async (req, res) => { | ||
| const { genesis } = req.query; | ||
| if (!genesis) { | ||
| res.status(400).json({ error: 'Genesis not found in the request' }); | ||
| return; | ||
| } | ||
|
|
||
| const voucherService = this._services.get(genesis.toString())?.voucher; | ||
| if (!voucherService) { | ||
| res.status(400).json({ error: 'Network is not supported' }); | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| const vouchers = await voucherService.getVouchers(req.body); | ||
| res.json(vouchers); | ||
| } catch (error) { | ||
| res.status(500).json({ error: 'Internal server error' }); | ||
| } |
There was a problem hiding this comment.
Don't you want to refactor this using decorators? As it's done with jsonrpc methods
There was a problem hiding this comment.
I decided that ideally REST should not be in the JSONRPC server at all and is a temporary solution
rename variables for consistency
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.
Resolves #1643 .
@osipov-mit