@ottochain/sdk 2.3.0 → 2.4.0

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

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.corpShareholdersDef = 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");
 /**
  * Shareholder meeting state machine managing annual/special meetings, record dates, proxy periods, voting, and certification of results.
  * Supports multiple share classes and cumulative voting.
@@ -37,7 +39,7 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
         },
     },
     createSchema: {
-        required: ["meetingId", "entityId"],
+        required: ["meetingId", "entityId", "registrar"],
         properties: {
             meetingId: {
                 type: "string",
@@ -49,6 +51,11 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                 description: "Reference to parent corporate-entity",
                 immutable: true,
             },
+            registrar: {
+                type: "address",
+                description: "State-pinned DAG address of the transfer agent / registrar authorized to register the eligible-shareholder roster of record. Verified against proofs[].address.",
+                immutable: true,
+            },
             meetingType: {
                 type: "string",
                 enum: ["ANNUAL", "SPECIAL"],
@@ -76,6 +83,7 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
         properties: {
             meetingId: { type: "string", immutable: true },
             entityId: { type: "string", immutable: true },
+            registrar: { type: "address", immutable: true },
             meetingType: { type: "string" },
             fiscalYear: { type: "integer" },
             scheduledDate: { type: "string", format: "date-time" },
@@ -145,11 +153,14 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
             },
             createdAt: { type: "timestamp", computed: true },
             updatedAt: { type: "timestamp", computed: true },
+            // Two-phase scheduling (#24): propose_schedule_annual binds the board-resolution fiber + records the
+            // pending meeting here; schedule_annual asserts the bound resolution is EXECUTED, then clears this.
+            pendingschedule_annual: { type: "object", nullable: true, computed: true },
         },
     },
     eventSchemas: {
-        schedule_annual: {
-            description: "Schedule an annual shareholder meeting",
+        propose_schedule_annual: {
+            description: "Phase 1 of annual-meeting scheduling: bind the executing board-resolution fiber (#24 _addDependency) and record the pending meeting",
             required: [
                 "meetingId",
                 "entityId",
@@ -166,6 +177,22 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                 boardResolutionRef: { type: "string" },
             },
         },
+        schedule_annual: {
+            description: "Phase 2 of annual-meeting scheduling: execute once the bound board resolution is EXECUTED",
+            required: [
+                "meetingId",
+                "entityId",
+                "fiscalYear",
+                "scheduledDate",
+            ],
+            properties: {
+                meetingId: { type: "string" },
+                entityId: { type: "string" },
+                fiscalYear: { type: "integer" },
+                scheduledDate: { type: "string", format: "date-time" },
+                location: { type: "object" },
+            },
+        },
         schedule_special: {
             description: "Schedule a special shareholder meeting",
             required: [
@@ -211,6 +238,10 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                         properties: {
                             shareholderId: { type: "string" },
                             name: { type: "string" },
+                            address: {
+                                type: "address",
+                                description: "DAG wallet address of record for this shareholder; the only key a verified signer can vote under.",
+                            },
                             shareholdings: { type: "array" },
                         },
                     },
@@ -372,6 +403,10 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
             properties: {
                 shareholderId: { type: "string" },
                 name: { type: "string" },
+                address: {
+                    type: "address",
+                    description: "State-pinned DAG wallet address of record; cast_vote requires this address ∈ proofs[].address.",
+                },
                 shareholdings: {
                     type: "array",
                     items: {
@@ -605,19 +640,51 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
     initialState: "SCHEDULED",
     transitions: [
         // Initial creation transitions (from: null means creation)
-        // schedule_annual -> SCHEDULED
+        // SCHEDULED -> SCHEDULED (propose_schedule_annual) — phase 1 (#24): bind the executing board-resolution
+        // fiber and record the pending meeting, so the next transition can read the resolution's state.
         {
             from: "SCHEDULED",
             to: "SCHEDULED",
-            eventName: "schedule_annual",
+            eventName: "propose_schedule_annual",
             guard: { "==": [1, 1] },
-            dependencies: [
-                {
-                    machine: "corporate-resolution",
-                    instanceRef: { var: "event.boardResolutionRef" },
-                    requiredState: "EXECUTED",
-                },
-            ],
+            effect: {
+                merge: [
+                    { var: "state" },
+                    {
+                        pendingschedule_annual: {
+                            meetingId: { var: "event.meetingId" },
+                            entityId: { var: "event.entityId" },
+                            fiscalYear: { var: "event.fiscalYear" },
+                            scheduledDate: { var: "event.scheduledDate" },
+                            location: { var: "event.location" },
+                            ref: { var: "event.boardResolutionRef" },
+                            proposedAt: { var: "$ordinal" },
+                        },
+                    },
+                    // bind the resolution fiber so schedule_annual can assert its state next transition
+                    (0, effects_js_1.addDependency)({ var: "event.boardResolutionRef" }),
+                ],
+            },
+            dependencies: [],
+        },
+        // SCHEDULED -> SCHEDULED (schedule_annual) — phase 2 (#24): execute once the bound board resolution is
+        // EXECUTED. depInState replaces the dropped object-form dependency (which silently never gated).
+        {
+            from: "SCHEDULED",
+            to: "SCHEDULED",
+            eventName: "schedule_annual",
+            guard: {
+                and: [
+                    // the proposal must target this meeting, and its bound resolution must be EXECUTED
+                    {
+                        "==": [
+                            { var: "state.pendingschedule_annual.meetingId" },
+                            { var: "event.meetingId" },
+                        ],
+                    },
+                    (0, guards_js_1.depInState)("state.pendingschedule_annual.ref", "EXECUTED"),
+                ],
+            },
             effect: {
                 merge: [
                     { var: "state" },
@@ -630,12 +697,19 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                         location: { var: "event.location" },
                         calledBy: {
                             type: "BOARD",
-                            resolutionRef: { var: "event.boardResolutionRef" },
+                            resolutionRef: { var: "state.pendingschedule_annual.ref" },
                         },
+                        // clear the consumed proposal
+                        pendingschedule_annual: null,
+                    },
+                    {
+                        _emit: [
+                            { name: "SHAREHOLDER_MEETING_SCHEDULED", data: { var: "event" }, destination: "external" },
+                        ],
                     },
                 ],
             },
-            emits: ["SHAREHOLDER_MEETING_SCHEDULED"],
+            dependencies: [],
         },
         // schedule_special -> SCHEDULED
         {
@@ -655,9 +729,13 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                             type: { var: "event.calledByType" },
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "SPECIAL_MEETING_SCHEDULED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["SPECIAL_MEETING_SCHEDULED"],
         },
         // SCHEDULED -> RECORD_DATE_SET
         {
@@ -672,20 +750,25 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                         status: "RECORD_DATE_SET",
                         recordDate: {
                             date: { var: "event.recordDate" },
-                            setByBoardOn: { var: "$timestamp" },
+                            setByBoardOn: { var: "$ordinal" },
                             resolutionRef: { var: "event.resolutionRef" },
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "RECORD_DATE_SET", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["RECORD_DATE_SET"],
         },
         // RECORD_DATE_SET -> RECORD_DATE_SET (register_eligible_shareholders)
         {
             from: "RECORD_DATE_SET",
             to: "RECORD_DATE_SET",
             eventName: "register_eligible_shareholders",
-            guard: { "==": [1, 1] },
+            // authority gate — only the pinned registrar may set the roster of record; 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: (0, guards_js_1.signerIsParty)("state.registrar"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -733,9 +816,13 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "PROXY_PERIOD_OPENED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["PROXY_PERIOD_OPENED"],
         },
         // add_agenda_item (can be from multiple states)
         {
@@ -748,12 +835,12 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                     { var: "state" },
                     {
                         agenda: {
-                            cat: [
+                            merge: [
                                 { var: "state.agenda" },
                                 [
                                     {
                                         itemId: { var: "event.itemId" },
-                                        itemNumber: { "+": [{ var: "state.agenda.length" }, 1] },
+                                        itemNumber: { "+": [{ length: [{ var: "state.agenda" }] }, 1] },
                                         title: { var: "event.title" },
                                         description: { var: "event.description" },
                                         type: { var: "event.type" },
@@ -781,12 +868,12 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                     { var: "state" },
                     {
                         agenda: {
-                            cat: [
+                            merge: [
                                 { var: "state.agenda" },
                                 [
                                     {
                                         itemId: { var: "event.itemId" },
-                                        itemNumber: { "+": [{ var: "state.agenda.length" }, 1] },
+                                        itemNumber: { "+": [{ length: [{ var: "state.agenda" }] }, 1] },
                                         title: { var: "event.title" },
                                         description: { var: "event.description" },
                                         type: { var: "event.type" },
@@ -814,12 +901,12 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                     { var: "state" },
                     {
                         agenda: {
-                            cat: [
+                            merge: [
                                 { var: "state.agenda" },
                                 [
                                     {
                                         itemId: { var: "event.itemId" },
-                                        itemNumber: { "+": [{ var: "state.agenda.length" }, 1] },
+                                        itemNumber: { "+": [{ length: [{ var: "state.agenda" }] }, 1] },
                                         title: { var: "event.title" },
                                         description: { var: "event.description" },
                                         type: { var: "event.type" },
@@ -869,9 +956,13 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "SHAREHOLDER_MEETING_OPENED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["SHAREHOLDER_MEETING_OPENED"],
         },
         // IN_SESSION -> VOTING
         {
@@ -907,15 +998,26 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
             from: "VOTING",
             to: "VOTING",
             eventName: "cast_vote",
+            // authority gate — the roster entry identified by event.shareholderId must carry an address that signed (address ∈ proofs[].address), so the recorded shareholderId is provably the matched entry's, not a forged one; an identity attestation layers on additively when the identity registry lands (docs/design/app-hardening-identity-integration.md §4.2)
             guard: {
                 and: [
                     {
                         some: [
                             { var: "state.eligibleVoters" },
                             {
-                                "==": [
-                                    { var: ".shareholderId" },
-                                    { var: "event.shareholderId" },
+                                and: [
+                                    {
+                                        "==": [
+                                            { var: "shareholderId" },
+                                            { var: "event.shareholderId" },
+                                        ],
+                                    },
+                                    {
+                                        in: [
+                                            { var: "address" },
+                                            { map: [{ var: "proofs" }, { var: "address" }] },
+                                        ],
+                                    },
                                 ],
                             },
                         ],
@@ -928,13 +1030,13 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                                     and: [
                                         {
                                             "==": [
-                                                { var: ".shareholderId" },
+                                                { var: "shareholderId" },
                                                 { var: "event.shareholderId" },
                                             ],
                                         },
                                         {
                                             "==": [
-                                                { var: ".agendaItemId" },
+                                                { var: "agendaItemId" },
                                                 { var: "event.agendaItemId" },
                                             ],
                                         },
@@ -950,7 +1052,7 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                     { var: "state" },
                     {
                         votes: {
-                            cat: [
+                            merge: [
                                 { var: "state.votes" },
                                 [
                                     {
@@ -967,7 +1069,7 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                                             var: "event.cumulativeVoteAllocation",
                                         },
                                         viaProxy: { var: "event.viaProxy" },
-                                        timestamp: { var: "$timestamp" },
+                                        timestamp: { var: "$ordinal" },
                                     },
                                 ],
                             ],
@@ -979,7 +1081,7 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                                     if: [
                                         {
                                             "==": [
-                                                { var: ".shareholderId" },
+                                                { var: "shareholderId" },
                                                 { var: "event.shareholderId" },
                                             ],
                                         },
@@ -1050,9 +1152,13 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "MEETING_RESULTS_CERTIFIED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["MEETING_RESULTS_CERTIFIED"],
         },
         // IN_SESSION -> CLOSED (adjourn_without_action)
         {
@@ -1072,9 +1178,13 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "MEETING_ADJOURNED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["MEETING_ADJOURNED"],
         },
         // VOTING -> CLOSED (adjourn_without_action)
         {
@@ -1094,9 +1204,13 @@ exports.corpShareholdersDef = (0, fiber_app_js_1.defineFiberApp)({
                             ],
                         },
                     },
+                    {
+                        _emit: [
+                            { name: "MEETING_ADJOURNED", data: { var: "event" }, destination: "external" },
+                        ],
+                    },
                 ],
             },
-            emits: ["MEETING_ADJOURNED"],
         },
     ],
 });

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

@@ -21,7 +21,20 @@
  * @packageDocumentation
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.thresholdHasQuorum = exports.isMember = exports.meetsThreshold = exports.canPropose = exports.isPassing = exports.hasQuorum = exports.getVotingPower = exports.hasSigned = exports.isSigner = exports.signaturesNeeded = exports.isThresholdMet = exports.getDAODefinition = exports.getGovernanceDefinition = exports.GOVERNANCE_DEFINITIONS = exports.daoReputationDef = exports.daoTokenDef = exports.daoMultisigDef = exports.daoSingleDef = exports.govSimpleDef = exports.govUniversalDef = exports.voteChoiceToJSON = exports.voteChoiceFromJSON = exports.proposalStatusToJSON = exports.proposalStatusFromJSON = exports.dAOStatusToJSON = exports.dAOStatusFromJSON = exports.dAOTypeToJSON = exports.dAOTypeFromJSON = exports.ExecuteRequest = exports.VoteRequest = exports.ProposeRequest = exports.CreateDAORequest = exports.ThresholdHistoryEntry = exports.ThresholdVotes = exports.ThresholdDAO = exports.TokenProposalResult = exports.TokenDAO = exports.MultisigAction = exports.MultisigDAO = exports.OwnershipTransfer = exports.SingleOwnerAction = exports.SingleOwnerDAO = exports.VoteTally = exports.Vote = exports.Proposal = exports.DAOMetadata = exports.VoteChoice = exports.ProposalStatus = exports.DAOStatus = exports.DAOType = void 0;
+exports.GOVERNANCE_DEFINITIONS = exports.daoReputationDef = exports.daoTokenDef = exports.daoMultisigDef = exports.daoSingleDef = exports.govSimpleDef = exports.govUniversalDef = exports.voteChoiceToJSON = exports.voteChoiceFromJSON = exports.proposalStatusToJSON = exports.proposalStatusFromJSON = exports.dAOStatusToJSON = exports.dAOStatusFromJSON = exports.dAOTypeToJSON = exports.dAOTypeFromJSON = exports.ExecuteRequest = exports.VoteRequest = exports.ProposeRequest = exports.CreateDAORequest = exports.ThresholdHistoryEntry = exports.ThresholdVotes = exports.ThresholdDAO = exports.TokenProposalResult = exports.TokenDAO = exports.MultisigAction = exports.MultisigDAO = exports.OwnershipTransfer = exports.SingleOwnerAction = exports.SingleOwnerDAO = exports.VoteTally = exports.Vote = exports.Proposal = exports.DAOMetadata = exports.VoteChoice = exports.ProposalStatus = exports.DAOStatus = exports.DAOType = void 0;
+exports.getGovernanceDefinition = getGovernanceDefinition;
+exports.getDAODefinition = getDAODefinition;
+exports.isThresholdMet = isThresholdMet;
+exports.signaturesNeeded = signaturesNeeded;
+exports.isSigner = isSigner;
+exports.hasSigned = hasSigned;
+exports.getVotingPower = getVotingPower;
+exports.hasQuorum = hasQuorum;
+exports.isPassing = isPassing;
+exports.canPropose = canPropose;
+exports.meetsThreshold = meetsThreshold;
+exports.isMember = isMember;
+exports.thresholdHasQuorum = thresholdHasQuorum;
 // Re-export generated protobuf types (source of truth)
 var governance_js_1 = require("../../generated/ottochain/apps/governance/v1/governance.js");
 Object.defineProperty(exports, "DAOType", { enumerable: true, get: function () { return governance_js_1.DAOType; } });
@@ -80,7 +93,6 @@ exports.GOVERNANCE_DEFINITIONS = {
 function getGovernanceDefinition(type) {
     return exports.GOVERNANCE_DEFINITIONS[type];
 }
-exports.getGovernanceDefinition = getGovernanceDefinition;
 /** @deprecated Use getGovernanceDefinition('daoSingle' | 'daoMultisig' | 'daoToken' | 'daoReputation') */
 function getDAODefinition(daoType) {
     const map = {
@@ -91,35 +103,30 @@ function getDAODefinition(daoType) {
     };
     return exports.GOVERNANCE_DEFINITIONS[map[daoType]];
 }
-exports.getDAODefinition = getDAODefinition;
 /**
  * Check if multisig has enough signatures to execute
  */
 function isThresholdMet(state) {
     return Object.keys(state.signatures).length >= state.threshold;
 }
-exports.isThresholdMet = isThresholdMet;
 /**
  * Get remaining signatures needed
  */
 function signaturesNeeded(state) {
     return Math.max(0, state.threshold - Object.keys(state.signatures).length);
 }
-exports.signaturesNeeded = signaturesNeeded;
 /**
  * Check if agent is a signer
  */
 function isSigner(state, agent) {
     return state.signers.includes(agent);
 }
-exports.isSigner = isSigner;
 /**
  * Check if agent has signed current proposal
  */
 function hasSigned(state, agent) {
     return agent in state.signatures;
 }
-exports.hasSigned = hasSigned;
 /**
  * Get effective voting power (includes delegation)
  */
@@ -133,7 +140,6 @@ function getVotingPower(state, agent) {
     }
     return power;
 }
-exports.getVotingPower = getVotingPower;
 /**
  * Check if proposal has quorum
  */
@@ -143,7 +149,6 @@ function hasQuorum(state) {
     const totalVoted = state.votes.votesFor + state.votes.votesAgainst + state.votes.votesAbstain;
     return totalVoted >= state.quorum;
 }
-exports.hasQuorum = hasQuorum;
 /**
  * Check if proposal is passing
  */
@@ -152,14 +157,12 @@ function isPassing(state) {
         return false;
     return state.votes.votesFor > state.votes.votesAgainst && hasQuorum(state);
 }
-exports.isPassing = isPassing;
 /**
  * Check if agent can propose
  */
 function canPropose(state, agent) {
     return (state.balances[agent] ?? 0) >= state.proposalThreshold;
 }
-exports.canPropose = canPropose;
 /**
  * Check if agent meets threshold for action
  */
@@ -173,14 +176,12 @@ function meetsThreshold(state, reputation, action) {
             return reputation >= state.proposeThreshold;
     }
 }
-exports.meetsThreshold = meetsThreshold;
 /**
  * Check if agent is a member
  */
 function isMember(state, agent) {
     return state.members.includes(agent);
 }
-exports.isMember = isMember;
 /**
  * Check if threshold proposal has quorum
  */
@@ -190,4 +191,3 @@ function thresholdHasQuorum(state) {
     const totalVoted = state.votes.votesFor.length + state.votes.votesAgainst.length;
     return totalVoted >= state.quorum;
 }
-exports.thresholdHasQuorum = thresholdHasQuorum;