From d5c08e9b835d1c672fb573db43b7dcc56d734742 Mon Sep 17 00:00:00 2001 From: MuRong Date: Thu, 22 Feb 2024 14:44:36 +0800 Subject: [PATCH] chore: upgrade cle api --- packages/cle-cli/package.json | 2 +- packages/cle-cli/src/commands/compile.ts | 4 ++-- packages/cle-cli/src/commands/deposit.ts | 4 ++-- packages/cle-cli/src/commands/exec.ts | 6 +++--- packages/cle-cli/src/commands/prove.ts | 16 ++++++++-------- packages/cle-cli/src/commands/publish.ts | 6 +++--- pnpm-lock.yaml | 14 +++++++++----- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/packages/cle-cli/package.json b/packages/cle-cli/package.json index 7182722..1bde4b2 100644 --- a/packages/cle-cli/package.json +++ b/packages/cle-cli/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@antfu/utils": "^0.7.6", - "@ora-io/cle-api": "^1.0.3-alpha.9", + "@ora-io/cle-api": "^1.0.3-alpha.11", "api": "^6.1.1", "assemblyscript": "^0.27.12", "await-to-js": "^3.0.0", diff --git a/packages/cle-cli/src/commands/compile.ts b/packages/cle-cli/src/commands/compile.ts index 9b3de32..1972f5d 100644 --- a/packages/cle-cli/src/commands/compile.ts +++ b/packages/cle-cli/src/commands/compile.ts @@ -1,6 +1,6 @@ import fs from 'node:fs' import path from 'node:path' -import * as zkgapi from '@ora-io/cle-api' +import * as cleApi from '@ora-io/cle-api' import webjson from '@ora-io/cle-lib/test/weblib/weblib.json' import to from 'await-to-js' import { CLEYaml } from '@ora-io/cle-api' @@ -76,7 +76,7 @@ async function compileRun(options: CompileOptions) { const relativeYamlPath = path.relative(dirPath, yamlPath) - const [err, res] = await to(zkgapi.compile({ + const [err, res] = await to(cleApi.compile({ ...webjson, ...fileMap, [relativeYamlPath]: yaml, diff --git a/packages/cle-cli/src/commands/deposit.ts b/packages/cle-cli/src/commands/deposit.ts index 1b54134..07653f8 100644 --- a/packages/cle-cli/src/commands/deposit.ts +++ b/packages/cle-cli/src/commands/deposit.ts @@ -1,4 +1,4 @@ -import * as zkgapi from '@ora-io/cle-api' +import * as cleApi from '@ora-io/cle-api' import { ethers } from 'ethers' import type { UserConfig } from '../config' import { loadJsonRpcProviderUrl, loadYamlFromPath, logLoadingAnimation } from '../utils' @@ -32,7 +32,7 @@ export async function deposit(options: DepositOptions) { logger.info('[*] Please wait for deposit tx... (estimated: 30 sec)') const loading = logLoadingAnimation() - const txReceipt = await zkgapi.deposit( + const txReceipt = await cleApi.deposit( deployedContractAddress, signer, { depositAmount }, diff --git a/packages/cle-cli/src/commands/exec.ts b/packages/cle-cli/src/commands/exec.ts index 8d62fe4..f544337 100644 --- a/packages/cle-cli/src/commands/exec.ts +++ b/packages/cle-cli/src/commands/exec.ts @@ -1,6 +1,6 @@ import fs from 'node:fs' import to from 'await-to-js' -import * as zkgapi from '@ora-io/cle-api' +import * as cleApi from '@ora-io/cle-api' import ethres from 'ethers' import { generateDspHubParams, loadJsonRpcProviderUrl, loadYamlFromPath, toHexString } from '../utils' import { logger } from '../logger' @@ -22,7 +22,7 @@ export async function exec(options: ExecOptions) { logger.error('[-] ERROR: Failed to get yaml') return } - const dsp = zkgapi.dspHub.getDSPByYaml(cleYaml) + const dsp = cleApi.dspHub.getDSPByYaml(cleYaml) if (!dsp) { logger.error('[-] ERROR: Failed to get DSP') return @@ -53,7 +53,7 @@ export async function exec(options: ExecOptions) { cleYaml, } - const state = await zkgapi.execute( + const state = await cleApi.execute( cleExecutable, execParams, // local, diff --git a/packages/cle-cli/src/commands/prove.ts b/packages/cle-cli/src/commands/prove.ts index e3c9d6e..ffcf0ff 100644 --- a/packages/cle-cli/src/commands/prove.ts +++ b/packages/cle-cli/src/commands/prove.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import { providers } from 'ethers' import to from 'await-to-js' import prompts from 'prompts' -import * as zkgapi from '@ora-io/cle-api' +import * as cleApi from '@ora-io/cle-api' import type { Input } from 'zkwasm-toolchain' import { convertToMd5, generateDspHubParams, loadJsonRpcProviderUrl, loadYamlFromPath, logLoadingAnimation, taskPrettyPrint, validateProvider } from '../utils' import { logger } from '../logger' @@ -45,7 +45,7 @@ export async function prove(options: ProveOptions) { logger.error('[-] ERROR: Failed to get yaml') return } - const dsp = zkgapi.dspHub.getDSPByYaml(yaml) + const dsp = cleApi.dspHub.getDSPByYaml(yaml) if (!dsp) { logger.error('[-] ERROR: Failed to get DSP') return @@ -100,10 +100,10 @@ export async function prove(options: ProveOptions) { const cleExecutable = { wasmUint8Array, - cleYaml: yaml as zkgapi.CLEYaml, + cleYaml: yaml as cleApi.CLEYaml, } - const input = await zkgapi.proveInputGen( + const input = await cleApi.proveInputGen( cleExecutable, proveParams, ) @@ -134,7 +134,7 @@ async function testMode(wasmUint8Array: Uint8Array, input: Input) { cleYaml: null, } - const [mockErr, mockSuccess] = await to(zkgapi.proveMock( + const [mockErr, mockSuccess] = await to(cleApi.proveMock( cleExecutable, input, )) @@ -146,7 +146,7 @@ async function testMode(wasmUint8Array: Uint8Array, input: Input) { if (mockSuccess) { logger.info('[+] ZKWASM MOCK EXECUTION SUCCESS!') - if (zkgapi.hasDebugOnlyFunc) + if (cleApi.hasDebugOnlyFunc) logger.warn('[+] PLEASE REMOVE DEBUG FUNCTION (e.g. console.log) BEFORE PROVE MODE') else logger.warn('[+] READY FOR PROVE MODE: npx cle prove --prove') @@ -194,7 +194,7 @@ async function proveMode(userPrivateKey: string, md5: string, privateInputStr: s const [queryTaskErr, data] = await to(dispatcher.queryTask(txhash)) if (queryTaskErr) { - if (queryTaskErr instanceof zkgapi.Error.TDNoTaskFound) { + if (queryTaskErr instanceof cleApi.Error.TDNoTaskFound) { logger.error('[-] PLEASE REQUIRE FINISH SETUP FIRST.') return } @@ -212,7 +212,7 @@ async function proveMode(userPrivateKey: string, md5: string, privateInputStr: s const loading = logLoadingAnimation() - const [err, result] = await to(zkgapi.waitProve(zkWasmProviderUrl, taskId)) + const [err, result] = await to(cleApi.waitProve(zkWasmProviderUrl, taskId)) if (err) { loading.stopAndClear() diff --git a/packages/cle-cli/src/commands/publish.ts b/packages/cle-cli/src/commands/publish.ts index 4bc04c4..94dc831 100644 --- a/packages/cle-cli/src/commands/publish.ts +++ b/packages/cle-cli/src/commands/publish.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import { ethers } from 'ethers' import to from 'await-to-js' -import * as zkgapi from '@ora-io/cle-api' +import * as cleApi from '@ora-io/cle-api' import { logger } from '../logger' import { loadJsonRpcProviderUrl, loadYamlFromPath, logDivider, logLoadingAnimation } from '../utils' import type { UserConfig } from '../config' @@ -42,7 +42,7 @@ export async function publish(options: PublishOptions) { const loading = logLoadingAnimation() - const [err, txReceipt] = await to(zkgapi.publish( + const [err, txReceipt] = await to(cleApi.publish( { wasmUint8Array, cleYaml }, signer, { @@ -53,7 +53,7 @@ export async function publish(options: PublishOptions) { )) if (err) { loading.stopAndClear() - if (err instanceof zkgapi.Error.GraphAlreadyExist) { + if (err instanceof cleApi.Error.GraphAlreadyExist) { logger.error(`[-] PUBLISH FAILED. ${err.message}`) return } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba91a9d..37a5706 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -82,8 +82,8 @@ importers: specifier: ^0.7.6 version: 0.7.6 '@ora-io/cle-api': - specifier: ^1.0.3-alpha.9 - version: 1.0.3-alpha.9 + specifier: ^1.0.3-alpha.11 + version: 1.0.3-alpha.11 api: specifier: ^6.1.1 version: 6.1.1(openapi-types@12.1.3) @@ -1995,8 +1995,8 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.15.0 - /@ora-io/cle-api@1.0.3-alpha.9: - resolution: {integrity: sha512-U3s9j5UCRLvpRPe7/cHmVB8Ot09knhAd90f57bSa2GrJuj9Uvhxo+U8TSGmlteJWRRjH/Sg3Q4QhGHELAicDBw==} + /@ora-io/cle-api@1.0.3-alpha.11: + resolution: {integrity: sha512-Lw4WQBj0nnsFn45oKaDiJMoLZwSJ3VQxPu+KPnXLVKka0AGT3Yrh3G4IrdoMtNUS2nR0Un+fJc3PZ2GsRlcnEA==} dependencies: '@ethereumjs/rlp': 5.0.2 '@murongg/utils': 0.1.20 @@ -2010,7 +2010,7 @@ packages: js-yaml: 4.1.0 semver: 7.5.4 web3-eth-contract: 1.10.4 - zkwasm-toolchain: 0.0.4 + zkwasm-toolchain: 0.0.5 transitivePeerDependencies: - aws-crt - bufferutil @@ -9027,6 +9027,10 @@ packages: resolution: {integrity: sha512-3vz0H0jSUCAJcBvEHFxViBS7su0+Ca3fxqO8cePTHwJixRhqE7bp3E/2TDYkV3Oax2k+OmgAmkRnfgam8Svpgg==} dev: false + /zkwasm-toolchain@0.0.5: + resolution: {integrity: sha512-H5dn2WJUWa5qKRYJgGvh7kWVFK7uWuTkh0t9q6Rxr6Z6aIqHz6qf+wBTDjZWYxngVPiOqEs+Yt/7qodPHNatjw==} + dev: false + github.com/DelphinusLab/delphinus-web3subscriber/b623f2174498bde8746d2acd43519680c968e466: resolution: {tarball: https://codeload.github.com/DelphinusLab/delphinus-web3subscriber/tar.gz/b623f2174498bde8746d2acd43519680c968e466} name: web3subscriber