@aztec/foundation 0.1.0-alpha23 → 0.1.0-alpha24

package/src/fields/point.ts

@@ -1,5 +1,5 @@
 import { BufferReader } from '../serialize/buffer_reader.js';
-import { Coordinate } from './coordinate.js';
+import { Fr } from './fields.js';
 
 /**
  * Represents a Point on an elliptic curve with x and y coordinates.
@@ -7,7 +7,7 @@ import { Coordinate } from './coordinate.js';
  * converting instances to various output formats, and checking the equality of points.
  */
 export class Point {
-  static ZERO = new Point(Coordinate.ZERO, Coordinate.ZERO);
+  static ZERO = new Point(Fr.ZERO, Fr.ZERO);
 
   /** Used to differentiate this class from AztecAddress */
   public readonly kind = 'point';
@@ -16,11 +16,11 @@ export class Point {
     /**
      * The point's x coordinate
      */
-    public readonly x: Coordinate,
+    public readonly x: Fr,
     /**
      * The point's y coordinate
      */
-    public readonly y: Coordinate,
+    public readonly y: Fr,
   ) {}
 
   /**
@@ -30,7 +30,7 @@ export class Point {
    */
   static random() {
     // TODO is this a random point on the curve?
-    return new Point(Coordinate.random(), Coordinate.random());
+    return new Point(Fr.random(), Fr.random());
   }
 
   /**
@@ -42,17 +42,7 @@ export class Point {
    */
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
-    return new this(Coordinate.fromBuffer(reader.readBytes(32)), Coordinate.fromBuffer(reader.readBytes(32)));
-  }
-
-  /**
-   * Creates a point instance from its x and y coordinates.
-   * @param x - X coordinate.
-   * @param y - Y coordinate.
-   * @returns A Point instance.
-   */
-  static fromCoordinates(x: Coordinate, y: Coordinate) {
-    return new this(x, y);
+    return new this(Fr.fromBuffer(reader.readBytes(32)), Fr.fromBuffer(reader.readBytes(32)));
   }
 
   /**
@@ -68,22 +58,11 @@ export class Point {
   }
 
   /**
-   * Convert the Point instance to a Buffer representation of fields
-   * The output buffer's length will be (128 bytes).
-   * This method is useful for serialization and deserialization of the Point object.
-   *
-   * @returns A Buffer representation of the Point instance.
-   */
-  toFieldsBuffer() {
-    return Buffer.concat([this.x.toFieldsBuffer(), this.y.toFieldsBuffer()]);
-  }
-
-  /**
-   * Returns the contents of the point as an array of 4 fields.
-   * @returns The point as an array of 4 fields
+   * Returns the contents of the point as an array of 2 fields.
+   * @returns The point as an array of 2 fields
    */
   toFields() {
-    return this.x.toFields().concat(this.y.toFields());
+    return [this.x, this.y];
   }
 
   /**
@@ -91,11 +70,9 @@ export class Point {
    * @returns The point as BigInts
    */
   toBigInts() {
-    const x = this.x.toBigInt();
-    const y = this.y.toBigInt();
     return {
-      x,
-      y,
+      x: this.x.value,
+      y: this.y.value,
     };
   }
 

package/src/json-rpc/client/json_rpc_client.test.ts

@@ -1,6 +1,7 @@
 import request from 'supertest';
+
+import { TestNote, TestState } from '../fixtures/test_state.js';
 import { JsonRpcServer } from '../server/json_rpc_server.js';
-import { TestState, TestNote } from '../fixtures/test_state.js';
 import { createJsonRpcClient } from './json_rpc_client.js';
 
 test('test an RPC function over client', async () => {

package/src/json-rpc/client/json_rpc_client.ts

@@ -3,9 +3,10 @@
 //  This takes a {foo(): T} and makes {foo(): Promise<T>}
 //  while avoiding Promise of Promise.
 import { RemoteObject } from 'comlink';
+
 import { createDebugLogger } from '../../log/index.js';
 import { retry } from '../../retry/index.js';
-import { ClassConverter, StringClassConverterInput, JsonClassConverterInput } from '../class_converter.js';
+import { ClassConverter, JsonClassConverterInput, StringClassConverterInput } from '../class_converter.js';
 import { JsonStringify, convertFromJsonObj, convertToJsonObj } from '../convert.js';
 
 export { JsonStringify } from '../convert.js';

package/src/json-rpc/convert.test.ts

@@ -1,9 +1,9 @@
+import { Buffer } from 'buffer';
+
 import { ClassConverter } from './class_converter.js';
 import { convertFromJsonObj, convertToJsonObj } from './convert.js';
 import { TestNote } from './fixtures/test_state.js';
 
-import { Buffer } from 'buffer';
-
 const TEST_BASE64 = 'YmFzZTY0IGRlY29kZXI=';
 test('test an RPC function over client', () => {
   const cc = new ClassConverter({ TestNote });

package/src/json-rpc/convert.ts

@@ -1,6 +1,7 @@
-import { ClassConverter } from './class_converter.js';
 import { Buffer } from 'buffer';
 
+import { ClassConverter } from './class_converter.js';
+
 /**
  * Recursively looks through an object for bigints and converts them to object format.
  * @param obj - The object to convert.

package/src/json-rpc/server/json_proxy.ts

@@ -1,5 +1,5 @@
 import { createDebugLogger } from '../../log/index.js';
-import { ClassConverter, StringClassConverterInput, JsonClassConverterInput } from '../class_converter.js';
+import { ClassConverter, JsonClassConverterInput, StringClassConverterInput } from '../class_converter.js';
 import { convertFromJsonObj, convertToJsonObj } from '../convert.js';
 import { assert, hasOwnProperty } from '../js_utils.js';
 

package/src/json-rpc/server/json_rpc_server.test.ts

@@ -1,5 +1,6 @@
 import request from 'supertest';
-import { TestState, TestNote } from '../fixtures/test_state.js';
+
+import { TestNote, TestState } from '../fixtures/test_state.js';
 import { JsonRpcServer } from './json_rpc_server.js';
 
 test('test an RPC function with a primitive parameter', async () => {

package/src/json-rpc/server/json_rpc_server.ts

@@ -1,14 +1,14 @@
-import http from 'http';
-import Router from 'koa-router';
 import cors from '@koa/cors';
-import compress from 'koa-compress';
+import http from 'http';
 import Koa from 'koa';
 import bodyParser from 'koa-bodyparser';
+import compress from 'koa-compress';
+import Router from 'koa-router';
 
 import { createLogger } from '../../log/index.js';
-import { StringClassConverterInput, JsonClassConverterInput } from '../class_converter.js';
-import { JsonProxy } from './json_proxy.js';
+import { JsonClassConverterInput, StringClassConverterInput } from '../class_converter.js';
 import { convertBigintsInObj } from '../convert.js';
+import { JsonProxy } from './json_proxy.js';
 
 /**
  * JsonRpcServer.

package/src/log/log_history.test.ts

@@ -1,4 +1,5 @@
 import { jest } from '@jest/globals';
+
 import { createDebugLogger, enableLogs } from './debug.js';
 import { LogHistory } from './log_history.js';
 

package/src/mutex/mutex.test.ts

@@ -1,4 +1,5 @@
 import { jest } from '@jest/globals';
+
 import { Mutex } from './index.js';
 import { MutexDatabase } from './mutex_database.js';
 

package/src/serialize/buffer_reader.test.ts

@@ -1,8 +1,9 @@
 import { jest } from '@jest/globals';
+
+import { randomBytes } from '../crypto/index.js';
 import { Fq, Fr } from '../fields/fields.js';
 import { BufferReader } from './buffer_reader.js';
 import { serializeBufferArrayToVector } from './free_funcs.js';
-import { randomBytes } from '../crypto/index.js';
 
 const ARRAY = Array.from(Array(32)).map((_, idx) => (idx % 2 === 0 ? 0 : 1));
 const BUFFER = Buffer.from(ARRAY);

package/src/serialize/buffer_reader.ts

@@ -1,4 +1,4 @@
-import { Fr, Fq } from '../fields/fields.js';
+import { Fq, Fr } from '../fields/fields.js';
 import { Tuple } from './types.js';
 
 /**

package/src/serialize/serialize.test.ts

@@ -1,12 +1,12 @@
 import { randomBytes } from '../crypto/index.js';
 import { Fr } from '../fields/fields.js';
 import {
-  serializeBufferToVector,
+  deserializeArrayFromVector,
   deserializeBufferFromVector,
-  deserializeUInt32,
   deserializeField,
+  deserializeUInt32,
   serializeBufferArrayToVector,
-  deserializeArrayFromVector,
+  serializeBufferToVector,
 } from './index.js';
 
 describe('serialize', () => {

package/src/serialize/serializer.ts

@@ -1,4 +1,3 @@
-import { serializeBufferArrayToVector } from './index.js';
 import {
   boolToByte,
   numToInt32BE,
@@ -7,6 +6,7 @@ import {
   serializeBufferToVector,
   serializeDate,
 } from './free_funcs.js';
+import { serializeBufferArrayToVector } from './index.js';
 
 /**
  * The Serializer class provides a convenient and efficient way to serialize various data types into binary format.

package/src/transport/browser/shared_worker_listener.ts

@@ -1,4 +1,5 @@
 import EventEmitter from 'events';
+
 import { Listener } from '../interface/listener.js';
 import { MessagePortSocket } from './message_port_socket.js';
 

package/src/transport/browser/worker_listener.ts

@@ -1,4 +1,5 @@
 import EventEmitter from 'events';
+
 import { Listener } from '../interface/listener.js';
 import { MessagePortSocket } from './message_port_socket.js';
 

package/src/transport/dispatch/create_dispatch_proxy.ts

@@ -1,7 +1,8 @@
-import { DispatchMsg } from './create_dispatch_fn.js';
-import { TransportClient } from '../transport_client.js';
 import { EventEmitter } from 'events';
-import { isTransferDescriptor, TransferDescriptor } from '../interface/transferable.js';
+
+import { TransferDescriptor, isTransferDescriptor } from '../interface/transferable.js';
+import { TransportClient } from '../transport_client.js';
+import { DispatchMsg } from './create_dispatch_fn.js';
 
 /**
  * FilterOutAttributes type filters out all non-method properties of an object, leaving only the attributes

package/src/transport/interface/listener.ts

@@ -1,4 +1,5 @@
 import EventEmitter from 'events';
+
 import { Socket } from './socket.js';
 
 /**

package/src/transport/node/node_connector.ts

@@ -1,4 +1,5 @@
 import { Worker } from 'worker_threads';
+
 import { Connector } from '../interface/connector.js';
 import { NodeConnectorSocket } from './node_connector_socket.js';
 

package/src/transport/node/node_connector_socket.ts

@@ -1,4 +1,5 @@
 import { TransferListItem, Worker } from 'worker_threads';
+
 import { Socket } from '../interface/socket.js';
 
 /**

package/src/transport/node/node_listener.ts

@@ -1,5 +1,6 @@
-import { parentPort } from 'worker_threads';
 import EventEmitter from 'events';
+import { parentPort } from 'worker_threads';
+
 import { Listener } from '../interface/listener.js';
 import { NodeListenerSocket } from './node_listener_socket.js';
 

package/src/transport/node/node_listener_socket.ts

@@ -1,4 +1,5 @@
 import { MessagePort, TransferListItem } from 'worker_threads';
+
 import { Socket } from '../interface/socket.js';
 
 /**

package/src/transport/transport_client.ts

@@ -1,8 +1,9 @@
 import EventEmitter from 'events';
-import { EventMessage, isEventMessage, ResponseMessage } from './dispatch/messages.js';
+
+import { createDebugLogger } from '../log/index.js';
+import { EventMessage, ResponseMessage, isEventMessage } from './dispatch/messages.js';
 import { Connector } from './interface/connector.js';
 import { Socket } from './interface/socket.js';
-import { createDebugLogger } from '../log/index.js';
 
 const debug = createDebugLogger('aztec:transport_client');
 

package/src/wasm/wasm/wasm_module.test.ts

@@ -1,7 +1,8 @@
-import { WasmModule } from './wasm_module.js';
-import { fileURLToPath } from 'url';
 import { readFile } from 'fs/promises';
 import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import { WasmModule } from './wasm_module.js';
 
 /**
  * Fetch a simple WASM.

package/src/wasm/wasm/wasm_module.ts

@@ -1,8 +1,9 @@
 import { Buffer } from 'buffer';
 import { randomBytes } from 'crypto';
-import { createDebugLogger, DebugLogger } from '../../log/index.js';
-import { getEmptyWasiSdk } from './empty_wasi_sdk.js';
+
 import { MemoryFifo } from '../../fifo/index.js';
+import { DebugLogger, createDebugLogger } from '../../log/index.js';
+import { getEmptyWasiSdk } from './empty_wasi_sdk.js';
 
 /**
  * The base shape of a WASM module providing low level memory and synchronous call access.

package/src/wasm/worker/browser/web_data_store.ts

@@ -1,7 +1,8 @@
-import { DataStore } from '../data_store.js';
 import levelup, { LevelUp } from 'levelup';
 import memdown from 'memdown';
 
+import { DataStore } from '../data_store.js';
+
 /**
  * Cache for data used by wasm module.
  * Stores in a LevelUp database.

package/src/wasm/worker/node/node_data_store.ts

@@ -1,8 +1,9 @@
-import { DataStore } from '../data_store.js';
-import levelup, { LevelUp } from 'levelup';
 import leveldown from 'leveldown';
+import levelup, { LevelUp } from 'levelup';
 import memdown from 'memdown';
 
+import { DataStore } from '../data_store.js';
+
 /**
  * Cache for data used by wasm module.
  */

package/src/wasm/worker/node/node_worker.ts

@@ -1,7 +1,8 @@
 import { Worker } from 'worker_threads';
+
+import { DispatchMsg, NodeConnector, TransportClient, createDispatchProxy } from '../../../transport/index.js';
 import { WasmModule } from '../../wasm/wasm_module.js';
 import { WasmWorker } from '../wasm_worker.js';
-import { DispatchMsg, NodeConnector, TransportClient, createDispatchProxy } from '../../../transport/index.js';
 
 /**
  * Creates a node worker.

package/src/wasm/worker/node/start_node_module.ts

@@ -1,6 +1,7 @@
 import { parentPort } from 'worker_threads';
-import { WasmModule } from '../../wasm/wasm_module.js';
+
 import { DispatchMsg, NodeListener, TransportServer } from '../../../transport/index.js';
+import { WasmModule } from '../../wasm/wasm_module.js';
 
 if (!parentPort) {
   throw new Error('InvalidWorker');