Merge pull request #58 from DelphinusLab/zkwas-221

Zkwas 221

Author: yymone

dist/cjs/helper/util.js

@@ -235,9 +235,13 @@ class ZkWasmUtil {
     static verifyProof(verify_contract, params) {
         return __awaiter(this, void 0, void 0, function* () {
             let aggregate_proof = this.bytesToBigIntArray(params.aggregate_proof);
-            let batchInstances = this.bytesToBigIntArray(params.batch_instances);
+            let shadow_instances = this.bytesToBigIntArray(params.shadow_instances);
             let aux = this.bytesToBigIntArray(params.aux);
-            let instances = this.bytesToBigIntArray(params.instances);
+            let instances = [];
+            params.instances.forEach((instance) => {
+                instances.push(this.bytesToBigIntArray(instance));
+            });
+            // let instances = this.bytesToBigIntArray(params.instances);
             // let args = ZkWasmUtil.parseArgs(params.instances).map((x) =>
             //   x.toString(10)
             // );
@@ -247,7 +251,7 @@ class ZkWasmUtil {
             // }
             // // convert to BigInt array
             // let bigIntArgs = args.map((x) => BigInt(x));
-            let result = yield verify_contract.verify.send(aggregate_proof, batchInstances, aux, [instances]);
+            let result = yield verify_contract.verify.send(aggregate_proof, shadow_instances, aux, instances);
             return result;
         });
     }

dist/cjs/interface/interface.d.ts

@@ -20,6 +20,7 @@ export interface Task {
     proof: Uint8Array;
     aux: Uint8Array;
     external_host_table: Uint8Array;
+    shadow_instances: Uint8Array;
     batch_instances: Uint8Array;
     instances: Uint8Array;
     public_inputs: Array<string>;
@@ -139,9 +140,9 @@ export interface QueryParams {
 }
 export interface VerifyProofParams {
     aggregate_proof: Uint8Array;
-    batch_instances: Uint8Array;
+    shadow_instances: Uint8Array;
     aux: Uint8Array;
-    instances: Uint8Array;
+    instances: Array<Uint8Array>;
 }
 export interface LogQuery {
     id: string;

dist/mjs/helper/util.js

@@ -264,9 +264,13 @@ export class ZkWasmUtil {
     }
     static async verifyProof(verify_contract, params) {
         let aggregate_proof = this.bytesToBigIntArray(params.aggregate_proof);
-        let batchInstances = this.bytesToBigIntArray(params.batch_instances);
+        let shadow_instances = this.bytesToBigIntArray(params.shadow_instances);
         let aux = this.bytesToBigIntArray(params.aux);
-        let instances = this.bytesToBigIntArray(params.instances);
+        let instances = [];
+        params.instances.forEach((instance) => {
+            instances.push(this.bytesToBigIntArray(instance));
+        });
+        // let instances = this.bytesToBigIntArray(params.instances);
         // let args = ZkWasmUtil.parseArgs(params.instances).map((x) =>
         //   x.toString(10)
         // );
@@ -276,7 +280,7 @@ export class ZkWasmUtil {
         // }
         // // convert to BigInt array
         // let bigIntArgs = args.map((x) => BigInt(x));
-        let result = await verify_contract.verify.send(aggregate_proof, batchInstances, aux, [instances]);
+        let result = await verify_contract.verify.send(aggregate_proof, shadow_instances, aux, instances);
         return result;
     }
     static async signMessage(message, priv_key) {

dist/mjs/interface/interface.d.ts

@@ -20,6 +20,7 @@ export interface Task {
     proof: Uint8Array;
     aux: Uint8Array;
     external_host_table: Uint8Array;
+    shadow_instances: Uint8Array;
     batch_instances: Uint8Array;
     instances: Uint8Array;
     public_inputs: Array<string>;
@@ -139,9 +140,9 @@ export interface QueryParams {
 }
 export interface VerifyProofParams {
     aggregate_proof: Uint8Array;
-    batch_instances: Uint8Array;
+    shadow_instances: Uint8Array;
     aux: Uint8Array;
-    instances: Uint8Array;
+    instances: Array<Uint8Array>;
 }
 export interface LogQuery {
     id: string;

src/helper/util.ts

@@ -331,9 +331,13 @@ export class ZkWasmUtil {
     params: VerifyProofParams
   ) {
     let aggregate_proof = this.bytesToBigIntArray(params.aggregate_proof);
-    let batchInstances = this.bytesToBigIntArray(params.batch_instances);
+    let shadow_instances = this.bytesToBigIntArray(params.shadow_instances);
     let aux = this.bytesToBigIntArray(params.aux);
-    let instances = this.bytesToBigIntArray(params.instances);
+    let instances: Array<BigInt[]> = [];
+    params.instances.forEach((instance) => {
+      instances.push(this.bytesToBigIntArray(instance));
+    });
+    // let instances = this.bytesToBigIntArray(params.instances);
     // let args = ZkWasmUtil.parseArgs(params.instances).map((x) =>
     //   x.toString(10)
     // );
@@ -346,9 +350,9 @@ export class ZkWasmUtil {
 
     let result = await verify_contract.verify.send(
       aggregate_proof,
-      batchInstances,
+      shadow_instances,
       aux,
-      [instances]
+      instances
     );
     return result;
   }

src/interface/interface.ts

@@ -23,6 +23,7 @@ export interface Task {
   proof: Uint8Array;
   aux: Uint8Array;
   external_host_table: Uint8Array;
+  shadow_instances: Uint8Array;
   batch_instances: Uint8Array;
   instances: Uint8Array;
   public_inputs: Array<string>;
@@ -175,9 +176,10 @@ export interface QueryParams {
 
 export interface VerifyProofParams {
   aggregate_proof: Uint8Array;
-  batch_instances: Uint8Array;
+  shadow_instances: Uint8Array;
+
   aux: Uint8Array;
-  instances: Uint8Array;
+  instances: Array<Uint8Array>;
 }
 
 export interface LogQuery {