From e1f40d19021c46fda7f5563ee87c1f0905fba401 Mon Sep 17 00:00:00 2001 From: boneyard93501 <4523011+boneyard93501@users.noreply.github.com> Date: Sat, 23 Oct 2021 13:47:42 -0500 Subject: [PATCH] update data and services --- aqua/snapshot.aqua | 31 ++++++++++++++++++++++--------- src/_aqua/snapshot.ts | 24 ++++++++++++------------ 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/aqua/snapshot.aqua b/aqua/snapshot.aqua index 33c8d5b..6ca2908 100644 --- a/aqua/snapshot.aqua +++ b/aqua/snapshot.aqua @@ -4,36 +4,49 @@ data PVResponse: eip_validation: bool ts_validation: bool -data DBResponse: - snapshot_id: u64 -service ProVoValidation("snapshot"): +data DBRecord: + snapshot_id: u64 + event_address: string + event_signature: string + eip712_doc: string + peer_id: string + timestamp: u64 + eip_validation: bool + ts_validation: bool + signed_response: string + +data DBResult: + stderr: string + stdout: []DBRecord + +service EIPValidator("snapshot"): eip712_validation_string(eip_str: string, peer_id: string) -> string eip712_validation_url(eip_str: string, peer_id: string) -> string service DataProvider("snapshot"): - get_records() -> []DBResponse - get_record(snapshot_id: u64) -> DBResponse + get_records() -> DBResult + get_record(snapshot_id: u64) -> DBResult func validate(relay: string, peer:string, eip712_json: string) -> string: on peer via relay: - result <- ProVoValidation.eip712_validation_string(eip712_json, peer) + result <- EIPValidator.eip712_validation_string(eip712_json, peer) <- result func validate_from_url(relay: string, peer:string, eip712_url: string) -> string: on peer via relay: - result <- ProVoValidation.eip712_validation_url(eip712_url, peer) + result <- EIPValidator.eip712_validation_url(eip712_url, peer) <- result -func get_record(relay:string, peer:string, snapshot_id: u64) -> DBResponse: +func get_record(relay:string, peer:string, snapshot_id: u64) -> DBResult: on peer via relay: result <- DataProvider.get_record(snapshot_id) <- result -func get_records(relay:string, peer:string) -> []DBResponse: +func get_records(relay:string, peer:string) -> DBResult: on peer via relay: result <- DataProvider.get_records() <- result diff --git a/src/_aqua/snapshot.ts b/src/_aqua/snapshot.ts index 1397783..cbe2502 100644 --- a/src/_aqua/snapshot.ts +++ b/src/_aqua/snapshot.ts @@ -16,17 +16,17 @@ import { // Services -export interface ProVoValidationDef { +export interface EIPValidatorDef { eip712_validation_string: (eip_str: string, peer_id: string, callParams: CallParams<'eip_str' | 'peer_id'>) => string | Promise; eip712_validation_url: (eip_str: string, peer_id: string, callParams: CallParams<'eip_str' | 'peer_id'>) => string | Promise; } -export function registerProVoValidation(service: ProVoValidationDef): void; -export function registerProVoValidation(serviceId: string, service: ProVoValidationDef): void; -export function registerProVoValidation(peer: FluencePeer, service: ProVoValidationDef): void; -export function registerProVoValidation(peer: FluencePeer, serviceId: string, service: ProVoValidationDef): void; +export function registerEIPValidator(service: EIPValidatorDef): void; +export function registerEIPValidator(serviceId: string, service: EIPValidatorDef): void; +export function registerEIPValidator(peer: FluencePeer, service: EIPValidatorDef): void; +export function registerEIPValidator(peer: FluencePeer, serviceId: string, service: EIPValidatorDef): void; -export function registerProVoValidation(...args: any) { +export function registerEIPValidator(...args: any) { registerService( args, { @@ -80,8 +80,8 @@ export function registerProVoValidation(...args: any) { export interface DataProviderDef { - get_record: (snapshot_id: number, callParams: CallParams<'snapshot_id'>) => { snapshot_id: number; } | Promise<{ snapshot_id: number; }>; -get_records: (callParams: CallParams) => { snapshot_id: number; }[] | Promise<{ snapshot_id: number; }[]>; + get_record: (snapshot_id: number, callParams: CallParams<'snapshot_id'>) => { stderr: string; stdout: { eip712_doc: string; eip_validation: boolean; event_address: string; event_signature: string; peer_id: string; signed_response: string; snapshot_id: number; timestamp: number; ts_validation: boolean; }[]; } | Promise<{ stderr: string; stdout: { eip712_doc: string; eip_validation: boolean; event_address: string; event_signature: string; peer_id: string; signed_response: string; snapshot_id: number; timestamp: number; ts_validation: boolean; }[]; }>; +get_records: (callParams: CallParams) => { stderr: string; stdout: { eip712_doc: string; eip_validation: boolean; event_address: string; event_signature: string; peer_id: string; signed_response: string; snapshot_id: number; timestamp: number; ts_validation: boolean; }[]; } | Promise<{ stderr: string; stdout: { eip712_doc: string; eip_validation: boolean; event_address: string; event_signature: string; peer_id: string; signed_response: string; snapshot_id: number; timestamp: number; ts_validation: boolean; }[]; }>; } export function registerDataProvider(service: DataProviderDef): void; export function registerDataProvider(serviceId: string, service: DataProviderDef): void; @@ -314,7 +314,7 @@ export function validate_from_url(...args: any) { } -export type Get_recordResult = { snapshot_id: number; } +export type Get_recordResult = { stderr: string; stdout: { eip712_doc: string; eip_validation: boolean; event_address: string; event_signature: string; peer_id: string; signed_response: string; snapshot_id: number; timestamp: number; ts_validation: boolean; }[]; } export function get_record(relay: string, peer_: string, snapshot_id: number, config?: {ttl?: number}): Promise; export function get_record(peer: FluencePeer, relay: string, peer_: string, snapshot_id: number, config?: {ttl?: number}): Promise; export function get_record(...args: any) { @@ -409,9 +409,9 @@ export function get_record(...args: any) { } - -export function get_records(relay: string, peer_: string, config?: {ttl?: number}): Promise<{ snapshot_id: number; }[]>; -export function get_records(peer: FluencePeer, relay: string, peer_: string, config?: {ttl?: number}): Promise<{ snapshot_id: number; }[]>; +export type Get_recordsResult = { stderr: string; stdout: { eip712_doc: string; eip_validation: boolean; event_address: string; event_signature: string; peer_id: string; signed_response: string; snapshot_id: number; timestamp: number; ts_validation: boolean; }[]; } +export function get_records(relay: string, peer_: string, config?: {ttl?: number}): Promise; +export function get_records(peer: FluencePeer, relay: string, peer_: string, config?: {ttl?: number}): Promise; export function get_records(...args: any) { let script = `