Skip to content

ZKWAS-263 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 22, 2024
Merged

ZKWAS-263 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e1e1c5
update types
rhaoio May 20, 2024
d7610c0
add chain id to query
rhaoio May 20, 2024
e0f184f
auto submit networks in config
rhaoio May 21, 2024
36db5f3
metadata type for batch data
rhaoio May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dist/cjs/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Task, ProvingParams, DeployParams, QueryParams, VerifyProofParams, VerifyData, StatusState, DeploymentInfo, Image, Statistics, AddImageParams, WithSignature, User, UserQueryParams, PaymentParams, SubscriptionParams, Subscription, SubscriptionType, SubscriptionRequest, TxHistoryQueryParams, TransactionInfo, TaskStatus, TaskType, AppConfig, PaginationResult, ResetImageParams, LogQuery, ModifyImageParams, ChainDetails, InputContextType, ContextHexString, WithCustomInputContextType, WithInitialContext, WithNonCustomInputContextType, WithResetContext, WithoutInitialContext, WithoutInputContextType, WithoutResetContext, ImageMetadataKeys, ImageMetadataValsProvePaymentSrc, TaskMetadataKeys, TaskMetadataValsProofSubmitMode, Round1BatchProof, Round2BatchProof, FinalBatchProof, Round1BatchProofStatus, Round2BatchProofStatus, Round1BatchProofQuery, Round2BatchProofQuery, FinalBatchProofQuery, PaginatedQuery, PaginationQuery, AutoSubmitStatus, TaskMetadata, VerifyBatchProofParams, FinalProofStatus } from "./interface/interface.js";
import { Task, ProvingParams, DeployParams, QueryParams, VerifyProofParams, VerifyData, StatusState, DeploymentInfo, Image, Statistics, AddImageParams, WithSignature, User, UserQueryParams, PaymentParams, SubscriptionParams, Subscription, SubscriptionType, SubscriptionRequest, TxHistoryQueryParams, TransactionInfo, TaskStatus, TaskType, AppConfig, PaginationResult, ResetImageParams, LogQuery, ModifyImageParams, ChainDetails, InputContextType, ContextHexString, WithCustomInputContextType, WithInitialContext, WithNonCustomInputContextType, WithResetContext, WithoutInitialContext, WithoutInputContextType, WithoutResetContext, ImageMetadataKeys, ImageMetadataValsProvePaymentSrc, TaskMetadataKeys, TaskMetadataValsProofSubmitMode, Round1BatchProof, Round2BatchProof, FinalBatchProof, Round1BatchProofStatus, Round2BatchProofStatus, Round1BatchProofQuery, Round2BatchProofQuery, FinalBatchProofQuery, PaginatedQuery, PaginationQuery, AutoSubmitStatus, TaskMetadata, VerifyBatchProofParams, FinalProofStatus, AutoSubmitBatchMetadata } from "./interface/interface.js";
import { ZkWasmUtil } from "./helper/util.js";
import { ZkWasmServiceEndpoint } from "./helper/endpoint.js";
import { ZkWasmServiceHelper } from "./helper/task.js";
export { ZkWasmServiceEndpoint, ZkWasmServiceHelper, ZkWasmUtil, InputContextType, ImageMetadataKeys, ImageMetadataValsProvePaymentSrc, TaskMetadataKeys, TaskMetadataValsProofSubmitMode, AutoSubmitStatus, Round1BatchProofStatus, Round2BatchProofStatus, FinalProofStatus, };
export type { Task, ProvingParams, DeployParams, QueryParams, VerifyProofParams, VerifyData, StatusState, DeploymentInfo, Image, Statistics, AddImageParams, TaskStatus, TaskType, WithSignature, User, UserQueryParams, Subscription, SubscriptionType, PaymentParams, SubscriptionParams, SubscriptionRequest, TxHistoryQueryParams, TransactionInfo, ResetImageParams, AppConfig, PaginationResult, LogQuery, ModifyImageParams, ChainDetails, ContextHexString, WithCustomInputContextType, WithInitialContext, WithNonCustomInputContextType, WithResetContext, WithoutInitialContext, WithoutInputContextType, WithoutResetContext, Round1BatchProof, Round2BatchProof, FinalBatchProof, Round1BatchProofQuery, Round2BatchProofQuery, FinalBatchProofQuery, PaginatedQuery, PaginationQuery, TaskMetadata, VerifyBatchProofParams, };
export type { Task, ProvingParams, DeployParams, QueryParams, VerifyProofParams, VerifyData, StatusState, DeploymentInfo, Image, Statistics, AddImageParams, TaskStatus, TaskType, WithSignature, User, UserQueryParams, Subscription, SubscriptionType, PaymentParams, SubscriptionParams, SubscriptionRequest, TxHistoryQueryParams, TransactionInfo, ResetImageParams, AppConfig, PaginationResult, LogQuery, ModifyImageParams, ChainDetails, ContextHexString, WithCustomInputContextType, WithInitialContext, WithNonCustomInputContextType, WithResetContext, WithoutInitialContext, WithoutInputContextType, WithoutResetContext, Round1BatchProof, Round2BatchProof, FinalBatchProof, Round1BatchProofQuery, Round2BatchProofQuery, FinalBatchProofQuery, PaginatedQuery, PaginationQuery, TaskMetadata, VerifyBatchProofParams, AutoSubmitBatchMetadata, };
15 changes: 14 additions & 1 deletion dist/cjs/interface/interface.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ export interface Task {
metadata: TaskMetadata;
auto_submit_status?: AutoSubmitStatus;
}
export interface AutoSubmitBatchMetadata {
chain_id: number;
id: string;
}
export interface Round1BatchProof {
_id?: any;
task_id: string;
Expand All @@ -52,6 +56,7 @@ export interface Round1BatchProof {
batch_finished?: string;
internal_message?: string;
static_files_verification_data: StaticFileVerificationData;
auto_submit_network_chain_id: number;
status: Round1BatchProofStatus;
}
export interface StaticFileVerificationData {
Expand All @@ -74,6 +79,8 @@ export interface Round2BatchProof {
batch_started?: string;
batch_finished?: string;
internal_message?: string;
auto_submit_network_chain_id: number;
verifier_contracts: VerifierContracts;
static_files_verification_data: StaticFileVerificationData;
status: Round2BatchProofStatus;
}
Expand All @@ -94,7 +101,9 @@ export interface FinalBatchProof {
batched_time?: string;
internal_message?: string;
static_files_verification_data: StaticFileVerificationData;
verifier_contracts: VerifierContracts[];
auto_submit_network_chain_id: number;
verifier_contracts: VerifierContracts;
registered_tx_hash: string | null;
status: FinalProofStatus;
}
export declare enum FinalProofStatus {
Expand All @@ -107,18 +116,21 @@ export interface Round1BatchProofQuery {
task_id?: string;
status?: Round1BatchProofStatus;
circuit_size?: number;
chain_id?: number;
}
export interface Round2BatchProofQuery {
id?: string;
task_id?: string;
status?: Round2BatchProofStatus;
circuit_size?: number;
chain_id?: number;
}
export interface FinalBatchProofQuery {
id?: string;
round_2_id?: string;
task_id?: string;
status?: FinalProofStatus;
chain_id?: number;
}
export interface PaginationQuery {
total?: number;
Expand Down Expand Up @@ -303,6 +315,7 @@ export interface AppConfig {
topup_token_data: TokenData;
deployments: ContractDeployments[];
subscription_plans: SubscriptionParams[];
supported_auto_submit_network_ids: number[];
}
export interface ContractDeployments {
chain_id: number;
Expand Down
4 changes: 2 additions & 2 deletions dist/mjs/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Task, ProvingParams, DeployParams, QueryParams, VerifyProofParams, VerifyData, StatusState, DeploymentInfo, Image, Statistics, AddImageParams, WithSignature, User, UserQueryParams, PaymentParams, SubscriptionParams, Subscription, SubscriptionType, SubscriptionRequest, TxHistoryQueryParams, TransactionInfo, TaskStatus, TaskType, AppConfig, PaginationResult, ResetImageParams, LogQuery, ModifyImageParams, ChainDetails, InputContextType, ContextHexString, WithCustomInputContextType, WithInitialContext, WithNonCustomInputContextType, WithResetContext, WithoutInitialContext, WithoutInputContextType, WithoutResetContext, ImageMetadataKeys, ImageMetadataValsProvePaymentSrc, TaskMetadataKeys, TaskMetadataValsProofSubmitMode, Round1BatchProof, Round2BatchProof, FinalBatchProof, Round1BatchProofStatus, Round2BatchProofStatus, Round1BatchProofQuery, Round2BatchProofQuery, FinalBatchProofQuery, PaginatedQuery, PaginationQuery, AutoSubmitStatus, TaskMetadata, VerifyBatchProofParams, FinalProofStatus } from "./interface/interface.js";
import { Task, ProvingParams, DeployParams, QueryParams, VerifyProofParams, VerifyData, StatusState, DeploymentInfo, Image, Statistics, AddImageParams, WithSignature, User, UserQueryParams, PaymentParams, SubscriptionParams, Subscription, SubscriptionType, SubscriptionRequest, TxHistoryQueryParams, TransactionInfo, TaskStatus, TaskType, AppConfig, PaginationResult, ResetImageParams, LogQuery, ModifyImageParams, ChainDetails, InputContextType, ContextHexString, WithCustomInputContextType, WithInitialContext, WithNonCustomInputContextType, WithResetContext, WithoutInitialContext, WithoutInputContextType, WithoutResetContext, ImageMetadataKeys, ImageMetadataValsProvePaymentSrc, TaskMetadataKeys, TaskMetadataValsProofSubmitMode, Round1BatchProof, Round2BatchProof, FinalBatchProof, Round1BatchProofStatus, Round2BatchProofStatus, Round1BatchProofQuery, Round2BatchProofQuery, FinalBatchProofQuery, PaginatedQuery, PaginationQuery, AutoSubmitStatus, TaskMetadata, VerifyBatchProofParams, FinalProofStatus, AutoSubmitBatchMetadata } from "./interface/interface.js";
import { ZkWasmUtil } from "./helper/util.js";
import { ZkWasmServiceEndpoint } from "./helper/endpoint.js";
import { ZkWasmServiceHelper } from "./helper/task.js";
export { ZkWasmServiceEndpoint, ZkWasmServiceHelper, ZkWasmUtil, InputContextType, ImageMetadataKeys, ImageMetadataValsProvePaymentSrc, TaskMetadataKeys, TaskMetadataValsProofSubmitMode, AutoSubmitStatus, Round1BatchProofStatus, Round2BatchProofStatus, FinalProofStatus, };
export type { Task, ProvingParams, DeployParams, QueryParams, VerifyProofParams, VerifyData, StatusState, DeploymentInfo, Image, Statistics, AddImageParams, TaskStatus, TaskType, WithSignature, User, UserQueryParams, Subscription, SubscriptionType, PaymentParams, SubscriptionParams, SubscriptionRequest, TxHistoryQueryParams, TransactionInfo, ResetImageParams, AppConfig, PaginationResult, LogQuery, ModifyImageParams, ChainDetails, ContextHexString, WithCustomInputContextType, WithInitialContext, WithNonCustomInputContextType, WithResetContext, WithoutInitialContext, WithoutInputContextType, WithoutResetContext, Round1BatchProof, Round2BatchProof, FinalBatchProof, Round1BatchProofQuery, Round2BatchProofQuery, FinalBatchProofQuery, PaginatedQuery, PaginationQuery, TaskMetadata, VerifyBatchProofParams, };
export type { Task, ProvingParams, DeployParams, QueryParams, VerifyProofParams, VerifyData, StatusState, DeploymentInfo, Image, Statistics, AddImageParams, TaskStatus, TaskType, WithSignature, User, UserQueryParams, Subscription, SubscriptionType, PaymentParams, SubscriptionParams, SubscriptionRequest, TxHistoryQueryParams, TransactionInfo, ResetImageParams, AppConfig, PaginationResult, LogQuery, ModifyImageParams, ChainDetails, ContextHexString, WithCustomInputContextType, WithInitialContext, WithNonCustomInputContextType, WithResetContext, WithoutInitialContext, WithoutInputContextType, WithoutResetContext, Round1BatchProof, Round2BatchProof, FinalBatchProof, Round1BatchProofQuery, Round2BatchProofQuery, FinalBatchProofQuery, PaginatedQuery, PaginationQuery, TaskMetadata, VerifyBatchProofParams, AutoSubmitBatchMetadata, };
15 changes: 14 additions & 1 deletion dist/mjs/interface/interface.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ export interface Task {
metadata: TaskMetadata;
auto_submit_status?: AutoSubmitStatus;
}
export interface AutoSubmitBatchMetadata {
chain_id: number;
id: string;
}
export interface Round1BatchProof {
_id?: any;
task_id: string;
Expand All @@ -52,6 +56,7 @@ export interface Round1BatchProof {
batch_finished?: string;
internal_message?: string;
static_files_verification_data: StaticFileVerificationData;
auto_submit_network_chain_id: number;
status: Round1BatchProofStatus;
}
export interface StaticFileVerificationData {
Expand All @@ -74,6 +79,8 @@ export interface Round2BatchProof {
batch_started?: string;
batch_finished?: string;
internal_message?: string;
auto_submit_network_chain_id: number;
verifier_contracts: VerifierContracts;
static_files_verification_data: StaticFileVerificationData;
status: Round2BatchProofStatus;
}
Expand All @@ -94,7 +101,9 @@ export interface FinalBatchProof {
batched_time?: string;
internal_message?: string;
static_files_verification_data: StaticFileVerificationData;
verifier_contracts: VerifierContracts[];
auto_submit_network_chain_id: number;
verifier_contracts: VerifierContracts;
registered_tx_hash: string | null;
status: FinalProofStatus;
}
export declare enum FinalProofStatus {
Expand All @@ -107,18 +116,21 @@ export interface Round1BatchProofQuery {
task_id?: string;
status?: Round1BatchProofStatus;
circuit_size?: number;
chain_id?: number;
}
export interface Round2BatchProofQuery {
id?: string;
task_id?: string;
status?: Round2BatchProofStatus;
circuit_size?: number;
chain_id?: number;
}
export interface FinalBatchProofQuery {
id?: string;
round_2_id?: string;
task_id?: string;
status?: FinalProofStatus;
chain_id?: number;
}
export interface PaginationQuery {
total?: number;
Expand Down Expand Up @@ -303,6 +315,7 @@ export interface AppConfig {
topup_token_data: TokenData;
deployments: ContractDeployments[];
subscription_plans: SubscriptionParams[];
supported_auto_submit_network_ids: number[];
}
export interface ContractDeployments {
chain_id: number;
Expand Down
2 changes: 2 additions & 0 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import {
TaskMetadata,
VerifyBatchProofParams,
FinalProofStatus,
AutoSubmitBatchMetadata,
} from "./interface/interface.js";

import { ZkWasmUtil } from "./helper/util.js";
Expand Down Expand Up @@ -125,4 +126,5 @@ export type {
PaginationQuery,
TaskMetadata,
VerifyBatchProofParams,
AutoSubmitBatchMetadata,
};
16 changes: 15 additions & 1 deletion src/interface/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ export interface Task {
auto_submit_status?: AutoSubmitStatus;
}

export interface AutoSubmitBatchMetadata {
chain_id: number;
id: string;
}

export interface Round1BatchProof {
_id?: any;
// The task id of the original aggregate proof task
Expand All @@ -58,6 +63,7 @@ export interface Round1BatchProof {
batch_finished?: string;
internal_message?: string;
static_files_verification_data: StaticFileVerificationData;
auto_submit_network_chain_id: number;
status: Round1BatchProofStatus;
}

Expand Down Expand Up @@ -93,6 +99,8 @@ export interface Round2BatchProof {
batch_started?: string;
batch_finished?: string;
internal_message?: string;
auto_submit_network_chain_id: number;
verifier_contracts: VerifierContracts;
static_files_verification_data: StaticFileVerificationData;
status: Round2BatchProofStatus;
}
Expand Down Expand Up @@ -120,7 +128,9 @@ export interface FinalBatchProof {
batched_time?: string;
internal_message?: string;
static_files_verification_data: StaticFileVerificationData;
verifier_contracts: VerifierContracts[];
auto_submit_network_chain_id: number;
verifier_contracts: VerifierContracts;
registered_tx_hash: string | null;
status: FinalProofStatus;
}

Expand All @@ -136,20 +146,23 @@ export interface Round1BatchProofQuery {
task_id?: string;
status?: Round1BatchProofStatus;
circuit_size?: number;
chain_id?: number;
}

export interface Round2BatchProofQuery {
id?: string;
task_id?: string;
status?: Round2BatchProofStatus;
circuit_size?: number;
chain_id?: number;
}

export interface FinalBatchProofQuery {
id?: string;
round_2_id?: string;
task_id?: string;
status?: FinalProofStatus;
chain_id?: number;
}

export interface PaginationQuery {
Expand Down Expand Up @@ -383,6 +396,7 @@ export interface AppConfig {
topup_token_data: TokenData;
deployments: ContractDeployments[];
subscription_plans: SubscriptionParams[];
supported_auto_submit_network_ids: number[];
}

export interface ContractDeployments {
Expand Down