Merge pull request #31 from ideal-lab5/dev

Simplify TS bindings

Author: driemworks

Cargo.lock

@@ -2,7 +2,6 @@
 members = ["timelock", "wasm", "timelock-ffi"]
 resolver = "2"
 
-
 [workspace.package]
 edition = "2021"
 authors = ["Ideal Labs <hello@idealabs.network>"]

Cargo.toml

@@ -1,6 +1,6 @@
 [project]
 name = "timelock"
-version = "0.0.1-dev"
+version = "0.0.2-dev"
 authors = [
   { name="Ideal Labs", email="hello@idealabs.network" },
 ]

py/pyproject.toml

@@ -1,6 +1,6 @@
 # Timelock Encyrption TypeScript Wrapper
 
-This is a typescript library for timelock encryption. It is a "thin" wrapper that calls the WebAssembly (WASM) implementation of timelock encryption. It is designed for use in web-based environments and easily integrates with frameworks like React, Vue, etc. The library supports both the experiemental [Ideal Network beacon](https://docs.idealabs.network) as well as [Drand's](https://drand.love) Quicknet.
+This is a typescript library for timelock encryption. It is a "thin" wrapper that calls the WebAssembly (WASM) implementation of timelock encryption. It is designed for use in web-based environments and easily integrates with frameworks like React, Vue, etc. The library supports [Drand's](https://drand.love) Quicknet.
 
 ## Installation
 
@@ -53,7 +53,7 @@ Messages can be encrypted for future rounds of a supported beacon's protocol by
 
 ``` js
 // import a pre-defined IdentityHandler implementation or create your own
-import { Timelock, IdealNetworkIdentityHandler } from '@ideallabs/timelock.js'
+import { Timelock, DrandIdentityHandler } from '@ideallabs/timelock.js'
 
 import hkdf from 'js-crypto-hkdf'
 // 1. Setup parameters for encryption
@@ -76,7 +76,7 @@ const pubkey =
 const roundNumber = 10
 
 // 2. Encrypt the message
-let ct = await timelockIdeal.encrypt(
+let ct = await Timelock.encrypt(
   encodedMessage,
   roundNumber,
   DrandIdentityBuilder,

ts/README.md

@@ -15,5 +15,4 @@
  */
 
 export * from './timelock'
-export { IdentityBuilder } from './interfaces/IIdentityBuilder'
 export { DrandIdentityBuilder } from './interfaces/DrandIdentityBuilder'

ts/src/index.ts

@@ -32,14 +32,6 @@ export enum TimelockErrors {
   ERR_UNEXPECTED_TYPE = "The wasm returned something that could not be converted to a UInt8Array."
 }
 
-/**
- * Curves supported by the timelock library
- */
-export enum SupportedCurve {
-  BLS12_377 = 'bls12_377',
-  BLS12_381 = 'bls12_381'
-}
-
 /**
  * A wrapper type to handle generic results 
  */
@@ -63,27 +55,20 @@ export class Timelock {
    */
   private wasmReady: boolean
 
-  /**
-   * The curve used by the beacon
-   */
-  public curveId: SupportedCurve
-
   /**
    * A private constructor to enforce usage of `build`
    */
-  private constructor(curveId: SupportedCurve) {
-    this.curveId = curveId
+  private constructor() {
     this.wasmReady = false
   }
 
   /**
    * Loads the wasm and constructs a new Timelock instance
-   * @param curveId: The curve used by the beacon 
    * @returns A Timelock instance
    */
-  public static async build(curveId: SupportedCurve) {
+  public static async build() {
     await init()
-    return new Timelock(curveId)
+    return new Timelock()
   }
 
   /**
@@ -108,7 +93,7 @@ export class Timelock {
       const beaconPublicKey = u8a(beaconPublicKeyHex)
       const ephemeralSecretKey = u8a(ephemeralSecretKeyHex)
       const id = await identityBuilder.build(roundNumber)
-      const ciphertext = tle(id, encodedMessage, ephemeralSecretKey, beaconPublicKey, this.curveId)
+      const ciphertext = tle(id, encodedMessage, ephemeralSecretKey, beaconPublicKey)
       const result = new Uint8Array(ciphertext)
       return ok(result)
     } catch (err) {
@@ -130,7 +115,7 @@ export class Timelock {
     try {
       await this.checkWasm()
       const signature = u8a(signatureHex)
-      return ok(new Uint8Array(tld(ciphertext, signature, this.curveId)))
+      return ok(new Uint8Array(tld(ciphertext, signature)))
     } catch (err) {
       return error(err.message)
     }
@@ -150,7 +135,7 @@ export class Timelock {
     try {
       await this.checkWasm()
       const ephemeralSecretKey = u8a(ephemeralSecretKeyHex)
-      return ok(new Uint8Array(decrypt(ciphertext, ephemeralSecretKey, this.curveId)))
+      return ok(new Uint8Array(decrypt(ciphertext, ephemeralSecretKey)))
     } catch (err) {
       return error(err.message)
     }

ts/src/timelock.ts

@@ -20,6 +20,7 @@ wasm-opt = false
 [dependencies]
 codec.workspace = true
 rand_chacha.workspace = true
+rand.workspace = true
 timelock.workspace = true
 serde.workspace = true
 serde-wasm-bindgen.workspace = true

wasm/Cargo.toml

@@ -25,6 +25,10 @@ export PYO3_CROSS_PYTHON_VERSION="3.10"
 maturin develop --features "python"
 ```
 
+#### Testing
+
+Run wasm-pack tests with `wasm-pack test --node`
+
 #### Publish
 
 ``` sh