Merge branch 'main' into feat/timestamp

topology-foundation · Dec 29, 2024 · aa60e99 · aa60e99
2 parents b6920c1 + 4220e72
commit aa60e99
Show file tree

Hide file tree

Showing 19 changed files with 456 additions and 87 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,3 +16,7 @@ jobs:
         run: |
           pnpm install --no-frozen-lockfile
           pnpm ci-test
+      
+      - shell: bash
+        run: |
+          pnpm run coverage
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ docs/
 node_modules/
 
 **/tsconfig.tsbuildinfo
+coverage/*
+.vscode/*
diff --git a/examples/chat/src/objects/chat.ts b/examples/chat/src/objects/chat.ts
@@ -9,22 +9,22 @@ import {
 export class Chat implements DRP {
 	operations: string[] = ["addMessage"];
 	semanticsType: SemanticsType = SemanticsType.pair;
-	// store messages as strings in the format (timestamp, message, nodeId)
+	// store messages as strings in the format (timestamp, message, peerId)
 	messages: Set<string>;
 	constructor() {
 		this.messages = new Set<string>();
 	}
 
-	addMessage(timestamp: string, message: string, nodeId: string): void {
-		this._addMessage(timestamp, message, nodeId);
+	addMessage(timestamp: string, message: string, peerId: string): void {
+		this._addMessage(timestamp, message, peerId);
 	}
 
 	private _addMessage(
 		timestamp: string,
 		message: string,
-		nodeId: string,
+		peerId: string,
 	): void {
-		this.messages.add(`(${timestamp}, ${message}, ${nodeId})`);
+		this.messages.add(`(${timestamp}, ${message}, ${peerId})`);
 	}
 
 	getMessages(): Set<string> {

diff --git a/examples/grid/src/index.ts b/examples/grid/src/index.ts
@@ -10,7 +10,7 @@ let peers: string[] = [];
 let discoveryPeers: string[] = [];
 let objectPeers: string[] = [];
 
-const formatNodeId = (id: string): string => {
+const formatPeerId = (id: string): string => {
 	return `${id.slice(0, 4)}...${id.slice(-4)}`;
 };
 
@@ -25,7 +25,7 @@ const hashCode = (str: string): number => {
 	return hash;
 };
 
-const getColorForNodeId = (id: string): string => {
+const getColorForPeerId = (id: string): string => {
 	if (!colorMap.has(id)) {
 		const hash = hashCode(id);
 		let r = (hash & 0xff0000) >> 16;
@@ -64,22 +64,22 @@ const render = () => {
 	}
 
 	const element_peerId = <HTMLDivElement>document.getElementById("peerId");
-	element_peerId.innerHTML = `<strong style="color: ${getColorForNodeId(node.networkNode.peerId)};">${formatNodeId(node.networkNode.peerId)}</strong>`;
+	element_peerId.innerHTML = `<strong style="color: ${getColorForPeerId(node.networkNode.peerId)};">${formatPeerId(node.networkNode.peerId)}</strong>`;
 
 	const element_peers = <HTMLDivElement>document.getElementById("peers");
-	element_peers.innerHTML = `[${peers.map((peer) => `<strong style="color: ${getColorForNodeId(peer)};">${formatNodeId(peer)}</strong>`).join(", ")}]`;
+	element_peers.innerHTML = `[${peers.map((peer) => `<strong style="color: ${getColorForPeerId(peer)};">${formatPeerId(peer)}</strong>`).join(", ")}]`;
 
 	const element_discoveryPeers = <HTMLDivElement>(
 		document.getElementById("discoveryPeers")
 	);
-	element_discoveryPeers.innerHTML = `[${discoveryPeers.map((peer) => `<strong style="color: ${getColorForNodeId(peer)};">${formatNodeId(peer)}</strong>`).join(", ")}]`;
+	element_discoveryPeers.innerHTML = `[${discoveryPeers.map((peer) => `<strong style="color: ${getColorForPeerId(peer)};">${formatPeerId(peer)}</strong>`).join(", ")}]`;
 
 	const element_objectPeers = <HTMLDivElement>(
 		document.getElementById("objectPeers")
 	);
 	element_objectPeers.innerHTML = !gridDRP
 		? ""
-		: `Your frens in GRID: [${objectPeers.map((peer) => `<strong style="color: ${getColorForNodeId(peer)};">${formatNodeId(peer)}</strong>`).join(", ")}]`;
+		: `Your frens in GRID: [${objectPeers.map((peer) => `<strong style="color: ${getColorForPeerId(peer)};">${formatPeerId(peer)}</strong>`).join(", ")}]`;
 
 	if (!gridDRP) return;
 	const users = gridDRP.getUsers();
@@ -179,7 +179,7 @@ async function addUser() {
 
 	gridDRP.addUser(
 		node.networkNode.peerId,
-		getColorForNodeId(node.networkNode.peerId),
+		getColorForPeerId(node.networkNode.peerId),
 	);
 	render();
 }

diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
 		"build:packages": "pnpm --filter '@ts-drp/*' build",
 		"clean": "pnpm --filter '@ts-drp/*' clean && rm -r node_modules/ docs/",
 		"cli": "tsx ./packages/node/src/run.ts",
+		"coverage": "pnpm exec ts-node scripts/coverage.ts",
 		"docs": "typedoc",
 		"postinstall": "pnpm build:packages",
 		"proto-gen": "pnpm proto-gen:object && pnpm proto-gen:network",
@@ -34,8 +35,10 @@
 		"@biomejs/biome": "^1.8.3",
 		"@release-it-plugins/workspaces": "^4.2.0",
 		"@types/node": "^22.5.4",
+		"@vitest/coverage-v8": "2.1.8",
 		"assemblyscript": "^0.27.29",
 		"release-it": "^17.6.0",
+		"ts-node": "^10.9.2",
 		"ts-proto": "^2.2.4",
 		"tsx": "4.19.1",
 		"typedoc": "^0.26.6",

diff --git a/packages/blueprints/tests/AddWinsSetWithACL.test.ts b/packages/blueprints/tests/AddWinsSetWithACL.test.ts
@@ -42,14 +42,14 @@ describe("AccessControl tests with RevokeWins resolution", () => {
 		const vertices = [
 			{
 				hash: "",
-				nodeId: "peer1",
+				peerId: "peer1",
 				operation: { type: "grant", value: "peer3" },
 				dependencies: [],
 				signature: "",
 			},
 			{
 				hash: "",
-				nodeId: "peer2",
+				peerId: "peer2",
 				operation: { type: "revoke", value: "peer3" },
 				dependencies: [],
 				signature: "",

diff --git a/packages/network/src/proto/drp/object/v1/object_pb.ts b/packages/network/src/proto/drp/object/v1/object_pb.ts
diff --git a/packages/node/src/handlers.ts b/packages/node/src/handlers.ts
@@ -215,11 +215,11 @@ export function drpObjectChangesHandler(
 
 export async function signGeneratedVertices(node: DRPNode, vertices: Vertex[]) {
 	const signPromises = vertices.map(async (vertex) => {
-		if (vertex.nodeId !== node.networkNode.peerId || vertex.signature !== "") {
+		if (vertex.peerId !== node.networkNode.peerId || vertex.signature !== "") {
 			return;
 		}
 
-		await node.signVertexOperation(vertex);
+		await node.signVertex(vertex);
 	});
 
 	await Promise.all(signPromises);
@@ -232,7 +232,7 @@ export async function verifyIncomingVertices(
 	const vertices: Vertex[] = incomingVertices.map((vertex) => {
 		return {
 			hash: vertex.hash,
-			nodeId: vertex.nodeId,
+			peerId: vertex.peerId,
 			operation: {
 				type: vertex.operation?.type ?? "",
 				value: vertex.operation?.value,
@@ -255,15 +255,13 @@ export async function verifyIncomingVertices(
 
 		const signature = uint8ArrayFromString(vertex.signature, "base64");
 
-		const publicKey = acl.getPeerKey(vertex.nodeId);
+		const publicKey = acl.getPeerKey(vertex.peerId);
 		if (!publicKey) {
 			return null;
 		}
 
 		const publicKeyBytes = uint8ArrayFromString(publicKey, "base64");
-		const operationData = uint8ArrayFromString(
-			JSON.stringify(vertex.operation),
-		);
+		const data = uint8ArrayFromString(vertex.hash);
 
 		try {
 			const cryptoKey = await crypto.subtle.importKey(
@@ -278,7 +276,7 @@ export async function verifyIncomingVertices(
 				{ name: "Ed25519" },
 				cryptoKey,
 				signature,
-				operationData,
+				data,
 			);
 
 			return isValid ? vertex : null;

diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -99,13 +99,11 @@ export class DRPNode {
 		operations.syncObject(this, id, peerId);
 	}
 
-	async signVertexOperation(vertex: Vertex) {
-		if (vertex.nodeId !== this.networkNode.peerId) {
+	async signVertex(vertex: Vertex) {
+		if (vertex.peerId !== this.networkNode.peerId) {
 			log.error("::signVertexOperation: Invalid peer id");
 			return "";
 		}
-		vertex.signature = await this.networkNode.sign(
-			JSON.stringify(vertex.operation),
-		);
+		vertex.signature = await this.networkNode.sign(vertex.hash);
 	}
 }
diff --git a/packages/node/tests/node.test.ts b/packages/node/tests/node.test.ts
@@ -31,7 +31,7 @@ describe("DPRNode with verify and sign signature", () => {
 		const vertices = [
 			{
 				hash: "hash",
-				nodeId: "nodeId",
+				peerId: "peerId",
 				operation: {
 					type: "type",
 					value: "value",
@@ -48,7 +48,7 @@ describe("DPRNode with verify and sign signature", () => {
 		const vertices = [
 			{
 				hash: "hash",
-				nodeId: drpNode.networkNode.peerId,
+				peerId: drpNode.networkNode.peerId,
 				operation: {
 					type: "add",
 					value: 1,
@@ -65,7 +65,7 @@ describe("DPRNode with verify and sign signature", () => {
 		const vertices = [
 			{
 				hash: "hash",
-				nodeId: drpNode.networkNode.peerId,
+				peerId: drpNode.networkNode.peerId,
 				operation: {
 					type: "add",
 					value: 1,
@@ -83,7 +83,7 @@ describe("DPRNode with verify and sign signature", () => {
 		const vertices = [
 			{
 				hash: "hash",
-				nodeId: "peer1",
+				peerId: "peer1",
 				operation: {
 					type: "add",
 					value: 1,
@@ -103,7 +103,7 @@ describe("DPRNode with verify and sign signature", () => {
 		const vertices = [
 			{
 				hash: "hash",
-				nodeId: drpNode.networkNode.peerId,
+				peerId: drpNode.networkNode.peerId,
 				operation: {
 					type: "add",
 					value: 1,

diff --git a/packages/object/package.json b/packages/object/package.json
@@ -27,7 +27,8 @@
 	"devDependencies": {
 		"@bufbuild/protobuf": "^2.0.0",
 		"benchmark": "^2.1.4",
-		"tsx": "4.19.1"
+		"tsx": "4.19.1",
+		"es-toolkit": "1.30.1"
 	},
 	"dependencies": {
 		"@ts-drp/logger": "^0.4.4"