@ottochain/sdk 2.2.5 → 2.4.0

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

@@ -1,4 +1,5 @@
 import { defineFiberApp } from "../../../schema/fiber-app.js";
+import { actorInSet, signerIsParty } from "../../../schema/guards.js";
 /**
  * N-of-M multisig governance. Requires threshold signatures for actions.
  */
@@ -110,16 +111,38 @@ export const daoMultisigDef = 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: [
@@ -128,7 +151,7 @@ export const daoMultisigDef = defineFiberApp({
             from: "ACTIVE",
             to: "PENDING",
             eventName: "propose",
-            guard: { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+            guard: actorInSet("state.signers"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -138,13 +161,13 @@ export const daoMultisigDef = 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" }],
                         },
                     },
                 ],
@@ -158,15 +181,15 @@ export const daoMultisigDef = defineFiberApp({
             eventName: "sign",
             guard: {
                 and: [
-                    { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+                    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" },
                         ],
                     },
@@ -177,10 +200,10 @@ export const daoMultisigDef = defineFiberApp({
                     { var: "state" },
                     {
                         signatures: {
-                            setKey: [
+                            set: [
                                 { var: "state.signatures" },
                                 { var: "event.agent" },
-                                { var: "$timestamp" },
+                                { var: "$ordinal" },
                             ],
                         },
                     },
@@ -195,7 +218,7 @@ export const daoMultisigDef = defineFiberApp({
             eventName: "execute",
             guard: {
                 ">=": [
-                    { size: { var: "state.signatures" } },
+                    { length: [{ keys: [{ var: "state.signatures" }] }] },
                     { var: "state.threshold" },
                 ],
             },
@@ -212,17 +235,25 @@ export const daoMultisigDef = 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)
@@ -232,10 +263,8 @@ export const daoMultisigDef = defineFiberApp({
             eventName: "cancel",
             guard: {
                 or: [
-                    { ">": [{ var: "$timestamp" }, { var: "state.proposal.expiresAt" }] },
-                    {
-                        "===": [{ var: "event.agent" }, { var: "state.proposal.proposer" }],
-                    },
+                    { ">": [{ var: "$ordinal" }, { var: "state.proposal.expiresAt" }] },
+                    signerIsParty("state.proposal.proposer"),
                 ],
             },
             effect: {
@@ -249,7 +278,7 @@ export const daoMultisigDef = defineFiberApp({
                                     {
                                         merge: [
                                             { var: "state.proposal" },
-                                            { cancelledAt: { var: "$timestamp" } },
+                                            { cancelledAt: { var: "$ordinal" } },
                                         ],
                                     },
                                 ],
@@ -267,7 +296,7 @@ export const daoMultisigDef = defineFiberApp({
             from: "ACTIVE",
             to: "PENDING",
             eventName: "propose_add_signer",
-            guard: { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+            guard: actorInSet("state.signers"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -277,13 +306,13 @@ export const daoMultisigDef = 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" }],
                         },
                     },
                 ],
@@ -297,10 +326,10 @@ export const daoMultisigDef = defineFiberApp({
             eventName: "propose_remove_signer",
             guard: {
                 and: [
-                    { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+                    actorInSet("state.signers"),
                     {
                         ">": [
-                            { size: { var: "state.signers" } },
+                            { length: [{ var: "state.signers" }] },
                             { var: "state.threshold" },
                         ],
                     },
@@ -315,13 +344,13 @@ export const daoMultisigDef = 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" }],
                         },
                     },
                 ],
@@ -335,12 +364,12 @@ export const daoMultisigDef = defineFiberApp({
             eventName: "propose_change_threshold",
             guard: {
                 and: [
-                    { in: [{ var: "event.agent" }, { var: "state.signers" }] },
+                    actorInSet("state.signers"),
                     { ">=": [{ var: "event.newThreshold" }, 1] },
                     {
                         "<=": [
                             { var: "event.newThreshold" },
-                            { size: { var: "state.signers" } },
+                            { length: [{ var: "state.signers" }] },
                         ],
                     },
                 ],
@@ -354,13 +383,13 @@ export const daoMultisigDef = 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" }],
                         },
                     },
                 ],
@@ -376,7 +405,7 @@ export const daoMultisigDef = defineFiberApp({
                 and: [
                     {
                         ">=": [
-                            { size: { var: "state.signatures" } },
+                            { length: [{ keys: [{ var: "state.signatures" }] }] },
                             { var: "state.threshold" },
                         ],
                     },
@@ -446,16 +475,29 @@ export const daoMultisigDef = 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/esm/apps/governance/state-machines/dao-reputation.js

@@ -1,4 +1,5 @@
 import { defineFiberApp } from "../../../schema/fiber-app.js";
+import { actorIsSigner, signerInSet } from "../../../schema/guards.js";
 /**
  * Reputation-based governance. Minimum reputation required for participation.
  */
@@ -124,9 +125,33 @@ export const daoReputationDef = 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: [
@@ -152,9 +177,9 @@ export const daoReputationDef = 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: [] },
@@ -176,20 +201,10 @@ export const daoReputationDef = 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" }] },
+                    { "!": [signerInSet("state.votes.for")] },
+                    { "!": [signerInSet("state.votes.against")] },
+                    { "!": [signerInSet("state.votes.abstain")] },
+                    { "<=": [{ var: "$ordinal" }, { var: "state.proposal.deadline" }] },
                 ],
             },
             effect: {
@@ -251,21 +266,23 @@ export const daoReputationDef = 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" },
@@ -285,23 +302,25 @@ export const daoReputationDef = 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)
@@ -309,23 +328,25 @@ export const daoReputationDef = 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" },
@@ -347,7 +368,7 @@ export const daoReputationDef = defineFiberApp({
                                         type: "rejected",
                                         proposal: { var: "state.proposal" },
                                         votes: { var: "state.votes" },
-                                        at: { var: "$timestamp" },
+                                        at: { var: "$ordinal" },
                                     },
                                 ],
                             ],
@@ -364,8 +385,17 @@ export const daoReputationDef = 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: [
+                    actorIsSigner(),
                     {
                         ">=": [
                             { var: "event.agentReputation" },
@@ -383,10 +413,10 @@ export const daoReputationDef = defineFiberApp({
                             cat: [{ var: "state.members" }, [{ var: "event.agent" }]],
                         },
                         memberJoinedAt: {
-                            setKey: [
+                            set: [
                                 { var: "state.memberJoinedAt" },
                                 { var: "event.agent" },
-                                { var: "$timestamp" },
+                                { var: "$ordinal" },
                             ],
                         },
                     },
@@ -399,7 +429,7 @@ export const daoReputationDef = defineFiberApp({
             from: "ACTIVE",
             to: "ACTIVE",
             eventName: "leave",
-            guard: { in: [{ var: "event.agent" }, { var: "state.members" }] },
+            guard: signerInSet("state.members"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -440,9 +470,9 @@ export const daoReputationDef = 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: [] },