@ottochain/sdk 2.3.0 → 2.5.0

package/dist/esm/apps/corporate/state-machines/corp-entity.js

@@ -1,550 +1,625 @@
-import { defineFiberApp } from "../../../schema/fiber-app.js";
+import { defineFiberApp } from '../../../schema/fiber-app.js';
+import { signerIsParty, depInState } from '../../../schema/guards.js';
+import { addDependency } from '../../../schema/effects.js';
 /**
  * Master corporate record tracking the lifecycle of a business entity from incorporation through dissolution.
  * Manages legal identity, share structure, and corporate status.
  */
 export const corpEntityDef = defineFiberApp({
     metadata: {
-        name: "CorpEntity",
-        app: "corporate",
-        type: "entity",
-        version: "1.0.0",
-        description: "Master corporate record tracking the lifecycle of a business entity from incorporation through dissolution. Manages legal identity, share structure, and corporate status.",
+        name: 'CorpEntity',
+        app: 'corporate',
+        type: 'entity',
+        version: '1.0.0',
+        description: 'Master corporate record tracking the lifecycle of a business entity from incorporation through dissolution. Manages legal identity, share structure, and corporate status.',
         crossReferences: {
             board: {
-                machine: "corporate-board",
-                description: "Board of directors for this entity",
-                foreignKey: "entityId",
+                machine: 'corporate-board',
+                description: 'Board of directors for this entity',
+                foreignKey: 'entityId',
             },
             officers: {
-                machine: "corporate-officers",
-                description: "Executive officers for this entity",
-                foreignKey: "entityId",
+                machine: 'corporate-officers',
+                description: 'Executive officers for this entity',
+                foreignKey: 'entityId',
             },
             bylaws: {
-                machine: "corporate-bylaws",
-                description: "Governing bylaws for this entity",
-                foreignKey: "entityId",
+                machine: 'corporate-bylaws',
+                description: 'Governing bylaws for this entity',
+                foreignKey: 'entityId',
             },
             shareholders: {
-                machine: "corporate-shareholders",
-                description: "Shareholder meeting instances",
-                foreignKey: "entityId",
+                machine: 'corporate-shareholders',
+                description: 'Shareholder meeting instances',
+                foreignKey: 'entityId',
             },
             securities: {
-                machine: "corporate-securities",
-                description: "Stock issuance records",
-                foreignKey: "entityId",
+                machine: 'corporate-securities',
+                description: 'Stock issuance records',
+                foreignKey: 'entityId',
             },
             compliance: {
-                machine: "corporate-compliance",
-                description: "Regulatory compliance tracking",
-                foreignKey: "entityId",
+                machine: 'corporate-compliance',
+                description: 'Regulatory compliance tracking',
+                foreignKey: 'entityId',
             },
         },
     },
     createSchema: {
-        required: ["entityId", "legalName", "entityType", "jurisdiction"],
+        required: [
+            'entityId',
+            'legalName',
+            'entityType',
+            'jurisdiction',
+            'charterAuthority',
+            'boardAuthority',
+            'shareholderAuthority',
+            'stateAuthority',
+        ],
         properties: {
             entityId: {
-                type: "string",
-                description: "Unique identifier for this corporate entity",
+                type: 'string',
+                description: 'Unique identifier for this corporate entity',
+                immutable: true,
+            },
+            charterAuthority: {
+                type: 'address',
+                description: 'State-pinned DAG address authorized to amend the charter (legal identity). Verified against proofs[].address.',
+                immutable: true,
+            },
+            boardAuthority: {
+                type: 'address',
+                description: 'State-pinned DAG address of the board authority (governs registered-agent changes, suspension/reinstatement, and the board half of voluntary dissolution). Verified against proofs[].address.',
+                immutable: true,
+            },
+            shareholderAuthority: {
+                type: 'address',
+                description: 'State-pinned DAG address of the shareholder authority (the shareholder half of voluntary dissolution). Verified against proofs[].address.',
+                immutable: true,
+            },
+            stateAuthority: {
+                type: 'address',
+                description: 'State-pinned DAG address of the chartering jurisdiction/registrar that may administratively dissolve a suspended entity. Verified against proofs[].address.',
                 immutable: true,
             },
             legalName: {
-                type: "string",
-                description: "Full legal name of the corporation",
+                type: 'string',
+                description: 'Full legal name of the corporation',
             },
             tradeName: {
-                type: "string",
+                type: 'string',
                 nullable: true,
-                description: "DBA or trade name if different",
+                description: 'DBA or trade name if different',
             },
             entityType: {
-                type: "string",
-                enum: ["C_CORP", "S_CORP", "B_CORP", "LLC", "LP", "LLP"],
-                description: "Legal entity type",
+                type: 'string',
+                enum: ['C_CORP', 'S_CORP', 'B_CORP', 'LLC', 'LP', 'LLP'],
+                description: 'Legal entity type',
             },
             jurisdiction: {
-                type: "object",
+                type: 'object',
                 properties: {
                     state: {
-                        type: "string",
-                        description: "State of incorporation (e.g., DE, NV, WY)",
+                        type: 'string',
+                        description: 'State of incorporation (e.g., DE, NV, WY)',
                     },
-                    country: { type: "string", default: "USA" },
+                    country: { type: 'string', default: 'USA' },
                     foreignQualifications: {
-                        type: "array",
-                        items: { type: "string" },
-                        description: "States where foreign qualified to do business",
+                        type: 'array',
+                        items: { type: 'string' },
+                        description: 'States where foreign qualified to do business',
                     },
                 },
             },
             fiscalYearEnd: {
-                type: "string",
-                description: "Fiscal year end (MM-DD format)",
+                type: 'string',
+                description: 'Fiscal year end (MM-DD format)',
             },
             registeredAgent: {
-                type: "object",
+                type: 'object',
                 properties: {
-                    name: { type: "string" },
-                    address: { type: "object" },
-                    phone: { type: "string" },
-                    email: { type: "string" },
-                    effectiveDate: { type: "string", format: "date" },
+                    name: { type: 'string' },
+                    address: { type: 'object' },
+                    phone: { type: 'string' },
+                    email: { type: 'string' },
+                    effectiveDate: { type: 'string', format: 'date' },
                 },
             },
             principalOffice: {
-                type: "object",
+                type: 'object',
                 properties: {
-                    street: { type: "string" },
-                    city: { type: "string" },
-                    state: { type: "string" },
-                    zip: { type: "string" },
-                    country: { type: "string", default: "USA" },
+                    street: { type: 'string' },
+                    city: { type: 'string' },
+                    state: { type: 'string' },
+                    zip: { type: 'string' },
+                    country: { type: 'string', default: 'USA' },
                 },
             },
             shareStructure: {
-                type: "object",
+                type: 'object',
                 properties: {
                     classes: {
-                        type: "array",
-                        items: { $ref: "#/definitions/ShareClass" },
+                        type: 'array',
+                        items: { $ref: '#/definitions/ShareClass' },
                     },
                     totalAuthorized: {
-                        type: "integer",
-                        description: "Sum of all authorized shares",
+                        type: 'integer',
+                        description: 'Sum of all authorized shares',
                     },
-                    totalIssued: { type: "integer" },
-                    totalOutstanding: { type: "integer" },
+                    totalIssued: { type: 'integer' },
+                    totalOutstanding: { type: 'integer' },
                 },
             },
             incorporators: {
-                type: "array",
-                items: { $ref: "#/definitions/Incorporator" },
+                type: 'array',
+                items: { $ref: '#/definitions/Incorporator' },
             },
             ein: {
-                type: "string",
+                type: 'string',
                 nullable: true,
-                description: "Federal EIN",
+                description: 'Federal EIN',
             },
             stateIds: {
-                type: "object",
-                additionalProperties: { type: "string" },
-                description: "State-specific entity IDs keyed by state code",
+                type: 'object',
+                additionalProperties: { type: 'string' },
+                description: 'State-specific entity IDs keyed by state code',
             },
         },
     },
     stateSchema: {
         properties: {
-            entityId: { type: "string", immutable: true },
-            legalName: { type: "string" },
-            tradeName: { type: "string", nullable: true },
-            entityType: { type: "string" },
-            jurisdiction: { type: "object" },
-            formationDate: { type: "string", format: "date", computed: true },
-            fiscalYearEnd: { type: "string" },
-            registeredAgent: { type: "object" },
-            principalOffice: { type: "object" },
-            shareStructure: { type: "object" },
-            incorporators: { type: "array" },
-            ein: { type: "string", nullable: true },
-            stateIds: { type: "object" },
+            entityId: { type: 'string', immutable: true },
+            charterAuthority: { type: 'address', immutable: true },
+            boardAuthority: { type: 'address', immutable: true },
+            shareholderAuthority: { type: 'address', immutable: true },
+            stateAuthority: { type: 'address', immutable: true },
+            legalName: { type: 'string' },
+            tradeName: { type: 'string', nullable: true },
+            entityType: { type: 'string' },
+            jurisdiction: { type: 'object' },
+            formationDate: { type: 'string', format: 'date', computed: true },
+            fiscalYearEnd: { type: 'string' },
+            registeredAgent: { type: 'object' },
+            principalOffice: { type: 'object' },
+            shareStructure: { type: 'object' },
+            incorporators: { type: 'array' },
+            ein: { type: 'string', nullable: true },
+            stateIds: { type: 'object' },
             status: {
-                type: "string",
-                enum: ["INCORPORATING", "ACTIVE", "SUSPENDED", "DISSOLVED"],
+                type: 'string',
+                enum: ['INCORPORATING', 'ACTIVE', 'SUSPENDED', 'DISSOLVED'],
                 computed: true,
             },
-            suspensionReason: { type: "string", nullable: true, computed: true },
+            suspensionReason: { type: 'string', nullable: true, computed: true },
             suspensionDate: {
-                type: "string",
-                format: "date",
+                type: 'string',
+                format: 'date',
                 nullable: true,
                 computed: true,
             },
             dissolutionDate: {
-                type: "string",
-                format: "date",
+                type: 'string',
+                format: 'date',
                 nullable: true,
                 computed: true,
             },
-            dissolutionReason: { type: "string", nullable: true, computed: true },
+            dissolutionReason: { type: 'string', nullable: true, computed: true },
             charterAmendments: {
-                type: "array",
-                items: { $ref: "#/definitions/CharterAmendment" },
+                type: 'array',
+                items: { $ref: '#/definitions/CharterAmendment' },
                 computed: true,
             },
-            createdAt: { type: "timestamp", computed: true },
-            updatedAt: { type: "timestamp", computed: true },
+            createdAt: { type: 'timestamp', computed: true },
+            updatedAt: { type: 'timestamp', computed: true },
+            // Two-phase amendment (#24): propose_amend_charter binds the resolution fiber + records the
+            // pending amendment here; amend_charter asserts the bound resolution is EXECUTED, then clears this.
+            pendingAmendCharter: { type: 'object', nullable: true, computed: true },
+            // Two-phase voluntary dissolution (#24): propose_dissolve_voluntary binds the board + shareholder
+            // resolution fibers + records the pending dissolution here; dissolve_voluntary asserts both bound
+            // resolutions are EXECUTED, then clears this.
+            pendingDissolveVoluntary: { type: 'object', nullable: true, computed: true },
         },
     },
     eventSchemas: {
         incorporate: {
-            description: "State approves articles of incorporation, corporation comes into existence",
-            required: ["approvalDate", "stateFileNumber"],
+            description: 'State approves articles of incorporation, corporation comes into existence',
+            required: ['approvalDate', 'stateFileNumber'],
             properties: {
-                approvalDate: { type: "string", format: "date" },
-                stateFileNumber: { type: "string" },
+                approvalDate: { type: 'string', format: 'date' },
+                stateFileNumber: { type: 'string' },
                 certificateOfIncorporation: {
-                    type: "string",
-                    description: "Document reference",
+                    type: 'string',
+                    description: 'Document reference',
                 },
             },
         },
-        amend_charter: {
-            description: "Amend the certificate/articles of incorporation (requires shareholder approval for most amendments)",
-            required: [
-                "amendmentId",
-                "description",
-                "amendmentType",
-                "resolutionRef",
-                "effectiveDate",
-                "filedDate",
-            ],
+        propose_amend_charter: {
+            description: 'Phase 1 of a charter amendment: bind the approving resolution fiber (#24 _addDependency) and record the pending amendment',
+            required: ['amendmentId', 'description', 'amendmentType', 'resolutionRef', 'effectiveDate', 'filedDate'],
             properties: {
-                amendmentId: { type: "string" },
-                description: { type: "string" },
+                amendmentId: { type: 'string' },
+                description: { type: 'string' },
                 amendmentType: {
-                    type: "string",
-                    enum: [
-                        "NAME_CHANGE",
-                        "SHARE_AUTHORIZATION",
-                        "PURPOSE_CHANGE",
-                        "OTHER",
-                    ],
+                    type: 'string',
+                    enum: ['NAME_CHANGE', 'SHARE_AUTHORIZATION', 'PURPOSE_CHANGE', 'OTHER'],
                 },
                 resolutionRef: {
-                    type: "string",
-                    description: "Reference to board/shareholder resolution",
+                    type: 'string',
+                    description: 'Reference to board/shareholder resolution',
                 },
-                effectiveDate: { type: "string", format: "date" },
-                filedDate: { type: "string", format: "date" },
+                effectiveDate: { type: 'string', format: 'date' },
+                filedDate: { type: 'string', format: 'date' },
                 newShareAuthorization: {
-                    type: "object",
+                    type: 'object',
                     nullable: true,
-                    description: "If increasing/changing authorized shares",
+                    description: 'If increasing/changing authorized shares',
                 },
-                newLegalName: { type: "string", nullable: true },
+                newLegalName: { type: 'string', nullable: true },
+            },
+        },
+        amend_charter: {
+            description: 'Phase 2 of a charter amendment: apply once the bound approving resolution is EXECUTED',
+            required: ['amendmentId', 'description', 'amendmentType', 'effectiveDate', 'filedDate'],
+            properties: {
+                amendmentId: { type: 'string' },
+                description: { type: 'string' },
+                amendmentType: {
+                    type: 'string',
+                    enum: ['NAME_CHANGE', 'SHARE_AUTHORIZATION', 'PURPOSE_CHANGE', 'OTHER'],
+                },
+                effectiveDate: { type: 'string', format: 'date' },
+                filedDate: { type: 'string', format: 'date' },
+                newShareAuthorization: {
+                    type: 'object',
+                    nullable: true,
+                    description: 'If increasing/changing authorized shares',
+                },
+                newLegalName: { type: 'string', nullable: true },
             },
         },
         update_share_class: {
-            description: "Update authorized shares for an existing class or add new class (requires charter amendment)",
-            required: [
-                "classId",
-                "className",
-                "authorized",
-                "parValue",
-                "votingRights",
-                "charterAmendmentRef",
-            ],
+            description: 'Update authorized shares for an existing class or add new class (requires charter amendment)',
+            required: ['classId', 'className', 'authorized', 'parValue', 'votingRights', 'charterAmendmentRef'],
             properties: {
-                classId: { type: "string" },
-                className: { type: "string" },
-                authorized: { type: "integer" },
-                parValue: { type: "number" },
-                votingRights: { type: "boolean" },
-                votesPerShare: { type: "number", default: 1 },
-                liquidationPreference: { type: "number", nullable: true },
-                dividendRate: { type: "number", nullable: true },
-                convertible: { type: "boolean", default: false },
-                charterAmendmentRef: { type: "string" },
+                classId: { type: 'string' },
+                className: { type: 'string' },
+                authorized: { type: 'integer' },
+                parValue: { type: 'number' },
+                votingRights: { type: 'boolean' },
+                votesPerShare: { type: 'number', default: 1 },
+                liquidationPreference: { type: 'number', nullable: true },
+                dividendRate: { type: 'number', nullable: true },
+                convertible: { type: 'boolean', default: false },
+                charterAmendmentRef: { type: 'string' },
             },
         },
         update_registered_agent: {
-            description: "Change the registered agent on file with the state",
-            required: ["name", "address", "effectiveDate"],
+            description: 'Change the registered agent on file with the state',
+            required: ['name', 'address', 'effectiveDate'],
             properties: {
-                name: { type: "string" },
-                address: { type: "object" },
-                phone: { type: "string" },
-                email: { type: "string" },
-                effectiveDate: { type: "string", format: "date" },
+                name: { type: 'string' },
+                address: { type: 'object' },
+                phone: { type: 'string' },
+                email: { type: 'string' },
+                effectiveDate: { type: 'string', format: 'date' },
                 filingConfirmation: {
-                    type: "string",
-                    description: "State filing confirmation number",
+                    type: 'string',
+                    description: 'State filing confirmation number',
                 },
             },
         },
         suspend: {
-            description: "State suspends corporate powers (typically for tax/filing noncompliance)",
-            required: ["reason", "suspensionDate"],
+            description: 'State suspends corporate powers (typically for tax/filing noncompliance)',
+            required: ['reason', 'suspensionDate'],
             properties: {
                 reason: {
-                    type: "string",
+                    type: 'string',
                     enum: [
-                        "FRANCHISE_TAX_DELINQUENT",
-                        "ANNUAL_REPORT_MISSING",
-                        "REGISTERED_AGENT_LAPSE",
-                        "ADMINISTRATIVE",
-                        "OTHER",
+                        'FRANCHISE_TAX_DELINQUENT',
+                        'ANNUAL_REPORT_MISSING',
+                        'REGISTERED_AGENT_LAPSE',
+                        'ADMINISTRATIVE',
+                        'OTHER',
                     ],
                 },
-                suspensionDate: { type: "string", format: "date" },
+                suspensionDate: { type: 'string', format: 'date' },
                 stateNotice: {
-                    type: "string",
-                    description: "Reference to state notice",
+                    type: 'string',
+                    description: 'Reference to state notice',
                 },
-                cureDeadline: { type: "string", format: "date", nullable: true },
+                cureDeadline: { type: 'string', format: 'date', nullable: true },
             },
         },
         reinstate: {
-            description: "Cure deficiencies and reinstate corporate powers",
-            required: [
-                "reinstatementDate",
-                "curativeActions",
-                "stateConfirmation",
-            ],
+            description: 'Cure deficiencies and reinstate corporate powers',
+            required: ['reinstatementDate', 'curativeActions', 'stateConfirmation'],
             properties: {
-                reinstatementDate: { type: "string", format: "date" },
+                reinstatementDate: { type: 'string', format: 'date' },
                 curativeActions: {
-                    type: "array",
-                    items: { type: "string" },
-                    description: "List of actions taken to cure",
+                    type: 'array',
+                    items: { type: 'string' },
+                    description: 'List of actions taken to cure',
                 },
-                stateConfirmation: { type: "string" },
-                penaltiesPaid: { type: "number", nullable: true },
+                stateConfirmation: { type: 'string' },
+                penaltiesPaid: { type: 'number', nullable: true },
+            },
+        },
+        propose_dissolve_voluntary: {
+            description: 'Phase 1 of voluntary dissolution: bind the executing board + shareholder resolution fibers (#24 _addDependency) and record the pending dissolution',
+            required: ['dissolutionDate', 'boardResolutionRef', 'shareholderResolutionRef'],
+            properties: {
+                dissolutionDate: { type: 'string', format: 'date' },
+                boardResolutionRef: { type: 'string' },
+                shareholderResolutionRef: { type: 'string' },
+                windingUpPlan: {
+                    type: 'string',
+                    description: 'Reference to winding up plan',
+                },
+                certificateOfDissolution: { type: 'string' },
             },
         },
         dissolve_voluntary: {
-            description: "Voluntary dissolution approved by board and shareholders",
-            required: [
-                "dissolutionDate",
-                "boardResolutionRef",
-                "shareholderResolutionRef",
-            ],
+            description: 'Phase 2 of voluntary dissolution: execute once both bound resolutions are EXECUTED',
+            required: ['dissolutionDate'],
             properties: {
-                dissolutionDate: { type: "string", format: "date" },
-                boardResolutionRef: { type: "string" },
-                shareholderResolutionRef: { type: "string" },
+                dissolutionDate: { type: 'string', format: 'date' },
                 windingUpPlan: {
-                    type: "string",
-                    description: "Reference to winding up plan",
+                    type: 'string',
+                    description: 'Reference to winding up plan',
                 },
-                certificateOfDissolution: { type: "string" },
+                certificateOfDissolution: { type: 'string' },
             },
         },
         dissolve_administrative: {
-            description: "Administrative dissolution by state after prolonged suspension",
-            required: ["dissolutionDate", "stateOrder", "reason"],
+            description: 'Administrative dissolution by state after prolonged suspension',
+            required: ['dissolutionDate', 'stateOrder', 'reason'],
             properties: {
-                dissolutionDate: { type: "string", format: "date" },
-                stateOrder: { type: "string" },
-                reason: { type: "string" },
+                dissolutionDate: { type: 'string', format: 'date' },
+                stateOrder: { type: 'string' },
+                reason: { type: 'string' },
             },
         },
     },
     definitions: {
         ShareClass: {
-            type: "object",
+            type: 'object',
             properties: {
                 className: {
-                    type: "string",
-                    description: "e.g., Common, Series A Preferred",
+                    type: 'string',
+                    description: 'e.g., Common, Series A Preferred',
                 },
-                classId: { type: "string" },
-                authorized: { type: "integer", description: "Total shares authorized" },
-                issued: { type: "integer", description: "Shares currently issued" },
-                outstanding: { type: "integer", description: "Issued minus treasury" },
-                treasury: { type: "integer", description: "Shares held by company" },
-                parValue: { type: "number", description: "Par value per share" },
+                classId: { type: 'string' },
+                authorized: { type: 'integer', description: 'Total shares authorized' },
+                issued: { type: 'integer', description: 'Shares currently issued' },
+                outstanding: { type: 'integer', description: 'Issued minus treasury' },
+                treasury: { type: 'integer', description: 'Shares held by company' },
+                parValue: { type: 'number', description: 'Par value per share' },
                 votingRights: {
-                    type: "boolean",
-                    description: "Whether class has voting rights",
+                    type: 'boolean',
+                    description: 'Whether class has voting rights',
                 },
-                votesPerShare: { type: "number", default: 1 },
+                votesPerShare: { type: 'number', default: 1 },
                 liquidationPreference: {
-                    type: "number",
+                    type: 'number',
                     nullable: true,
-                    description: "Liquidation preference multiple",
+                    description: 'Liquidation preference multiple',
                 },
                 dividendRate: {
-                    type: "number",
+                    type: 'number',
                     nullable: true,
-                    description: "Annual dividend rate %",
+                    description: 'Annual dividend rate %',
                 },
-                convertible: { type: "boolean", default: false },
-                conversionRatio: { type: "number", nullable: true },
+                convertible: { type: 'boolean', default: false },
+                conversionRatio: { type: 'number', nullable: true },
                 antidilution: {
-                    type: "string",
-                    enum: [
-                        "NONE",
-                        "BROAD_BASED",
-                        "NARROW_BASED",
-                        "FULL_RATCHET",
-                    ],
+                    type: 'string',
+                    enum: ['NONE', 'BROAD_BASED', 'NARROW_BASED', 'FULL_RATCHET'],
                     nullable: true,
                 },
             },
         },
         Incorporator: {
-            type: "object",
+            type: 'object',
             properties: {
-                name: { type: "string" },
-                address: { type: "object" },
-                signatureDate: { type: "string", format: "date" },
+                name: { type: 'string' },
+                address: { type: 'object' },
+                signatureDate: { type: 'string', format: 'date' },
             },
         },
         CharterAmendment: {
-            type: "object",
+            type: 'object',
             properties: {
-                amendmentId: { type: "string" },
-                description: { type: "string" },
-                effectiveDate: { type: "string", format: "date" },
+                amendmentId: { type: 'string' },
+                description: { type: 'string' },
+                effectiveDate: { type: 'string', format: 'date' },
                 resolutionRef: {
-                    type: "string",
-                    description: "Reference to approving resolution",
+                    type: 'string',
+                    description: 'Reference to approving resolution',
                 },
-                filedDate: { type: "string", format: "date" },
+                filedDate: { type: 'string', format: 'date' },
             },
         },
     },
     states: {
         INCORPORATING: {
-            id: "INCORPORATING",
+            id: 'INCORPORATING',
             isFinal: false,
-            description: "Initial state during formation process. Articles filed but not yet approved by state.",
+            description: 'Initial state during formation process. Articles filed but not yet approved by state.',
         },
         ACTIVE: {
-            id: "ACTIVE",
+            id: 'ACTIVE',
             isFinal: false,
-            description: "Corporation is in good standing and authorized to conduct business.",
+            description: 'Corporation is in good standing and authorized to conduct business.',
         },
         SUSPENDED: {
-            id: "SUSPENDED",
+            id: 'SUSPENDED',
             isFinal: false,
-            description: "Corporate powers suspended due to compliance failure (tax, filings, etc). Can be reinstated.",
+            description: 'Corporate powers suspended due to compliance failure (tax, filings, etc). Can be reinstated.',
         },
         DISSOLVED: {
-            id: "DISSOLVED",
+            id: 'DISSOLVED',
             isFinal: true,
-            description: "Corporation has been legally dissolved. Terminal state.",
+            description: 'Corporation has been legally dissolved. Terminal state.',
         },
     },
-    initialState: "INCORPORATING",
+    initialState: 'INCORPORATING',
     transitions: [
         // INCORPORATING -> ACTIVE
         {
-            from: "INCORPORATING",
-            to: "ACTIVE",
-            eventName: "incorporate",
+            from: 'INCORPORATING',
+            to: 'ACTIVE',
+            eventName: 'incorporate',
             guard: {
                 and: [
-                    { "!=": [{ var: "state.legalName" }, null] },
-                    { "!=": [{ var: "state.jurisdiction.state" }, null] },
-                    { "!=": [{ var: "state.registeredAgent" }, null] },
-                    { ">": [{ var: "state.incorporators.length" }, 0] },
-                    { ">": [{ var: "state.shareStructure.classes.length" }, 0] },
-                    { ">": [{ var: "state.shareStructure.totalAuthorized" }, 0] },
+                    { '!=': [{ var: 'state.legalName' }, null] },
+                    { '!=': [{ var: 'state.jurisdiction.state' }, null] },
+                    { '!=': [{ var: 'state.registeredAgent' }, null] },
+                    { '>': [{ length: [{ var: 'state.incorporators' }] }, 0] },
+                    { '>': [{ length: [{ var: 'state.shareStructure.classes' }] }, 0] },
+                    { '>': [{ var: 'state.shareStructure.totalAuthorized' }, 0] },
                 ],
             },
             effect: {
                 merge: [
-                    { var: "state" },
+                    { var: 'state' },
+                    {
+                        status: 'ACTIVE',
+                        formationDate: { var: 'event.approvalDate' },
+                        updatedAt: { var: '$ordinal' },
+                    },
                     {
-                        status: "ACTIVE",
-                        formationDate: { var: "event.approvalDate" },
-                        updatedAt: { var: "$timestamp" },
+                        _emit: [{ name: 'CORPORATION_FORMED', data: { var: 'event' }, destination: 'external' }],
                     },
                 ],
             },
-            emits: ["CORPORATION_FORMED"],
         },
-        // ACTIVE -> ACTIVE (amend_charter)
+        // ACTIVE -> ACTIVE (propose_amend_charter) — phase 1 (#24): bind the approving resolution fiber and
+        // record the pending amendment, so amend_charter can read the resolution's state next transition.
         {
-            from: "ACTIVE",
-            to: "ACTIVE",
-            eventName: "amend_charter",
-            guard: { "!=": [{ var: "event.resolutionRef" }, null] },
-            dependencies: [
-                {
-                    machine: "corporate-resolution",
-                    instanceRef: { var: "event.resolutionRef" },
-                    requiredState: "EXECUTED",
-                },
-            ],
+            from: 'ACTIVE',
+            to: 'ACTIVE',
+            eventName: 'propose_amend_charter',
+            // authority gate — an identity role attestation (ISSUER/BOARD_MEMBER/...) layers on additively when the identity registry lands (docs/design/app-hardening-identity-integration.md §4.2)
+            guard: signerIsParty('state.charterAuthority'),
             effect: {
                 merge: [
-                    { var: "state" },
+                    { var: 'state' },
+                    {
+                        pendingAmendCharter: {
+                            amendmentId: { var: 'event.amendmentId' },
+                            description: { var: 'event.description' },
+                            effectiveDate: { var: 'event.effectiveDate' },
+                            filedDate: { var: 'event.filedDate' },
+                            newLegalName: { var: 'event.newLegalName' },
+                            ref: { var: 'event.resolutionRef' },
+                            proposedAt: { var: '$ordinal' },
+                        },
+                    },
+                    // bind the resolution fiber so amend_charter can assert its state next transition
+                    addDependency({ var: 'event.resolutionRef' }),
+                ],
+            },
+            dependencies: [],
+        },
+        // ACTIVE -> ACTIVE (amend_charter) — phase 2 (#24): apply once the bound approving resolution is
+        // EXECUTED. depInState replaces the dropped object-form dependency (which silently never gated).
+        {
+            from: 'ACTIVE',
+            to: 'ACTIVE',
+            eventName: 'amend_charter',
+            // authority gate — an identity role attestation (ISSUER/BOARD_MEMBER/...) layers on additively when the identity registry lands (docs/design/app-hardening-identity-integration.md §4.2)
+            guard: {
+                and: [
+                    signerIsParty('state.charterAuthority'),
+                    // the proposal must target this amendment, and its bound resolution must be EXECUTED
+                    {
+                        '==': [{ var: 'state.pendingAmendCharter.amendmentId' }, { var: 'event.amendmentId' }],
+                    },
+                    depInState('state.pendingAmendCharter.ref', 'EXECUTED'),
+                ],
+            },
+            effect: {
+                merge: [
+                    { var: 'state' },
                     {
                         charterAmendments: {
-                            cat: [
-                                { var: "state.charterAmendments" },
+                            merge: [
+                                { var: 'state.charterAmendments' },
                                 [
                                     {
-                                        amendmentId: { var: "event.amendmentId" },
-                                        description: { var: "event.description" },
-                                        effectiveDate: { var: "event.effectiveDate" },
-                                        resolutionRef: { var: "event.resolutionRef" },
-                                        filedDate: { var: "event.filedDate" },
+                                        amendmentId: { var: 'event.amendmentId' },
+                                        description: { var: 'event.description' },
+                                        effectiveDate: { var: 'event.effectiveDate' },
+                                        resolutionRef: { var: 'state.pendingAmendCharter.ref' },
+                                        filedDate: { var: 'event.filedDate' },
                                     },
                                 ],
                             ],
                         },
                         legalName: {
                             if: [
-                                { "!=": [{ var: "event.newLegalName" }, null] },
-                                { var: "event.newLegalName" },
-                                { var: "state.legalName" },
+                                { '!=': [{ var: 'event.newLegalName' }, null] },
+                                { var: 'event.newLegalName' },
+                                { var: 'state.legalName' },
                             ],
                         },
-                        updatedAt: { var: "$timestamp" },
+                        updatedAt: { var: '$ordinal' },
+                        // clear the consumed proposal
+                        pendingAmendCharter: null,
+                    },
+                    {
+                        _emit: [{ name: 'CHARTER_AMENDED', data: { var: 'event' }, destination: 'external' }],
                     },
                 ],
             },
-            emits: ["CHARTER_AMENDED"],
+            dependencies: [],
         },
         // ACTIVE -> ACTIVE (update_share_class)
         {
-            from: "ACTIVE",
-            to: "ACTIVE",
-            eventName: "update_share_class",
+            from: 'ACTIVE',
+            to: 'ACTIVE',
+            eventName: 'update_share_class',
             guard: {
                 some: [
-                    { var: "state.charterAmendments" },
+                    { var: 'state.charterAmendments' },
                     {
-                        "==": [
-                            { var: ".amendmentId" },
-                            { var: "event.charterAmendmentRef" },
-                        ],
+                        '==': [{ var: 'amendmentId' }, { var: 'event.charterAmendmentRef' }],
                     },
                 ],
             },
             effect: {
                 merge: [
-                    { var: "state" },
+                    { var: 'state' },
                     {
                         shareStructure: {
                             merge: [
-                                { var: "state.shareStructure" },
+                                { var: 'state.shareStructure' },
                                 {
                                     classes: {
                                         map: [
-                                            { var: "state.shareStructure.classes" },
+                                            { var: 'state.shareStructure.classes' },
                                             {
                                                 if: [
                                                     {
-                                                        "==": [
-                                                            { var: ".classId" },
-                                                            { var: "event.classId" },
-                                                        ],
+                                                        '==': [{ var: 'classId' }, { var: 'event.classId' }],
                                                     },
                                                     {
-                                                        classId: { var: "event.classId" },
-                                                        className: { var: "event.className" },
-                                                        authorized: { var: "event.authorized" },
+                                                        classId: { var: 'event.classId' },
+                                                        className: { var: 'event.className' },
+                                                        authorized: { var: 'event.authorized' },
                                                         issued: 0,
                                                         outstanding: 0,
                                                         treasury: 0,
-                                                        parValue: { var: "event.parValue" },
-                                                        votingRights: { var: "event.votingRights" },
-                                                        votesPerShare: { var: "event.votesPerShare" },
+                                                        parValue: { var: 'event.parValue' },
+                                                        votingRights: { var: 'event.votingRights' },
+                                                        votesPerShare: { var: 'event.votesPerShare' },
                                                         liquidationPreference: {
-                                                            var: "event.liquidationPreference",
+                                                            var: 'event.liquidationPreference',
                                                         },
-                                                        dividendRate: { var: "event.dividendRate" },
-                                                        convertible: { var: "event.convertible" },
+                                                        dividendRate: { var: 'event.dividendRate' },
+                                                        convertible: { var: 'event.convertible' },
                                                     },
-                                                    { var: "" },
+                                                    { var: '' },
                                                 ],
                                             },
                                         ],
@@ -558,111 +633,162 @@ export const corpEntityDef = defineFiberApp({
         },
         // ACTIVE -> ACTIVE (update_registered_agent)
         {
-            from: "ACTIVE",
-            to: "ACTIVE",
-            eventName: "update_registered_agent",
-            guard: { "==": [1, 1] },
+            from: 'ACTIVE',
+            to: 'ACTIVE',
+            eventName: 'update_registered_agent',
+            // authority gate — an identity role attestation (ISSUER/BOARD_MEMBER/...) layers on additively when the identity registry lands (docs/design/app-hardening-identity-integration.md §4.2)
+            guard: signerIsParty('state.boardAuthority'),
             effect: {
                 merge: [
-                    { var: "state" },
+                    { var: 'state' },
                     {
                         registeredAgent: {
-                            name: { var: "event.name" },
-                            address: { var: "event.address" },
-                            phone: { var: "event.phone" },
-                            email: { var: "event.email" },
-                            effectiveDate: { var: "event.effectiveDate" },
+                            name: { var: 'event.name' },
+                            address: { var: 'event.address' },
+                            phone: { var: 'event.phone' },
+                            email: { var: 'event.email' },
+                            effectiveDate: { var: 'event.effectiveDate' },
                         },
                     },
+                    {
+                        _emit: [{ name: 'REGISTERED_AGENT_CHANGED', data: { var: 'event' }, destination: 'external' }],
+                    },
                 ],
             },
-            emits: ["REGISTERED_AGENT_CHANGED"],
         },
         // ACTIVE -> SUSPENDED
         {
-            from: "ACTIVE",
-            to: "SUSPENDED",
-            eventName: "suspend",
-            guard: { "==": [1, 1] },
+            from: 'ACTIVE',
+            to: 'SUSPENDED',
+            eventName: 'suspend',
+            // authority gate — state-initiated enforcement; an identity role attestation (ISSUER/BOARD_MEMBER/...) layers on additively when the identity registry lands (docs/design/app-hardening-identity-integration.md §4.2)
+            guard: signerIsParty('state.stateAuthority'),
             effect: {
                 merge: [
-                    { var: "state" },
+                    { var: 'state' },
                     {
-                        status: "SUSPENDED",
-                        suspensionReason: { var: "event.reason" },
-                        suspensionDate: { var: "event.suspensionDate" },
+                        status: 'SUSPENDED',
+                        suspensionReason: { var: 'event.reason' },
+                        suspensionDate: { var: 'event.suspensionDate' },
+                    },
+                    {
+                        _emit: [{ name: 'CORPORATION_SUSPENDED', data: { var: 'event' }, destination: 'external' }],
                     },
                 ],
             },
-            emits: ["CORPORATION_SUSPENDED"],
         },
         // SUSPENDED -> ACTIVE
         {
-            from: "SUSPENDED",
-            to: "ACTIVE",
-            eventName: "reinstate",
-            guard: { "==": [1, 1] },
+            from: 'SUSPENDED',
+            to: 'ACTIVE',
+            eventName: 'reinstate',
+            // authority gate — an identity role attestation (ISSUER/BOARD_MEMBER/...) layers on additively when the identity registry lands (docs/design/app-hardening-identity-integration.md §4.2)
+            guard: signerIsParty('state.boardAuthority'),
             effect: {
                 merge: [
-                    { var: "state" },
+                    { var: 'state' },
                     {
-                        status: "ACTIVE",
+                        status: 'ACTIVE',
                         suspensionReason: null,
                         suspensionDate: null,
                     },
+                    {
+                        _emit: [{ name: 'CORPORATION_REINSTATED', data: { var: 'event' }, destination: 'external' }],
+                    },
                 ],
             },
-            emits: ["CORPORATION_REINSTATED"],
         },
-        // ACTIVE -> DISSOLVED (voluntary)
+        // ACTIVE -> ACTIVE (propose_dissolve_voluntary) — phase 1 (#24): bind BOTH executing resolution
+        // fibers (board + shareholder) and record the pending dissolution, so dissolve_voluntary can read
+        // both resolutions' states next transition.
         {
-            from: "ACTIVE",
-            to: "DISSOLVED",
-            eventName: "dissolve_voluntary",
-            guard: { "==": [1, 1] },
-            dependencies: [
-                {
-                    machine: "corporate-resolution",
-                    instanceRef: { var: "event.boardResolutionRef" },
-                    requiredState: "EXECUTED",
-                },
-                {
-                    machine: "corporate-resolution",
-                    instanceRef: { var: "event.shareholderResolutionRef" },
-                    requiredState: "EXECUTED",
-                },
-            ],
+            from: 'ACTIVE',
+            to: 'ACTIVE',
+            eventName: 'propose_dissolve_voluntary',
+            // authority gate — both the board and shareholder authorities must sign; identity role attestations (BOARD_MEMBER/...) layer on additively when the identity registry lands (docs/design/app-hardening-identity-integration.md §4.2)
+            guard: {
+                and: [signerIsParty('state.boardAuthority'), signerIsParty('state.shareholderAuthority')],
+            },
+            effect: {
+                merge: [
+                    { var: 'state' },
+                    {
+                        pendingDissolveVoluntary: {
+                            dissolutionDate: { var: 'event.dissolutionDate' },
+                            boardRef: { var: 'event.boardResolutionRef' },
+                            shareholderRef: { var: 'event.shareholderResolutionRef' },
+                            proposedAt: { var: '$ordinal' },
+                        },
+                    },
+                    // bind both resolution fibers so dissolve_voluntary can assert their states next transition
+                    {
+                        _addDependency: [
+                            { fiberId: { var: 'event.boardResolutionRef' } },
+                            { fiberId: { var: 'event.shareholderResolutionRef' } },
+                        ],
+                    },
+                ],
+            },
+            dependencies: [],
+        },
+        // ACTIVE -> DISSOLVED (dissolve_voluntary) — phase 2 (#24): execute once BOTH bound resolutions are
+        // EXECUTED. depInState replaces the dropped object-form dependencies (which silently never gated).
+        {
+            from: 'ACTIVE',
+            to: 'DISSOLVED',
+            eventName: 'dissolve_voluntary',
+            // authority gate — both the board and shareholder authorities must sign; identity role attestations (BOARD_MEMBER/...) layer on additively when the identity registry lands (docs/design/app-hardening-identity-integration.md §4.2)
+            guard: {
+                and: [
+                    signerIsParty('state.boardAuthority'),
+                    signerIsParty('state.shareholderAuthority'),
+                    // the proposal must target this dissolution, and its bound resolutions must both be EXECUTED
+                    {
+                        '==': [{ var: 'state.pendingDissolveVoluntary.dissolutionDate' }, { var: 'event.dissolutionDate' }],
+                    },
+                    depInState('state.pendingDissolveVoluntary.boardRef', 'EXECUTED'),
+                    depInState('state.pendingDissolveVoluntary.shareholderRef', 'EXECUTED'),
+                ],
+            },
             effect: {
                 merge: [
-                    { var: "state" },
+                    { var: 'state' },
+                    {
+                        status: 'DISSOLVED',
+                        dissolutionDate: { var: 'event.dissolutionDate' },
+                        dissolutionReason: 'VOLUNTARY',
+                        // clear the consumed proposal
+                        pendingDissolveVoluntary: null,
+                    },
                     {
-                        status: "DISSOLVED",
-                        dissolutionDate: { var: "event.dissolutionDate" },
-                        dissolutionReason: "VOLUNTARY",
+                        _emit: [{ name: 'CORPORATION_DISSOLVED', data: { var: 'event' }, destination: 'external' }],
                     },
                 ],
             },
-            emits: ["CORPORATION_DISSOLVED"],
+            dependencies: [],
         },
         // SUSPENDED -> DISSOLVED (administrative)
         {
-            from: "SUSPENDED",
-            to: "DISSOLVED",
-            eventName: "dissolve_administrative",
-            guard: { "==": [1, 1] },
+            from: 'SUSPENDED',
+            to: 'DISSOLVED',
+            eventName: 'dissolve_administrative',
+            // authority gate — state-initiated dissolution; an identity role attestation (ISSUER/BOARD_MEMBER/...) layers on additively when the identity registry lands (docs/design/app-hardening-identity-integration.md §4.2)
+            guard: signerIsParty('state.stateAuthority'),
             effect: {
                 merge: [
-                    { var: "state" },
+                    { var: 'state' },
                     {
-                        status: "DISSOLVED",
-                        dissolutionDate: { var: "event.dissolutionDate" },
+                        status: 'DISSOLVED',
+                        dissolutionDate: { var: 'event.dissolutionDate' },
                         dissolutionReason: {
-                            cat: ["ADMINISTRATIVE: ", { var: "event.reason" }],
+                            cat: ['ADMINISTRATIVE: ', { var: 'event.reason' }],
                         },
                     },
+                    {
+                        _emit: [{ name: 'CORPORATION_DISSOLVED', data: { var: 'event' }, destination: 'external' }],
+                    },
                 ],
             },
-            emits: ["CORPORATION_DISSOLVED"],
         },
     ],
 });