@aephia/atlas-kit 0.6.0-next.40 → 0.6.0-next.42

package/dist/planning/index.js

@@ -163,13 +163,13 @@ function normalizeSemanticFact(value, field) {
     }
     return invalid(`${field}.kind`, semantic.kind, 'one of exclusive, requires, invalidates, or transition');
 }
-function normalizePrecondition(value, field, version = 17) {
+function normalizePrecondition(value, field) {
     const precondition = readRecord(value, field);
-    if (version >= 17 && precondition.kind === 'fleet-arrival')
+    if (precondition.kind === 'fleet-arrival')
         return normalizeArrivalGuard(precondition, field);
-    if (version >= 16 && isRuntimeGuard(precondition))
+    if (isRuntimeGuard(precondition))
         return normalizeRuntimeGuard(precondition, field);
-    if (version >= 15 && precondition.kind === 'ship-import-funding') {
+    if (precondition.kind === 'ship-import-funding') {
         assertKeys(precondition, field, [
             'kind',
             'address',
@@ -200,7 +200,7 @@ function normalizePrecondition(value, field, version = 17) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if (version >= 13 && precondition.kind === 'fleet-mining') {
+    if (precondition.kind === 'fleet-mining') {
         assertKeys(precondition, field, [
             'kind',
             'address',
@@ -218,18 +218,15 @@ function normalizePrecondition(value, field, version = 17) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if (version >= 12 &&
-        isFactionTradeGuard(precondition) &&
-        (version >= 14 || !precondition.kind.endsWith('-versioned'))) {
+    if (isFactionTradeGuard(precondition)) {
         const kind = precondition.kind;
-        const versioned = kind.endsWith('-versioned');
         assertKeys(precondition, field, [
             'kind',
             'address',
             'game',
             'factionId',
             'describes',
-            ...(versioned ? ['schemaVersion'] : []),
+            'schemaVersion',
             ...(isTradeBuyGuard(precondition)
                 ? ['cargoId', 'floorRaw']
                 : isTradeSellGuard(precondition)
@@ -254,7 +251,7 @@ function normalizePrecondition(value, field, version = 17) {
             address: readAddress(precondition.address, `${field}.address`),
             game: readAddress(precondition.game, `${field}.game`),
             factionId: unsigned('factionId'),
-            ...(versioned ? { schemaVersion: unsigned('schemaVersion', 255) } : {}),
+            schemaVersion: unsigned('schemaVersion', 255),
             describes: readString(precondition.describes, `${field}.describes`),
         };
         if (isTradeBuyGuard(precondition))
@@ -273,7 +270,7 @@ function normalizePrecondition(value, field, version = 17) {
             });
         return Object.freeze({ kind, ...common });
     }
-    if (version >= 11 && precondition.kind === 'fleet-add-ship') {
+    if (precondition.kind === 'fleet-add-ship') {
         assertKeys(precondition, field, [
             'kind',
             'address',
@@ -321,7 +318,7 @@ function normalizePrecondition(value, field, version = 17) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if (version >= 10 && precondition.kind === 'fleet-create') {
+    if (precondition.kind === 'fleet-create') {
         assertKeys(precondition, field, [
             'kind',
             'address',
@@ -363,7 +360,7 @@ function normalizePrecondition(value, field, version = 17) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if (version >= 8 && precondition.kind === 'system-account-or-absent') {
+    if (precondition.kind === 'system-account-or-absent') {
         assertKeys(precondition, field, ['kind', 'address', 'describes']);
         return Object.freeze({
             kind: 'system-account-or-absent',
@@ -371,7 +368,7 @@ function normalizePrecondition(value, field, version = 17) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if (version >= 7 && precondition.kind === 'token-mint') {
+    if (precondition.kind === 'token-mint') {
         assertKeys(precondition, field, [
             'kind',
             'address',
@@ -391,7 +388,7 @@ function normalizePrecondition(value, field, version = 17) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if (version >= 6 && precondition.kind === 'game-ship-config') {
+    if (precondition.kind === 'game-ship-config') {
         assertKeys(precondition, field, [
             'kind',
             'address',
@@ -410,7 +407,7 @@ function normalizePrecondition(value, field, version = 17) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if (version >= 5 && precondition.kind === 'game-account') {
+    if (precondition.kind === 'game-account') {
         assertKeys(precondition, field, ['kind', 'address', 'describes']);
         return Object.freeze({
             kind: 'game-account',
@@ -418,9 +415,7 @@ function normalizePrecondition(value, field, version = 17) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if ((version >= 9 && precondition.kind === 'game-cargo-bytes-config') ||
-        (version >= 4 &&
-            ['token-account', 'game-cargo-config', 'cargo-cache'].includes(String(precondition.kind)))) {
+    if (['game-cargo-bytes-config', 'token-account', 'cargo-cache'].includes(String(precondition.kind))) {
         const base = {
             address: readAddress(precondition.address, `${field}.address`),
             describes: readString(precondition.describes, `${field}.describes`),
@@ -447,8 +442,7 @@ function normalizePrecondition(value, field, version = 17) {
                 minimumBalance: amount,
             });
         }
-        if (precondition.kind === 'game-cargo-config' ||
-            precondition.kind === 'game-cargo-bytes-config') {
+        if (precondition.kind === 'game-cargo-bytes-config') {
             assertKeys(precondition, field, [
                 'kind',
                 'address',
@@ -489,7 +483,7 @@ function normalizePrecondition(value, field, version = 17) {
             bump,
         });
     }
-    if (precondition.kind === 'token-account-or-absent' && version >= 3) {
+    if (precondition.kind === 'token-account-or-absent') {
         assertKeys(precondition, field, [
             'kind',
             'address',
@@ -505,7 +499,7 @@ function normalizePrecondition(value, field, version = 17) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if (precondition.kind === 'account-absent' && version !== 1) {
+    if (precondition.kind === 'account-absent') {
         assertKeys(precondition, field, ['kind', 'address', 'describes']);
         return Object.freeze({
             kind: 'account-absent',
@@ -514,45 +508,7 @@ function normalizePrecondition(value, field, version = 17) {
         });
     }
     if (precondition.kind !== 'account-state') {
-        invalid(`${field}.kind`, precondition.kind, version === 1
-            ? 'the value account-state'
-            : `one of ${[
-                ...(version >= 17 ? ['fleet-arrival'] : []),
-                ...(version >= 16
-                    ? ['democracy-history', 'xp-runtime', 'governance-fees']
-                    : []),
-                ...(version >= 15 ? ['ship-import-funding'] : []),
-                ...(version >= 14
-                    ? [
-                        'faction-treasury-buy-versioned',
-                        'faction-treasury-sell-versioned',
-                        'faction-epoch-meter-versioned',
-                    ]
-                    : []),
-                ...(version >= 13 ? ['fleet-mining'] : []),
-                ...(version >= 12
-                    ? [
-                        'faction-treasury-buy',
-                        'faction-treasury-sell',
-                        'faction-epoch-meter',
-                    ]
-                    : []),
-                ...(version >= 11 ? ['fleet-add-ship'] : []),
-                ...(version >= 10 ? ['fleet-create'] : []),
-                'account-state',
-                'account-absent',
-                ...(version >= 8 ? ['system-account-or-absent'] : []),
-                ...(version >= 3 ? ['token-account-or-absent'] : []),
-                ...(version >= 4 ? ['token-account'] : []),
-                ...(version >= 7 ? ['token-mint'] : []),
-                ...(version >= 4 ? ['game-cargo-config'] : []),
-                ...(version >= 9 ? ['game-cargo-bytes-config'] : []),
-                ...(version >= 4 ? ['cargo-cache'] : []),
-                ...(version >= 5 ? ['game-account'] : []),
-                ...(version >= 6 ? ['game-ship-config'] : []),
-            ]
-                .join(', ')
-                .replace(/, ([^,]+)$/u, version === 2 ? ' or $1' : ', or $1')}`);
+        invalid(`${field}.kind`, precondition.kind, 'a supported current Plan guard; recreate the Plan using the current capability planner');
     }
     assertKeys(precondition, field, ['kind', 'address', 'dataHash', 'describes']);
     return Object.freeze({
@@ -588,201 +544,48 @@ function instructionToJSON(instruction) {
     return deepFreeze(value);
 }
 function planToJSON(plan) {
-    const hasSemantics = plan.steps.some((step) => (step.semantics?.length ?? 0) > 0);
-    const hasAbsentPrecondition = plan.preconditions.some(({ kind }) => kind === 'account-absent');
-    const common = {
+    return deepFreeze({
+        v: 18,
         kind: plan.kind,
         summary: plan.summary,
         affected: [...plan.affected],
         requiredSigners: [...plan.requiredSigners],
-    };
-    const steps = plan.steps.map((step) => ({
-        instruction: instructionToJSON(step.instruction),
-        describes: step.describes,
-        ...((step.semantics?.length ?? 0) > 0
-            ? { semantics: step.semantics.map((semantic) => ({ ...semantic })) }
-            : {}),
-        signers: [...step.signers],
-    }));
-    const hasArrivalGuard = plan.preconditions.some(({ kind }) => kind === 'fleet-arrival');
-    const hasRuntimeGuard = plan.preconditions.some(isRuntimeGuard);
-    const hasShipImportFunding = plan.preconditions.some(({ kind }) => kind === 'ship-import-funding');
-    const hasMiningGuard = plan.preconditions.some(({ kind }) => kind === 'fleet-mining');
-    if (hasArrivalGuard ||
-        hasRuntimeGuard ||
-        hasShipImportFunding ||
-        hasMiningGuard ||
-        plan.preconditions.some(isFactionTradeGuard)) {
-        return deepFreeze({
-            v: hasArrivalGuard
-                ? 17
-                : hasRuntimeGuard
-                    ? 16
-                    : hasShipImportFunding
-                        ? 15
-                        : plan.preconditions.some((guard) => 'schemaVersion' in guard)
-                            ? 14
-                            : hasMiningGuard
-                                ? 13
-                                : 12,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => {
-                if (guard.kind === 'fleet-arrival')
-                    return arrivalGuardToJSON(guard);
-                if (isRuntimeGuard(guard))
-                    return runtimeGuardToJSON(guard);
-                if (isTradeBuyGuard(guard))
-                    return { ...guard, floorRaw: String(guard.floorRaw) };
-                if (isTradeSellGuard(guard))
-                    return {
-                        ...guard,
-                        atlasOutCapPerEpochRaw: String(guard.atlasOutCapPerEpochRaw),
-                        epochLengthSeconds: String(guard.epochLengthSeconds),
-                    };
-                if (guard.kind === 'fleet-add-ship')
-                    return {
-                        ...guard,
-                        amount: String(guard.amount),
-                        maximumProfileDebit: String(guard.maximumProfileDebit),
-                    };
-                if (guard.kind === 'fleet-create' ||
-                    guard.kind === 'ship-import-funding')
-                    return {
-                        ...guard,
-                        maximumProfileDebit: String(guard.maximumProfileDebit),
-                    };
-                if (guard.kind === 'token-account')
-                    return { ...guard, minimumBalance: String(guard.minimumBalance) };
-                return { ...guard };
-            }),
-        });
-    }
-    if (plan.preconditions.some(({ kind }) => kind === 'fleet-add-ship')) {
-        return deepFreeze({
-            v: 11,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => guard.kind === 'fleet-add-ship'
-                ? {
+        steps: plan.steps.map((step) => ({
+            instruction: instructionToJSON(step.instruction),
+            describes: step.describes,
+            ...((step.semantics?.length ?? 0) > 0
+                ? { semantics: step.semantics.map((semantic) => ({ ...semantic })) }
+                : {}),
+            signers: [...step.signers],
+        })),
+        preconditions: plan.preconditions.map((guard) => {
+            if (guard.kind === 'fleet-arrival')
+                return arrivalGuardToJSON(guard);
+            if (isRuntimeGuard(guard))
+                return runtimeGuardToJSON(guard);
+            if (isTradeBuyGuard(guard))
+                return { ...guard, floorRaw: String(guard.floorRaw) };
+            if (isTradeSellGuard(guard))
+                return {
+                    ...guard,
+                    atlasOutCapPerEpochRaw: String(guard.atlasOutCapPerEpochRaw),
+                    epochLengthSeconds: String(guard.epochLengthSeconds),
+                };
+            if (guard.kind === 'fleet-add-ship')
+                return {
                     ...guard,
                     amount: String(guard.amount),
                     maximumProfileDebit: String(guard.maximumProfileDebit),
-                }
-                : guard.kind === 'fleet-create'
-                    ? {
-                        ...guard,
-                        maximumProfileDebit: String(guard.maximumProfileDebit),
-                    }
-                    : guard.kind === 'token-account'
-                        ? { ...guard, minimumBalance: String(guard.minimumBalance) }
-                        : { ...guard }),
-        });
-    }
-    if (plan.preconditions.some(({ kind }) => kind === 'fleet-create')) {
-        return deepFreeze({
-            v: 10,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => guard.kind === 'fleet-create'
-                ? { ...guard, maximumProfileDebit: String(guard.maximumProfileDebit) }
-                : guard.kind === 'token-account'
-                    ? { ...guard, minimumBalance: String(guard.minimumBalance) }
-                    : { ...guard }),
-        });
-    }
-    if (plan.preconditions.some(({ kind }) => kind === 'game-cargo-bytes-config')) {
-        return deepFreeze({
-            v: 9,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => guard.kind === 'token-account'
-                ? { ...guard, minimumBalance: String(guard.minimumBalance) }
-                : { ...guard }),
-        });
-    }
-    if (plan.preconditions.some(({ kind }) => kind === 'system-account-or-absent')) {
-        return deepFreeze({
-            v: 8,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => guard.kind === 'token-account'
-                ? { ...guard, minimumBalance: String(guard.minimumBalance) }
-                : { ...guard }),
-        });
-    }
-    if (plan.preconditions.some(({ kind }) => kind === 'token-mint')) {
-        return deepFreeze({
-            v: 7,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => guard.kind === 'token-account'
-                ? { ...guard, minimumBalance: String(guard.minimumBalance) }
-                : { ...guard }),
-        });
-    }
-    if (plan.preconditions.some(({ kind }) => kind === 'game-ship-config')) {
-        return deepFreeze({
-            v: 6,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => guard.kind === 'token-account'
-                ? { ...guard, minimumBalance: String(guard.minimumBalance) }
-                : { ...guard }),
-        });
-    }
-    if (plan.preconditions.some(({ kind }) => kind === 'game-account')) {
-        return deepFreeze({
-            v: 5,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => guard.kind === 'token-account'
-                ? { ...guard, minimumBalance: String(guard.minimumBalance) }
-                : { ...guard }),
-        });
-    }
-    if (plan.preconditions.some(({ kind }) => kind === 'token-account' ||
-        kind === 'game-cargo-config' ||
-        kind === 'cargo-cache')) {
-        return deepFreeze({
-            v: 4,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => guard.kind === 'token-account'
-                ? { ...guard, minimumBalance: String(guard.minimumBalance) }
-                : { ...guard }),
-        });
-    }
-    if (plan.preconditions.some(({ kind }) => kind === 'token-account-or-absent')) {
-        return deepFreeze({
-            v: 3,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => ({
-                ...guard,
-            })),
-        });
-    }
-    if (hasSemantics || hasAbsentPrecondition) {
-        return deepFreeze({
-            v: 2,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => ({
-                ...guard,
-            })),
-        });
-    }
-    return deepFreeze({
-        v: 1,
-        ...common,
-        steps,
-        preconditions: plan.preconditions.map((precondition) => ({
-            kind: 'account-state',
-            address: precondition.address,
-            dataHash: precondition.dataHash,
-            describes: precondition.describes,
-        })),
+                };
+            if (guard.kind === 'fleet-create' || guard.kind === 'ship-import-funding')
+                return {
+                    ...guard,
+                    maximumProfileDebit: String(guard.maximumProfileDebit),
+                };
+            if (guard.kind === 'token-account')
+                return { ...guard, minimumBalance: String(guard.minimumBalance) };
+            return { ...guard };
+        }),
     });
 }
 /** Creates an inert branded Plan while deriving every aggregate field.
@@ -851,7 +654,7 @@ function sameAddresses(actual, encoded) {
  *
  * @example
  * ```ts
- * declare const wire: PlanJsonV1 | PlanJsonV2 | PlanJsonV3 | PlanJsonV4 | PlanJsonV5 | PlanJsonV6 | PlanJsonV7 | PlanJsonV8 | PlanJsonV9 | PlanJsonV10 | PlanJsonV11 | PlanJsonV12 | PlanJsonV13 | PlanJsonV14 | PlanJsonV15 | PlanJsonV16 | PlanJsonV17;
+ * declare const wire: PlanJson;
  * const plan = planFromJSON(wire);
  * console.log(plan.describe());
  * ```
@@ -867,87 +670,66 @@ export function planFromJSON(json) {
         'affected',
         'requiredSigners',
     ]);
-    if (value.v !== 1 &&
-        value.v !== 2 &&
-        value.v !== 3 &&
-        value.v !== 4 &&
-        value.v !== 5 &&
-        value.v !== 6 &&
-        value.v !== 7 &&
-        value.v !== 8 &&
-        value.v !== 9 &&
-        value.v !== 10 &&
-        value.v !== 11 &&
-        value.v !== 12 &&
-        value.v !== 13 &&
-        value.v !== 14 &&
-        value.v !== 15 &&
-        value.v !== 16 &&
-        value.v !== 17) {
-        invalid('planJson.v', value.v, 'the Plan wire version 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, or 17');
-    }
-    const version = value.v;
-    if (version >= 4 && Array.isArray(value.preconditions)) {
-        value.preconditions = value.preconditions.map((entry) => {
-            const guard = readRecord(entry, 'precondition');
-            if (version >= 17 && guard.kind === 'fleet-arrival')
-                return normalizeArrivalGuard(guard, 'precondition', true);
-            if (version >= 16 && isRuntimeGuard(guard))
-                return normalizeRuntimeGuard(guard, 'precondition', true);
-            if (version >= 12 &&
-                (isTradeBuyGuard(guard) || isTradeSellGuard(guard))) {
-                const keys = isTradeBuyGuard(guard)
-                    ? ['floorRaw']
-                    : ['atlasOutCapPerEpochRaw', 'epochLengthSeconds'];
-                const decoded = { ...guard };
-                for (const key of keys) {
-                    const raw = guard[key];
-                    const pattern = key === 'epochLengthSeconds'
-                        ? /^(0|[1-9][0-9]*|-[1-9][0-9]*)$/
-                        : /^(0|[1-9][0-9]*)$/;
-                    if (typeof raw !== 'string' || !pattern.test(raw))
-                        invalid(key, raw, 'a canonical decimal string');
-                    decoded[key] = BigInt(raw);
-                }
-                return decoded;
+    if (value.v !== 18) {
+        throw new InvalidActionInputError('planJson.v', value.v, 'the current Plan wire version 18', 'Recreate the Plan using the current capability planner; do not change its saved version or migrate its guards.');
+    }
+    value.preconditions = readArray(value.preconditions, 'planJson.preconditions').map((entry) => {
+        const guard = readRecord(entry, 'precondition');
+        if (guard.kind === 'fleet-arrival')
+            return normalizeArrivalGuard(guard, 'precondition', true);
+        if (isRuntimeGuard(guard))
+            return normalizeRuntimeGuard(guard, 'precondition', true);
+        if (isTradeBuyGuard(guard) || isTradeSellGuard(guard)) {
+            const keys = isTradeBuyGuard(guard)
+                ? ['floorRaw']
+                : ['atlasOutCapPerEpochRaw', 'epochLengthSeconds'];
+            const decoded = { ...guard };
+            for (const key of keys) {
+                const raw = guard[key];
+                const pattern = key === 'epochLengthSeconds'
+                    ? /^(0|[1-9][0-9]*|-[1-9][0-9]*)$/
+                    : /^(0|[1-9][0-9]*)$/;
+                if (typeof raw !== 'string' || !pattern.test(raw))
+                    invalid(key, raw, 'a canonical decimal string');
+                decoded[key] = BigInt(raw);
             }
-            if (version >= 11 && guard.kind === 'fleet-add-ship') {
-                for (const field of ['amount', 'maximumProfileDebit'])
-                    if (typeof guard[field] !== 'string' ||
-                        !/^(0|[1-9][0-9]*)$/.test(guard[field]))
-                        invalid(field, guard[field], 'a canonical unsigned decimal string');
-                return {
-                    ...guard,
-                    amount: BigInt(guard.amount),
-                    maximumProfileDebit: BigInt(guard.maximumProfileDebit),
-                };
-            }
-            if ((version >= 10 && guard.kind === 'fleet-create') ||
-                (version >= 15 && guard.kind === 'ship-import-funding')) {
-                if (typeof guard.maximumProfileDebit !== 'string' ||
-                    !/^(0|[1-9][0-9]*)$/.test(guard.maximumProfileDebit))
-                    invalid('maximumProfileDebit', guard.maximumProfileDebit, 'a canonical unsigned decimal string');
-                return {
-                    ...guard,
-                    maximumProfileDebit: BigInt(guard.maximumProfileDebit),
-                };
-            }
-            if (guard.kind !== 'token-account')
-                return guard;
-            if (typeof guard.minimumBalance !== 'string' ||
-                !/^(0|[1-9][0-9]*)$/.test(guard.minimumBalance))
-                invalid('minimumBalance', guard.minimumBalance, 'a canonical unsigned decimal string');
-            return { ...guard, minimumBalance: BigInt(guard.minimumBalance) };
-        });
-    }
+            return decoded;
+        }
+        if (guard.kind === 'fleet-add-ship') {
+            for (const field of ['amount', 'maximumProfileDebit'])
+                if (typeof guard[field] !== 'string' ||
+                    !/^(0|[1-9][0-9]*)$/.test(guard[field]))
+                    invalid(field, guard[field], 'a canonical unsigned decimal string');
+            return {
+                ...guard,
+                amount: BigInt(guard.amount),
+                maximumProfileDebit: BigInt(guard.maximumProfileDebit),
+            };
+        }
+        if (guard.kind === 'fleet-create' || guard.kind === 'ship-import-funding') {
+            if (typeof guard.maximumProfileDebit !== 'string' ||
+                !/^(0|[1-9][0-9]*)$/.test(guard.maximumProfileDebit))
+                invalid('maximumProfileDebit', guard.maximumProfileDebit, 'a canonical unsigned decimal string');
+            return {
+                ...guard,
+                maximumProfileDebit: BigInt(guard.maximumProfileDebit),
+            };
+        }
+        if (guard.kind !== 'token-account')
+            return guard;
+        if (typeof guard.minimumBalance !== 'string' ||
+            !/^(0|[1-9][0-9]*)$/.test(guard.minimumBalance))
+            invalid('minimumBalance', guard.minimumBalance, 'a canonical unsigned decimal string');
+        return { ...guard, minimumBalance: BigInt(guard.minimumBalance) };
+    });
     const steps = readArray(value.steps, 'planJson.steps').map((candidate, index) => {
         const field = `planJson.steps[${String(index)}]`;
         const step = readRecord(candidate, field);
-        assertKeys(step, field, ['instruction', 'describes', 'signers'], version !== 1 ? ['semantics'] : []);
+        assertKeys(step, field, ['instruction', 'describes', 'signers'], ['semantics']);
         return {
             instruction: readWireInstruction(step.instruction, `${field}.instruction`),
             describes: readString(step.describes, `${field}.describes`),
-            ...(version !== 1 && step.semantics !== undefined
+            ...(step.semantics !== undefined
                 ? {
                     semantics: readArray(step.semantics, `${field}.semantics`).map((semantic, semanticIndex) => normalizeSemanticFact(semantic, `${field}.semantics[${String(semanticIndex)}]`)),
                 }
@@ -955,7 +737,7 @@ export function planFromJSON(json) {
             signers: readArray(step.signers, `${field}.signers`).map((signer, signerIndex) => readAddress(signer, `${field}.signers[${String(signerIndex)}]`)),
         };
     });
-    const preconditions = readArray(value.preconditions, 'planJson.preconditions').map((candidate, index) => normalizePrecondition(candidate, `planJson.preconditions[${String(index)}]`, version));
+    const preconditions = readArray(value.preconditions, 'planJson.preconditions').map((candidate, index) => normalizePrecondition(candidate, `planJson.preconditions[${String(index)}]`));
     const affected = readArray(value.affected, 'planJson.affected').map((candidate, index) => readAddress(candidate, `planJson.affected[${String(index)}]`));
     const requiredSigners = readArray(value.requiredSigners, 'planJson.requiredSigners').map((candidate, index) => readAddress(candidate, `planJson.requiredSigners[${String(index)}]`));
     const plan = createPlan({
@@ -1014,11 +796,7 @@ function validateFactionGuardComposition(guards) {
                     `${String(guard.atlasOutCapPerEpochRaw)}:${String(guard.epochLengthSeconds)}`,
                 ]);
         }
-        if ('schemaVersion' in guard)
-            constraints.push([
-                `${guard.address}:schema`,
-                String(guard.schemaVersion),
-            ]);
+        constraints.push([`${guard.address}:schema`, String(guard.schemaVersion)]);
         for (const [key, value] of constraints) {
             const previous = retained.get(key);
             if (previous !== undefined && previous !== value)