feat: move ACL from inside DRP to outside DRPObject

packages/network/src/proto/drp/network/v1/messages_grpc_pb.js

@@ -0,0 +1 @@
+// GENERATED CODE -- NO SERVICES IN PROTO

packages/node/src/handlers.ts

@@ -1,6 +1,6 @@
 import type { Stream } from "@libp2p/interface";
 import { NetworkPb, streamToUint8Array } from "@ts-drp/network";
-import type { DRP, DRPObject, ObjectPb, Vertex } from "@ts-drp/object";
+import type { DRP, DRPObject, IACL, ObjectPb, Vertex } from "@ts-drp/object";
 import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";
 import { type DRPNode, log } from "./index.js";
 
@@ -236,6 +236,7 @@ export async function verifyIncomingVertices(
 			operation: {
 				type: vertex.operation?.type ?? "",
 				value: vertex.operation?.value,
+				vertexType: vertex.operation?.vertexType ?? "",
 			},
 			dependencies: vertex.dependencies,
 			timestamp: vertex.timestamp,
@@ -244,10 +245,10 @@ export async function verifyIncomingVertices(
 	});
 
 	const drp = object.drp as DRP;
-	if (!drp.acl) {
+	const acl: IACL & DRP = object.acl as IACL & DRP;
+	if (!acl) {
 		return vertices;
 	}
-	const acl = drp.acl;
 	const verificationPromises = vertices.map(async (vertex) => {
 		if (vertex.signature === "") {
 			return null;

packages/node/src/index.ts

@@ -6,7 +6,7 @@ import {
 	type DRPNetworkNodeConfig,
 	NetworkPb,
 } from "@ts-drp/network";
-import { type DRP, DRPObject, type Vertex } from "@ts-drp/object";
+import { type DRP, DRPObject, type IACL, type Vertex } from "@ts-drp/object";
 import { drpMessagesHandler } from "./handlers.js";
 import * as operations from "./operations.js";
 import { DRPObjectStore } from "./store/index.js";
@@ -78,7 +78,13 @@ export class DRPNode {
 		sync?: boolean,
 		peerId?: string,
 	) {
-		const object = new DRPObject(this.networkNode.peerId, drp, id, abi);
+		const object = new DRPObject(
+			this.networkNode.peerId,
+			drp,
+			null as unknown as IACL & DRP,
+			id,
+			abi,
+		);
 		operations.createObject(this, object);
 		operations.subscribeObject(this, object.id);
 		if (sync) {

packages/node/tests/node.test.ts

@@ -1,5 +1,6 @@
-import { AddWinsSetWithACL } from "@topology-foundation/blueprints/src/AddWinsSetWithACL/index.js";
+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 { type DRP, DRPObject } from "@ts-drp/object";
 import { beforeAll, beforeEach, describe, expect, test } from "vitest";
 import {
@@ -19,12 +20,13 @@ describe("DPRNode with verify and sign signature", () => {
 	});
 
 	beforeEach(async () => {
-		drp = new AddWinsSetWithACL(
+		drp = new AddWinsSet();
+		const acl = new ACL(
 			new Map([
 				[drpNode.networkNode.peerId, drpNode.networkNode.publicKey || ""],
 			]),
 		);
-		drpObject = new DRPObject(drpNode.networkNode.peerId, drp);
+		drpObject = new DRPObject(drpNode.networkNode.peerId, drp, acl);
 	});
 
 	test("Node will not sign vertex if it is not the creator", async () => {
@@ -107,6 +109,7 @@ describe("DPRNode with verify and sign signature", () => {
 				operation: {
 					type: "add",
 					value: 1,
+					vertexType: VertexTypeOperation.drp,
 				},
 				dependencies: [],
 				signature: "",

packages/object/src/hashgraph/index.ts

@@ -82,6 +82,7 @@ export class HashGraph {
 			operation: {
 				type: OperationType.NOP,
 				value: null,
+				vertexType: "",
 			},
 			dependencies: [],
 			timestamp: -1,