keri-ts 2.0.1 → 2.1.0

package/esm/keri/npm/src/app/identity/configing.js

@@ -1,5 +1,5 @@
 import * as dntShim from "../../_dnt.shims.js";
-import { basename, dirname, join } from "../../deps/jsr.io/@std/path/1.1.6/mod.js";
+import { basename, dirname, extname, join } from "../../deps/jsr.io/@std/path/1.1.6/mod.js";
 import { ValidationError } from "../../core/errors.js";
 import { PathManager } from "../../db/core/path-manager.js";
 const CONFIGER_DEFAULTS = {
@@ -23,7 +23,7 @@ const CONFIGER_DEFAULTS = {
  * - currently supports JSON only
  */
 export class Configer {
-    /** Create a config manager bound to a PathManager-backed directory. */
+    /** Create a config manager bound to a PathManager-resolved file. */
     constructor(options = {}) {
         Object.defineProperty(this, "name", {
             enumerable: true,
@@ -62,7 +62,7 @@ export class Configer {
             value: null
         });
         this.name = options.name || "conf";
-        this.base = options.base || "";
+        this.base = options.base ?? "main";
         this.temp = options.temp || false;
         this.fext = options.fext || CONFIGER_DEFAULTS.fext;
         this.pathManager = new PathManager({
@@ -70,27 +70,24 @@ export class Configer {
             name: this.name,
             base: this.base,
             temp: this.temp,
+            filed: true,
+            fext: this.fext,
         }, {
             tailDirPath: CONFIGER_DEFAULTS.tailDirPath,
             cleanTailDirPath: CONFIGER_DEFAULTS.cleanTailDirPath,
-            altTailDirPath: CONFIGER_DEFAULTS.altTailDirPath,
-            altCleanTailDirPath: CONFIGER_DEFAULTS.altCleanTailDirPath,
+            altTailDirPath: options.compat ? ".keri/cf" : CONFIGER_DEFAULTS.altTailDirPath,
+            altCleanTailDirPath: options.compat ? ".keri/clean/cf" : CONFIGER_DEFAULTS.altCleanTailDirPath,
             tempPrefix: CONFIGER_DEFAULTS.tempPrefix,
         });
     }
     get opened() {
         return this.path !== null;
     }
-    /** Resolve and validate the config filename and extension. */
-    resolvedFileName() {
-        if (this.name.endsWith(`.${this.fext}`)) {
-            return this.name;
-        }
-        const hasExt = this.name.includes(".");
-        if (hasExt) {
+    /** Refuse a config name carrying an extension this manager cannot read. */
+    assertSupportedExtension() {
+        if (extname(this.name) && !this.name.endsWith(`.${this.fext}`)) {
             throw new ValidationError(`Unsupported config extension for '${this.name}'. Only .${this.fext} is supported.`);
         }
-        return `${this.name}.${this.fext}`;
     }
     ensureOpenPath() {
         if (!this.path) {
@@ -194,44 +191,21 @@ export class Configer {
             throw pendingError;
         }
     }
-    /** Open or create the config file in the resolved Configer directory. */
+    /** Open the config file at KERIpy's `{head}/keri/cf/{base}/{name}.{fext}`, creating it when absent. */
     *reopen(options = {}) {
-        const opened = yield* this.pathManager.reopen({
-            ...options,
-            name: this.name,
-            base: this.base,
-            temp: this.temp,
-        });
+        this.assertSupportedExtension();
+        const opened = yield* this.pathManager.reopen(options);
         if (!opened || !this.pathManager.path) {
             return false;
         }
-        const fileName = this.resolvedFileName();
-        this.path = join(this.pathManager.path, fileName);
-        try {
-            dntShim.Deno.statSync(this.path);
-        }
-        catch (error) {
-            if (error instanceof dntShim.Deno.errors.NotFound) {
-                this.writeAtomic(this.path, "{}\n");
-            }
-            else {
-                throw error;
-            }
+        this.path = this.pathManager.path;
+        if (dntShim.Deno.statSync(this.path).size === 0) {
+            this.writeAtomic(this.path, "{}\n");
         }
         return true;
     }
-    /** Close the config manager and optionally remove files. */
+    /** Close the config manager and optionally remove the file. */
     *close(clear = false) {
-        if (clear && this.path) {
-            try {
-                dntShim.Deno.removeSync(this.path);
-            }
-            catch (error) {
-                if (!(error instanceof dntShim.Deno.errors.NotFound)) {
-                    throw error;
-                }
-            }
-        }
         this.path = null;
         yield* this.pathManager.close(clear);
         return true;

package/esm/keri/npm/src/app/identity/habbing.js

@@ -23,13 +23,13 @@ import { HabitatRecord } from "../../core/records.js";
 import { Roles } from "../../core/roles.js";
 import { BasicReplyRouteHandler, Revery, Router } from "../../core/routing.js";
 import { Schemes } from "../../core/schemes.js";
-import { createBaser } from "../../db/basing.js";
-import { createKeeper, PreSit } from "../../db/keeping.js";
+import { Baser } from "../../db/basing.js";
+import { openOwner } from "../../db/core/store-owner.js";
+import { Keeper, PreSit } from "../../db/keeping.js";
 import { makeNowIso8601 } from "../../time/mod.js";
 import { oobiReplyMessages } from "../bootstrap/oobi-replies.js";
 import { loadStoredReply } from "../delivery/stored-replies.js";
 import { acceptedGroupMembers, latestGroupContribution } from "../multisig/group-members.js";
-import { createConfiger } from "./configing.js";
 import { branToSaltQb64, encodeHugeNumber, ensureKeeperCryptoReady, Manager, normalizeSaltQb64, saltySigner, } from "./keeping.js";
 /** Reserved alias for the local signatory habitat record. */
 export const SIGNER = "__signatory__";
@@ -43,13 +43,16 @@ const KERI_V1 = Object.freeze({ major: 1, minor: 0 });
 /**
  * Select the KERI version for a new event on an existing identifier.
  *
- * An identifier keeps the KERI version of its accepted KEL, so rotation and
- * interaction never mix versions within one KEL. An explicit selection that
- * conflicts with the accepted KEL is refused rather than silently ignored.
+ * An identifier follows the KERI version of its latest accepted event. An explicit
+ * selection that conflicts with it is refused rather than silently ignored, except
+ * for a deliberate upgrade rotation, which is how a v1 identifier moves up to v2.
+ * Stricter than KERIpy, whose per-event default can mix versions without being asked.
  */
-function acceptedKelVersion(kever, requested) {
+function acceptedKelVersion(kever, requested, { allowUpgrade = false } = {}) {
     const accepted = kever.serder.pvrsn.major === 1 ? Vrsn_1_0 : Vrsn_2_0;
     if (requested && (requested.major !== accepted.major || requested.minor !== accepted.minor)) {
+        if (allowUpgrade && requested.major > accepted.major)
+            return requested;
         throw new ValidationError(`KEL of ${kever.prefixer.qb64} is KERI ${accepted.major}.${accepted.minor}; `
             + `refusing a KERI ${requested.major}.${requested.minor} event.`);
     }
@@ -473,7 +476,7 @@ export class Hab {
         if (!kever) {
             throw new ValidationError(`Missing accepted key state for ${this.pre}.`);
         }
-        const version = acceptedKelVersion(kever, args.version);
+        const version = acceptedKelVersion(kever, args.version, { allowUpgrade: true });
         const priorSit = this.ks.getSits(this.pre);
         if (!priorSit) {
             throw new ValidationError(`Missing keeper state for ${this.pre}.`);
@@ -1077,7 +1080,7 @@ export class Signator {
  */
 export class Habery {
     /** Compose one habery from already-opened storage, manager, and config surfaces. */
-    constructor(name, base, temp, headDirPath, compat, readonly, db, ks, mgr, cf, skipSignator = false) {
+    constructor(name, base, temp, headDirPath, compat, readonly, db, ks, mgr, cf, skipSignator = false, opener, borrowsStores = false) {
         Object.defineProperty(this, "name", {
             enumerable: true,
             configurable: true,
@@ -1114,6 +1117,19 @@ export class Habery {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "storeOpener", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /** True when `db` and `ks` were borrowed; their owner closes them. */
+        Object.defineProperty(this, "borrowsStores", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "db", {
             enumerable: true,
             configurable: true,
@@ -1174,6 +1190,8 @@ export class Habery {
             writable: true,
             value: void 0
         });
+        this.storeOpener = opener;
+        this.borrowsStores = borrowsStores;
         this.name = name;
         this.base = base;
         this.temp = temp;
@@ -1688,10 +1706,20 @@ export class Habery {
         this.habs.set(pre, hab);
         return hab;
     }
-    /** Closes backing databases and optionally clears temp storage. */
+    /** Creates this Habery's sidecar stores. */
+    get opener() {
+        if (!this.storeOpener)
+            throw new ValidationError("This Habery was given stores without an opener for sidecars.");
+        return this.storeOpener;
+    }
+    /** Identity shared by this Habery's stores and sidecars. */
+    storeIdentity() {
+        return { name: this.name, base: this.base, temp: this.temp, reopen: true, readonly: this.readonly };
+    }
+    /** Closes owned backing databases and optionally clears temp storage. */
     *close(clear = false) {
         const failures = [];
-        const closing = [this.db.close(clear), this.ks.close(clear)];
+        const closing = this.borrowsStores ? [] : [this.db.close(clear), this.ks.close(clear)];
         if (this.cf)
             closing.push(this.cf.close(clear && this.temp));
         for (const operation of closing) {
@@ -1726,38 +1754,29 @@ export function branToSeedAeid(bran) {
  * The returned `Habery` immediately reconstructs its local habitat cache from
  * durable DB state rather than depending on process-local creation history.
  */
-export function* createHabery(args) {
-    const { name, base = "", temp = false, headDirPath, compat = false, readonly = false, cf: providedCf, skipConfig = false, skipSignator = false, bran, seed, aeid, salt, algo, } = args;
+export function* openHabery(args) {
+    const { name, base = "", temp = false, headDirPath, compat = false, readonly = false, cf: providedCf, createConfig, skipConfig = false, skipSignator = false, opener, stores, bran, seed, aeid, salt, algo, } = args;
     let db;
     let ks;
     let cf;
     let delivered = false;
     let failure;
     try {
-        db = yield* createBaser({
-            name,
-            base,
-            temp,
-            headDirPath,
-            compat,
-            reopen: true,
-            readonly,
-        });
-        ks = yield* createKeeper({
-            name,
-            base,
-            temp,
-            headDirPath,
-            compat,
-            reopen: true,
-            readonly,
-        });
+        if (!opener && !stores)
+            throw new ValidationError("A Habery needs a store opener or borrowed stores.");
+        if (!providedCf && !skipConfig && !createConfig) {
+            throw new ValidationError("A Habery needs a Configer, a Configer factory or skipConfig.");
+        }
+        const identity = { name, base, temp, reopen: true, readonly };
+        db = stores?.db ?? (yield* openOwner(new Baser(opener.create(Baser.Family, identity)), "Baser", identity));
+        ks = stores?.ks ?? (yield* openOwner(new Keeper(opener.create(Keeper.Family, identity)), "Keeper", identity));
         cf = providedCf
-            ?? (skipConfig ? undefined : (yield* createConfiger({
+            ?? (skipConfig ? undefined : (yield* createConfig({
                 name,
                 base,
                 temp,
                 headDirPath,
+                compat,
                 reopen: true,
                 clear: false,
             })));
@@ -1779,7 +1798,7 @@ export function* createHabery(args) {
             algo,
             salt: normalizeSaltQb64(salt),
         });
-        const hby = new Habery(name, base, temp, headDirPath, compat, readonly, db, ks, mgr, cf, skipSignator);
+        const hby = new Habery(name, base, temp, headDirPath, compat, readonly, db, ks, mgr, cf, skipSignator, opener, !!stores);
         delivered = true;
         return hby;
     }
@@ -1796,9 +1815,9 @@ export function* createHabery(args) {
             const closing = [];
             if (cf && cf !== providedCf)
                 closing.push(cf.close());
-            if (ks)
+            if (ks && !stores)
                 closing.push(ks.close());
-            if (db)
+            if (db && !stores)
                 closing.push(db.close());
             for (const operation of closing) {
                 try {

package/esm/keri/npm/src/app/identity/keeping.js

@@ -1195,7 +1195,7 @@ export function b64DecodeUrl(text) {
 /**
  * Backward-compatibility no-op for older app-layer startup seams.
  *
- * CESR primitives now own libsodium readiness through their own module
+ * CESR primitives now own crypto backend readiness through their own module
  * initialization, so higher layers no longer need an explicit keeper-crypto
  * readiness step.
  */

package/esm/keri/npm/src/app/identity/lmdb-habery.js

@@ -0,0 +1,12 @@
+/** Default LMDB-backed `Habery` construction, kept apart so `openHabery` stays backend-neutral. */
+import { LmdbStoreOpener } from "../../db/core/lmdb-opener.js";
+import { createConfiger } from "./configing.js";
+import { openHabery } from "./habbing.js";
+/** Open a `Habery` on LMDB at its established paths, unless the caller supplies stores or an opener. */
+export function* createHabery(args) {
+    return yield* openHabery({
+        opener: new LmdbStoreOpener({ headDirPath: args.headDirPath, compat: args.compat }),
+        createConfig: createConfiger,
+        ...args,
+    });
+}

package/esm/keri/npm/src/app/ipex/ipex-graph.js

@@ -1,6 +1,6 @@
 /** Borrowed IPEX frame DAGs, negotiated disclosure paths and traversal policy. */
 import { Compactor, makePather, SerderACDC } from "cesr-ts";
-import { acdcEdgeBlocks as blocks, acdcEdgeTarget, acdcGroupLabels } from "../../acdc/chaining.js";
+import { walkAcdcGraph } from "../../acdc/chaining.js";
 const nodeIlks = new Set([null, "acm", "ace", "act", "acg"]);
 /** Empty UUID marks field-map metadata; fixed-field public credentials keep that slot empty too. */
 export function isIpexMetadata(node) {
@@ -58,15 +58,15 @@ export function singleDagDisclosurePlan(value) {
     return Array.isArray(value) && value.length === 1 && validDisclosurePlan(value[0]) ? value[0] : null;
 }
 /**
- * Index unique disclosed credential nodes and walk their reachable graph in BFS order.
- * Offers may omit far nodes; grants require every referenced node. Nested ownership
+ * Index unique disclosed credential frames, then delegate the graph walk to `walkAcdcGraph`.
+ * Offers always walk open; Grants use the caller's walk policy. Nested ownership
  * does not make these nodes independently accepted runtime messages.
  */
-export function walkIpexGraph(origin, nests, closed) {
+export function walkIpexGraph(origin, nests, walk) {
     const nodes = new Map();
     for (const [index, frame] of nests.entries()) {
         const body = frame.body;
-        if (!(body instanceof SerderACDC) || !body.verify() || !nodeIlks.has(body.ilk)
+        if (!(body instanceof SerderACDC) || !nodeIlks.has(body.ilk)
             || !body.said || (index === 0 && body.said !== origin) || nodes.has(body.said))
             return null;
         // Descendants are not additional implicit evidence for this disclosed node.
@@ -74,71 +74,8 @@ export function walkIpexGraph(origin, nests, closed) {
             return null;
         nodes.set(body.said, frame);
     }
-    if (!nodes.has(origin))
-        return null;
-    const seen = new Set();
-    const order = [];
-    const dependencies = new Map();
-    const queue = [origin];
-    for (let index = 0; index < queue.length; index++) {
-        const said = queue[index];
-        if (seen.has(said))
-            continue;
-        seen.add(said);
-        order.push(said);
-        const farNodes = new Set();
-        dependencies.set(said, farNodes);
-        const edges = blocks(nodes.get(said).body.sad.e);
-        if (!edges)
-            return null;
-        const groups = [...edges];
-        for (let g = 0; g < groups.length; g++) {
-            const edge = groups[g];
-            const target = acdcEdgeTarget(edge);
-            if (target === false)
-                return null;
-            if (typeof target === "string") {
-                if (!nodes.has(target)) {
-                    if (closed)
-                        return null;
-                }
-                else {
-                    farNodes.add(target);
-                    if (!seen.has(target))
-                        queue.push(target);
-                }
-            }
-            else {
-                if (!record(edge))
-                    return null;
-                for (const [key, value] of Object.entries(edge)) {
-                    if (acdcGroupLabels.has(key) || typeof value === "string")
-                        continue;
-                    groups.push(value);
-                }
-            }
-        }
-    }
-    if (seen.size !== nodes.size)
-        return null;
-    const parents = new Map();
-    for (const [near, children] of dependencies) {
-        for (const far of children) {
-            if (!parents.has(far))
-                parents.set(far, new Set());
-            parents.get(far).add(near);
-        }
-    }
-    const dependencyOrder = order.filter((said) => dependencies.get(said).size === 0);
-    for (let i = 0; i < dependencyOrder.length; i++) {
-        for (const near of parents.get(dependencyOrder[i]) ?? []) {
-            const children = dependencies.get(near);
-            children.delete(dependencyOrder[i]);
-            if (!children.size)
-                dependencyOrder.push(near);
-        }
-    }
-    return dependencyOrder.length === nodes.size ? { nodes, order } : null;
+    const order = walkAcdcGraph(origin, nodes, walk);
+    return order ? { nodes, order, walk } : null;
 }
 /** Compare SAD values structurally while retaining list order; map insertion order is not semantic here. */
 function equal(a, b) {

package/esm/keri/npm/src/app/ipex/ipex-grouping.js

@@ -29,10 +29,11 @@ import { collectBytes } from "../transport/byte-source.js";
 import { credentialGrantReady, credentialPresentationSupportMessages, credentialSaidFromGrant, validateAdmitGrant, } from "./ipex-credentialing.js";
 import { walkIpexGraph } from "./ipex-graph.js";
 import { authenticateIpexNode, issuedNodeVerdict } from "./ipex-node-authentication.js";
+import { ipexGrantWalk } from "./ipex-v2.js";
 import { IPEX_ADMIT_ROUTE, IPEX_GRANT_ROUTE, ipexConversationReady, ipexRecipient } from "./ipexing.js";
 /** Authenticate the exact disclosed graph; only the existing evaluator's explicit true authorizes new use. */
-function acdcV2GraphUse(hby, registry, origin, nests) {
-    const graph = walkIpexGraph(origin, nests, true);
+function acdcV2GraphUse(hby, registry, origin, nests, walk) {
+    const graph = walkIpexGraph(origin, nests, walk);
     if (!graph)
         throw new ValidationError("ACDC v2 group graph is malformed or incomplete.");
     const verdicts = new Map();
@@ -55,7 +56,7 @@ function acdcV2GrantUse(hby, exchanger, registry, said) {
     if (!Array.isArray(origins) || origins.length !== 1 || typeof origins[0] !== "string") {
         throw new ValidationError("ACDC v2 group Grant requires one origin.");
     }
-    return acdcV2GraphUse(hby, registry, origins[0], loadNests(hby.db, said));
+    return acdcV2GraphUse(hby, registry, origins[0], loadNests(hby.db, said), ipexGrantWalk(exchanger));
 }
 /** Recheck current graph authorization at an accepted group's new delivery, output or consent action. */
 export function requireAcdcV2GroupUse(hby, protocol, embedded) {
@@ -110,8 +111,10 @@ export function* prepareAcdcV2GroupIpex(hby, protocol, group, raw) {
             if (!Array.isArray(origins) || origins.length !== 1 || typeof origins[0] !== "string") {
                 throw new ValidationError("ACDC v2 group Grant requires one origin.");
             }
-            if (acdcV2GraphUse(hby, protocol.registry?.store ?? null, origins[0], frame.nests ?? []) !== true)
+            const walk = ipexGrantWalk(protocol.exc);
+            if (acdcV2GraphUse(hby, protocol.registry?.store ?? null, origins[0], frame.nests ?? [], walk) !== true) {
                 return null;
+            }
         }
         else if (embedded.route === IPEX_ADMIT_ROUTE) {
             if (typeof embedded.sad.p !== "string"
@@ -353,7 +356,7 @@ function* prepareGroupIpexMessages(hby, protocol, groupHab, embedded, childGvrsn
         if (child.route === IPEX_GRANT_ROUTE) {
             const origins = child.sad.a.o;
             if (!Array.isArray(origins) || origins.length !== 1 || typeof origins[0] !== "string"
-                || acdcV2GraphUse(hby, protocol.registry?.store ?? null, origins[0], childFrame.nests ?? []) !== true) {
+                || acdcV2GraphUse(hby, protocol.registry?.store ?? null, origins[0], childFrame.nests ?? [], ipexGrantWalk(protocol.exc)) !== true) {
                 throw new ValidationError("ACDC v2 group graph is unavailable before proposal publication.");
             }
         }

package/esm/keri/npm/src/app/ipex/ipex-v2.js

@@ -1,7 +1,7 @@
 import { IPEX_V2_PREDECESSORS, isIpexVerb, nestedIpexRoute, } from "../../core/exchange/protocol-exchanging.js";
 /** V2 IPEX route policy; v1 routing remains independently registered. */
 import { Diger, ParserError, Prefixer, } from "cesr-ts";
-import { evaluateChain } from "../../acdc/chaining.js";
+import { DEFAULT_GRANT_WALK, evaluateChain } from "../../acdc/chaining.js";
 import { validateUpdate, verifyRegistryAnchor, vet, vetBinds, vetBlind, vetBound, } from "../../acdc/regeventing.js";
 import { validateSchema } from "../../acdc/scheming.js";
 import { DatabaseOperationError } from "../../core/errors.js";
@@ -31,9 +31,11 @@ function missing(reason) {
  * Authenticate each disclosed node independently before Exchanger persists an EXN.
  * Registry evidence is caller-owned; notifier delivery follows durable acceptance.
  * Presentation registries require the retained receiver receipt and node-local proofs.
+ * `grantWalk` selects how a Grant treats an undisclosed far node (`AcdcWalkPolicy`);
+ * a far node the disclosure plan selects but the Grant does not nest always refuses.
  */
 export class IpexV2Handler {
-    constructor(resource, hby, notifier = null, registry = null) {
+    constructor(resource, hby, notifier = null, registry = null, grantWalk = DEFAULT_GRANT_WALK) {
         Object.defineProperty(this, "resource", {
             enumerable: true,
             configurable: true,
@@ -58,6 +60,12 @@ export class IpexV2Handler {
             writable: true,
             value: registry
         });
+        Object.defineProperty(this, "grantWalk", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: grantWalk
+        });
         Object.defineProperty(this, "protocolMajor", {
             enumerable: true,
             configurable: true,
@@ -266,7 +274,7 @@ export class IpexV2Handler {
         if (verb === "offer" && nests.length) {
             if (nests.some(hasIpexNodeAttachments))
                 return false;
-            const graph = walkIpexGraph(attrs.o[0], nests, false);
+            const graph = walkIpexGraph(attrs.o[0], nests, "open");
             return graph ? this.nodeSchemas(graph) : false;
         }
         if (verb !== "grant")
@@ -287,7 +295,7 @@ export class IpexV2Handler {
         if (!single(attrs.o, "string") || !this.validOrigin(attrs.o[0]) || !nests.length)
             return false;
         const origin = attrs.o[0];
-        const graph = walkIpexGraph(origin, nests, true);
+        const graph = walkIpexGraph(origin, nests, this.grantWalk);
         if (!graph || [...graph.nodes.values()].some((node) => isIpexMetadata(node.body)))
             return false;
         if (!verifyIpexDisclosure(plan, origin, graph))
@@ -492,7 +500,7 @@ export class IpexV2Handler {
         const nests = loadNests(this.hby.db, offerSaid);
         if (!nests.length)
             return missing(`Missing metadata ACDC for accepted Offer ${offerSaid}.`);
-        const offered = walkIpexGraph(offeredOrigin, nests, false);
+        const offered = walkIpexGraph(offeredOrigin, nests, "open");
         if (!offered)
             return false;
         const metadata = offered.nodes.get(offeredOrigin).body;
@@ -690,3 +698,11 @@ export class IpexV2Handler {
         return [[issuee, regid]];
     }
 }
+/**
+ * The Grant walk policy of the exchanger's v2 Grant owner. Later use of an
+ * accepted Grant re-walks it under this policy so reuse agrees with admission.
+ */
+export function ipexGrantWalk(exchanger) {
+    const handler = exchanger.routeHandler("/ipex/grant", 2);
+    return handler instanceof IpexV2Handler ? handler.grantWalk : DEFAULT_GRANT_WALK;
+}

package/esm/keri/npm/src/app/ipex/ipexing.js

@@ -111,7 +111,7 @@ export class IpexHandler {
 export function loadIpexHandlers(hby, exchanger, options = {}) {
     for (const route of IPEX_ROUTES) {
         exchanger.addHandler(new IpexHandler(route, hby, options.notifier ?? null));
-        exchanger.addHandler(new IpexV2Handler(route, hby, options.notifier ?? null, options.registry ?? null));
+        exchanger.addHandler(new IpexV2Handler(route, hby, options.notifier ?? null, options.registry ?? null, options.grantWalk));
     }
 }
 /** Apply for an ACDC. */

package/esm/keri/npm/src/app/mailbox/mailboxing.js

@@ -1,6 +1,7 @@
 import { TopicsRecord } from "../../core/records.js";
 import { Roles } from "../../core/roles.js";
-import { createMailboxer } from "../../db/mailbox/mailboxing.js";
+import { openOwner } from "../../db/core/store-owner.js";
+import { Mailboxer } from "../../db/mailbox/mailboxing.js";
 /**
  * Derive mailbox open options from one existing habery.
  *
@@ -13,13 +14,7 @@ import { createMailboxer } from "../../db/mailbox/mailboxing.js";
  */
 export function mailboxerOptionsForHabery(hby, options = {}) {
     return {
-        name: hby.name,
-        base: hby.base,
-        temp: hby.temp,
-        headDirPath: hby.headDirPath,
-        compat: hby.compat,
-        readonly: hby.readonly,
-        reopen: true,
+        ...hby.storeIdentity(),
         ...options,
     };
 }
@@ -35,7 +30,8 @@ export function mailboxerOptionsForHabery(hby, options = {}) {
  * @returns Provider sidecar whose acquisition/lifetime belongs to the caller scope.
  */
 export function* openMailboxerForHabery(hby, options = {}) {
-    return yield* createMailboxer(mailboxerOptionsForHabery(hby, options));
+    const identity = mailboxerOptionsForHabery(hby, options);
+    return yield* openOwner(new Mailboxer(hby.opener.create(Mailboxer.Family, identity)), "Mailboxer", identity);
 }
 /**
  * Build the stored mailbox topic key used by KERIpy-style mailbox storage.

package/esm/keri/npm/src/app/multisig/group-members.js

@@ -64,6 +64,20 @@ export function groupWitnesserSelection(db, group, { sn, said }) {
     }
     return null;
 }
+/**
+ * Return the current signing member elected by `coordinator`, as KERIpy
+ * `GroupHab.elected`: the member whose latest contribution to the coordinator's
+ * establishment keys holds the lowest verified signing index. Null when the
+ * event has no election or that contributor is no longer a current signing
+ * member. The result depends on locally stored signatures, so it suits
+ * idempotent duties only; frozen operations recheck their earlier choice instead.
+ */
+export function groupElectedMember(hby, group, coordinator) {
+    const selection = groupWitnesserSelection(hby.db, group, coordinator);
+    if (!selection)
+        return null;
+    return groupSigningMembers(hby, group).find(member => latestGroupContribution(hby.db, member, selection.establishment.verfers)?.index === selection.index) ?? null;
+}
 /** Return current group signing member AIDs in signing-index order. */
 export function groupSigningMembers(hby, groupPre) {
     const stored = hby.ks.getSmids(groupPre).map((tuple) => tuple[0].qb64);

package/esm/keri/npm/src/app/multisig/grouping.js

@@ -304,8 +304,9 @@ export function* prepareMultisigEventExn(sender, proposal, wire, options = {}) {
     // Keep the route selection stable through parser suspension; attribute values remain immutable borrows.
     const captured = { ...proposal };
     const { route, attrs } = captured;
-    // KERIpy `kli multisig incept|interact|rotate` and `ends add` send these routes as v1
-    // `e`-embed wrappers whatever the group KEL version, and `kli multisig join` reads only `e`.
+    // KERIpy `kli multisig incept|interact` and `ends add` send these routes as v1 `e`-embed
+    // wrappers whatever the group KEL version. `kli multisig rotate --version 2.0` sends a v2
+    // nested wrapper, and `kli multisig join` replies in its proposal's form, as approvals here do.
     const keripyEmbedRoute = KERIPY_EMBED_PROPOSAL_ROUTES.includes(route);
     const version = options.pvrsn ?? options.version ?? (keripyEmbedRoute ? Vrsn_1_0 : Vrsn_2_0);
     const field = route.slice(route.lastIndexOf("/") + 1);
@@ -547,7 +548,7 @@ export class Multiplexor {
             if (this.isLocalHab(sender))
                 yield* this.processApproved(nests);
         }
-        const { existing, submitters } = this.hby.db.env.transactionSync(() => {
+        const { existing, submitters } = this.hby.db.transaction(() => {
             const indexed = this.hby.db.meids.get([embeddedSaid]);
             const existing = isV2RegistryRoute(route) || v2Ipex
                 ? indexed.filter(diger => {

package/esm/keri/npm/src/app/multisig/multisig-workflows.js

@@ -152,9 +152,10 @@ export function* publishAcdcV2Registry(hby, postman, group, approval) {
  * @param proposal Route-correlated group proposal with its named business fields.
  * @param embeddedMessage Signed child wire to include under the route-derived label.
  * @param childGvrsn Optional explicit attachment genus for the child.
+ * @param wrapperVersion Optional wrapper protocol version; an approval mirrors its proposal's.
  * @returns Stable proposal/wrapper identities and completed deliveries, independent of group acceptance.
  */
-export function* publishProposal(hby, protocol, postman, member, recipients, proposal, embeddedMessage, childGvrsn) {
+export function* publishProposal(hby, protocol, postman, member, recipients, proposal, embeddedMessage, childGvrsn, wrapperVersion) {
     const input = new Reactor(protocol);
     const outcomes = [];
     for (const recipient of remoteGroupMembers(hby, member, recipients)) {
@@ -162,6 +163,7 @@ export function* publishProposal(hby, protocol, postman, member, recipients, pro
         const prepared = yield* prepareMultisigEventExn(member.pre, proposal, embeddedMessage, {
             recipient: destination,
             childGvrsn,
+            ...(wrapperVersion ? { pvrsn: wrapperVersion } : {}),
         });
         const signed = yield* prepareGroupMessage(protocol.exc, member, destination, prepared);
         outcomes.push(yield* admitAndSendGroupMessage(input, postman, signed));
@@ -444,7 +446,10 @@ function* approveKelProposal(hby, runtime, exn, route, options) {
     yield* runtime.reactor.processBytes(concatBytes(Counter.makeGVC(approval.genus), localMessage), { local: true });
     yield* runtime.reactor.processBytes(concatBytes(Counter.makeGVC(approval.genus), serder.raw, approval.attachment), { local: true });
     yield* runtime.protocol.processEscrowsOnce();
-    const publication = yield* publishProposal(hby, runtime.protocol, runtime.postman, member, members, proposal, localMessage, approval.genus);
+    const publication = yield* publishProposal(hby, runtime.protocol, runtime.postman, member, members, proposal, localMessage, approval.genus, 
+    // KERIpy indexes contributions by wrapper form (v1 `e` SAID, v2 child SAID), so an
+    // approval must reuse its proposal's wrapper version for the proposer to merge it.
+    exn.pvrsn);
     const accepted = eventAccepted(hby, serder);
     if (proposal.route !== MULTISIG_IXN_ROUTE) {
         commitAcceptedGroupMembers(hby, serder, smids, proposal.attrs.rmids);