@ottochain/sdk 2.2.5 → 2.4.0

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

@@ -1,4 +1,5 @@
 import { defineFiberApp } from "../../../schema/fiber-app.js";
+import { signerIsParty } from "../../../schema/guards.js";
 /**
  * Single owner controls all actions. Simplest governance model.
  */
@@ -75,9 +76,33 @@ export const daoSingleDef = defineFiberApp({
         },
     },
     states: {
-        ACTIVE: { id: "ACTIVE", isFinal: false, metadata: null },
-        TRANSFERRING: { id: "TRANSFERRING", isFinal: false, metadata: null },
-        DISSOLVED: { id: "DISSOLVED", isFinal: true, metadata: null },
+        ACTIVE: {
+            id: "ACTIVE",
+            isFinal: false,
+            metadata: {
+                label: "Active",
+                description: "Single owner controls the DAO and may act or transfer ownership",
+                category: "initial",
+            },
+        },
+        TRANSFERRING: {
+            id: "TRANSFERRING",
+            isFinal: false,
+            metadata: {
+                label: "Transferring",
+                description: "Ownership transfer proposed; awaiting acceptance",
+                category: "pending",
+            },
+        },
+        DISSOLVED: {
+            id: "DISSOLVED",
+            isFinal: true,
+            metadata: {
+                label: "Dissolved",
+                description: "DAO dissolved by its owner (terminal)",
+                category: "terminal",
+            },
+        },
     },
     initialState: "ACTIVE",
     transitions: [
@@ -86,7 +111,7 @@ export const daoSingleDef = defineFiberApp({
             from: "ACTIVE",
             to: "ACTIVE",
             eventName: "execute",
-            guard: { "===": [{ var: "event.agent" }, { var: "state.owner" }] },
+            guard: signerIsParty("state.owner"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -99,15 +124,23 @@ export const daoSingleDef = defineFiberApp({
                                         id: { var: "event.actionId" },
                                         type: { var: "event.actionType" },
                                         payload: { var: "event.payload" },
-                                        executedAt: { var: "$timestamp" },
+                                        executedAt: { var: "$ordinal" },
                                     },
                                 ],
                             ],
                         },
+                        // 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: "action_executed",
+                                data: { actionId: { var: "event.actionId" } },
+                                destination: "external",
+                            },
+                        ],
                     },
                 ],
             },
-            emits: [{ event: "action_executed", to: "external" }],
             dependencies: [],
         },
         // ACTIVE → TRANSFERRING: transfer_ownership (owner only)
@@ -115,13 +148,13 @@ export const daoSingleDef = defineFiberApp({
             from: "ACTIVE",
             to: "TRANSFERRING",
             eventName: "transfer_ownership",
-            guard: { "===": [{ var: "event.agent" }, { var: "state.owner" }] },
+            guard: signerIsParty("state.owner"),
             effect: {
                 merge: [
                     { var: "state" },
                     {
                         pendingOwner: { var: "event.newOwner" },
-                        transferInitiatedAt: { var: "$timestamp" },
+                        transferInitiatedAt: { var: "$ordinal" },
                     },
                 ],
             },
@@ -132,7 +165,7 @@ export const daoSingleDef = defineFiberApp({
             from: "TRANSFERRING",
             to: "ACTIVE",
             eventName: "accept_ownership",
-            guard: { "===": [{ var: "event.agent" }, { var: "state.pendingOwner" }] },
+            guard: signerIsParty("state.pendingOwner"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -147,15 +180,23 @@ export const daoSingleDef = defineFiberApp({
                                     {
                                         from: { var: "state.owner" },
                                         to: { var: "state.pendingOwner" },
-                                        at: { var: "$timestamp" },
+                                        at: { var: "$ordinal" },
                                     },
                                 ],
                             ],
                         },
+                        // 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: "ownership_transferred",
+                                data: { var: "event" },
+                                destination: "Identity",
+                            },
+                        ],
                     },
                 ],
             },
-            emits: [{ event: "ownership_transferred", to: "Identity" }],
             dependencies: [],
         },
         // TRANSFERRING → ACTIVE: cancel_transfer (owner only)
@@ -163,7 +204,7 @@ export const daoSingleDef = defineFiberApp({
             from: "TRANSFERRING",
             to: "ACTIVE",
             eventName: "cancel_transfer",
-            guard: { "===": [{ var: "event.agent" }, { var: "state.owner" }] },
+            guard: signerIsParty("state.owner"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -180,12 +221,12 @@ export const daoSingleDef = defineFiberApp({
             from: "ACTIVE",
             to: "DISSOLVED",
             eventName: "dissolve",
-            guard: { "===": [{ var: "event.agent" }, { var: "state.owner" }] },
+            guard: signerIsParty("state.owner"),
             effect: {
                 merge: [
                     { var: "state" },
                     {
-                        dissolvedAt: { var: "$timestamp" },
+                        dissolvedAt: { var: "$ordinal" },
                         status: "DISSOLVED",
                     },
                 ],

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

@@ -1,4 +1,5 @@
 import { defineFiberApp } from "../../../schema/fiber-app.js";
+import { signerIsParty, actorIsSigner } from "../../../schema/guards.js";
 /**
  * Token-weighted voting. Voting power proportional to token holdings.
  */
@@ -125,10 +126,42 @@ export const daoTokenDef = defineFiberApp({
         },
     },
     states: {
-        ACTIVE: { id: "ACTIVE", isFinal: false, metadata: null },
-        VOTING: { id: "VOTING", isFinal: false, metadata: null },
-        QUEUED: { id: "QUEUED", 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: "Token holders are voting on the active proposal",
+                category: "pending",
+            },
+        },
+        QUEUED: {
+            id: "QUEUED",
+            isFinal: false,
+            metadata: {
+                label: "Queued",
+                description: "Passed proposal queued in timelock before execution",
+                category: "pending",
+            },
+        },
+        DISSOLVED: {
+            id: "DISSOLVED",
+            isFinal: true,
+            metadata: {
+                label: "Dissolved",
+                description: "Token DAO dissolved (terminal)",
+                category: "terminal",
+            },
+        },
     },
     initialState: "ACTIVE",
     transitions: [
@@ -137,10 +170,18 @@ export const daoTokenDef = defineFiberApp({
             from: "ACTIVE",
             to: "VOTING",
             eventName: "propose",
+            // S1/A2 coupled fix: a CHAIN-VERIFIED signer must hold >= proposalThreshold
+            // tokens. Iterate proofs[].address and read each balance via `get` (getKey is
+            // not a JLVM opcode); never trust the forgeable event.agent for the lookup.
             guard: {
-                ">=": [
-                    { getKey: [{ var: "state.balances" }, { var: "event.agent" }] },
-                    { var: "state.proposalThreshold" },
+                some: [
+                    { map: [{ var: "proofs" }, { var: "address" }] },
+                    {
+                        ">=": [
+                            { get: [{ var: "state.balances" }, { var: "" }] },
+                            { var: "state.proposalThreshold" },
+                        ],
+                    },
                 ],
             },
             effect: {
@@ -154,9 +195,9 @@ export const daoTokenDef = defineFiberApp({
                             actionType: { var: "event.actionType" },
                             payload: { var: "event.payload" },
                             proposer: { var: "event.agent" },
-                            proposedAt: { var: "$timestamp" },
+                            proposedAt: { var: "$ordinal" },
                             votingEndsAt: {
-                                "+": [{ var: "$timestamp" }, { var: "state.votingPeriodMs" }],
+                                "+": [{ var: "$ordinal" }, { var: "state.votingPeriodMs" }],
                             },
                             snapshotBlock: { var: "event.snapshotBlock" },
                         },
@@ -171,26 +212,28 @@ export const daoTokenDef = defineFiberApp({
             from: "VOTING",
             to: "VOTING",
             eventName: "vote",
+            // S1+A2 coupled fix: bind event.agent to a verified signer (actorIsSigner) so the
+            // balance lookup, the no-double-vote check, and the voters write below all key on the
+            // CHAIN-VERIFIED actor — never a forgeable claim. getKey→get (value), getKey→has
+            // (presence), setKey→set are the rc.5 map opcodes (getKey/setKey do not exist).
             guard: {
                 and: [
+                    actorIsSigner(),
                     {
                         ">": [
-                            { getKey: [{ var: "state.balances" }, { var: "event.agent" }] },
+                            { get: [{ var: "state.balances" }, { var: "event.agent" }] },
                             0,
                         ],
                     },
                     {
                         "!": [
                             {
-                                getKey: [{ var: "state.votes.voters" }, { var: "event.agent" }],
+                                has: [{ var: "state.votes.voters" }, { var: "event.agent" }],
                             },
                         ],
                     },
                     {
-                        "<=": [
-                            { var: "$timestamp" },
-                            { var: "state.proposal.votingEndsAt" },
-                        ],
+                        "<=": [{ var: "$ordinal" }, { var: "state.proposal.votingEndsAt" }],
                     },
                 ],
             },
@@ -209,7 +252,7 @@ export const daoTokenDef = defineFiberApp({
                                                 "+": [
                                                     { var: "state.votes.for" },
                                                     {
-                                                        getKey: [
+                                                        get: [
                                                             { var: "state.balances" },
                                                             { var: "event.agent" },
                                                         ],
@@ -223,7 +266,7 @@ export const daoTokenDef = defineFiberApp({
                                                 "+": [
                                                     { var: "state.votes.against" },
                                                     {
-                                                        getKey: [
+                                                        get: [
                                                             { var: "state.balances" },
                                                             { var: "event.agent" },
                                                         ],
@@ -236,7 +279,7 @@ export const daoTokenDef = defineFiberApp({
                                                 "+": [
                                                     { var: "state.votes.abstain" },
                                                     {
-                                                        getKey: [
+                                                        get: [
                                                             { var: "state.balances" },
                                                             { var: "event.agent" },
                                                         ],
@@ -248,18 +291,18 @@ export const daoTokenDef = defineFiberApp({
                                 },
                                 {
                                     voters: {
-                                        setKey: [
+                                        set: [
                                             { var: "state.votes.voters" },
                                             { var: "event.agent" },
                                             {
                                                 vote: { var: "event.vote" },
                                                 weight: {
-                                                    getKey: [
+                                                    get: [
                                                         { var: "state.balances" },
                                                         { var: "event.agent" },
                                                     ],
                                                 },
-                                                votedAt: { var: "$timestamp" },
+                                                votedAt: { var: "$ordinal" },
                                             },
                                         ],
                                     },
@@ -279,10 +322,7 @@ export const daoTokenDef = defineFiberApp({
             guard: {
                 and: [
                     {
-                        ">": [
-                            { var: "$timestamp" },
-                            { var: "state.proposal.votingEndsAt" },
-                        ],
+                        ">": [{ var: "$ordinal" }, { var: "state.proposal.votingEndsAt" }],
                     },
                     { ">": [{ var: "state.votes.for" }, { var: "state.votes.against" }] },
                     {
@@ -307,9 +347,9 @@ export const daoTokenDef = defineFiberApp({
                             merge: [
                                 { var: "state.proposal" },
                                 {
-                                    queuedAt: { var: "$timestamp" },
+                                    queuedAt: { var: "$ordinal" },
                                     executableAt: {
-                                        "+": [{ var: "$timestamp" }, { var: "state.timelockMs" }],
+                                        "+": [{ var: "$ordinal" }, { var: "state.timelockMs" }],
                                     },
                                 },
                             ],
@@ -325,7 +365,7 @@ export const daoTokenDef = defineFiberApp({
             to: "ACTIVE",
             eventName: "execute",
             guard: {
-                ">=": [{ var: "$timestamp" }, { var: "state.proposal.executableAt" }],
+                ">=": [{ var: "$ordinal" }, { var: "state.proposal.executableAt" }],
             },
             effect: {
                 merge: [
@@ -340,7 +380,7 @@ export const daoTokenDef = defineFiberApp({
                                             { var: "state.proposal" },
                                             {
                                                 votes: { var: "state.votes" },
-                                                executedAt: { var: "$timestamp" },
+                                                executedAt: { var: "$ordinal" },
                                             },
                                         ],
                                     },
@@ -349,10 +389,18 @@ export const daoTokenDef = defineFiberApp({
                         },
                         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: { proposalId: { var: "state.proposal.id" } },
+                                destination: "external",
+                            },
+                        ],
                     },
                 ],
             },
-            emits: [{ event: "proposal_executed", to: "external" }],
             dependencies: [],
         },
         // VOTING → ACTIVE: reject (voting ended, failed quorum or for <= against)
@@ -363,10 +411,7 @@ export const daoTokenDef = defineFiberApp({
             guard: {
                 and: [
                     {
-                        ">": [
-                            { var: "$timestamp" },
-                            { var: "state.proposal.votingEndsAt" },
-                        ],
+                        ">": [{ var: "$ordinal" }, { var: "state.proposal.votingEndsAt" }],
                     },
                     {
                         or: [
@@ -405,7 +450,7 @@ export const daoTokenDef = defineFiberApp({
                                             { var: "state.proposal" },
                                             {
                                                 votes: { var: "state.votes" },
-                                                rejectedAt: { var: "$timestamp" },
+                                                rejectedAt: { var: "$ordinal" },
                                             },
                                         ],
                                     },
@@ -424,9 +469,7 @@ export const daoTokenDef = defineFiberApp({
             from: "QUEUED",
             to: "ACTIVE",
             eventName: "cancel",
-            guard: {
-                "===": [{ var: "event.agent" }, { var: "state.proposal.proposer" }],
-            },
+            guard: signerIsParty("state.proposal.proposer"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -438,7 +481,7 @@ export const daoTokenDef = defineFiberApp({
                                     {
                                         merge: [
                                             { var: "state.proposal" },
-                                            { cancelledAt: { var: "$timestamp" } },
+                                            { cancelledAt: { var: "$ordinal" } },
                                         ],
                                     },
                                 ],
@@ -456,10 +499,17 @@ export const daoTokenDef = defineFiberApp({
             from: "ACTIVE",
             to: "ACTIVE",
             eventName: "delegate",
+            // S1+A2: bind event.agent to a verified signer so the delegation is written under the
+            // CHAIN-VERIFIED delegator's key (set), keyed on the same actor whose balance is checked (get).
             guard: {
-                ">": [
-                    { getKey: [{ var: "state.balances" }, { var: "event.agent" }] },
-                    0,
+                and: [
+                    actorIsSigner(),
+                    {
+                        ">": [
+                            { get: [{ var: "state.balances" }, { var: "event.agent" }] },
+                            0,
+                        ],
+                    },
                 ],
             },
             effect: {
@@ -467,7 +517,7 @@ export const daoTokenDef = defineFiberApp({
                     { var: "state" },
                     {
                         delegations: {
-                            setKey: [
+                            set: [
                                 { var: "state.delegations" },
                                 { var: "event.agent" },
                                 { var: "event.delegateTo" },
@@ -483,13 +533,21 @@ export const daoTokenDef = defineFiberApp({
             from: "ACTIVE",
             to: "ACTIVE",
             eventName: "undelegate",
-            guard: { getKey: [{ var: "state.delegations" }, { var: "event.agent" }] },
+            // S1+A2: bind event.agent to a verified signer; presence via has, removal via unset (the rc.5
+            // map opcodes — getKey/deleteKey do not exist). Only the verified delegator can clear their own
+            // delegation.
+            guard: {
+                and: [
+                    actorIsSigner(),
+                    { has: [{ var: "state.delegations" }, { var: "event.agent" }] },
+                ],
+            },
             effect: {
                 merge: [
                     { var: "state" },
                     {
                         delegations: {
-                            deleteKey: [{ var: "state.delegations" }, { var: "event.agent" }],
+                            unset: [{ var: "state.delegations" }, { var: "event.agent" }],
                         },
                     },
                 ],