feat: change vertexType to drpType, type to opType

packages/blueprints/src/ACL/index.ts

@@ -72,21 +72,21 @@ export class ACL implements IACL, DRP {
 		if (!vertices[0].operation || !vertices[1].operation)
 			return { action: ActionType.Nop };
 		if (
-			vertices[0].operation.type === vertices[1].operation.type ||
+			vertices[0].operation.opType === vertices[1].operation.opType ||
 			vertices[0].operation.value !== vertices[1].operation.value
 		)
 			return { action: ActionType.Nop };
 
 		return this._conflictResolution === ACLConflictResolution.GrantWins
 			? {
 					action:
-						vertices[0].operation.type === "grant"
+						vertices[0].operation.opType === "grant"
 							? ActionType.DropRight
 							: ActionType.DropLeft,
 				}
 			: {
 					action:
-						vertices[0].operation.type === "grant"
+						vertices[0].operation.opType === "grant"
 							? ActionType.DropLeft
 							: ActionType.DropRight,
 				};

packages/blueprints/src/AddWinsSet/index.ts

@@ -38,10 +38,10 @@ export class AddWinsSet<T> implements DRP {
 		if (
 			vertices[0].operation &&
 			vertices[1].operation &&
-			vertices[0].operation?.type !== vertices[1].operation?.type &&
+			vertices[0].operation?.opType !== vertices[1].operation?.opType &&
 			vertices[0].operation?.value === vertices[1].operation?.value
 		) {
-			return vertices[0].operation.type === "add"
+			return vertices[0].operation.opType === "add"
 				? { action: ActionType.DropRight }
 				: { action: ActionType.DropLeft };
 		}

packages/blueprints/src/AddWinsSetWithACL/index.ts

@@ -41,23 +41,23 @@ export class AddWinsSetWithACL<T> implements DRP {
 		if (!vertices[0].operation || !vertices[1].operation)
 			return { action: ActionType.Nop };
 		if (
-			vertices[0].operation.type === vertices[1].operation.type ||
+			vertices[0].operation.opType === vertices[1].operation.opType ||
 			vertices[0].operation.value !== vertices[1].operation.value
 		)
 			return { action: ActionType.Nop };
 
 		if (
-			["grant", "revoke"].includes(vertices[0].operation.type) &&
-			["grant", "revoke"].includes(vertices[1].operation.type)
+			["grant", "revoke"].includes(vertices[0].operation.opType) &&
+			["grant", "revoke"].includes(vertices[1].operation.opType)
 		) {
 			return this.acl.resolveConflicts(vertices);
 		}
 
 		if (
-			this.operations.includes(vertices[0].operation.type) &&
-			this.operations.includes(vertices[1].operation.type)
+			this.operations.includes(vertices[0].operation.opType) &&
+			this.operations.includes(vertices[1].operation.opType)
 		) {
-			return vertices[0].operation.type === "add"
+			return vertices[0].operation.opType === "add"
 				? { action: ActionType.DropRight }
 				: { action: ActionType.DropLeft };
 		}

packages/node/src/handlers.ts

@@ -238,9 +238,9 @@ export async function verifyIncomingVertices(
 			hash: vertex.hash,
 			peerId: vertex.peerId,
 			operation: {
-				type: vertex.operation?.type ?? "",
+				drpType: vertex.operation?.drpType ?? "",
+				opType: vertex.operation?.opType ?? "",
 				value: vertex.operation?.value,
-				vertexType: vertex.operation?.vertexType ?? "",
 			},
 			dependencies: vertex.dependencies,
 			timestamp: vertex.timestamp,

packages/node/tests/node.test.ts

@@ -1,6 +1,6 @@
 import { ACL } from "@topology-foundation/blueprints/src/ACL/index.js";
 import { AddWinsSet } from "@topology-foundation/blueprints/src/index.js";
-import { VertexTypeOperation } from "@topology-foundation/object/src/index.js";
+import { DrpTypeOperation } from "@topology-foundation/object/src/index.js";
 import { type DRP, DRPObject } from "@ts-drp/object";
 import { beforeAll, beforeEach, describe, expect, test } from "vitest";
 import {
@@ -108,7 +108,7 @@ describe("DPRNode with verify and sign signature", () => {
 				operation: {
 					type: "add",
 					value: 1,
-					vertexType: VertexTypeOperation.drp,
+					vertexType: DrpTypeOperation.Drp,
 				},
 				dependencies: [],
 				signature: "",

packages/object/src/hashgraph/index.ts

@@ -80,9 +80,9 @@ export class HashGraph {
 			hash: HashGraph.rootHash,
 			peerId: "",
 			operation: {
-				type: OperationType.NOP,
+				drpType: "",
+				opType: OperationType.NOP,
 				value: null,
-				vertexType: "",
 			},
 			dependencies: [],
 			timestamp: -1,
@@ -104,7 +104,7 @@ export class HashGraph {
 		const vertex: Vertex = {
 			hash,
 			peerId: this.peerId,
-			operation: operation ?? { type: OperationType.NOP },
+			operation: operation ?? { opType: OperationType.NOP },
 			dependencies: deps,
 			timestamp: currentTimestamp,
 			signature: "",

packages/object/src/index.ts

@@ -60,9 +60,9 @@ export interface LcaAndOperations {
 
 export let log: Logger;
 
-export enum VertexTypeOperation {
-	acl = "acl",
-	drp = "drp",
+export enum DrpTypeOperation {
+	Acl = "ACL",
+	Drp = "DRP",
 }
 
 export class DRPObject implements IDRPObject {
@@ -103,10 +103,10 @@ export class DRPObject implements IDRPObject {
 		this.bytecode = new Uint8Array();
 		this.vertices = [];
 		this.drp = drp
-			? new Proxy(drp, this.proxyDRPHandler(VertexTypeOperation.drp))
+			? new Proxy(drp, this.proxyDRPHandler(DrpTypeOperation.Drp))
 			: null;
 		this.acl = acl
-			? new Proxy(acl, this.proxyDRPHandler(VertexTypeOperation.acl))
+			? new Proxy(acl, this.proxyDRPHandler(DrpTypeOperation.Acl))
 			: null;
 		this.hashGraph = new HashGraph(
 			peerId,
@@ -124,7 +124,7 @@ export class DRPObject implements IDRPObject {
 	resolveConflicts(vertices: Vertex[]): ResolveConflictsType {
 		if (
 			this.acl &&
-			vertices.some((v) => v.operation?.vertexType === VertexTypeOperation.acl)
+			vertices.some((v) => v.operation?.drpType === DrpTypeOperation.Acl)
 		) {
 			const acl = this.acl as IACL & DRP;
 			return acl.resolveConflicts(vertices);
@@ -134,7 +134,7 @@ export class DRPObject implements IDRPObject {
 	}
 
 	// This function is black magic, it allows us to intercept calls to the DRP object
-	proxyDRPHandler(vertexType: VertexTypeOperation): ProxyHandler<object> {
+	proxyDRPHandler(vertexType: DrpTypeOperation): ProxyHandler<object> {
 		const obj = this;
 		return {
 			get(target, propKey, receiver) {
@@ -174,17 +174,17 @@ export class DRPObject implements IDRPObject {
 		fn: string,
 		// biome-ignore lint: value can't be unknown because of protobuf
 		args: any,
-		vertexType: VertexTypeOperation,
+		drpType: DrpTypeOperation,
 	) {
 		// biome-ignore lint/suspicious/noExplicitAny: <explanation>
 		let preOperationDRP: any;
-		if (vertexType === VertexTypeOperation.acl) {
+		if (drpType === DrpTypeOperation.Acl) {
 			preOperationDRP = this._computeACL(this.hashGraph.getFrontier());
 		} else {
 			preOperationDRP = this._computeDRP(this.hashGraph.getFrontier());
 		}
 		const drp = cloneDeep(preOperationDRP);
-		this._applyOperation(drp, { type: fn, value: args, vertexType });
+		this._applyOperation(drp, { opType: fn, value: args, drpType });
 
 		let stateChanged = false;
 		for (const key of Object.keys(preOperationDRP)) {
@@ -199,9 +199,9 @@ export class DRPObject implements IDRPObject {
 		}
 
 		const vertex = this.hashGraph.addToFrontier({
-			type: fn,
+			drpType: drpType,
+			opType: fn,
 			value: args,
-			vertexType,
 		});
 
 		this._setState(vertex, this._getDRPState(drp));
@@ -235,7 +235,7 @@ export class DRPObject implements IDRPObject {
 				}
 				const preComputeLca = this.computeLCA(vertex.dependencies);
 
-				if (vertex.operation.vertexType === VertexTypeOperation.drp) {
+				if (vertex.operation.drpType === DrpTypeOperation.Drp) {
 					const drp = this._computeDRP(vertex.dependencies, preComputeLca);
 					this.hashGraph.addVertex(
 						vertex.operation,
@@ -293,21 +293,21 @@ export class DRPObject implements IDRPObject {
 
 	// apply the operation to the DRP
 	private _applyOperation(drp: DRP, operation: Operation) {
-		const { type, value } = operation;
+		const { opType, value } = operation;
 
-		const typeParts = type.split(".");
+		const typeParts = opType.split(".");
 		// biome-ignore lint: target can be anything
 		let target: any = drp;
 		for (let i = 0; i < typeParts.length - 1; i++) {
 			target = target[typeParts[i]];
 			if (!target) {
-				throw new Error(`Invalid operation type: ${type}`);
+				throw new Error(`Invalid operation type: ${opType}`);
 			}
 		}
 
 		const methodName = typeParts[typeParts.length - 1];
 		if (typeof target[methodName] !== "function") {
-			throw new Error(`${type} is not a function`);
+			throw new Error(`${opType} is not a function`);
 		}
 
 		const args = Array.isArray(value) ? value : [value];
@@ -337,11 +337,10 @@ export class DRPObject implements IDRPObject {
 		}
 
 		for (const op of linearizedOperations) {
-			op.vertexType === VertexTypeOperation.drp &&
-				this._applyOperation(drp, op);
+			op.drpType === DrpTypeOperation.Drp && this._applyOperation(drp, op);
 		}
 		if (vertexOperation) {
-			vertexOperation.vertexType === VertexTypeOperation.drp &&
+			vertexOperation.drpType === DrpTypeOperation.Drp &&
 				this._applyOperation(drp, vertexOperation);
 		}
 
@@ -369,11 +368,10 @@ export class DRPObject implements IDRPObject {
 			acl[key] = value;
 		}
 		for (const op of linearizedOperations) {
-			op.vertexType === VertexTypeOperation.acl &&
-				this._applyOperation(acl, op);
+			op.drpType === DrpTypeOperation.Acl && this._applyOperation(acl, op);
 		}
 		if (vertexOperation) {
-			vertexOperation.vertexType === VertexTypeOperation.acl &&
+			vertexOperation.drpType === DrpTypeOperation.Acl &&
 				this._applyOperation(acl, vertexOperation);
 		}
 

packages/object/src/proto/drp/object/v1/object.proto

@@ -7,9 +7,9 @@ import "google/protobuf/struct.proto";
 // Supposed to be the RIBLT stuff
 message Vertex {
   message Operation {
-    string type = 1;
-    google.protobuf.Value value = 2;
-    string vertex_type = 3;
+    string drp_type = 1;
+    string op_type = 2;
+    google.protobuf.Value value = 3;
   }
   string hash = 1;
   string peer_id = 2;