@ottochain/sdk 2.2.5 → 2.4.0

package/dist/cjs/apps/governance/state-machines/dao-multisig.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.daoMultisigDef = void 0;
 const fiber_app_js_1 = require("../../../schema/fiber-app.js");
+const guards_js_1 = require("../../../schema/guards.js");
 /**
  * N-of-M multisig governance. Requires threshold signatures for actions.
  */
@@ -113,16 +114,38 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
             },
         },
         dissolve: {
-            description: "Dissolve the DAO (requires unanimous signer count)",
-            properties: {
-                signatureCount: { type: "number" },
-            },
+            description: "Dissolve the DAO (requires every signer to sign this op — verified unanimity)",
+            properties: {},
         },
     },
     states: {
-        ACTIVE: { id: "ACTIVE", isFinal: false, metadata: null },
-        PENDING: { id: "PENDING", isFinal: false, metadata: null },
-        DISSOLVED: { id: "DISSOLVED", isFinal: true, metadata: null },
+        ACTIVE: {
+            id: "ACTIVE",
+            isFinal: false,
+            metadata: {
+                label: "Active",
+                description: "Multisig is idle and ready to propose an action",
+                category: "initial",
+            },
+        },
+        PENDING: {
+            id: "PENDING",
+            isFinal: false,
+            metadata: {
+                label: "Pending",
+                description: "An action is awaiting the required signature threshold",
+                category: "pending",
+            },
+        },
+        DISSOLVED: {
+            id: "DISSOLVED",
+            isFinal: true,
+            metadata: {
+                label: "Dissolved",
+                description: "Multisig DAO dissolved (terminal)",
+                category: "terminal",
+            },
+        },
     },
     initialState: "ACTIVE",
     transitions: [
@@ -131,7 +154,7 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
             from: "ACTIVE",
             to: "PENDING",
             eventName: "propose",
-            guard: { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+            guard: (0, guards_js_1.actorInSet)("state.signers"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -141,13 +164,13 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
                             actionType: { var: "event.actionType" },
                             payload: { var: "event.payload" },
                             proposer: { var: "event.agent" },
-                            proposedAt: { var: "$timestamp" },
+                            proposedAt: { var: "$ordinal" },
                             expiresAt: {
-                                "+": [{ var: "$timestamp" }, { var: "state.proposalTTLMs" }],
+                                "+": [{ var: "$ordinal" }, { var: "state.proposalTTLMs" }],
                             },
                         },
                         signatures: {
-                            setKey: [{}, { var: "event.agent" }, { var: "$timestamp" }],
+                            set: [{}, { var: "event.agent" }, { var: "$ordinal" }],
                         },
                     },
                 ],
@@ -161,15 +184,15 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
             eventName: "sign",
             guard: {
                 and: [
-                    { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+                    (0, guards_js_1.actorInSet)("state.signers"),
                     {
                         "!": [
-                            { getKey: [{ var: "state.signatures" }, { var: "event.agent" }] },
+                            { has: [{ var: "state.signatures" }, { var: "event.agent" }] },
                         ],
                     },
                     {
                         "<": [
-                            { size: { var: "state.signatures" } },
+                            { length: [{ keys: [{ var: "state.signatures" }] }] },
                             { var: "state.threshold" },
                         ],
                     },
@@ -180,10 +203,10 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
                     { var: "state" },
                     {
                         signatures: {
-                            setKey: [
+                            set: [
                                 { var: "state.signatures" },
                                 { var: "event.agent" },
-                                { var: "$timestamp" },
+                                { var: "$ordinal" },
                             ],
                         },
                     },
@@ -198,7 +221,7 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
             eventName: "execute",
             guard: {
                 ">=": [
-                    { size: { var: "state.signatures" } },
+                    { length: [{ keys: [{ var: "state.signatures" }] }] },
                     { var: "state.threshold" },
                 ],
             },
@@ -215,17 +238,25 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
                                         type: { var: "state.proposal.actionType" },
                                         payload: { var: "state.proposal.payload" },
                                         signatures: { var: "state.signatures" },
-                                        executedAt: { var: "$timestamp" },
+                                        executedAt: { var: "$ordinal" },
                                     },
                                 ],
                             ],
                         },
                         proposal: null,
                         signatures: {},
+                        // A3 fix: transition-level `emits` is dropped by the chain; emit from INSIDE the effect
+                        // under the reserved `_emit` key (extracted as an EmittedEvent, stripped from state).
+                        _emit: [
+                            {
+                                name: "multisig_executed",
+                                data: { proposalId: { var: "state.proposal.id" } },
+                                destination: "external",
+                            },
+                        ],
                     },
                 ],
             },
-            emits: [{ event: "multisig_executed", to: "external" }],
             dependencies: [],
         },
         // PENDING → ACTIVE: cancel (expired or proposer)
@@ -235,10 +266,8 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
             eventName: "cancel",
             guard: {
                 or: [
-                    { ">": [{ var: "$timestamp" }, { var: "state.proposal.expiresAt" }] },
-                    {
-                        "===": [{ var: "event.agent" }, { var: "state.proposal.proposer" }],
-                    },
+                    { ">": [{ var: "$ordinal" }, { var: "state.proposal.expiresAt" }] },
+                    (0, guards_js_1.signerIsParty)("state.proposal.proposer"),
                 ],
             },
             effect: {
@@ -252,7 +281,7 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
                                     {
                                         merge: [
                                             { var: "state.proposal" },
-                                            { cancelledAt: { var: "$timestamp" } },
+                                            { cancelledAt: { var: "$ordinal" } },
                                         ],
                                     },
                                 ],
@@ -270,7 +299,7 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
             from: "ACTIVE",
             to: "PENDING",
             eventName: "propose_add_signer",
-            guard: { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+            guard: (0, guards_js_1.actorInSet)("state.signers"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -280,13 +309,13 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
                             actionType: "add_signer",
                             payload: { newSigner: { var: "event.newSigner" } },
                             proposer: { var: "event.agent" },
-                            proposedAt: { var: "$timestamp" },
+                            proposedAt: { var: "$ordinal" },
                             expiresAt: {
-                                "+": [{ var: "$timestamp" }, { var: "state.proposalTTLMs" }],
+                                "+": [{ var: "$ordinal" }, { var: "state.proposalTTLMs" }],
                             },
                         },
                         signatures: {
-                            setKey: [{}, { var: "event.agent" }, { var: "$timestamp" }],
+                            set: [{}, { var: "event.agent" }, { var: "$ordinal" }],
                         },
                     },
                 ],
@@ -300,10 +329,10 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
             eventName: "propose_remove_signer",
             guard: {
                 and: [
-                    { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+                    (0, guards_js_1.actorInSet)("state.signers"),
                     {
                         ">": [
-                            { size: { var: "state.signers" } },
+                            { length: [{ var: "state.signers" }] },
                             { var: "state.threshold" },
                         ],
                     },
@@ -318,13 +347,13 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
                             actionType: "remove_signer",
                             payload: { removeSigner: { var: "event.removeSigner" } },
                             proposer: { var: "event.agent" },
-                            proposedAt: { var: "$timestamp" },
+                            proposedAt: { var: "$ordinal" },
                             expiresAt: {
-                                "+": [{ var: "$timestamp" }, { var: "state.proposalTTLMs" }],
+                                "+": [{ var: "$ordinal" }, { var: "state.proposalTTLMs" }],
                             },
                         },
                         signatures: {
-                            setKey: [{}, { var: "event.agent" }, { var: "$timestamp" }],
+                            set: [{}, { var: "event.agent" }, { var: "$ordinal" }],
                         },
                     },
                 ],
@@ -338,12 +367,12 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
             eventName: "propose_change_threshold",
             guard: {
                 and: [
-                    { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+                    (0, guards_js_1.actorInSet)("state.signers"),
                     { ">=": [{ var: "event.newThreshold" }, 1] },
                     {
                         "<=": [
                             { var: "event.newThreshold" },
-                            { size: { var: "state.signers" } },
+                            { length: [{ var: "state.signers" }] },
                         ],
                     },
                 ],
@@ -357,13 +386,13 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
                             actionType: "change_threshold",
                             payload: { newThreshold: { var: "event.newThreshold" } },
                             proposer: { var: "event.agent" },
-                            proposedAt: { var: "$timestamp" },
+                            proposedAt: { var: "$ordinal" },
                             expiresAt: {
-                                "+": [{ var: "$timestamp" }, { var: "state.proposalTTLMs" }],
+                                "+": [{ var: "$ordinal" }, { var: "state.proposalTTLMs" }],
                             },
                         },
                         signatures: {
-                            setKey: [{}, { var: "event.agent" }, { var: "$timestamp" }],
+                            set: [{}, { var: "event.agent" }, { var: "$ordinal" }],
                         },
                     },
                 ],
@@ -379,7 +408,7 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
                 and: [
                     {
                         ">=": [
-                            { size: { var: "state.signatures" } },
+                            { length: [{ keys: [{ var: "state.signatures" }] }] },
                             { var: "state.threshold" },
                         ],
                     },
@@ -449,16 +478,29 @@ exports.daoMultisigDef = (0, fiber_app_js_1.defineFiberApp)({
             from: "ACTIVE",
             to: "DISSOLVED",
             eventName: "dissolve",
+            // S2 fix: dissolution must not trust an attacker-supplied count. Derive
+            // unanimity from the CHAIN-VERIFIED signers — every signer in state.signers
+            // must be among proofs[].address (with a non-empty belt). signers is an array.
             guard: {
-                "===": [
-                    { var: "event.signatureCount" },
-                    { size: { var: "state.signers" } },
+                and: [
+                    { ">": [{ length: [{ var: "state.signers" }] }, 0] },
+                    {
+                        all: [
+                            { var: "state.signers" },
+                            {
+                                in: [
+                                    { var: "" },
+                                    { map: [{ var: "proofs" }, { var: "address" }] },
+                                ],
+                            },
+                        ],
+                    },
                 ],
             },
             effect: {
                 merge: [
                     { var: "state" },
-                    { dissolvedAt: { var: "$timestamp" }, status: "DISSOLVED" },
+                    { dissolvedAt: { var: "$ordinal" }, status: "DISSOLVED" },
                 ],
             },
             dependencies: [],

package/dist/cjs/apps/governance/state-machines/dao-reputation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.daoReputationDef = void 0;
 const fiber_app_js_1 = require("../../../schema/fiber-app.js");
+const guards_js_1 = require("../../../schema/guards.js");
 /**
  * Reputation-based governance. Minimum reputation required for participation.
  */
@@ -127,9 +128,33 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
         },
     },
     states: {
-        ACTIVE: { id: "ACTIVE", isFinal: false, metadata: null },
-        VOTING: { id: "VOTING", isFinal: false, metadata: null },
-        DISSOLVED: { id: "DISSOLVED", isFinal: true, metadata: null },
+        ACTIVE: {
+            id: "ACTIVE",
+            isFinal: false,
+            metadata: {
+                label: "Active",
+                description: "DAO is idle and ready to accept a proposal",
+                category: "initial",
+            },
+        },
+        VOTING: {
+            id: "VOTING",
+            isFinal: false,
+            metadata: {
+                label: "Voting",
+                description: "Members vote with reputation-weighted power",
+                category: "pending",
+            },
+        },
+        DISSOLVED: {
+            id: "DISSOLVED",
+            isFinal: true,
+            metadata: {
+                label: "Dissolved",
+                description: "Reputation DAO dissolved (terminal)",
+                category: "terminal",
+            },
+        },
     },
     initialState: "ACTIVE",
     transitions: [
@@ -155,9 +180,9 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
                             actionType: { var: "event.actionType" },
                             payload: { var: "event.payload" },
                             proposer: { var: "event.agent" },
-                            proposedAt: { var: "$timestamp" },
+                            proposedAt: { var: "$ordinal" },
                             deadline: {
-                                "+": [{ var: "$timestamp" }, { var: "state.votingPeriodMs" }],
+                                "+": [{ var: "$ordinal" }, { var: "state.votingPeriodMs" }],
                             },
                         },
                         votes: { for: [], against: [], abstain: [] },
@@ -179,20 +204,10 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
                             { var: "state.voteThreshold" },
                         ],
                     },
-                    {
-                        "!": [{ in: [{ var: "event.agent" }, { var: "state.votes.for" }] }],
-                    },
-                    {
-                        "!": [
-                            { in: [{ var: "event.agent" }, { var: "state.votes.against" }] },
-                        ],
-                    },
-                    {
-                        "!": [
-                            { in: [{ var: "event.agent" }, { var: "state.votes.abstain" }] },
-                        ],
-                    },
-                    { "<=": [{ var: "$timestamp" }, { var: "state.proposal.deadline" }] },
+                    { "!": [(0, guards_js_1.signerInSet)("state.votes.for")] },
+                    { "!": [(0, guards_js_1.signerInSet)("state.votes.against")] },
+                    { "!": [(0, guards_js_1.signerInSet)("state.votes.abstain")] },
+                    { "<=": [{ var: "$ordinal" }, { var: "state.proposal.deadline" }] },
                 ],
             },
             effect: {
@@ -254,21 +269,23 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
             from: "VOTING",
             to: "ACTIVE",
             eventName: "execute",
+            // A2 fix: votes.for/against/abstain are arrays of voter addresses; count with
+            // `length` (size is not a JLVM opcode).
             guard: {
                 and: [
-                    { ">": [{ var: "$timestamp" }, { var: "state.proposal.deadline" }] },
+                    { ">": [{ var: "$ordinal" }, { var: "state.proposal.deadline" }] },
                     {
                         ">": [
-                            { size: { var: "state.votes.for" } },
-                            { size: { var: "state.votes.against" } },
+                            { length: [{ var: "state.votes.for" }] },
+                            { length: [{ var: "state.votes.against" }] },
                         ],
                     },
                     {
                         ">=": [
                             {
                                 "+": [
-                                    { size: { var: "state.votes.for" } },
-                                    { size: { var: "state.votes.against" } },
+                                    { length: [{ var: "state.votes.for" }] },
+                                    { length: [{ var: "state.votes.against" }] },
                                 ],
                             },
                             { var: "state.quorum" },
@@ -288,23 +305,25 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
                                         type: "executed",
                                         proposal: { var: "state.proposal" },
                                         votes: { var: "state.votes" },
-                                        at: { var: "$timestamp" },
+                                        at: { var: "$ordinal" },
                                     },
                                 ],
                             ],
                         },
                         proposal: null,
                         votes: null,
+                        // A3 fix: transition-level `emits` is dropped by the chain; emit from INSIDE the effect
+                        // under the reserved `_emit` key (extracted as an EmittedEvent, stripped from state).
+                        _emit: [
+                            {
+                                name: "proposal_executed",
+                                data: { action: "increase", agents: { var: "state.votes.for" } },
+                                destination: "Reputation",
+                            },
+                        ],
                     },
                 ],
             },
-            emits: [
-                {
-                    event: "proposal_executed",
-                    to: "Reputation",
-                    payload: { action: "increase", agents: { var: "state.votes.for" } },
-                },
-            ],
             dependencies: [],
         },
         // VOTING → ACTIVE: reject (voting ended, for <= against or quorum not met)
@@ -312,23 +331,25 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
             from: "VOTING",
             to: "ACTIVE",
             eventName: "reject",
+            // A2 fix: count the array-shaped vote tallies with `length` (size is not a JLVM
+            // opcode).
             guard: {
                 and: [
-                    { ">": [{ var: "$timestamp" }, { var: "state.proposal.deadline" }] },
+                    { ">": [{ var: "$ordinal" }, { var: "state.proposal.deadline" }] },
                     {
                         or: [
                             {
                                 "<=": [
-                                    { size: { var: "state.votes.for" } },
-                                    { size: { var: "state.votes.against" } },
+                                    { length: [{ var: "state.votes.for" }] },
+                                    { length: [{ var: "state.votes.against" }] },
                                 ],
                             },
                             {
                                 "<": [
                                     {
                                         "+": [
-                                            { size: { var: "state.votes.for" } },
-                                            { size: { var: "state.votes.against" } },
+                                            { length: [{ var: "state.votes.for" }] },
+                                            { length: [{ var: "state.votes.against" }] },
                                         ],
                                     },
                                     { var: "state.quorum" },
@@ -350,7 +371,7 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
                                         type: "rejected",
                                         proposal: { var: "state.proposal" },
                                         votes: { var: "state.votes" },
-                                        at: { var: "$timestamp" },
+                                        at: { var: "$ordinal" },
                                     },
                                 ],
                             ],
@@ -367,8 +388,17 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
             from: "ACTIVE",
             to: "ACTIVE",
             eventName: "join",
+            // S1/A2: bind event.agent to a verified signer (actorIsSigner) so the member is appended to the
+            // array and keyed into memberJoinedAt under a CHAIN-VERIFIED address (set is the rc.5 map-write
+            // opcode), and dedup on that bound actor.
+            // TODO(#24): event.agentReputation is self-asserted. Replace the reputation clause with
+            // signerHasReputation(registryReputationPath(<registryDep>), "state.memberThreshold") once
+            // runtime-updatable dependencies (#24) let a std-app bind the identity-registry instance — the
+            // same gate as corp-board's removal-resolution. The registry foundation + read helper already
+            // exist (src/apps/identity/state-machines/identity-registry.ts, guards.signerHasReputation).
             guard: {
                 and: [
+                    (0, guards_js_1.actorIsSigner)(),
                     {
                         ">=": [
                             { var: "event.agentReputation" },
@@ -386,10 +416,10 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
                             cat: [{ var: "state.members" }, [{ var: "event.agent" }]],
                         },
                         memberJoinedAt: {
-                            setKey: [
+                            set: [
                                 { var: "state.memberJoinedAt" },
                                 { var: "event.agent" },
-                                { var: "$timestamp" },
+                                { var: "$ordinal" },
                             ],
                         },
                     },
@@ -402,7 +432,7 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
             from: "ACTIVE",
             to: "ACTIVE",
             eventName: "leave",
-            guard: { in: [{ var: "event.agent" }, { var: "state.members" }] },
+            guard: (0, guards_js_1.signerInSet)("state.members"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -443,9 +473,9 @@ exports.daoReputationDef = (0, fiber_app_js_1.defineFiberApp)({
                                 proposeThreshold: { var: "event.proposeThreshold" },
                             },
                             proposer: { var: "event.agent" },
-                            proposedAt: { var: "$timestamp" },
+                            proposedAt: { var: "$ordinal" },
                             deadline: {
-                                "+": [{ var: "$timestamp" }, { var: "state.votingPeriodMs" }],
+                                "+": [{ var: "$ordinal" }, { var: "state.votingPeriodMs" }],
                             },
                         },
                         votes: { for: [], against: [], abstain: [] },