From 2e2d7f6a9b116dac2fa20be657c916cb498c1508 Mon Sep 17 00:00:00 2001 From: Estevan Castilho Date: Sat, 19 Sep 2026 01:08:28 +0000 Subject: Do not assume that the hash of an object is its storage address --- lib/kernel/BranchManager.ml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'lib/kernel/BranchManager.ml') diff --git a/lib/kernel/BranchManager.ml b/lib/kernel/BranchManager.ml index 016f75a..1162b40 100644 --- a/lib/kernel/BranchManager.ml +++ b/lib/kernel/BranchManager.ml @@ -51,13 +51,21 @@ module Make (S : Abstract.Storage.STORAGE) = struct method update key reference value = let open Utilities.Result in + let open Protocols in SI.with_transaction storage (fun tx -> match Utilities.Atomic.mswap head (fun head -> + let address_of h = + let* i = Handle.require Addressable.from h in + Ok (Addressable.address i) + in let* branch = M.lookup tx key head |> Result.map_error (fun e -> Some e) in - (* FIXME: we should have an addressable protocol rather than assuming the hash is the content store address *) - let reference = Option.map Protocols.Handle.hash reference in - let value = Option.map Protocols.Handle.hash value in + let* reference = Option.map address_of reference + |> Utilities.Option.sequence + |> Result.map_error (fun e -> Some e) in + let* value = Option.map address_of value + |> Utilities.Option.sequence + |> Result.map_error (fun e -> Some e) in if branch = reference then begin let* new_head = match value with -- cgit v1.2.3