@ibgib/core-gib 0.1.54 → 0.1.57

package/src/sync/sync-conflict-text-merge.respec.mts

@@ -18,7 +18,7 @@ import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 import { IbGibData_V1, IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../core-constants.mjs';
-import { TestTransformer, getTestKeystoneServiceHelper } from '../test-helpers.mjs';
+import { TestTransformer, } from '../test-helpers.mjs';
 import { TestMut8Info, } from '../test-types.mjs';
 import { SyncSagaCoordinator } from './sync-saga-coordinator.mjs';
 import { getFromSpace } from '../witness/space/space-helper.mjs';
@@ -80,14 +80,14 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     const testTransformer = new TestTransformer(metaspace, sourceSpace, destSpace);
 
     if (logalot) { console.log(`${lc} Setting up Coordinators...`); }
-    const mockKeystone = await getTestKeystoneServiceHelper();
-    const senderCoordinator = new SyncSagaCoordinator(mockKeystone);
-    const receiverCoordinator = new SyncSagaCoordinator(mockKeystone);
+    const senderCoordinator = new SyncSagaCoordinator();
+    const receiverCoordinator = new SyncSagaCoordinator();
 
     async function newTestPeer(): Promise<SyncPeerInnerspace_V1> {
         const peer = new SyncPeerInnerspace_V1(clone(SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1));
         await peer.initialized;
         await peer.initializeOpts({
+            localMetaspace: metaspace,
             localSpace: sourceSpace,
             receiverSpace: destSpace,
             receiverCoordinator: receiverCoordinator,
@@ -128,7 +128,6 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
             metaspace,
             domainIbGibs: [r1_alpha_v0_source.ibGib],
             conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            useSessionIdentity: false,
         });
         await r1_syncSaga.done;
         if (logalot) { console.log(`${lc} R1 Sync Complete.`); }
@@ -148,7 +147,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
             });
             const r1_alpha_source_tipAddr = r1_alpha_sourceKV[alpha_tjpAddr];
             if (!r1_alpha_source_tipAddr) {
-                await ifWe(sir, 'r1_alpha_source_tipAddr is falsy?', async () => {
+                await ifWeMight(sir, 'r1_alpha_source_tipAddr is falsy?', async () => {
                     iReckon(sir, true).asTo('fail').isGonnaBeFalse();
                 });
                 return; /* <<<< returns early */
@@ -161,17 +160,17 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
             });
             const r1_alpha_dest_tipAddr = r1_alpha_destKV[alpha_tjpAddr];
             if (!r1_alpha_dest_tipAddr) {
-                await ifWe(sir, 'r1_alpha_dest_tipAddr is falsy?', async () => {
+                await ifWeMight(sir, 'r1_alpha_dest_tipAddr is falsy?', async () => {
                     iReckon(sir, true).asTo('fail').isGonnaBeFalse();
                 });
                 return; /* <<<< returns early */
             }
 
-            await ifWe(sir, 'r1 tip addrs match', async () => {
+            await ifWeMight(sir, 'r1 tip addrs match', async () => {
                 iReckon(sir, r1_alpha_source_tipAddr).asTo('R1 source/dest have same tip').isGonnaBe(r1_alpha_dest_tipAddr);
             });
 
-            await ifWe(sir, 'r1 text synced correctly', async () => {
+            await ifWeMight(sir, 'r1 text synced correctly', async () => {
                 if (!r1_alpha_dest_tipAddr) {
                     throw new Error(`r1_dest_tipAddr is null/undefined (E: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`);
                 }
@@ -181,7 +180,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
                 iReckon(sir, destTipIbGib.data!.text).asTo('Dest has initial text').isGonnaBe(INITIAL_TEXT);
             });
 
-            await ifWe(sir, 'r1 dep graphs synced', async () => {
+            await ifWeMight(sir, 'r1 dep graphs synced', async () => {
                 const [r1_alpha_source_tip] = await getIbGibsFromCache_fallbackToSpaces({
                     addrs: [r1_alpha_source_tipAddr],
                     space: sourceSpace,
@@ -260,7 +259,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     // #endregion r2 dest edits
 
     await respecfully(sir, `r2 verify pre`, async () => {
-        await ifWe(sir, 'texts as expected', async () => {
+        await ifWeMight(sir, 'texts as expected', async () => {
             // before the sync, each side only has their edit. after the sync,
             // both sides should have both prepended and appended text
             iReckon(sir, r2_alpha_v1_source_appendedText.ibGib.data?.text.includes(INITIAL_TEXT)).asTo('alpha source has initial text').isGonnaBeTrue();
@@ -282,7 +281,6 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
             metaspace,
             domainIbGibs: [r2_alpha_v1_source_appendedText.ibGib],
             conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            useSessionIdentity: false,
         });
         await r2_syncSaga.done;
     } catch (e) {
@@ -296,14 +294,14 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
         const kv_dest = await senderCoordinator.getKnowledgeMap({ space: destSpace, metaspace, domainIbGibs: [r1_alpha_v0_source.ibGib] });
         const r2_alpha_source_tipAddr = kv_source[alpha_tjpAddr];
         if (!r2_alpha_source_tipAddr) {
-            await ifWe(sir, 'r2_alpha_source_tipAddr falsy?', async () => {
+            await ifWeMight(sir, 'r2_alpha_source_tipAddr falsy?', async () => {
                 iReckon(sir, true).asTo('fails').isGonnaBe(false);
             });
             return; /* <<<< returns early */
         }
         const r2_alpha_dest_tipAddr = kv_dest[alpha_tjpAddr];
         if (!r2_alpha_dest_tipAddr) {
-            await ifWe(sir, 'r2_alpha_dest_tipAddr falsy?', async () => {
+            await ifWeMight(sir, 'r2_alpha_dest_tipAddr falsy?', async () => {
                 iReckon(sir, true).asTo('fails').isGonnaBe(false);
             });
             return; /* <<<< returns early */
@@ -317,11 +315,11 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
             space: sourceSpace,
         });
 
-        await ifWe(sir, 'r2 tip addrs match', async () => {
+        await ifWeMight(sir, 'r2 tip addrs match', async () => {
             iReckon(sir, r2_alpha_source_tipAddr).asTo('alpha').isGonnaBe(r2_alpha_dest_tipAddr);
         });
 
-        await ifWe(sir, 'r2 text merged correctly', async () => {
+        await ifWeMight(sir, 'r2 text merged correctly', async () => {
             // before the sync, each side only has their edit. after the sync,
             // both sides should have both prepended and appended text
             iReckon(sir, r2_alpha_v1_source_appendedText.ibGib.data?.text.includes(INITIAL_TEXT)).asTo('alpha source has initial text').isGonnaBeTrue();
@@ -340,7 +338,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
             iReckon(sir, text).asTo('R2 has both prepend and append').isGonnaBe(DEST_PREPEND + INITIAL_TEXT + SOURCE_APPEND);
         });
 
-        await ifWe(sir, 'r2 dep graphs synced', async () => {
+        await ifWeMight(sir, 'r2 dep graphs synced', async () => {
             // alpha's full dep graph should exist on dest
             const depGraph_alpha_source = await getDependencyGraph({
                 ibGib: r2_alpha_source_tip,
@@ -414,7 +412,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     // // #endregion r3 dest edits
 
     // await respecfully(sir, `r3 verify pre`, async () => {
-    //     await ifWe(sir, 'dest has alpha after R2 graft', async () => {
+    //     await ifWeMight(sir, 'dest has alpha after R2 graft', async () => {
     //         const kv = await receiverCoordinator.getKnowledgeMap({ space: destSpace, metaspace, domainIbGibs: [r3_v0_graft_fromDest] });
     //         iReckon(sir, !!kv[alpha_tjpAddr]).asTo('dest has tip').isGonnaBeTrue();
     //     });
@@ -430,7 +428,6 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     //         metaspace,
     //         domainIbGibs: [r3_v1_source.ibGib],
     //         conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-    //         useSessionIdentity: false,
     //     });
     //     await r3_syncSaga.done;
     // } catch (e) {
@@ -445,11 +442,11 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     //     const r3_tip_s = kv_s[alpha_tjpAddr];
     //     const r3_tip_d = kv_d[alpha_tjpAddr];
 
-    //     await ifWe(sir, 'r3 tip addrs match', async () => {
+    //     await ifWeMight(sir, 'r3 tip addrs match', async () => {
     //         iReckon(sir, r3_tip_s).asTo('R3 tips match').isGonnaBe(r3_tip_d);
     //     });
 
-    //     await ifWe(sir, 'r3 both paragraph edits merged', async () => {
+    //     await ifWeMight(sir, 'r3 both paragraph edits merged', async () => {
     //         const res = await getFromSpace({ space: sourceSpace, addr: r3_tip_s! });
     //         const tip = res.ibGibs![0] as IbGib_V1<TestData>;
     //         const mergedText = tip.data!.text!;
@@ -468,7 +465,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     //             .isGonnaBeTrue();
     //     });
 
-    //     await ifWe(sir, 'r3 dep graphs synced', async () => {
+    //     await ifWeMight(sir, 'r3 dep graphs synced', async () => {
     //         const [d] = await getIbGibsFromCache_fallbackToSpaces({ addrs: [r3_tip_s!], space: destSpace });
     //         iReckon(sir, d).asTo('exists dest').isGonnaBeTruthy();
     //     });
@@ -502,7 +499,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     // // #endregion r4 dest edits
 
     // await respecfully(sir, `r4 verify pre`, async () => {
-    //     await ifWe(sir, 'dest has alpha after R3 graft', async () => {
+    //     await ifWeMight(sir, 'dest has alpha after R3 graft', async () => {
     //         // TODO: Verify pre-sync state
     //     });
     // });
@@ -512,16 +509,16 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     // // TODO: Add sync operation
 
     // await respecfully(sir, `r4 verify post`, async () => {
-    //     await ifWe(sir, 'r4 tip addrs match', async () => {
+    //     await ifWeMight(sir, 'r4 tip addrs match', async () => {
     //         // TODO: Verify tips match
     //     });
 
-    //     await ifWe(sir, 'r4 LCS merged both word changes', async () => {
+    //     await ifWeMight(sir, 'r4 LCS merged both word changes', async () => {
     //         // TODO: Verify text has both source and dest word changes
     //         // TODO: Verify LCS algorithm preserved both edits correctly
     //     });
 
-    //     await ifWe(sir, 'r4 dep graphs synced', async () => {
+    //     await ifWeMight(sir, 'r4 dep graphs synced', async () => {
     //         // TODO: Verify dep graphs
     //     });
     // });
@@ -556,7 +553,7 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     // // #endregion r5 dest edits
 
     // await respecfully(sir, `r5 verify pre`, async () => {
-    //     await ifWe(sir, 'dest has alpha after R4 graft', async () => {
+    //     await ifWeMight(sir, 'dest has alpha after R4 graft', async () => {
     //         // TODO: Verify pre-sync state
     //     });
     // });
@@ -566,24 +563,24 @@ await respecfully(sir, `Text merge (LCS) conflict resolution`, async () => {
     // // TODO: Add sync operation
 
     // await respecfully(sir, `r5 verify post`, async () => {
-    //     await ifWe(sir, 'r5 tip addrs match', async () => {
+    //     await ifWeMight(sir, 'r5 tip addrs match', async () => {
     //         // TODO: Verify tips match
     //     });
 
-    //     await ifWe(sir, 'r5 text field merged', async () => {
+    //     await ifWeMight(sir, 'r5 text field merged', async () => {
     //         // TODO: Verify text field has both source and dest changes
     //     });
 
-    //     await ifWe(sir, 'r5 description field merged', async () => {
+    //     await ifWeMight(sir, 'r5 description field merged', async () => {
     //         // TODO: Verify description field has both source and dest changes
     //     });
 
-    //     await ifWe(sir, 'r5 both fields independently LCS-merged', async () => {
+    //     await ifWeMight(sir, 'r5 both fields independently LCS-merged', async () => {
     //         // TODO: Verify each field was merged independently
     //         // TODO: Ensure one field's merge didn't affect the other
     //     });
 
-    //     await ifWe(sir, 'r5 dep graphs synced', async () => {
+    //     await ifWeMight(sir, 'r5 dep graphs synced', async () => {
     //         // TODO: Verify dep graphs
     //     });
     // });

package/src/sync/sync-constants.mts

@@ -1,14 +1,11 @@
-import { HashAlgorithm } from "@ibgib/helper-gib/dist/helpers/utils-helper.mjs";
-import { ROOT_ADDR } from "@ibgib/ts-gib/dist/V1/constants.mjs";
-import { KeystoneReplenishStrategy } from "../keystone/keystone-types.mjs";
-import { KEYSTONE_VERB_MANAGE, KEYSTONE_VERB_SIGN, POOL_ID_DEFAULT, POOL_ID_DELEGATE, POOL_ID_TRANSITION } from "../keystone/keystone-constants.mjs";
+// import { ROOT_ADDR } from "@ibgib/ts-gib/dist/V1/constants.mjs";
 
 export const SYNC_ATOM = "sync";
 
 export const SYNC_MSG_REL8N_NAME = "syncmsg";
 /**
  * payload addrs should be domain-only, i.e., we are not including the sync
- * saga ibgib, or its message stone, or identity keystones.
+ * saga ibgib, or its message stone.
  */
 export const SYNC_SAGA_PAYLOAD_ADDRS_DOMAIN = "@payloadAddrsDomain";
 
@@ -80,60 +77,3 @@ export function isValidSyncConflictStrategy(strategy: string): strategy is SyncC
     return SYNC_CONFLICT_STRATEGY_VALID_VALUES.includes(strategy as SyncConflictStrategy);
 }
 // #endregion SyncConflictStrategy
-
-/**
- * to be used by the sender
- */
-export const SESSION_IDENTITY_KEYSTONE_PRIMARY_POOL_ID = POOL_ID_DEFAULT;
-/**
- * single use pool
- */
-export const SESSION_IDENTITY_KEYSTONE_TRANSITION_POOL_ID = POOL_ID_TRANSITION;
-/**
- * to be used by the receiver, created via the single-use transition pool.
- */
-export const SESSION_IDENTITY_KEYSTONE_DELEGATE_POOL_ID = POOL_ID_DELEGATE;
-/**
- * When synchronizing, the plan for identity integration is to create a session
- * keystone. This keystone will have a primary pool, driven by the sender's
- * secret, and a secondary delegated pool for use by the receiver. Initially,
- * this will have a known, weak "secret" and it is the job of the receiver to
- * use this to then change the keystone to use a secret chosen by the
- * receiver's end.
- */
-export const SESSION_IDENTITY_KEYSTONE_SECRET_TRANSITIONPOOL = ROOT_ADDR;
-
-/**
- * has to be big enough to avoid our currently poor (atow 02/24/2026)
- * implementation of the binding target.
- */
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_SIZE = 100;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_ALGO = HashAlgorithm.sha_256;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_ROUNDS = 3;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_RANDOM = 2;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_SEQUENTIAL = 2;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_TARGET_BINDING = 4;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_REPLENISH_STRATEGY = KeystoneReplenishStrategy.topUp;
-/**
- * verbs associated with primary/sender participant.
- *
- * todo: would be slightly cleaner to have the sender/primary genesis with two pools, one for signing and one being one-time manage use (to add the transition pool) just like the transition pool, but this is a finesse and not for V1. Still it is neat that this possibility/mechanism exists.
- */
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_VERBS_PRIMARY = [KEYSTONE_VERB_MANAGE];
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_VERBS_DELEGATE = [KEYSTONE_VERB_SIGN];
-
-/**
- * transition pool is purposefully weak with a known password.
- */
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_SIZE_TRANSITIONPOOL = 1;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_ALGO_TRANSITIONPOOL = HashAlgorithm.sha_256;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_ROUNDS_TRANSITIONPOOL = 1;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_RANDOM_TRANSITIONPOOL = 0;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_SEQUENTIAL_TRANSITIONPOOL = 1;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_TARGET_BINDING_TRANSITIONPOOL = 0;
-/**
- * This pool is to be used only once, by the receiver, in order for the receiver
- * to create their own pool.
- */
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_REPLENISH_STRATEGY_TRANSITIONPOOL = KeystoneReplenishStrategy.deleteAll;
-export const SESSION_IDENTITY_KEYSTONE_CONFIG_VERBS_TRANSITIONPOOL = [KEYSTONE_VERB_MANAGE];

package/src/sync/sync-helpers.mts

@@ -16,7 +16,6 @@ import {
 import { IbGibSpaceAny } from "../witness/space/space-base-v1.mjs";
 import { getFromSpace, putInSpace } from "../witness/space/space-helper.mjs";
 import { IbGibSpaceResultData, IbGibSpaceResultIbGib, IbGibSpaceResultRel8ns } from "../witness/space/space-types.mjs";
-import { KeystoneIbGib_V1 } from "../keystone/keystone-types.mjs";
 import { SyncSagaConflictInfo, SyncSagaMessageCommitData_V1, SyncSagaMessageDeltaData_V1, SyncSagaMessageIbGib_V1 } from "./sync-saga-message/sync-saga-message-types.mjs";
 import { getIbGibsFromCache_fallbackToSpaces } from "../common/other/ibgib-helper.mjs";
 import { isGraftInfo } from "./graft-info/graft-info-helpers.mjs";
@@ -166,7 +165,6 @@ export async function isPastFrame({
  * It only retrieves the *content* of the current frame:
  * 1. The Frame itself.
  * 2. The Message Stone(s) (`rel8ns.msg`).
- * 3. The Identity(s) (`rel8ns.identity`).
  *
  * This is used for efficient transmission of the "Current Step" without re-sending the entire history.
  */
@@ -203,12 +201,7 @@ export async function getSyncSagaFrameDependencyGraph({
     const msgStoneAddrs = sagaIbGib.rel8ns[SYNC_MSG_REL8N_NAME]!;
     const msgStones = await fnGet(msgStoneAddrs) as SyncSagaMessageIbGib_V1[];
 
-    // identities
-    const identities = sagaIbGib.rel8ns.identity && sagaIbGib.rel8ns.identity.length > 0 ?
-        await fnGet(sagaIbGib.rel8ns.identity) as KeystoneIbGib_V1[] :
-        [];
-
-    return { sagaIbGib, msgStones, identities, };
+    return { sagaIbGib, msgStones, };
 }
 
 /**