@ibgib/core-gib 0.1.27 → 0.1.29

package/src/sync/sync-helpers.mts

@@ -7,11 +7,12 @@ import { getIbGibAddr } from "@ibgib/ts-gib/dist/helper.mjs";
 
 import { GLOBAL_LOG_A_LOT } from "../core-constants.mjs";
 import { SYNC_ATOM, SYNC_MSG_REL8N_NAME } from "./sync-constants.mjs";
-import { isValidSyncConflictStrategy, SYNC_CONFLICT_STRATEGY_VALID_VALUES, SyncData_V1, SyncExecutionContext, SyncIb_V1, SyncIbGib_V1, SyncSagaFrameDependencyGraph } from "./sync-types.mjs";
+import { isValidSyncConflictStrategy, SYNC_CONFLICT_STRATEGY_VALID_VALUES, SyncData_V1, SyncSagaFrameOrigin, SyncIb_V1, SyncIbGib_V1, SyncSagaFrameDependencyGraph } from "./sync-types.mjs";
 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 { SyncSagaMessageCommitData_V1, SyncSagaMessageIbGib_V1 } from "./sync-saga-message/sync-saga-message-types.mjs";
 
 const logalot = GLOBAL_LOG_A_LOT;
 
@@ -192,7 +193,7 @@ export async function getSyncSagaFrameDependencyGraph({
 
     // msg stones
     const msgStoneAddrs = sagaIbGib.rel8ns[SYNC_MSG_REL8N_NAME]!;
-    const msgStones = await fnGet(msgStoneAddrs);
+    const msgStones = await fnGet(msgStoneAddrs) as SyncSagaMessageIbGib_V1[];
 
     // identities
     const identities = sagaIbGib.rel8ns.identity && sagaIbGib.rel8ns.identity.length > 0 ?
@@ -242,11 +243,10 @@ export async function getFullSyncSagaHistory({
             resGraphs.push(graph);
         }
 
-        // my attempt at lining up
+        // the \n are my my attempt at lining up an indent
         if (logalot) { console.log(`${lc} resGraphs:...\n  ${pretty(resGraphs).split('\n').join('\n  ')}\n...(I: d8e11827d88a3454d887ff05fb4ff526)`); }
 
         return resGraphs;
-
     } catch (error) {
         console.error(`${lc} ${extractErrorMsg(error)}`);
         throw error;
@@ -336,6 +336,23 @@ export async function validateSyncSagaFrame({
     }
 }
 
+export async function validateFullSyncSagaHistory({
+    history,
+}: {
+    history: SyncSagaFrameDependencyGraph[],
+}): Promise<string[]> {
+    const lc = `[${validateFullSyncSagaHistory.name}]`;
+    try {
+        if (logalot) { console.log(`${lc} starting... (I: df02b802f6989096b8d8f728e2c0a526)`); }
+        console.error(`${lc} NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)`)
+        return [];
+    } catch (error) {
+        console.error(`${lc} ${extractErrorMsg(error)}`);
+        throw error;
+    } finally {
+        if (logalot) { console.log(`${lc} complete.`); }
+    }
+}
 
 export async function putInSpace_dnasThenNonDnas({
     ibGibs,
@@ -343,7 +360,7 @@ export async function putInSpace_dnasThenNonDnas({
 }: {
     ibGibs: IbGib_V1[],
     space: IbGibSpaceAny,
-}): Promise<void> {
+}): Promise<{ payload_Dnas: IbGib_V1[], payload_NonDnas: IbGib_V1[] }> {
     const lc = `[${putInSpace_dnasThenNonDnas.name}]`;
     try {
         if (logalot) { console.log(`${lc} starting... (I: aa3ab828402836b3914800a8ffa1b826)`); }
@@ -363,10 +380,16 @@ export async function putInSpace_dnasThenNonDnas({
         }
 
         // dnas are the simplest and we store those first...
-        await putInSpace({ ibGibs: payload_Dnas, isDna: true, space, });
+        if (payload_Dnas.length > 0) {
+            await putInSpace({ ibGibs: payload_Dnas, isDna: true, space, });
+        }
 
         // then put all non-dnas ("regular" ibgibs) in the space
-        await putInSpace({ ibGibs: payload_NonDnas, isDna: false, space, });
+        if (payload_NonDnas.length > 0) {
+            await putInSpace({ ibGibs: payload_NonDnas, isDna: false, space, });
+        }
+
+        return { payload_Dnas, payload_NonDnas };
     } catch (error) {
         console.error(`${lc} ${extractErrorMsg(error)}`);
         throw error;
@@ -376,14 +399,14 @@ export async function putInSpace_dnasThenNonDnas({
 }
 
 /**
- * @see {@link SyncExecutionContext}
+ * @see {@link SyncSagaFrameOrigin}
  */
-export function getExecutionContext({
+export function getSyncSagaFrameOrigin({
     sagaFrame,
 }: {
     sagaFrame: SyncIbGib_V1,
-}): SyncExecutionContext {
-    const lc = `[${getExecutionContext.name}]`;
+}): SyncSagaFrameOrigin {
+    const lc = `[${getSyncSagaFrameOrigin.name}]`;
     try {
         if (logalot) { console.log(`${lc} starting... (I: 93521332d0dd2f5e88398b7db95e8126)`); }
         if (!sagaFrame) { throw new Error(`(UNEXPECTED) sagaFrame falsy? (E: 01fb28be6668d88ea49bb298c739c926)`); }
@@ -395,9 +418,9 @@ export function getExecutionContext({
         // odd => receiver
 
         if (modulo === 0) {
-            return SyncExecutionContext.sender;
+            return SyncSagaFrameOrigin.sender;
         } else if (modulo === 1) {
-            return SyncExecutionContext.receiver;
+            return SyncSagaFrameOrigin.receiver;
         } else {
             throw new Error(`(UNEXPECTED) modulo is neither 0 nor 1? my logic sucks! This was way too defensive on my part... (E: 559488a2eef8d17b57079ca8886ee826)`);
         }

package/src/sync/sync-innerspace-constants.respec.mts

@@ -55,8 +55,8 @@ await respecfully(sir, `Sync Constants (No TJP)`, async () => {
         // 2. Create Constant (C1) in Source
         // Factory_V1.constant returns Promise<IbGib_V1>, not { newIbGib: ... }
         const c1 = await Factory_V1.constant({
-            ib: 'constant_c1',
             parentPrimitiveIb: 'root',
+            ib: 'constant_c1',
             data: { some: 'data' },
         });
         const addrC1 = getIbGibAddr({ ibGib: c1 });
@@ -81,7 +81,7 @@ await respecfully(sir, `Sync Constants (No TJP)`, async () => {
 
         // 4. Sync C1 (First Pass)
         let resSync = await senderCoordinator.sync({
-            peer: peer,
+            peer,
             localSpace: sourceSpace,
             metaspace: metaspace,
             domainIbGibs: [c1],
@@ -94,43 +94,43 @@ await respecfully(sir, `Sync Constants (No TJP)`, async () => {
         const getC1Dest = await getFromSpace({ space: destSpace, addr: addrC1 });
         iReckon(sir, getC1Dest.success && !!getC1Dest.ibGibs![0]).asTo('Dest has C1 after sync').isGonnaBeTrue();
 
-        // 5. Sync C1 (Second Pass - Idempotency / Smart Diff)
-        // Should NOT send payload again.
-        resSync = await senderCoordinator.sync({
-            peer: peer,
-            localSpace: sourceSpace,
-            metaspace: metaspace,
-            domainIbGibs: [c1],
-            useSessionIdentity: false,
-        });
-        await resSync.done;
-        iReckon(sir, true).asTo('Sync execution 2 (idempotent) completes').isGonnaBeTrue();
-
-        // 6. Create "Constant with Dependency" (C2 -> C1)
-        const c2 = await Factory_V1.constant({
-            ib: 'constant_c2',
-            parentPrimitiveIb: 'root',
-            rel8ns: {
-                link: [addrC1], // C2 links to C1
-            },
-        });
-        const addrC2 = getIbGibAddr({ ibGib: c2 });
-        await putInSpace({ space: sourceSpace, ibGibs: [c2] });
-
-        // Sync C2
-        resSync = await senderCoordinator.sync({
-            peer: peer,
-            localSpace: sourceSpace,
-            metaspace: metaspace,
-            domainIbGibs: [c2],
-            useSessionIdentity: false,
-        });
-        await resSync.done;
-        iReckon(sir, true).asTo('Sync C2 completes').isGonnaBeTrue();
-
-        // Verify C2 in Dest
-        const getC2Dest = await getFromSpace({ space: destSpace, addr: addrC2 });
-        iReckon(sir, getC2Dest.success).asTo('Dest has C2').isGonnaBeTrue();
+        // // 5. Sync C1 (Second Pass - Idempotency / Smart Diff)
+        // // Should NOT send payload again.
+        // resSync = await senderCoordinator.sync({
+        //     peer: peer,
+        //     localSpace: sourceSpace,
+        //     metaspace: metaspace,
+        //     domainIbGibs: [c1],
+        //     useSessionIdentity: false,
+        // });
+        // await resSync.done;
+        // iReckon(sir, true).asTo('Sync execution 2 (idempotent) completes').isGonnaBeTrue();
+
+        // // 6. Create "Constant with Dependency" (C2 -> C1)
+        // const c2 = await Factory_V1.constant({
+        //     ib: 'constant_c2',
+        //     parentPrimitiveIb: 'root',
+        //     rel8ns: {
+        //         link: [addrC1], // C2 links to C1
+        //     },
+        // });
+        // const addrC2 = getIbGibAddr({ ibGib: c2 });
+        // await putInSpace({ space: sourceSpace, ibGibs: [c2] });
+
+        // // Sync C2
+        // resSync = await senderCoordinator.sync({
+        //     peer: peer,
+        //     localSpace: sourceSpace,
+        //     metaspace: metaspace,
+        //     domainIbGibs: [c2],
+        //     useSessionIdentity: false,
+        // });
+        // await resSync.done;
+        // iReckon(sir, true).asTo('Sync C2 completes').isGonnaBeTrue();
+
+        // // Verify C2 in Dest
+        // const getC2Dest = await getFromSpace({ space: destSpace, addr: addrC2 });
+        // iReckon(sir, getC2Dest.success).asTo('Dest has C2').isGonnaBeTrue();
 
     });
 });

package/src/sync/sync-innerspace-deep-updates.respec.mts

@@ -11,20 +11,20 @@ import {
 const maam = `[${import.meta.url}]`, sir = maam;
 import { clone, delay, extractErrorMsg, pretty } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
-import { getDependencyGraph } from '../common/other/graph-helper.mjs';
 
+import { GLOBAL_LOG_A_LOT } from '../core-constants.mjs';
+import { getDependencyGraph } from '../common/other/graph-helper.mjs';
 import { SyncSagaCoordinator } from './sync-saga-coordinator.mjs';
-import { putInSpace, getFromSpace } from '../witness/space/space-helper.mjs';
+import { getFromSpace } from '../witness/space/space-helper.mjs';
 import { Metaspace_Innerspace } from '../witness/space/metaspace/metaspace-innerspace/metaspace-innerspace.mjs';
 import { InnerSpace_V1 } from '../witness/space/inner-space/inner-space-v1.mjs';
 import { createTimelineRootHelper, getTestKeystoneServiceHelper } from '../agent-helpers.mjs';
 import { mut8Timeline } from '../timeline/timeline-api.mjs';
 import { DEFAULT_INNER_SPACE_DATA_V1 } from '../witness/space/inner-space/inner-space-types.mjs';
-import { toDto } from '../common/other/ibgib-helper.mjs';
 import { SyncPeerInnerspace_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-v1.mjs';
 import { SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-constants.mjs';
 
-const logalot = true;
+const logalot = GLOBAL_LOG_A_LOT || true;
 const lc = `[sync-innerspace-deep-updates.respec]`;
 
 await respecfully(sir, `Sync InnerSpaces (Deep Updates)`, async () => {
@@ -121,14 +121,14 @@ await respecfully(sir, `Sync InnerSpaces (Deep Updates)`, async () => {
             localSpace: sourceSpace,
             metaspace: metaspace,
             domainIbGibs: [commentV2], // Sync the TIP
+            useSessionIdentity: false,
         });
-
         await resSync.done;
 
         // 5. Verify Dest
         console.log(`${lc} Verifying Destination...`);
 
-        await ifWe(sir, `verify deep timeline present`, async () => {
+        await ifWeMight(sir, `verify deep timeline present`, async () => {
             // Verify Tip (V2)
             const getV2 = await getFromSpace({ space: destSpace, addr: addrV2 });
             iReckon(sir, getV2.success).asTo('Tip V2 present').isGonnaBeTrue();

package/src/sync/sync-innerspace-multiple-timelines.respec.mts

@@ -130,7 +130,7 @@ await respecfully(sir, `Sync InnerSpaces (Multiple Timelines)`, async () => {
         // 5. Verify Dest
         console.log(`${lc} Verifying Destination...`);
 
-        await ifWe(sir, `verify timelines present`, async () => {
+        await ifWeMight(sir, `verify timelines present`, async () => {
             // Verify A
             const getA = await getFromSpace({ space: destSpace, addr: addrA });
             iReckon(sir, getA.success).asTo('Timeline A present').isGonnaBeTrue();

package/src/sync/sync-innerspace-partial-update.respec.mts

@@ -98,7 +98,7 @@ await respecfully(sir, `Sync InnerSpaces (Partial Update)`, async () => {
         // Transfer Root & V1 to Dest (Simulate previous sync)
         await putInSpace({ space: destSpace, ibGibs: [root, v1] });
 
-        await ifWe(sir, 'verify setup', async () => {
+        await ifWeMight(sir, 'verify setup', async () => {
             // Verify Dest has V1
             const checkV1 = await getFromSpace({ space: destSpace, addr: getIbGibAddr({ ibGib: v1 }) });
             iReckon(sir, checkV1.success).asTo('Dest has V1').isGonnaBeTrue();
@@ -137,7 +137,7 @@ await respecfully(sir, `Sync InnerSpaces (Partial Update)`, async () => {
         // 5. Verify Dest (Should now have V2)
         console.log(`${lc} Verifying Destination...`);
 
-        await ifWe(sir, `verify dest updated`, async () => {
+        await ifWeMight(sir, `verify dest updated`, async () => {
             // Verify Tip (V2)
             const getV2 = await getFromSpace({ space: destSpace, addr: addrV2 });
             iReckon(sir, getV2.success).asTo('V2 present in Dest').isGonnaBeTrue();

package/src/sync/sync-innerspace.respec.mts

@@ -13,6 +13,7 @@ const maam = `[${import.meta.url}]`, sir = maam;
 import { clone, delay, extractErrorMsg, pretty } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 
+import { GLOBAL_LOG_A_LOT } from '../core-constants.mjs';
 import { SyncSagaCoordinator } from './sync-saga-coordinator.mjs';
 import { getFromSpace } from '../witness/space/space-helper.mjs';
 import { Metaspace_Innerspace } from '../witness/space/metaspace/metaspace-innerspace/metaspace-innerspace.mjs';
@@ -25,7 +26,7 @@ import { fnObs } from '../common/pubsub/observer/observer-helper.mjs';
 import { SyncPeerInnerspace_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-v1.mjs';
 import { SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-constants.mjs';
 
-const logalot = true;
+const logalot = GLOBAL_LOG_A_LOT;
 const lc = `[sync-innerspace.respec]`;
 
 await respecfully(sir, `Sync InnerSpaces`, async () => {
@@ -47,7 +48,7 @@ await respecfully(sir, `Sync InnerSpaces`, async () => {
         const defaultLocalUserSpace = await metaspace.getLocalUserSpace({ lock: false });
         if (!defaultLocalUserSpace) { throw new Error(`(UNEXPECTED) defaultLocalUserSpace falsy? (E: 56f019430b29b45147e0caa4d5931826)`); }
         await defaultLocalUserSpace.initialized;
-        console.log(`defaultLocalUserSpace: ${pretty(toDto({ ibGib: defaultLocalUserSpace }))}`);
+        if (logalot) { console.log(`defaultLocalUserSpace: ${pretty(toDto({ ibGib: defaultLocalUserSpace }))}`); }
 
         sourceSpace = new InnerSpace_V1({
             ...DEFAULT_INNER_SPACE_DATA_V1,
@@ -56,7 +57,7 @@ await respecfully(sir, `Sync InnerSpaces`, async () => {
             description: 'source test space',
         });
         await sourceSpace.initialized;
-        console.log(`sourceSpace: ${pretty(toDto({ ibGib: sourceSpace }))}`);
+        if (logalot) { console.log(`sourceSpace: ${pretty(toDto({ ibGib: sourceSpace }))}`); }
         // await (sourceSpace as any).initialize(); // DO NOT AWAIT THIS. THIS IS AUTOMATICALLY AWAITED IN PLUMBING
 
         destSpace = new InnerSpace_V1({
@@ -66,11 +67,11 @@ await respecfully(sir, `Sync InnerSpaces`, async () => {
             description: 'dest test space',
         });
         await destSpace.initialized;
-        console.log(`destSpace: ${pretty(toDto({ ibGib: destSpace }))}`);
+        if (logalot) { console.log(`destSpace: ${pretty(toDto({ ibGib: destSpace }))}`); }
         // await (destSpace as any).initialized; // DO NOT AWAIT THIS. THIS IS AUTOMATICALLY AWAITED IN PLUMBING
 
         // 2. Seed Source Data
-        console.log(`${lc} Creating data in Source...`);
+        if (logalot) { console.log(`${lc} Creating data in Source...`); }
         const root = await createTimelineRootHelper({
             ib: 'timeline_root',
             // data: { type: 'root', n: 0 }, // DO NOT TRY TO MANUALLY SET n
@@ -90,11 +91,11 @@ await respecfully(sir, `Sync InnerSpaces`, async () => {
         const childAddr = getIbGibAddr({ ibGib: child });
 
         // 3. Setup Coordinators & Peer
-        console.log(`${lc} Setting up Coordinators...`);
+        if (logalot) { console.log(`${lc} Setting up Coordinators...`); }
         const mockKeystone = await getTestKeystoneServiceHelper();
         // const identity = await (mockKeystone as any).getIdentity(); // SKIP IDENTITY FOR INITIAL TESTING SIMPLICITY
 
-        // Sender Coordinator 
+        // Sender Coordinator
         const senderCoordinator = new SyncSagaCoordinator(mockKeystone);
 
         // Receiver Coordinator
@@ -114,7 +115,7 @@ await respecfully(sir, `Sync InnerSpaces`, async () => {
         });
 
         // 4. Run Sync
-        console.log(`${lc} Running Sync...`);
+        if (logalot) { console.log(`${lc} Running Sync...`); }
         const resSync = await senderCoordinator.sync({
             peer: peer,
             localSpace: sourceSpace,
@@ -123,7 +124,7 @@ await respecfully(sir, `Sync InnerSpaces`, async () => {
             useSessionIdentity: false,
         }); // Type cast if needed until we align optional params
 
-        console.log(`${lc} resSync: ${pretty(resSync)}`);
+        if (logalot) { console.log(`${lc} resSync: ${pretty(resSync)}`); }
 
         const sublc = `${lc}[updates$]`;
         /**
@@ -132,44 +133,44 @@ await respecfully(sir, `Sync InnerSpaces`, async () => {
          */
         const subscription = await resSync.updates$.subscribe(fnObs({
             next: async (ctxIbGib) => {
-                console.log(`${sublc} next fired`);
+                if (logalot) { console.log(`${sublc} next fired`); }
             },
             error: async (e) => {
-                console.log(`${sublc} error fired`);
+                if (logalot) { console.log(`${sublc} error fired`); }
             },
             complete: async () => {
-                console.log(`${sublc} complete fired`);
+                if (logalot) { console.log(`${sublc} complete fired`); }
             },
         }));
 
-        console.log(`${lc} awaiting resSync.done`)
+        if (logalot) { console.log(`${lc} awaiting resSync.done`) }
         await resSync.done;
 
 
         // todo: add iReckon assertions about resSync
 
         // 5. Verify Dest
-        console.log(`${lc} Verifying Destination...`);
+        if (logalot) { console.log(`${lc} Verifying Destination...`); }
         try {
             const getChildInDest = await getFromSpace({ space: destSpace, addr: childAddr });
 
-            await ifWe(sir, `verify success getChildInDest`, async () => {
+            await ifWeMight(sir, `verify success getChildInDest`, async () => {
                 iReckon(sir, getChildInDest.success).asTo('Child present in Dest').isGonnaBeTrue();
             });
 
-            await ifWe(sir, `verify getChildInDest.ibGibs`, async () => {
+            await ifWeMight(sir, `verify getChildInDest.ibGibs`, async () => {
                 const firstChild = getChildInDest.ibGibs?.[0];
-                console.log(`${lc} firstChild: ${pretty(firstChild)}`);
+                if (logalot) { console.log(`${lc} firstChild: ${pretty(firstChild)}`); }
                 iReckon(sir, firstChild?.data?.n).asTo('Child content matches').isGonnaBe(2);
             });
 
         } catch (error) {
-            await ifWe(sir, `doh`, async () => {
+            await ifWeMight(sir, `doh`, async () => {
                 // hack here I'm getting tired...
                 iReckon(sir, true).asTo(`error: ${extractErrorMsg(error)}`).isGonnaBeFalse();
             });
         } finally {
-            console.log(`${lc} Test complete.`);
+            if (logalot) { console.log(`${lc} Test complete.`); }
         }
     });
 

package/src/sync/sync-peer/sync-peer-innerspace/sync-peer-innerspace-v1.mts

@@ -4,30 +4,22 @@
 
 import { delay, extractErrorMsg, pretty, unique } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
-import { IbGibAddr } from '@ibgib/ts-gib/dist/types.mjs';
-import { IbGib_V1, IbGibData_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
-import { isDna } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../../../core-constants.mjs';
 import { IbGibSpaceAny } from '../../../witness/space/space-base-v1.mjs';
 import { SyncPeer_V1 } from '../sync-peer-v1.mjs';
-import { getFromSpace, putInSpace, registerNewIbGib } from '../../../witness/space/space-helper.mjs';
+import { putInSpace, registerNewIbGib } from '../../../witness/space/space-helper.mjs';
 import { SyncSagaContextIbGib_V1, } from '../../sync-saga-context/sync-saga-context-types.mjs';
 import { SyncPeerInnerspaceData_V1, SyncPeerInnerspaceIbGib_V1, SyncPeerInnerspaceOptions, SyncPeerInnerspaceRel8ns_V1 } from './sync-peer-innerspace-types.mjs';
 import { MetaspaceService } from '../../../witness/space/metaspace/metaspace-types.mjs';
 import { SyncSagaCoordinator } from '../../sync-saga-coordinator.mjs';
-import { IbGibSpaceResultData } from '../../../witness/space/space-types.mjs';
 import { InitializeSyncPeerOpts } from '../sync-peer-types.mjs';
-import { getSyncSagaMessageFromFrame } from '../../sync-saga-message/sync-saga-message-helpers.mjs';
-import { SYNC_STAGE_VALID_VALUES, SyncStage } from '../../sync-constants.mjs';
-import { SyncSagaMessageAckData_V1, SyncSagaMessageCommitData_V1, SyncSagaMessageData_V1, SyncSagaMessageDeltaData_V1, SyncSagaMessageInitData_V1 } from '../../sync-saga-message/sync-saga-message-types.mjs';
-import { getExecutionContext, getSyncSagaFrameDependencyGraph, putInSpace_dnasThenNonDnas } from '../../sync-helpers.mjs';
-import { splitPerTjpAndOrDna, toDto } from '../../../common/other/ibgib-helper.mjs';
-import { SyncExecutionContext } from '../../sync-types.mjs';
+import { getSyncSagaFrameDependencyGraph, putInSpace_dnasThenNonDnas } from '../../sync-helpers.mjs';
+import { toDto } from '../../../common/other/ibgib-helper.mjs';
 
 
-const logalot = GLOBAL_LOG_A_LOT || true;
-const logalotControlDomain = true;
+const logalot = GLOBAL_LOG_A_LOT;
+const logalotControlDomain = false;
 const lcControlDomain = '[ControlDomain]';
 
 /**
@@ -112,6 +104,8 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
     protected async sendContextRequest(context: SyncSagaContextIbGib_V1): Promise<SyncSagaContextIbGib_V1 | undefined> {
         const lc = `${this.lc}[${this.sendContextRequest.name}]`;
         try {
+            if (logalot) { console.log(`${lc} starting... (I: bab87f15dea77cd4892bd8a8d2e65826)`); }
+
             if (!this.opts) { throw new Error(`(UNEXPECTED) this.opts falsy? (E: d8b1348e3233810128999596b1fa5826)`); }
 
             const {
@@ -141,7 +135,7 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             // let localTempSpace: IbGibSpaceAny;
             // let remoteSpace: IbGibSpaceAny;
             // let remoteTempSpace: IbGibSpaceAny;
-            // if (getExecutionContext({ sagaFrame: context.sagaFrame }) === SyncExecutionContext.sender) {
+            // if (getSyncSagaFrameOrigin({ sagaFrame: context.sagaFrame }) === SyncSagaFrameOrigin.sender) {
             //     localSpace = senderSpace;
             //     localTempSpace = senderTempSpace;
             //     remoteSpace = receiverSpace;
@@ -173,6 +167,7 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             const payloadIbGibsControl = [
                 ...identities, msg, sagaFrame, context
             ].map(x => toDto({ ibGib: x }));
+            if (logalot) { console.log(`${lc} putting into receiverSpace: ${receiverSpace.ib} (I: 1ba18b14a26bdd0e7800da4812898826)`); }
             await putInSpace({
                 ibGibs: payloadIbGibsControl,
                 space: receiverSpace,
@@ -187,6 +182,7 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
             }
 
             if (context.payloadIbGibsDomain && context.payloadIbGibsDomain.length > 0) {
+                if (logalot) { console.log(`${lc} putting into receiverTempSpace: ${receiverTempSpace.ib} (I: d0cea920b818393d68118bc8a1515526)`); }
                 await putInSpace_dnasThenNonDnas({
                     ibGibs: context.payloadIbGibsDomain,
                     space: receiverTempSpace,
@@ -289,52 +285,9 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
         } catch (error) {
             console.error(`${lc} ${extractErrorMsg(error)}`);
             throw error;
-        }
-    }
-
-    /**
-     * Helper to copy single ibgib from A to B.
-     */
-    protected async transfer({
-        addrs,
-        from,
-        to
-    }: {
-        addrs: IbGibAddr[],
-        from: IbGibSpaceAny,
-        to: IbGibSpaceAny
-    }): Promise<void> {
-        const lc = `${this.lc}[${this.transfer.name}]`;
-        try {
-            if (logalot) { console.log(`${lc} starting... (I: f1145dc75a461afc885efe984f08d426)`); }
-
-            console.error(`${lc} NAG ERROR (DOES NOT THROW): This needs to be adapted to be able to pull from multiple spaces. IOW, the 'from' param should be an array of spaces. This is because we need to be checking both durable and temp spaces when querying. (E: 823f3856b8b82ece080868e85ded0826)`)
-
-            // 1. Get from Source
-            const resGet = await getFromSpace({ space: from, addrs });
-            if (!resGet.success || !resGet.ibGibs || resGet.ibGibs.length !== addrs.length) {
-                if (!resGet.rawResultIbGib) { throw new Error(`(UNEXPECTED) resGet.rawResultIbGib falsy? (E: b829f827a378890bcf7dc3d41c908826)`); }
-                if (!resGet.rawResultIbGib.data) { throw new Error(`(UNEXPECTED) resGet.rawResultIbGib.data falsy? (E: 8d15341d8fa8fc96297425e3c6e39226)`); }
-                const data = resGet.rawResultIbGib.data as IbGibSpaceResultData;
-
-                throw new Error(`${lc} Failed to get all ${addrs} from source space ${from.ib}. resGet.errorMsg: ${resGet.errorMsg}. failed info: ${JSON.stringify(data)} (E: 4ed3383573382920c80054d7c1024626)`);
-            }
-            const ibGibs = resGet.ibGibs.concat();
-
-            // 2. Put in Dest
-            // Note: putInSpace handles existence check usually, or we can check.
-            const resPut = await putInSpace({ space: to, ibGibs });
-            if (resPut.success) {
-                console.error(`${lc} NAG ERROR: (SORT OF AN ERROR, DID NOT THROW): is the sync peer responsible for calling registerNewIbGib?? I'm not sure at this point if that is true, rather, I think that it probably is NOT responsible for this. But I'm putting this error msg as a nag message until this is resolved. (E: 00086833e294ee834800046801c47826) `);
-            } else {
-                throw new Error(`ERROR: successfully got addrs (${addrs}) from space (${from.ib}), BUT failed to put into space (${to.ib}). resPut.errorMsg: ${resPut.errorMsg}. timedOut: ${resPut.timedOut}. (E: c1044e14cc1db72d28a2240819dab826)`);
-            }
-        } catch (error) {
-            console.error(`${lc} ${extractErrorMsg(error)}`);
-            throw error;
         } finally {
             if (logalot) { console.log(`${lc} complete.`); }
         }
-
     }
+
 }

package/src/sync/sync-peer/sync-peer-v1.mts

@@ -21,8 +21,8 @@ import { newupSubject } from '../../common/pubsub/subject/subject-helper.mjs';
 import { authenticateContext, authorizeContext, validateContextAndSagaFrame } from '../sync-saga-context/sync-saga-context-helpers.mjs';
 import { getFromSpace } from '../../witness/space/space-helper.mjs';
 
-const logalot = GLOBAL_LOG_A_LOT || true;
-const logalotControlDomain = true;
+const logalot = GLOBAL_LOG_A_LOT;
+const logalotControlDomain = false;
 const lcControlDomain = '[ControlDomain]';
 
 /**