Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: merge new vertices when drp is missing #460

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: merge new vertices when drp is missing #460

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c125d90
remove mergeWithoutDrp
trungnotchung Feb 12, 2025
d6bbb18
update logic
trungnotchung Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 23 additions & 55 deletions packages/object/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,20 +228,6 @@ export class DRPObject implements ObjectPb.DRPObjectBase {
this._notify("callFn", [vertex]);
}

/* Merges the vertices into the hashgraph
* Returns a tuple with a boolean indicating if there were
* missing vertices and an array with the missing vertices
*/
merge(vertices: Vertex[]): [merged: boolean, missing: string[]] {
if (!this.hashGraph) {
throw new Error("Hashgraph is undefined");
}
if (!this.drp) {
return this._mergeWithoutDrp(vertices);
}
return this._mergeWithDrp(vertices);
}

validateVertex(vertex: Vertex) {
// Validate hash value
if (
Expand Down Expand Up @@ -276,9 +262,15 @@ export class DRPObject implements ObjectPb.DRPObjectBase {
}
}

/* Merges the vertices into the hashgraph using DRP
/* Merges the vertices into the hashgraph
* Returns a tuple with a boolean indicating if there were
* missing vertices and an array with the missing vertices
*/
private _mergeWithDrp(vertices: Vertex[]): [merged: boolean, missing: string[]] {
merge(vertices: Vertex[]): [merged: boolean, missing: string[]] {
if (!this.hashGraph) {
throw new Error("Hashgraph is undefined");
}

const missing: Hash[] = [];
const newVertices: Vertex[] = [];
for (const vertex of vertices) {
Expand All @@ -291,15 +283,22 @@ export class DRPObject implements ObjectPb.DRPObjectBase {
this.validateVertex(vertex);
const preComputeLca = this.computeLCA(vertex.dependencies);

if (vertex.operation.drpType === DrpType.DRP) {
const drp = this._computeDRP(vertex.dependencies, preComputeLca, vertex.operation);
this._setObjectACLState(vertex, preComputeLca);
if (this.drp) {
const drp = this._computeDRP(
vertex.dependencies,
preComputeLca,
vertex.operation.drpType === DrpType.DRP ? vertex.operation : undefined
);
this._setDRPState(vertex, preComputeLca, this._getDRPState(drp));
} else {
const acl = this._computeObjectACL(vertex.dependencies, preComputeLca, vertex.operation);
this._setObjectACLState(vertex, preComputeLca, this._getDRPState(acl));
this._setDRPState(vertex, preComputeLca);
}

const acl = this._computeObjectACL(
vertex.dependencies,
preComputeLca,
vertex.operation.drpType === DrpType.ACL ? vertex.operation : undefined
);
this._setObjectACLState(vertex, preComputeLca, this._getDRPState(acl));

this.hashGraph.addVertex(vertex);
this._initializeFinalityState(vertex.hash);
newVertices.push(vertex);
Expand All @@ -310,39 +309,12 @@ export class DRPObject implements ObjectPb.DRPObjectBase {

this.vertices = this.hashGraph.getAllVertices();
this._updateObjectACLState();
this._updateDRPState();
if (this.drp) this._updateDRPState();
this._notify("merge", newVertices);

return [missing.length === 0, missing];
}

/* Merges the vertices into the hashgraph without using DRP
*/
private _mergeWithoutDrp(vertices: Vertex[]): [merged: boolean, missing: string[]] {
const missing = [];
for (const vertex of vertices) {
if (!vertex.operation || this.hashGraph.vertices.has(vertex.hash)) {
continue;
}

try {
this.validateVertex(vertex);
this.hashGraph.addVertex({
hash: vertex.hash,
operation: vertex.operation,
dependencies: vertex.dependencies,
peerId: vertex.peerId,
timestamp: vertex.timestamp,
signature: vertex.signature,
});
} catch (_) {
missing.push(vertex.hash);
}
}

return [missing.length === 0, missing];
}

subscribe(callback: DRPObjectCallback) {
this.subscriptions.push(callback);
}
Expand Down Expand Up @@ -373,10 +345,6 @@ export class DRPObject implements ObjectPb.DRPObjectBase {

// check if the given peer has write permission
private _checkWriterPermission(peerId: string, deps: Hash[]): boolean {
if (!this.drp) {
return (this.acl as ACL).query_isWriter(peerId);
}

const acl = this._computeObjectACL(deps);
return (acl as ACL).query_isWriter(peerId);
}
Expand Down