feat: update

2026-01-10 04:27:56 -05:00 · 2024-01-17 15:45:48 +01:00
parent 58bf2e43d1
commit 16c2bc4f9e
9 changed files with 55 additions and 115 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,9 +58,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"

 [[package]]
 name = "bumpalo"
@@ -229,9 +229,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"

 [[package]]
 name = "libm"
@@ -241,9 +241,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"

 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"

 [[package]]
 name = "log"
@@ -400,9 +400,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
 "unicode-ident",
 ]
@@ -472,9 +472,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
 "proc-macro2",
 ]
@@ -555,11 +555,11 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"

 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
 "errno",
 "libc",
 "linux-raw-sys",
@@ -574,29 +574,29 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"

 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]

 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e"

 [[package]]
 name = "spin"
@@ -623,9 +623,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.40"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -683,7 +683,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 "wasm-bindgen-shared",
 ]

@@ -705,7 +705,7 @@ checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 Multi-party PSI using Multi-party BFV

-### TO DOs
+### Guide
+
+- Wasm and JS/TS bindings built using `wasm-pack` [guide](https://developer.mozilla.org/en-US/docs/WebAssembly/Rust_to_Wasm)

 - [ ] Extend serialization to `state0`, `state1`, `state2`, `state3` and `state4`
 - [ ] Test the full flow in the HTML file
--- a/index.html
+++ b/index.html
@@ -6,10 +6,9 @@
  </head>
  <body>
    <script type="module">
-      import init, { statetest } from "./pkg/mp_psi.js";
+      import init, { state0_serialized } from "./pkg/mp_psi.js";
      init().then(() => {
-        console.log("hello-wasm initialized");
-        console.log(statetest());
+        console.log(state0_serialized());
      });
    </script>
  </body>
--- a/pkg/README.md
+++ b/pkg/README.md
@@ -1 +1,8 @@
 Multi-party PSI using Multi-party BFV
+
+### Guide
+
+- Wasm and JS/TS bindings built using `wasm-pack` [guide](https://developer.mozilla.org/en-US/docs/WebAssembly/Rust_to_Wasm)
+
+- [ ] Extend serialization to `state0`, `state1`, `state2`, `state3` and `state4`
+- [ ] Test the full flow in the HTML file
--- a/pkg/mp_psi.d.ts
+++ b/pkg/mp_psi.d.ts
@@ -3,22 +3,15 @@
 /**
 * @returns {Uint8Array}
 */
-export function statetest(): Uint8Array;
-/**
-* @param {string} name
-*/
-export function greet(name: string): void;
+export function state0_serialized(): Uint8Array;

 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;

 export interface InitOutput {
  readonly memory: WebAssembly.Memory;
-  readonly statetest: (a: number) => void;
-  readonly greet: (a: number, b: number) => void;
+  readonly state0_serialized: (a: number) => void;
  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
  readonly __wbindgen_free: (a: number, b: number, c: number) => void;
-  readonly __wbindgen_malloc: (a: number, b: number) => number;
-  readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
  readonly __wbindgen_exn_store: (a: number) => void;
 }

--- a/pkg/mp_psi.js
+++ b/pkg/mp_psi.js
@@ -63,10 +63,10 @@ function getArrayU8FromWasm0(ptr, len) {
 /**
 * @returns {Uint8Array}
 */
-export function statetest() {
+export function state0_serialized() {
    try {
        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.statetest(retptr);
+        wasm.state0_serialized(retptr);
        var r0 = getInt32Memory0()[retptr / 4 + 0];
        var r1 = getInt32Memory0()[retptr / 4 + 1];
        var v1 = getArrayU8FromWasm0(r0, r1).slice();
@@ -77,69 +77,6 @@ export function statetest() {
    }
 }

-let WASM_VECTOR_LEN = 0;
-
-const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
-
-const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
-    ? function (arg, view) {
-    return cachedTextEncoder.encodeInto(arg, view);
-}
-    : function (arg, view) {
-    const buf = cachedTextEncoder.encode(arg);
-    view.set(buf);
-    return {
-        read: arg.length,
-        written: buf.length
-    };
-});
-
-function passStringToWasm0(arg, malloc, realloc) {
-
-    if (realloc === undefined) {
-        const buf = cachedTextEncoder.encode(arg);
-        const ptr = malloc(buf.length, 1) >>> 0;
-        getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
-        WASM_VECTOR_LEN = buf.length;
-        return ptr;
-    }
-
-    let len = arg.length;
-    let ptr = malloc(len, 1) >>> 0;
-
-    const mem = getUint8Memory0();
-
-    let offset = 0;
-
-    for (; offset < len; offset++) {
-        const code = arg.charCodeAt(offset);
-        if (code > 0x7F) break;
-        mem[ptr + offset] = code;
-    }
-
-    if (offset !== len) {
-        if (offset !== 0) {
-            arg = arg.slice(offset);
-        }
-        ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
-        const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
-        const ret = encodeString(arg, view);
-
-        offset += ret.written;
-    }
-
-    WASM_VECTOR_LEN = offset;
-    return ptr;
-}
-/**
-* @param {string} name
-*/
-export function greet(name) {
-    const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    wasm.greet(ptr0, len0);
-}
-
 function handleError(f, args) {
    try {
        return f.apply(this, args);
@@ -182,9 +119,6 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
    const imports = {};
    imports.wbg = {};
-    imports.wbg.__wbg_alert_9e36cb99b2a415e1 = function(arg0, arg1) {
-        alert(getStringFromWasm0(arg0, arg1));
-    };
    imports.wbg.__wbg_crypto_d05b68a3572bb8ca = function(arg0) {
        const ret = getObject(arg0).crypto;
        return addHeapObject(ret);
--- a/pkg/mp_psi_bg.wasm
+++ b/pkg/mp_psi_bg.wasm
--- a/pkg/mp_psi_bg.wasm.d.ts
+++ b/pkg/mp_psi_bg.wasm.d.ts
@@ -1,10 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export function statetest(a: number): void;
-export function greet(a: number, b: number): void;
+export function state0_serialized(a: number): void;
 export function __wbindgen_add_to_stack_pointer(a: number): number;
 export function __wbindgen_free(a: number, b: number, c: number): void;
-export function __wbindgen_malloc(a: number, b: number): number;
-export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number;
 export function __wbindgen_exn_store(a: number): void;
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -65,13 +65,21 @@ struct MessageBToAPostState3 {
 }

 #[wasm_bindgen]
-pub fn statetest() -> Vec<u8> {
-    let params = params();
-    let mut rng = thread_rng();
-    let s_pk_a = SecretKey::random_with_params(&params, &mut rng);
+pub fn state0_serialized() -> Vec<u8> {
+    let (private_output_a_state0, _, _) = state0();

-    let serialized_sk = SecretKeyProto::try_from_with_parameters(&s_pk_a, &params);
-    serialized_sk.coefficients
+    let s_pk_a_serialized =
+        SecretKeyProto::try_from_with_parameters(&private_output_a_state0.s_pk_a, &params())
+            .coefficients;
+
+    let s_rlk_a_serialized =
+        SecretKeyProto::try_from_with_parameters(&private_output_a_state0.s_rlk_a, &params())
+            .coefficients;
+
+    let mut output_serialized = s_pk_a_serialized;
+    output_serialized.extend(s_rlk_a_serialized);
+
+    output_serialized
 }

 fn state0() -> (