@ottochain/sdk 2.2.5 → 2.4.0

package/dist/cjs/apps/contracts/state-machines/contract-universal.js

@@ -30,10 +30,42 @@ exports.contractUniversalDef = (0, fiber_app_js_1.defineFiberApp)({
         complete: {},
     },
     states: {
-        PROPOSED: { id: "PROPOSED", isFinal: false, metadata: null },
-        ACTIVE: { id: "ACTIVE", isFinal: false, metadata: null },
-        COMPLETED: { id: "COMPLETED", isFinal: true, metadata: null },
-        CANCELLED: { id: "CANCELLED", isFinal: true, metadata: null },
+        PROPOSED: {
+            id: "PROPOSED",
+            isFinal: false,
+            metadata: {
+                label: "Proposed",
+                description: "Contract proposed; awaiting acceptance",
+                category: "initial",
+            },
+        },
+        ACTIVE: {
+            id: "ACTIVE",
+            isFinal: false,
+            metadata: {
+                label: "Active",
+                description: "Contract accepted and in effect",
+                category: "active",
+            },
+        },
+        COMPLETED: {
+            id: "COMPLETED",
+            isFinal: true,
+            metadata: {
+                label: "Completed",
+                description: "Contract obligations fulfilled (terminal)",
+                category: "terminal",
+            },
+        },
+        CANCELLED: {
+            id: "CANCELLED",
+            isFinal: true,
+            metadata: {
+                label: "Cancelled",
+                description: "Contract cancelled before completion (terminal)",
+                category: "terminal",
+            },
+        },
     },
     initialState: "PROPOSED",
     transitions: [
@@ -45,7 +77,7 @@ exports.contractUniversalDef = (0, fiber_app_js_1.defineFiberApp)({
             effect: {
                 merge: [
                     { var: "state" },
-                    { status: "ACTIVE", acceptedAt: { var: "$timestamp" } },
+                    { status: "ACTIVE", acceptedAt: { var: "$ordinal" } },
                 ],
             },
             dependencies: [],
@@ -58,7 +90,7 @@ exports.contractUniversalDef = (0, fiber_app_js_1.defineFiberApp)({
             effect: {
                 merge: [
                     { var: "state" },
-                    { status: "CANCELLED", cancelledAt: { var: "$timestamp" } },
+                    { status: "CANCELLED", cancelledAt: { var: "$ordinal" } },
                 ],
             },
             dependencies: [],
@@ -71,7 +103,7 @@ exports.contractUniversalDef = (0, fiber_app_js_1.defineFiberApp)({
             effect: {
                 merge: [
                     { var: "state" },
-                    { status: "COMPLETED", completedAt: { var: "$timestamp" } },
+                    { status: "COMPLETED", completedAt: { var: "$ordinal" } },
                 ],
             },
             dependencies: [],
@@ -84,7 +116,7 @@ exports.contractUniversalDef = (0, fiber_app_js_1.defineFiberApp)({
             effect: {
                 merge: [
                     { var: "state" },
-                    { status: "CANCELLED", cancelledAt: { var: "$timestamp" } },
+                    { status: "CANCELLED", cancelledAt: { var: "$ordinal" } },
                 ],
             },
             dependencies: [],

package/dist/cjs/apps/corporate/index.js

@@ -22,7 +22,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.corpBoardDef = exports.corpEntityDef = exports.resolutionStatusToJSON = exports.resolutionStatusFromJSON = exports.boardMeetingTypeToJSON = exports.boardMeetingTypeFromJSON = exports.officerStatusToJSON = exports.officerStatusFromJSON = exports.directorStatusToJSON = exports.directorStatusFromJSON = exports.entityStateToJSON = exports.entityStateFromJSON = exports.entityTypeToJSON = exports.entityTypeFromJSON = exports.ProposeResolutionRequest = exports.IssueSharesRequest = exports.AppointDirectorRequest = exports.CreateEntityRequest = exports.ComplianceRequirement = exports.FilingRecord = exports.CorporateCompliance = exports.SecurityTransfer = exports.SecurityIssuance = exports.CorporateSecurities = exports.ResolutionVote = exports.CorporateResolution = exports.ShareHolding = exports.Shareholder = exports.CorporateShareholders = exports.OfficerAction = exports.Officer = exports.CorporateOfficers = exports.MeetingAttendee = exports.BoardMeeting = exports.QuorumRules = exports.SeatInfo = exports.Director = exports.CorporateBoard = exports.ShareStructure = exports.Incorporator = exports.RegisteredAgent = exports.CorporateEntity = exports.ShareClass = exports.Jurisdiction = exports.ResolutionStatus = exports.BoardMeetingType = exports.OfficerStatus = exports.DirectorStatus = exports.EntityState = exports.EntityType = void 0;
-exports.getCorporateDefinition = exports.CORPORATE_DEFINITIONS = exports.corpSecuritiesDef = exports.corpShareholdersDef = void 0;
+exports.CORPORATE_DEFINITIONS = exports.corpSecuritiesDef = exports.corpShareholdersDef = void 0;
+exports.getCorporateDefinition = getCorporateDefinition;
 // Re-export generated protobuf types (source of truth)
 var corporate_js_1 = require("../../generated/ottochain/apps/corporate/v1/corporate.js");
 Object.defineProperty(exports, "EntityType", { enumerable: true, get: function () { return corporate_js_1.EntityType; } });
@@ -95,4 +96,3 @@ exports.CORPORATE_DEFINITIONS = {
 function getCorporateDefinition(type) {
     return exports.CORPORATE_DEFINITIONS[type];
 }
-exports.getCorporateDefinition = getCorporateDefinition;

package/dist/cjs/apps/corporate/state-machines/corp-board.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.corpBoardDef = void 0;
 const fiber_app_js_1 = require("../../../schema/fiber-app.js");
+const guards_js_1 = require("../../../schema/guards.js");
+const effects_js_1 = require("../../../schema/effects.js");
 /**
  * Board of directors state machine managing director seats, meetings, quorum, and formal board actions.
  * Supports staggered boards with classified directors.
@@ -37,7 +39,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
         },
     },
     createSchema: {
-        required: ["boardId", "entityId", "seats"],
+        required: ["boardId", "entityId", "seats", "authorizedRemovers"],
         properties: {
             boardId: {
                 type: "string",
@@ -49,6 +51,12 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                 description: "Reference to parent corporate-entity",
                 immutable: true,
             },
+            authorizedRemovers: {
+                type: "array",
+                description: "State-pinned set of DAG addresses authorized to remove a director for cause (board/shareholder authority). A verified signer must be a member; checked against proofs[].address.",
+                immutable: false,
+                items: { type: "address" },
+            },
             seats: {
                 type: "object",
                 properties: {
@@ -122,6 +130,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
         properties: {
             boardId: { type: "string", immutable: true },
             entityId: { type: "string", immutable: true },
+            authorizedRemovers: { type: "array", items: { type: "address" } },
             directors: {
                 type: "array",
                 items: { $ref: "#/definitions/Director" },
@@ -148,6 +157,9 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
             },
             createdAt: { type: "timestamp", computed: true },
             updatedAt: { type: "timestamp", computed: true },
+            // Two-phase removal (#24): propose_removal binds the resolution fiber + records the pending
+            // removal here; remove_for_cause asserts the bound resolution is EXECUTED, then clears this.
+            pendingRemoval: { type: "object", nullable: true, computed: true },
         },
     },
     eventSchemas: {
@@ -192,18 +204,20 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                 },
             },
         },
-        remove_for_cause: {
-            description: "Remove a director for cause (requires board or shareholder action depending on bylaws)",
-            required: [
-                "directorId",
-                "cause",
-                "removalResolutionRef",
-                "effectiveDate",
-            ],
+        propose_removal: {
+            description: "Phase 1 of for-cause removal: bind the executing resolution fiber (#24 _addDependency) and record the pending removal",
+            required: ["directorId", "cause", "removalResolutionRef"],
             properties: {
                 directorId: { type: "string" },
                 cause: { type: "string" },
                 removalResolutionRef: { type: "string" },
+            },
+        },
+        remove_for_cause: {
+            description: "Phase 2 of for-cause removal: execute once the bound removal resolution is EXECUTED",
+            required: ["directorId", "effectiveDate"],
+            properties: {
+                directorId: { type: "string" },
                 effectiveDate: { type: "string", format: "date" },
             },
         },
@@ -423,12 +437,8 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
             eventName: "elect_director",
             guard: {
                 and: [
-                    {
-                        or: [
-                            { ">": [{ var: "state.seats.vacant" }, 0] },
-                            { "==": [{ var: "event.isFillingVacancy" }, true] },
-                        ],
-                    },
+                    // vacancy gated solely on verified state — the forgeable event.isFillingVacancy disjunct was removed
+                    { ">": [{ var: "state.seats.vacant" }, 0] },
                     { "!=": [{ var: "event.electionResolutionRef" }, null] },
                     {
                         "!": {
@@ -438,11 +448,11 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                                     and: [
                                         {
                                             "==": [
-                                                { var: ".directorId" },
+                                                { var: "directorId" },
                                                 { var: "event.directorId" },
                                             ],
                                         },
-                                        { "==": [{ var: ".status" }, "ACTIVE"] },
+                                        { "==": [{ var: "status" }, "ACTIVE"] },
                                     ],
                                 },
                             ],
@@ -455,7 +465,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                     { var: "state" },
                     {
                         directors: {
-                            cat: [
+                            merge: [
                                 { var: "state.directors" },
                                 [
                                     {
@@ -485,9 +495,13 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "DIRECTOR_ELECTED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["DIRECTOR_ELECTED"],
         },
         // ACTIVE -> ACTIVE (resign_director) and IN_MEETING -> ACTIVE (resign_director)
         {
@@ -499,8 +513,8 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                     { var: "state.directors" },
                     {
                         and: [
-                            { "==": [{ var: ".directorId" }, { var: "event.directorId" }] },
-                            { "==": [{ var: ".status" }, "ACTIVE"] },
+                            { "==": [{ var: "directorId" }, { var: "event.directorId" }] },
+                            { "==": [{ var: "status" }, "ACTIVE"] },
                         ],
                     },
                 ],
@@ -516,7 +530,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                                     if: [
                                         {
                                             "==": [
-                                                { var: ".directorId" },
+                                                { var: "directorId" },
                                                 { var: "event.directorId" },
                                             ],
                                         },
@@ -544,9 +558,13 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "DIRECTOR_RESIGNED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["DIRECTOR_RESIGNED"],
         },
         {
             from: "IN_MEETING",
@@ -557,8 +575,8 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                     { var: "state.directors" },
                     {
                         and: [
-                            { "==": [{ var: ".directorId" }, { var: "event.directorId" }] },
-                            { "==": [{ var: ".status" }, "ACTIVE"] },
+                            { "==": [{ var: "directorId" }, { var: "event.directorId" }] },
+                            { "==": [{ var: "status" }, "ACTIVE"] },
                         ],
                     },
                 ],
@@ -574,7 +592,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                                     if: [
                                         {
                                             "==": [
-                                                { var: ".directorId" },
+                                                { var: "directorId" },
                                                 { var: "event.directorId" },
                                             ],
                                         },
@@ -602,33 +620,88 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "DIRECTOR_RESIGNED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["DIRECTOR_RESIGNED"],
         },
-        // ACTIVE -> ACTIVE (remove_for_cause)
+        // ACTIVE -> ACTIVE (propose_removal) — phase 1 (#24): bind the executing resolution fiber and
+        // record the pending removal, so the next transition can read the resolution's state.
+        {
+            from: "ACTIVE",
+            to: "ACTIVE",
+            eventName: "propose_removal",
+            guard: {
+                and: [
+                    (0, guards_js_1.signerInSet)("state.authorizedRemovers"),
+                    {
+                        some: [
+                            { var: "state.directors" },
+                            {
+                                and: [
+                                    { "==": [{ var: "directorId" }, { var: "event.directorId" }] },
+                                    { "==": [{ var: "status" }, "ACTIVE"] },
+                                ],
+                            },
+                        ],
+                    },
+                ],
+            },
+            effect: {
+                merge: [
+                    { var: "state" },
+                    {
+                        pendingRemoval: {
+                            directorId: { var: "event.directorId" },
+                            cause: { var: "event.cause" },
+                            resolutionRef: { var: "event.removalResolutionRef" },
+                            proposedAt: { var: "$ordinal" },
+                        },
+                    },
+                    // bind the resolution fiber so remove_for_cause can assert its state next transition
+                    (0, effects_js_1.addDependency)({ var: "event.removalResolutionRef" }),
+                ],
+            },
+            dependencies: [],
+        },
+        // ACTIVE -> ACTIVE (remove_for_cause) — phase 2 (#24): execute once the bound removal resolution is
+        // EXECUTED. depInState replaces the dropped object-form dependency (which silently never gated).
         {
             from: "ACTIVE",
             to: "ACTIVE",
             eventName: "remove_for_cause",
+            // authority gate — a member of the pinned authorizedRemovers set must sign; an identity role
+            // attestation (BOARD_MEMBER/...) layers on additively when the identity registry lands (§4.2).
             guard: {
-                some: [
-                    { var: "state.directors" },
+                and: [
+                    (0, guards_js_1.signerInSet)("state.authorizedRemovers"),
+                    // the proposal must target this director, and its bound resolution must be EXECUTED
                     {
-                        and: [
-                            { "==": [{ var: ".directorId" }, { var: "event.directorId" }] },
-                            { "==": [{ var: ".status" }, "ACTIVE"] },
+                        "==": [
+                            { var: "state.pendingRemoval.directorId" },
+                            { var: "event.directorId" },
+                        ],
+                    },
+                    (0, guards_js_1.depInState)("state.pendingRemoval.resolutionRef", "EXECUTED"),
+                    // event.directorId is the lookup key only — the director must exist and be ACTIVE
+                    {
+                        some: [
+                            { var: "state.directors" },
+                            {
+                                and: [
+                                    {
+                                        "==": [{ var: "directorId" }, { var: "event.directorId" }],
+                                    },
+                                    { "==": [{ var: "status" }, "ACTIVE"] },
+                                ],
+                            },
                         ],
                     },
                 ],
             },
-            dependencies: [
-                {
-                    machine: "corporate-resolution",
-                    instanceRef: { var: "event.removalResolutionRef" },
-                    requiredState: "EXECUTED",
-                },
-            ],
             effect: {
                 merge: [
                     { var: "state" },
@@ -640,7 +713,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                                     if: [
                                         {
                                             "==": [
-                                                { var: ".directorId" },
+                                                { var: "directorId" },
                                                 { var: "event.directorId" },
                                             ],
                                         },
@@ -667,10 +740,17 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                                 },
                             ],
                         },
+                        // clear the consumed proposal
+                        pendingRemoval: null,
+                    },
+                    {
+                        _emit: [
+                            { name: "DIRECTOR_REMOVED", data: { var: "event" }, destination: "external" },
+                        ],
                     },
                 ],
             },
-            emits: ["DIRECTOR_REMOVED"],
+            dependencies: [],
         },
         // ACTIVE -> ACTIVE (designate_chair)
         {
@@ -682,8 +762,8 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                     { var: "state.directors" },
                     {
                         and: [
-                            { "==": [{ var: ".directorId" }, { var: "event.directorId" }] },
-                            { "==": [{ var: ".status" }, "ACTIVE"] },
+                            { "==": [{ var: "directorId" }, { var: "event.directorId" }] },
+                            { "==": [{ var: "status" }, "ACTIVE"] },
                         ],
                     },
                 ],
@@ -701,7 +781,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                                         {
                                             isChair: {
                                                 "==": [
-                                                    { var: ".directorId" },
+                                                    { var: "directorId" },
                                                     { var: "event.directorId" },
                                                 ],
                                             },
@@ -763,9 +843,13 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                             quorumCount: 0,
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "BOARD_MEETING_SCHEDULED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["BOARD_MEETING_SCHEDULED"],
         },
         // ACTIVE -> ACTIVE (record_attendance)
         {
@@ -782,9 +866,9 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                             {
                                 and: [
                                     {
-                                        "==": [{ var: ".directorId" }, { var: "event.directorId" }],
+                                        "==": [{ var: "directorId" }, { var: "event.directorId" }],
                                     },
-                                    { "==": [{ var: ".status" }, "ACTIVE"] },
+                                    { "==": [{ var: "status" }, "ACTIVE"] },
                                 ],
                             },
                         ],
@@ -800,7 +884,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                                 { var: "state.currentMeeting" },
                                 {
                                     attendees: {
-                                        cat: [
+                                        merge: [
                                             { var: "state.currentMeeting.attendees" },
                                             [
                                                 {
@@ -843,9 +927,13 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "BOARD_MEETING_OPENED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["BOARD_MEETING_OPENED"],
         },
         // IN_MEETING -> IN_MEETING (director_departs)
         {
@@ -868,7 +956,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                                                 if: [
                                                     {
                                                         "==": [
-                                                            { var: ".directorId" },
+                                                            { var: "directorId" },
                                                             { var: "event.directorId" },
                                                         ],
                                                     },
@@ -900,9 +988,16 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
             eventName: "quorum_lost",
             guard: { "==": [{ var: "state.currentMeeting.quorumPresent" }, false] },
             effect: {
-                merge: [{ var: "state" }, { status: "QUORUM_LOST" }],
+                merge: [
+                    { var: "state" },
+                    { status: "QUORUM_LOST" },
+                    {
+                        _emit: [
+                            { name: "BOARD_QUORUM_LOST", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
+                ],
             },
-            emits: ["BOARD_QUORUM_LOST"],
         },
         // QUORUM_LOST -> IN_MEETING
         {
@@ -911,9 +1006,16 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
             eventName: "quorum_restored",
             guard: { "==": [{ var: "state.currentMeeting.quorumPresent" }, true] },
             effect: {
-                merge: [{ var: "state" }, { status: "IN_MEETING" }],
+                merge: [
+                    { var: "state" },
+                    { status: "IN_MEETING" },
+                    {
+                        _emit: [
+                            { name: "BOARD_QUORUM_RESTORED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
+                ],
             },
-            emits: ["BOARD_QUORUM_RESTORED"],
         },
         // IN_MEETING -> ACTIVE (adjourn)
         {
@@ -928,7 +1030,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                         status: "ACTIVE",
                         currentMeeting: null,
                         meetingHistory: {
-                            cat: [
+                            merge: [
                                 { var: "state.meetingHistory" },
                                 [
                                     {
@@ -946,9 +1048,13 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "BOARD_MEETING_ADJOURNED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["BOARD_MEETING_ADJOURNED"],
         },
         // QUORUM_LOST -> ACTIVE (adjourn)
         {
@@ -963,7 +1069,7 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                         status: "ACTIVE",
                         currentMeeting: null,
                         meetingHistory: {
-                            cat: [
+                            merge: [
                                 { var: "state.meetingHistory" },
                                 [
                                     {
@@ -981,9 +1087,13 @@ exports.corpBoardDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "BOARD_MEETING_ADJOURNED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["BOARD_MEETING_ADJOURNED"],
         },
         // ACTIVE -> ACTIVE (update_seats)
         {