@ottochain/sdk 2.3.0 → 2.4.0

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.
  */
@@ -169,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: {
@@ -186,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" },
                         },
@@ -203,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" }],
                     },
                 ],
             },
@@ -241,7 +252,7 @@ export const daoTokenDef = defineFiberApp({
                                                 "+": [
                                                     { var: "state.votes.for" },
                                                     {
-                                                        getKey: [
+                                                        get: [
                                                             { var: "state.balances" },
                                                             { var: "event.agent" },
                                                         ],
@@ -255,7 +266,7 @@ export const daoTokenDef = defineFiberApp({
                                                 "+": [
                                                     { var: "state.votes.against" },
                                                     {
-                                                        getKey: [
+                                                        get: [
                                                             { var: "state.balances" },
                                                             { var: "event.agent" },
                                                         ],
@@ -268,7 +279,7 @@ export const daoTokenDef = defineFiberApp({
                                                 "+": [
                                                     { var: "state.votes.abstain" },
                                                     {
-                                                        getKey: [
+                                                        get: [
                                                             { var: "state.balances" },
                                                             { var: "event.agent" },
                                                         ],
@@ -280,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" },
                                             },
                                         ],
                                     },
@@ -311,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" }] },
                     {
@@ -339,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" }],
                                     },
                                 },
                             ],
@@ -357,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: [
@@ -372,7 +380,7 @@ export const daoTokenDef = defineFiberApp({
                                             { var: "state.proposal" },
                                             {
                                                 votes: { var: "state.votes" },
-                                                executedAt: { var: "$timestamp" },
+                                                executedAt: { var: "$ordinal" },
                                             },
                                         ],
                                     },
@@ -381,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)
@@ -395,10 +411,7 @@ export const daoTokenDef = defineFiberApp({
             guard: {
                 and: [
                     {
-                        ">": [
-                            { var: "$timestamp" },
-                            { var: "state.proposal.votingEndsAt" },
-                        ],
+                        ">": [{ var: "$ordinal" }, { var: "state.proposal.votingEndsAt" }],
                     },
                     {
                         or: [
@@ -437,7 +450,7 @@ export const daoTokenDef = defineFiberApp({
                                             { var: "state.proposal" },
                                             {
                                                 votes: { var: "state.votes" },
-                                                rejectedAt: { var: "$timestamp" },
+                                                rejectedAt: { var: "$ordinal" },
                                             },
                                         ],
                                     },
@@ -456,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" },
@@ -470,7 +481,7 @@ export const daoTokenDef = defineFiberApp({
                                     {
                                         merge: [
                                             { var: "state.proposal" },
-                                            { cancelledAt: { var: "$timestamp" } },
+                                            { cancelledAt: { var: "$ordinal" } },
                                         ],
                                     },
                                 ],
@@ -488,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: {
@@ -499,7 +517,7 @@ export const daoTokenDef = defineFiberApp({
                     { var: "state" },
                     {
                         delegations: {
-                            setKey: [
+                            set: [
                                 { var: "state.delegations" },
                                 { var: "event.agent" },
                                 { var: "event.delegateTo" },
@@ -515,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" }],
                         },
                     },
                 ],

package/dist/esm/apps/governance/state-machines/governance-simple.js

@@ -1,4 +1,5 @@
 import { defineFiberApp } from "../../../schema/fiber-app.js";
+import { actorHasEntry, signerHasEntry, signerInSet, signerIsAnyParty, signerIsNotParty, } from "../../../schema/guards.js";
 /**
  * Simple org governance: manage members, update rules, resolve disputes.
  */
@@ -89,11 +90,8 @@ export const govSimpleDef = defineFiberApp({
             },
         },
         finalize: {
-            description: "Finalize the voting period",
-            required: ["forCount"],
-            properties: {
-                forCount: { type: "number" },
-            },
+            description: "Finalize the voting period (for-count derived from recorded ballots)",
+            properties: {},
         },
         file_dispute: {
             description: "File a dispute against a member",
@@ -122,11 +120,8 @@ export const govSimpleDef = defineFiberApp({
             },
         },
         dissolve: {
-            description: "Dissolve the organization (requires 90% approval)",
-            required: ["approvalCount"],
-            properties: {
-                approvalCount: { type: "number" },
-            },
+            description: "Dissolve the organization (requires every member to sign this op — verified unanimity)",
+            properties: {},
         },
     },
     states: {
@@ -174,16 +169,16 @@ export const govSimpleDef = defineFiberApp({
             from: "ACTIVE",
             to: "ACTIVE",
             eventName: "add_member",
-            guard: { in: [{ var: "event.agent" }, { var: "state.admins" }] },
+            guard: signerInSet("state.admins"),
             effect: {
                 merge: [
                     { var: "state" },
                     {
                         members: {
-                            setKey: [
+                            set: [
                                 { var: "state.members" },
                                 { var: "event.member" },
-                                { role: { var: "event.role" }, addedAt: { var: "$timestamp" } },
+                                { role: { var: "event.role" }, addedAt: { var: "$ordinal" } },
                             ],
                         },
                     },
@@ -196,13 +191,13 @@ export const govSimpleDef = defineFiberApp({
             from: "ACTIVE",
             to: "ACTIVE",
             eventName: "remove_member",
-            guard: { in: [{ var: "event.agent" }, { var: "state.admins" }] },
+            guard: signerInSet("state.admins"),
             effect: {
                 merge: [
                     { var: "state" },
                     {
                         members: {
-                            deleteKey: [{ var: "state.members" }, { var: "event.member" }],
+                            unset: [{ var: "state.members" }, { var: "event.member" }],
                         },
                     },
                 ],
@@ -214,7 +209,9 @@ export const govSimpleDef = defineFiberApp({
             from: "ACTIVE",
             to: "VOTING",
             eventName: "propose",
-            guard: { getKey: [{ var: "state.members" }, { var: "event.agent" }] },
+            // S1/A2 coupled fix: a CHAIN-VERIFIED signer must be a member (getKey is not a
+            // JLVM opcode; signerHasEntry checks signer ∈ keys(state.members) via `has`).
+            guard: signerHasEntry("state.members"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -224,9 +221,9 @@ export const govSimpleDef = defineFiberApp({
                             type: { var: "event.type" },
                             changes: { var: "event.changes" },
                             proposer: { var: "event.agent" },
-                            proposedAt: { var: "$timestamp" },
+                            proposedAt: { var: "$ordinal" },
                             deadline: {
-                                "+": [{ var: "$timestamp" }, { var: "state.votingPeriodMs" }],
+                                "+": [{ var: "$ordinal" }, { var: "state.votingPeriodMs" }],
                             },
                         },
                         votes: {},
@@ -240,12 +237,14 @@ export const govSimpleDef = defineFiberApp({
             from: "VOTING",
             to: "VOTING",
             eventName: "vote",
+            // S1/A2 coupled fix: bind event.agent to a verified signer who is a member (actorHasEntry),
+            // and block a re-vote by that SAME bound actor — so the ballot is recorded under, and deduped
+            // on, the chain-verified voter. Without the binding, signerHasEntry only proves SOME signer is a
+            // member, letting one member stuff votes under arbitrary keys (set is the rc.5 map-write opcode).
             guard: {
                 and: [
-                    { getKey: [{ var: "state.members" }, { var: "event.agent" }] },
-                    {
-                        "!": [{ getKey: [{ var: "state.votes" }, { var: "event.agent" }] }],
-                    },
+                    actorHasEntry("state.members"),
+                    { "!": [{ has: [{ var: "state.votes" }, { var: "event.agent" }] }] },
                 ],
             },
             effect: {
@@ -253,10 +252,10 @@ export const govSimpleDef = defineFiberApp({
                     { var: "state" },
                     {
                         votes: {
-                            setKey: [
+                            set: [
                                 { var: "state.votes" },
                                 { var: "event.agent" },
-                                { vote: { var: "event.vote" }, votedAt: { var: "$timestamp" } },
+                                { vote: { var: "event.vote" }, votedAt: { var: "$ordinal" } },
                             ],
                         },
                     },
@@ -269,12 +268,24 @@ export const govSimpleDef = defineFiberApp({
             from: "VOTING",
             to: "ACTIVE",
             eventName: "finalize",
+            // S2/A2 coupled fix: the for-count is DERIVED from recorded ballots in
+            // state.votes (length of the "for" entries), never read from the attacker's
+            // event.forCount. members is a Map so its count is length(keys(members)).
             guard: {
                 ">=": [
-                    { var: "event.forCount" },
+                    {
+                        length: [
+                            {
+                                filter: [
+                                    { values: [{ var: "state.votes" }] },
+                                    { "===": [{ var: "vote" }, "for"] },
+                                ],
+                            },
+                        ],
+                    },
                     {
                         "*": [
-                            { size: { var: "state.members" } },
+                            { length: [{ keys: [{ var: "state.members" }] }] },
                             { var: "state.passingThreshold" },
                         ],
                     },
@@ -298,7 +309,7 @@ export const govSimpleDef = defineFiberApp({
                                         type: "rule_change",
                                         proposal: { var: "state.proposal" },
                                         outcome: "passed",
-                                        finalizedAt: { var: "$timestamp" },
+                                        finalizedAt: { var: "$ordinal" },
                                     },
                                 ],
                             ],
@@ -315,12 +326,23 @@ export const govSimpleDef = defineFiberApp({
             from: "VOTING",
             to: "ACTIVE",
             eventName: "finalize",
+            // S2/A2 coupled fix (failed arm): derive the for-count from recorded ballots in
+            // state.votes; never from event.forCount. members count = length(keys(members)).
             guard: {
                 "<": [
-                    { var: "event.forCount" },
+                    {
+                        length: [
+                            {
+                                filter: [
+                                    { values: [{ var: "state.votes" }] },
+                                    { "===": [{ var: "vote" }, "for"] },
+                                ],
+                            },
+                        ],
+                    },
                     {
                         "*": [
-                            { size: { var: "state.members" } },
+                            { length: [{ keys: [{ var: "state.members" }] }] },
                             { var: "state.passingThreshold" },
                         ],
                     },
@@ -338,7 +360,7 @@ export const govSimpleDef = defineFiberApp({
                                         type: "rule_change",
                                         proposal: { var: "state.proposal" },
                                         outcome: "failed",
-                                        finalizedAt: { var: "$timestamp" },
+                                        finalizedAt: { var: "$ordinal" },
                                     },
                                 ],
                             ],
@@ -355,7 +377,9 @@ export const govSimpleDef = defineFiberApp({
             from: "ACTIVE",
             to: "DISPUTE",
             eventName: "file_dispute",
-            guard: { getKey: [{ var: "state.members" }, { var: "event.agent" }] },
+            // S1/A2 coupled fix: only a CHAIN-VERIFIED member may file (getKey is not a JLVM
+            // opcode; signerHasEntry checks signer ∈ keys(state.members) via `has`).
+            guard: signerHasEntry("state.members"),
             effect: {
                 merge: [
                     { var: "state" },
@@ -365,7 +389,7 @@ export const govSimpleDef = defineFiberApp({
                             plaintiff: { var: "event.agent" },
                             defendant: { var: "event.defendant" },
                             claim: { var: "event.claim" },
-                            filedAt: { var: "$timestamp" },
+                            filedAt: { var: "$ordinal" },
                             evidence: [],
                         },
                         votes: {},
@@ -379,16 +403,10 @@ export const govSimpleDef = defineFiberApp({
             from: "DISPUTE",
             to: "DISPUTE",
             eventName: "submit_evidence",
-            guard: {
-                or: [
-                    {
-                        "===": [{ var: "event.agent" }, { var: "state.dispute.plaintiff" }],
-                    },
-                    {
-                        "===": [{ var: "event.agent" }, { var: "state.dispute.defendant" }],
-                    },
-                ],
-            },
+            guard: signerIsAnyParty([
+                "state.dispute.plaintiff",
+                "state.dispute.defendant",
+            ]),
             effect: {
                 merge: [
                     { var: "state" },
@@ -404,7 +422,7 @@ export const govSimpleDef = defineFiberApp({
                                                 {
                                                     from: { var: "event.agent" },
                                                     content: { var: "event.content" },
-                                                    at: { var: "$timestamp" },
+                                                    at: { var: "$ordinal" },
                                                 },
                                             ],
                                         ],
@@ -422,18 +440,16 @@ export const govSimpleDef = defineFiberApp({
             from: "DISPUTE",
             to: "DISPUTE",
             eventName: "vote",
+            // S1/A2 coupled fix: bind event.agent to a verified member (actorHasEntry), exclude the parties,
+            // and block a re-vote by that SAME bound actor — so the dispute ballot is recorded under, and
+            // deduped on, the chain-verified voter (set is the rc.5 map-write opcode; signerIsNotParty still
+            // excludes any signer who is a party, which covers the bound actor).
             guard: {
                 and: [
-                    { getKey: [{ var: "state.members" }, { var: "event.agent" }] },
-                    {
-                        "!==": [{ var: "event.agent" }, { var: "state.dispute.plaintiff" }],
-                    },
-                    {
-                        "!==": [{ var: "event.agent" }, { var: "state.dispute.defendant" }],
-                    },
-                    {
-                        "!": [{ getKey: [{ var: "state.votes" }, { var: "event.agent" }] }],
-                    },
+                    actorHasEntry("state.members"),
+                    signerIsNotParty("state.dispute.plaintiff"),
+                    signerIsNotParty("state.dispute.defendant"),
+                    { "!": [{ has: [{ var: "state.votes" }, { var: "event.agent" }] }] },
                 ],
             },
             effect: {
@@ -441,12 +457,12 @@ export const govSimpleDef = defineFiberApp({
                     { var: "state" },
                     {
                         votes: {
-                            setKey: [
+                            set: [
                                 { var: "state.votes" },
                                 { var: "event.agent" },
                                 {
                                     ruling: { var: "event.ruling" },
-                                    votedAt: { var: "$timestamp" },
+                                    votedAt: { var: "$ordinal" },
                                 },
                             ],
                         },
@@ -460,9 +476,11 @@ export const govSimpleDef = defineFiberApp({
             from: "DISPUTE",
             to: "ACTIVE",
             eventName: "resolve",
+            // A2 fix: count recorded ballots. votes is a Map, and `length` rejects Maps, so
+            // count its keys: length(keys(state.votes)). (size is not a JLVM opcode.)
             guard: {
                 ">=": [
-                    { size: { var: "state.votes" } },
+                    { length: [{ keys: [{ var: "state.votes" }] }] },
                     { var: "state.disputeQuorum" },
                 ],
             },
@@ -479,7 +497,7 @@ export const govSimpleDef = defineFiberApp({
                                         dispute: { var: "state.dispute" },
                                         ruling: { var: "event.ruling" },
                                         remedy: { var: "event.remedy" },
-                                        resolvedAt: { var: "$timestamp" },
+                                        resolvedAt: { var: "$ordinal" },
                                     },
                                 ],
                             ],
@@ -496,14 +514,28 @@ export const govSimpleDef = defineFiberApp({
             from: "ACTIVE",
             to: "DISSOLVED",
             eventName: "dissolve",
+            // S2/A2 coupled fix: dissolution must not trust an attacker-supplied
+            // approvalCount. Derive consent from the CHAIN-VERIFIED signers — every member
+            // (a key in state.members) must be among proofs[].address, with a non-empty
+            // belt. members is a Map, so iterate keys(members); size is not a JLVM opcode.
             guard: {
-                ">=": [
-                    { var: "event.approvalCount" },
-                    { "*": [{ size: { var: "state.members" } }, 0.9] },
+                and: [
+                    { ">": [{ length: [{ keys: [{ var: "state.members" }] }] }, 0] },
+                    {
+                        all: [
+                            { keys: [{ var: "state.members" }] },
+                            {
+                                in: [
+                                    { var: "" },
+                                    { map: [{ var: "proofs" }, { var: "address" }] },
+                                ],
+                            },
+                        ],
+                    },
                 ],
             },
             effect: {
-                merge: [{ var: "state" }, { dissolvedAt: { var: "$timestamp" } }],
+                merge: [{ var: "state" }, { dissolvedAt: { var: "$ordinal" } }],
             },
             dependencies: [],
         },

package/dist/esm/apps/governance/state-machines/governance-universal.js

@@ -90,7 +90,7 @@ export const govUniversalDef = defineFiberApp({
                     {
                         status: "VOTING",
                         proposal: { var: "event.proposal" },
-                        proposedAt: { var: "$timestamp" },
+                        proposedAt: { var: "$ordinal" },
                         votes: {},
                     },
                 ],
@@ -149,7 +149,7 @@ export const govUniversalDef = defineFiberApp({
                     { var: "state" },
                     {
                         status: "DISSOLVED",
-                        dissolvedAt: { var: "$timestamp" },
+                        dissolvedAt: { var: "$ordinal" },
                     },
                 ],
             },