@ottochain/sdk 2.3.0 → 2.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/apps/compute/index.js +33 -0
- package/dist/cjs/apps/compute/state-machines/compute-rule110.js +164 -0
- package/dist/cjs/apps/compute/state-machines/index.js +9 -0
- package/dist/cjs/apps/contracts/index.js +16 -9
- package/dist/cjs/apps/contracts/state-machines/contract-agreement.js +134 -161
- package/dist/cjs/apps/contracts/state-machines/contract-escrow.js +192 -170
- package/dist/cjs/apps/contracts/state-machines/contract-universal.js +46 -58
- package/dist/cjs/apps/corporate/index.js +2 -2
- package/dist/cjs/apps/corporate/state-machines/corp-board.js +500 -456
- package/dist/cjs/apps/corporate/state-machines/corp-entity.js +487 -361
- package/dist/cjs/apps/corporate/state-machines/corp-securities.js +769 -576
- package/dist/cjs/apps/corporate/state-machines/corp-shareholders.js +567 -557
- package/dist/cjs/apps/governance/index.js +21 -21
- package/dist/cjs/apps/governance/state-machines/dao-multisig.js +188 -209
- package/dist/cjs/apps/governance/state-machines/dao-reputation.js +181 -228
- package/dist/cjs/apps/governance/state-machines/dao-single.js +105 -88
- package/dist/cjs/apps/governance/state-machines/dao-token.js +199 -227
- package/dist/cjs/apps/governance/state-machines/governance-simple.js +231 -231
- package/dist/cjs/apps/governance/state-machines/governance-universal.js +64 -64
- package/dist/cjs/apps/identity/constants.js +55 -22
- package/dist/cjs/apps/identity/index.js +28 -12
- package/dist/cjs/apps/identity/state-machines/identity-agent.js +124 -158
- package/dist/cjs/apps/identity/state-machines/identity-oracle.js +158 -173
- package/dist/cjs/apps/identity/state-machines/identity-registry.js +262 -0
- package/dist/cjs/apps/identity/state-machines/identity-universal.js +51 -57
- package/dist/cjs/apps/identity/state-machines/index.js +3 -1
- package/dist/cjs/apps/index.js +22 -8
- package/dist/cjs/apps/lending/assets.js +247 -0
- package/dist/cjs/apps/lending/credit-scoring.js +87 -0
- package/dist/cjs/apps/lending/eligibility.js +105 -0
- package/dist/cjs/apps/lending/index.js +91 -0
- package/dist/cjs/apps/lending/state-machines/index.js +9 -0
- package/dist/cjs/apps/lending/state-machines/lending-zk-loan.js +433 -0
- package/dist/cjs/apps/markets/index.js +22 -12
- package/dist/cjs/apps/markets/state-machines/market-auction.js +116 -134
- package/dist/cjs/apps/markets/state-machines/market-crowdfund.js +131 -141
- package/dist/cjs/apps/markets/state-machines/market-group-buy.js +163 -184
- package/dist/cjs/apps/markets/state-machines/market-prediction.js +226 -233
- package/dist/cjs/apps/markets/state-machines/market-universal.js +65 -80
- package/dist/cjs/apps/oracles/index.js +3 -3
- package/dist/cjs/apps/privacy/index.js +67 -0
- package/dist/cjs/apps/privacy/state-machines/index.js +17 -0
- package/dist/cjs/apps/privacy/state-machines/mixer-ddhRing.js +286 -0
- package/dist/cjs/apps/privacy/state-machines/note-pool.js +476 -0
- package/dist/cjs/apps/staked-pool/assets.js +103 -0
- package/dist/cjs/apps/staked-pool/base.js +498 -0
- package/dist/cjs/apps/staked-pool/consumer.js +55 -0
- package/dist/cjs/apps/staked-pool/index.js +83 -0
- package/dist/cjs/apps/staked-pool/state-machines/index.js +12 -0
- package/dist/cjs/apps/staked-pool/state-machines/staked-pool-base.js +49 -0
- package/dist/cjs/apps/staked-pool/state-machines/staked-pool-oracle.js +131 -0
- package/dist/cjs/errors.js +3 -3
- package/dist/cjs/generated/google/protobuf/struct.js +5 -5
- package/dist/cjs/generated/google/protobuf/timestamp.js +1 -1
- package/dist/cjs/generated/index.js +11 -7
- package/dist/cjs/generated/openapi.js +6 -0
- package/dist/cjs/generated/ottochain/apps/contracts/v1/contract.js +51 -51
- package/dist/cjs/generated/ottochain/apps/corporate/v1/corporate.js +20 -21
- package/dist/cjs/generated/ottochain/apps/governance/v1/governance.js +14 -14
- package/dist/cjs/generated/ottochain/apps/identity/v1/attestation.js +5 -5
- package/dist/cjs/generated/ottochain/apps/identity/v1/identity.js +125 -131
- package/dist/cjs/generated/ottochain/apps/markets/v1/market.js +108 -108
- package/dist/cjs/generated/ottochain/v1/common.js +5 -5
- package/dist/cjs/generated/ottochain/v1/fiber.js +44 -6
- package/dist/cjs/generated/ottochain/v1/messages.js +1 -1
- package/dist/cjs/generated/ottochain/v1/records.js +1 -1
- package/dist/cjs/index.js +58 -7
- package/dist/cjs/openapi.js +2 -0
- package/dist/cjs/ottochain/drop-nulls.js +1 -2
- package/dist/cjs/ottochain/genesis-manifest.js +17 -11
- package/dist/cjs/ottochain/index.js +23 -13
- package/dist/cjs/ottochain/metagraph-client.js +81 -16
- package/dist/cjs/ottochain/snapshot.js +13 -16
- package/dist/cjs/ottochain/transaction.js +67 -14
- package/dist/cjs/ottochain/types.js +16 -2
- package/dist/cjs/privacy/index.js +14 -0
- package/dist/cjs/privacy/sealed-bid.js +213 -0
- package/dist/cjs/privacy/shield-app.js +131 -0
- package/dist/cjs/schema/effects.js +156 -0
- package/dist/cjs/schema/fiber-app.js +150 -15
- package/dist/cjs/schema/guard-lint.js +343 -0
- package/dist/cjs/schema/guards.js +246 -0
- package/dist/cjs/signing.js +80 -0
- package/dist/cjs/templates/asset-policy.js +190 -0
- package/dist/cjs/templates/index.js +86 -0
- package/dist/cjs/templates/machine.js +130 -0
- package/dist/cjs/templates/migration.js +39 -0
- package/dist/cjs/templates/state-shape.js +38 -0
- package/dist/cjs/types.js +2 -3
- package/dist/cjs/validation.js +9 -11
- package/dist/cjs/verify.js +9 -4
- package/dist/cjs/zk/commit.js +53 -0
- package/dist/cjs/zk/guard.js +107 -0
- package/dist/cjs/zk/index.js +48 -0
- package/dist/cjs/zk/preimage.js +37 -0
- package/dist/cjs/zk/prover.js +87 -0
- package/dist/cjs/zk/registry.js +62 -0
- package/dist/cjs/zk/types.js +28 -0
- package/dist/cjs/zk/witness.js +19 -0
- package/dist/esm/apps/compute/index.js +29 -0
- package/dist/esm/apps/compute/state-machines/compute-rule110.js +161 -0
- package/dist/esm/apps/compute/state-machines/index.js +5 -0
- package/dist/esm/apps/contracts/index.js +9 -5
- package/dist/esm/apps/contracts/state-machines/contract-agreement.js +135 -162
- package/dist/esm/apps/contracts/state-machines/contract-escrow.js +193 -171
- package/dist/esm/apps/contracts/state-machines/contract-universal.js +47 -59
- package/dist/esm/apps/corporate/index.js +2 -2
- package/dist/esm/apps/corporate/state-machines/corp-board.js +501 -457
- package/dist/esm/apps/corporate/state-machines/corp-entity.js +488 -362
- package/dist/esm/apps/corporate/state-machines/corp-securities.js +770 -577
- package/dist/esm/apps/corporate/state-machines/corp-shareholders.js +568 -558
- package/dist/esm/apps/governance/index.js +10 -10
- package/dist/esm/apps/governance/state-machines/dao-multisig.js +189 -210
- package/dist/esm/apps/governance/state-machines/dao-reputation.js +182 -229
- package/dist/esm/apps/governance/state-machines/dao-single.js +106 -89
- package/dist/esm/apps/governance/state-machines/dao-token.js +200 -228
- package/dist/esm/apps/governance/state-machines/governance-simple.js +232 -232
- package/dist/esm/apps/governance/state-machines/governance-universal.js +65 -65
- package/dist/esm/apps/identity/constants.js +52 -21
- package/dist/esm/apps/identity/index.js +14 -9
- package/dist/esm/apps/identity/state-machines/identity-agent.js +125 -159
- package/dist/esm/apps/identity/state-machines/identity-oracle.js +159 -174
- package/dist/esm/apps/identity/state-machines/identity-registry.js +259 -0
- package/dist/esm/apps/identity/state-machines/identity-universal.js +52 -58
- package/dist/esm/apps/identity/state-machines/index.js +1 -0
- package/dist/esm/apps/index.js +9 -5
- package/dist/esm/apps/lending/assets.js +231 -0
- package/dist/esm/apps/lending/credit-scoring.js +81 -0
- package/dist/esm/apps/lending/eligibility.js +99 -0
- package/dist/esm/apps/lending/index.js +69 -0
- package/dist/esm/apps/lending/state-machines/index.js +5 -0
- package/dist/esm/apps/lending/state-machines/lending-zk-loan.js +430 -0
- package/dist/esm/apps/markets/index.js +11 -7
- package/dist/esm/apps/markets/state-machines/market-auction.js +117 -135
- package/dist/esm/apps/markets/state-machines/market-crowdfund.js +132 -142
- package/dist/esm/apps/markets/state-machines/market-group-buy.js +164 -185
- package/dist/esm/apps/markets/state-machines/market-prediction.js +227 -234
- package/dist/esm/apps/markets/state-machines/market-universal.js +66 -81
- package/dist/esm/apps/oracles/index.js +3 -3
- package/dist/esm/apps/privacy/index.js +56 -0
- package/dist/esm/apps/privacy/state-machines/index.js +6 -0
- package/dist/esm/apps/privacy/state-machines/mixer-ddhRing.js +282 -0
- package/dist/esm/apps/privacy/state-machines/note-pool.js +470 -0
- package/dist/esm/apps/staked-pool/assets.js +91 -0
- package/dist/esm/apps/staked-pool/base.js +493 -0
- package/dist/esm/apps/staked-pool/consumer.js +49 -0
- package/dist/esm/apps/staked-pool/index.js +60 -0
- package/dist/esm/apps/staked-pool/state-machines/index.js +6 -0
- package/dist/esm/apps/staked-pool/state-machines/staked-pool-base.js +46 -0
- package/dist/esm/apps/staked-pool/state-machines/staked-pool-oracle.js +127 -0
- package/dist/esm/generated/google/protobuf/struct.js +1 -1
- package/dist/esm/generated/google/protobuf/timestamp.js +1 -1
- package/dist/esm/generated/index.js +9 -5
- package/dist/esm/generated/openapi.js +5 -0
- package/dist/esm/generated/ottochain/apps/contracts/v1/contract.js +47 -47
- package/dist/esm/generated/ottochain/apps/corporate/v1/corporate.js +1 -1
- package/dist/esm/generated/ottochain/apps/governance/v1/governance.js +1 -1
- package/dist/esm/generated/ottochain/apps/identity/v1/attestation.js +1 -1
- package/dist/esm/generated/ottochain/apps/identity/v1/identity.js +115 -121
- package/dist/esm/generated/ottochain/apps/markets/v1/market.js +101 -101
- package/dist/esm/generated/ottochain/v1/common.js +1 -1
- package/dist/esm/generated/ottochain/v1/fiber.js +40 -2
- package/dist/esm/generated/ottochain/v1/messages.js +1 -1
- package/dist/esm/generated/ottochain/v1/records.js +1 -1
- package/dist/esm/index.js +28 -3
- package/dist/esm/openapi.js +1 -0
- package/dist/esm/ottochain/genesis-manifest.js +15 -9
- package/dist/esm/ottochain/index.js +2 -3
- package/dist/esm/ottochain/metagraph-client.js +81 -16
- package/dist/esm/ottochain/snapshot.js +6 -8
- package/dist/esm/ottochain/transaction.js +51 -3
- package/dist/esm/ottochain/types.js +15 -1
- package/dist/esm/privacy/index.js +6 -0
- package/dist/esm/privacy/sealed-bid.js +209 -0
- package/dist/esm/privacy/shield-app.js +127 -0
- package/dist/esm/schema/effects.js +145 -0
- package/dist/esm/schema/fiber-app.js +139 -8
- package/dist/esm/schema/guard-lint.js +337 -0
- package/dist/esm/schema/guards.js +228 -0
- package/dist/esm/signing.js +74 -0
- package/dist/esm/templates/asset-policy.js +182 -0
- package/dist/esm/templates/index.js +41 -0
- package/dist/esm/templates/machine.js +125 -0
- package/dist/esm/templates/migration.js +34 -0
- package/dist/esm/templates/state-shape.js +34 -0
- package/dist/esm/validation.js +1 -3
- package/dist/esm/verify.js +8 -2
- package/dist/esm/zk/commit.js +44 -0
- package/dist/esm/zk/guard.js +99 -0
- package/dist/esm/zk/index.js +19 -0
- package/dist/esm/zk/preimage.js +30 -0
- package/dist/esm/zk/prover.js +82 -0
- package/dist/esm/zk/registry.js +55 -0
- package/dist/esm/zk/types.js +25 -0
- package/dist/esm/zk/witness.js +15 -0
- package/dist/types/apps/compute/index.d.ts +176 -0
- package/dist/types/apps/compute/state-machines/compute-rule110.d.ts +157 -0
- package/dist/types/apps/compute/state-machines/index.d.ts +5 -0
- package/dist/types/apps/contracts/index.d.ts +81 -221
- package/dist/types/apps/contracts/state-machines/contract-agreement.d.ts +23 -98
- package/dist/types/apps/contracts/state-machines/contract-escrow.d.ts +49 -115
- package/dist/types/apps/contracts/state-machines/contract-universal.d.ts +4 -4
- package/dist/types/apps/corporate/index.d.ts +1176 -440
- package/dist/types/apps/corporate/state-machines/corp-board.d.ts +271 -135
- package/dist/types/apps/corporate/state-machines/corp-entity.d.ts +279 -74
- package/dist/types/apps/corporate/state-machines/corp-securities.d.ts +373 -149
- package/dist/types/apps/corporate/state-machines/corp-shareholders.d.ts +252 -80
- package/dist/types/apps/governance/index.d.ts +368 -470
- package/dist/types/apps/governance/state-machines/dao-multisig.d.ts +92 -107
- package/dist/types/apps/governance/state-machines/dao-reputation.d.ts +61 -85
- package/dist/types/apps/governance/state-machines/dao-single.d.ts +25 -47
- package/dist/types/apps/governance/state-machines/dao-token.d.ts +79 -68
- package/dist/types/apps/governance/state-machines/governance-simple.d.ts +95 -125
- package/dist/types/apps/governance/state-machines/governance-universal.d.ts +6 -6
- package/dist/types/apps/identity/constants.d.ts +33 -5
- package/dist/types/apps/identity/index.d.ts +415 -131
- package/dist/types/apps/identity/state-machines/identity-agent.d.ts +23 -23
- package/dist/types/apps/identity/state-machines/identity-oracle.d.ts +27 -98
- package/dist/types/apps/identity/state-machines/identity-registry.d.ts +379 -0
- package/dist/types/apps/identity/state-machines/identity-universal.d.ts +4 -4
- package/dist/types/apps/identity/state-machines/index.d.ts +1 -0
- package/dist/types/apps/index.d.ts +9 -5
- package/dist/types/apps/lending/assets.d.ts +258 -0
- package/dist/types/apps/lending/credit-scoring.d.ts +80 -0
- package/dist/types/apps/lending/eligibility.d.ts +83 -0
- package/dist/types/apps/lending/index.d.ts +556 -0
- package/dist/types/apps/lending/state-machines/index.d.ts +5 -0
- package/dist/types/apps/lending/state-machines/lending-zk-loan.d.ts +536 -0
- package/dist/types/apps/markets/index.d.ts +181 -276
- package/dist/types/apps/markets/state-machines/market-auction.d.ts +25 -49
- package/dist/types/apps/markets/state-machines/market-crowdfund.d.ts +35 -53
- package/dist/types/apps/markets/state-machines/market-group-buy.d.ts +35 -61
- package/dist/types/apps/markets/state-machines/market-prediction.d.ts +65 -86
- package/dist/types/apps/markets/state-machines/market-universal.d.ts +12 -12
- package/dist/types/apps/oracles/index.d.ts +1 -1
- package/dist/types/apps/privacy/index.d.ts +328 -0
- package/dist/types/apps/privacy/state-machines/index.d.ts +6 -0
- package/dist/types/apps/privacy/state-machines/mixer-ddhRing.d.ts +337 -0
- package/dist/types/apps/privacy/state-machines/note-pool.d.ts +196 -0
- package/dist/types/apps/staked-pool/assets.d.ts +53 -0
- package/dist/types/apps/staked-pool/base.d.ts +80 -0
- package/dist/types/apps/staked-pool/consumer.d.ts +29 -0
- package/dist/types/apps/staked-pool/index.d.ts +51 -0
- package/dist/types/apps/staked-pool/state-machines/index.d.ts +6 -0
- package/dist/types/apps/staked-pool/state-machines/staked-pool-base.d.ts +8 -0
- package/dist/types/apps/staked-pool/state-machines/staked-pool-oracle.d.ts +34 -0
- package/dist/types/generated/index.d.ts +5 -5
- package/dist/types/generated/openapi.d.ts +1270 -0
- package/dist/types/generated/ottochain/apps/contracts/v1/contract.d.ts +5 -5
- package/dist/types/generated/ottochain/apps/identity/v1/identity.d.ts +12 -12
- package/dist/types/generated/ottochain/apps/markets/v1/market.d.ts +11 -11
- package/dist/types/generated/ottochain/v1/fiber.d.ts +7 -0
- package/dist/types/index.d.ts +7 -3
- package/dist/types/openapi.d.ts +24 -0
- package/dist/types/ottochain/genesis-manifest.d.ts +11 -5
- package/dist/types/ottochain/index.d.ts +5 -6
- package/dist/types/ottochain/metagraph-client.d.ts +49 -7
- package/dist/types/ottochain/snapshot.d.ts +6 -6
- package/dist/types/ottochain/transaction.d.ts +41 -1
- package/dist/types/ottochain/types.d.ts +336 -31
- package/dist/types/privacy/index.d.ts +6 -0
- package/dist/types/privacy/sealed-bid.d.ts +348 -0
- package/dist/types/privacy/shield-app.d.ts +48 -0
- package/dist/types/schema/effects.d.ts +141 -0
- package/dist/types/schema/fiber-app.d.ts +282 -2
- package/dist/types/schema/guard-lint.d.ts +111 -0
- package/dist/types/schema/guards.d.ts +146 -0
- package/dist/types/signing.d.ts +45 -0
- package/dist/types/templates/asset-policy.d.ts +119 -0
- package/dist/types/templates/index.d.ts +26 -0
- package/dist/types/templates/machine.d.ts +139 -0
- package/dist/types/templates/migration.d.ts +34 -0
- package/dist/types/templates/state-shape.d.ts +30 -0
- package/dist/types/validation.d.ts +22 -217
- package/dist/types/verify.d.ts +4 -0
- package/dist/types/zk/commit.d.ts +28 -0
- package/dist/types/zk/guard.d.ts +46 -0
- package/dist/types/zk/index.d.ts +19 -0
- package/dist/types/zk/preimage.d.ts +10 -0
- package/dist/types/zk/prover.d.ts +34 -0
- package/dist/types/zk/registry.d.ts +34 -0
- package/dist/types/zk/types.d.ts +33 -0
- package/dist/types/zk/witness.d.ts +40 -0
- package/package.json +47 -15
- package/dist/cjs/ottochain/normalize.js +0 -186
- package/dist/esm/ottochain/normalize.js +0 -179
- package/dist/types/ottochain/normalize.d.ts +0 -79
|
@@ -2,191 +2,181 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.govSimpleDef = void 0;
|
|
4
4
|
const fiber_app_js_1 = require("../../../schema/fiber-app.js");
|
|
5
|
+
const guards_js_1 = require("../../../schema/guards.js");
|
|
5
6
|
/**
|
|
6
7
|
* Simple org governance: manage members, update rules, resolve disputes.
|
|
7
8
|
*/
|
|
8
9
|
exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
9
10
|
metadata: {
|
|
10
|
-
name:
|
|
11
|
-
app:
|
|
12
|
-
type:
|
|
13
|
-
version:
|
|
14
|
-
description:
|
|
11
|
+
name: 'Governance',
|
|
12
|
+
app: 'governance',
|
|
13
|
+
type: 'simple',
|
|
14
|
+
version: '1.0.0',
|
|
15
|
+
description: 'Simple org governance: manage members, update rules, resolve disputes',
|
|
15
16
|
},
|
|
16
17
|
createSchema: {
|
|
17
|
-
required: [
|
|
18
|
-
"admins",
|
|
19
|
-
"passingThreshold",
|
|
20
|
-
"disputeQuorum",
|
|
21
|
-
"votingPeriodMs",
|
|
22
|
-
],
|
|
18
|
+
required: ['admins', 'passingThreshold', 'disputeQuorum', 'votingPeriodMs'],
|
|
23
19
|
properties: {
|
|
24
20
|
admins: {
|
|
25
|
-
type:
|
|
26
|
-
description:
|
|
21
|
+
type: 'array',
|
|
22
|
+
description: 'Initial admin addresses',
|
|
27
23
|
immutable: false,
|
|
28
24
|
},
|
|
29
25
|
passingThreshold: {
|
|
30
|
-
type:
|
|
31
|
-
description:
|
|
26
|
+
type: 'number',
|
|
27
|
+
description: 'Fraction of members required to pass (0-1)',
|
|
32
28
|
},
|
|
33
29
|
disputeQuorum: {
|
|
34
|
-
type:
|
|
35
|
-
description:
|
|
30
|
+
type: 'number',
|
|
31
|
+
description: 'Min votes to resolve a dispute',
|
|
36
32
|
},
|
|
37
33
|
votingPeriodMs: {
|
|
38
|
-
type:
|
|
39
|
-
description:
|
|
34
|
+
type: 'number',
|
|
35
|
+
description: 'Voting window in milliseconds',
|
|
40
36
|
},
|
|
41
37
|
},
|
|
42
38
|
},
|
|
43
39
|
stateSchema: {
|
|
44
40
|
properties: {
|
|
45
|
-
admins: { type:
|
|
46
|
-
members: { type:
|
|
47
|
-
rules: { type:
|
|
48
|
-
history: { type:
|
|
49
|
-
proposal: { type:
|
|
50
|
-
votes: { type:
|
|
51
|
-
dispute: { type:
|
|
52
|
-
passingThreshold: { type:
|
|
53
|
-
disputeQuorum: { type:
|
|
54
|
-
votingPeriodMs: { type:
|
|
41
|
+
admins: { type: 'array', immutable: false },
|
|
42
|
+
members: { type: 'object', computed: true },
|
|
43
|
+
rules: { type: 'object', computed: true },
|
|
44
|
+
history: { type: 'array', computed: true },
|
|
45
|
+
proposal: { type: 'object' },
|
|
46
|
+
votes: { type: 'object', computed: true },
|
|
47
|
+
dispute: { type: 'object' },
|
|
48
|
+
passingThreshold: { type: 'number' },
|
|
49
|
+
disputeQuorum: { type: 'number' },
|
|
50
|
+
votingPeriodMs: { type: 'number' },
|
|
55
51
|
},
|
|
56
52
|
},
|
|
57
53
|
eventSchemas: {
|
|
58
54
|
add_member: {
|
|
59
|
-
description:
|
|
60
|
-
required: [
|
|
55
|
+
description: 'Add a member (admin only)',
|
|
56
|
+
required: ['member', 'role'],
|
|
61
57
|
properties: {
|
|
62
|
-
agent: { type:
|
|
63
|
-
member: { type:
|
|
64
|
-
role: { type:
|
|
58
|
+
agent: { type: 'address' },
|
|
59
|
+
member: { type: 'address' },
|
|
60
|
+
role: { type: 'string' },
|
|
65
61
|
},
|
|
66
62
|
},
|
|
67
63
|
remove_member: {
|
|
68
|
-
description:
|
|
69
|
-
required: [
|
|
64
|
+
description: 'Remove a member (admin only)',
|
|
65
|
+
required: ['member'],
|
|
70
66
|
properties: {
|
|
71
|
-
agent: { type:
|
|
72
|
-
member: { type:
|
|
67
|
+
agent: { type: 'address' },
|
|
68
|
+
member: { type: 'address' },
|
|
73
69
|
},
|
|
74
70
|
},
|
|
75
71
|
propose: {
|
|
76
|
-
description:
|
|
77
|
-
required: [
|
|
72
|
+
description: 'Submit a rule change proposal',
|
|
73
|
+
required: ['proposalId', 'type', 'changes'],
|
|
78
74
|
properties: {
|
|
79
|
-
agent: { type:
|
|
80
|
-
proposalId: { type:
|
|
81
|
-
type: { type:
|
|
82
|
-
changes: { type:
|
|
75
|
+
agent: { type: 'address' },
|
|
76
|
+
proposalId: { type: 'string' },
|
|
77
|
+
type: { type: 'string' },
|
|
78
|
+
changes: { type: 'object' },
|
|
83
79
|
},
|
|
84
80
|
},
|
|
85
81
|
vote: {
|
|
86
|
-
description:
|
|
87
|
-
required: [
|
|
82
|
+
description: 'Cast a vote on the active proposal or dispute',
|
|
83
|
+
required: ['vote'],
|
|
88
84
|
properties: {
|
|
89
|
-
agent: { type:
|
|
90
|
-
vote: { type:
|
|
91
|
-
ruling: { type:
|
|
85
|
+
agent: { type: 'address' },
|
|
86
|
+
vote: { type: 'string' },
|
|
87
|
+
ruling: { type: 'string' },
|
|
92
88
|
},
|
|
93
89
|
},
|
|
94
90
|
finalize: {
|
|
95
|
-
description:
|
|
96
|
-
|
|
97
|
-
properties: {
|
|
98
|
-
forCount: { type: "number" },
|
|
99
|
-
},
|
|
91
|
+
description: 'Finalize the voting period (for-count derived from recorded ballots)',
|
|
92
|
+
properties: {},
|
|
100
93
|
},
|
|
101
94
|
file_dispute: {
|
|
102
|
-
description:
|
|
103
|
-
required: [
|
|
95
|
+
description: 'File a dispute against a member',
|
|
96
|
+
required: ['disputeId', 'defendant', 'claim'],
|
|
104
97
|
properties: {
|
|
105
|
-
agent: { type:
|
|
106
|
-
disputeId: { type:
|
|
107
|
-
defendant: { type:
|
|
108
|
-
claim: { type:
|
|
98
|
+
agent: { type: 'address' },
|
|
99
|
+
disputeId: { type: 'string' },
|
|
100
|
+
defendant: { type: 'address' },
|
|
101
|
+
claim: { type: 'string' },
|
|
109
102
|
},
|
|
110
103
|
},
|
|
111
104
|
submit_evidence: {
|
|
112
|
-
description:
|
|
113
|
-
required: [
|
|
105
|
+
description: 'Submit evidence in a dispute',
|
|
106
|
+
required: ['content'],
|
|
114
107
|
properties: {
|
|
115
|
-
agent: { type:
|
|
116
|
-
content: { type:
|
|
108
|
+
agent: { type: 'address' },
|
|
109
|
+
content: { type: 'string' },
|
|
117
110
|
},
|
|
118
111
|
},
|
|
119
112
|
resolve: {
|
|
120
|
-
description:
|
|
121
|
-
required: [
|
|
113
|
+
description: 'Resolve the active dispute',
|
|
114
|
+
required: ['ruling', 'remedy'],
|
|
122
115
|
properties: {
|
|
123
|
-
ruling: { type:
|
|
124
|
-
remedy: { type:
|
|
116
|
+
ruling: { type: 'string' },
|
|
117
|
+
remedy: { type: 'string' },
|
|
125
118
|
},
|
|
126
119
|
},
|
|
127
120
|
dissolve: {
|
|
128
|
-
description:
|
|
129
|
-
|
|
130
|
-
properties: {
|
|
131
|
-
approvalCount: { type: "number" },
|
|
132
|
-
},
|
|
121
|
+
description: 'Dissolve the organization (requires every member to sign this op — verified unanimity)',
|
|
122
|
+
properties: {},
|
|
133
123
|
},
|
|
134
124
|
},
|
|
135
125
|
states: {
|
|
136
126
|
ACTIVE: {
|
|
137
|
-
id:
|
|
127
|
+
id: 'ACTIVE',
|
|
138
128
|
isFinal: false,
|
|
139
129
|
metadata: {
|
|
140
|
-
label:
|
|
141
|
-
description:
|
|
142
|
-
category:
|
|
130
|
+
label: 'Active',
|
|
131
|
+
description: 'Governance is idle and ready to accept a proposal',
|
|
132
|
+
category: 'initial',
|
|
143
133
|
},
|
|
144
134
|
},
|
|
145
135
|
VOTING: {
|
|
146
|
-
id:
|
|
136
|
+
id: 'VOTING',
|
|
147
137
|
isFinal: false,
|
|
148
138
|
metadata: {
|
|
149
|
-
label:
|
|
150
|
-
description:
|
|
151
|
-
category:
|
|
139
|
+
label: 'Voting',
|
|
140
|
+
description: 'A proposal is open for voting',
|
|
141
|
+
category: 'pending',
|
|
152
142
|
},
|
|
153
143
|
},
|
|
154
144
|
DISPUTE: {
|
|
155
|
-
id:
|
|
145
|
+
id: 'DISPUTE',
|
|
156
146
|
isFinal: false,
|
|
157
147
|
metadata: {
|
|
158
|
-
label:
|
|
159
|
-
description:
|
|
160
|
-
category:
|
|
148
|
+
label: 'Dispute',
|
|
149
|
+
description: 'A proposal outcome is being disputed',
|
|
150
|
+
category: 'pending',
|
|
161
151
|
},
|
|
162
152
|
},
|
|
163
153
|
DISSOLVED: {
|
|
164
|
-
id:
|
|
154
|
+
id: 'DISSOLVED',
|
|
165
155
|
isFinal: true,
|
|
166
156
|
metadata: {
|
|
167
|
-
label:
|
|
168
|
-
description:
|
|
169
|
-
category:
|
|
157
|
+
label: 'Dissolved',
|
|
158
|
+
description: 'Governance entity dissolved (terminal)',
|
|
159
|
+
category: 'terminal',
|
|
170
160
|
},
|
|
171
161
|
},
|
|
172
162
|
},
|
|
173
|
-
initialState:
|
|
163
|
+
initialState: 'ACTIVE',
|
|
174
164
|
transitions: [
|
|
175
165
|
// ACTIVE → ACTIVE: add member (admin only)
|
|
176
166
|
{
|
|
177
|
-
from:
|
|
178
|
-
to:
|
|
179
|
-
eventName:
|
|
180
|
-
guard:
|
|
167
|
+
from: 'ACTIVE',
|
|
168
|
+
to: 'ACTIVE',
|
|
169
|
+
eventName: 'add_member',
|
|
170
|
+
guard: (0, guards_js_1.signerInSet)('state.admins'),
|
|
181
171
|
effect: {
|
|
182
172
|
merge: [
|
|
183
|
-
{ var:
|
|
173
|
+
{ var: 'state' },
|
|
184
174
|
{
|
|
185
175
|
members: {
|
|
186
|
-
|
|
187
|
-
{ var:
|
|
188
|
-
{ var:
|
|
189
|
-
{ role: { var:
|
|
176
|
+
set: [
|
|
177
|
+
{ var: 'state.members' },
|
|
178
|
+
{ var: 'event.member' },
|
|
179
|
+
{ role: { var: 'event.role' }, addedAt: { var: '$ordinal' } },
|
|
190
180
|
],
|
|
191
181
|
},
|
|
192
182
|
},
|
|
@@ -196,16 +186,16 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
196
186
|
},
|
|
197
187
|
// ACTIVE → ACTIVE: remove member (admin only)
|
|
198
188
|
{
|
|
199
|
-
from:
|
|
200
|
-
to:
|
|
201
|
-
eventName:
|
|
202
|
-
guard:
|
|
189
|
+
from: 'ACTIVE',
|
|
190
|
+
to: 'ACTIVE',
|
|
191
|
+
eventName: 'remove_member',
|
|
192
|
+
guard: (0, guards_js_1.signerInSet)('state.admins'),
|
|
203
193
|
effect: {
|
|
204
194
|
merge: [
|
|
205
|
-
{ var:
|
|
195
|
+
{ var: 'state' },
|
|
206
196
|
{
|
|
207
197
|
members: {
|
|
208
|
-
|
|
198
|
+
unset: [{ var: 'state.members' }, { var: 'event.member' }],
|
|
209
199
|
},
|
|
210
200
|
},
|
|
211
201
|
],
|
|
@@ -214,22 +204,24 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
214
204
|
},
|
|
215
205
|
// ACTIVE → VOTING: propose
|
|
216
206
|
{
|
|
217
|
-
from:
|
|
218
|
-
to:
|
|
219
|
-
eventName:
|
|
220
|
-
|
|
207
|
+
from: 'ACTIVE',
|
|
208
|
+
to: 'VOTING',
|
|
209
|
+
eventName: 'propose',
|
|
210
|
+
// S1/A2 coupled fix: a CHAIN-VERIFIED signer must be a member (getKey is not a
|
|
211
|
+
// JLVM opcode; signerHasEntry checks signer ∈ keys(state.members) via `has`).
|
|
212
|
+
guard: (0, guards_js_1.signerHasEntry)('state.members'),
|
|
221
213
|
effect: {
|
|
222
214
|
merge: [
|
|
223
|
-
{ var:
|
|
215
|
+
{ var: 'state' },
|
|
224
216
|
{
|
|
225
217
|
proposal: {
|
|
226
|
-
id: { var:
|
|
227
|
-
type: { var:
|
|
228
|
-
changes: { var:
|
|
229
|
-
proposer: { var:
|
|
230
|
-
proposedAt: { var:
|
|
218
|
+
id: { var: 'event.proposalId' },
|
|
219
|
+
type: { var: 'event.type' },
|
|
220
|
+
changes: { var: 'event.changes' },
|
|
221
|
+
proposer: { var: 'event.agent' },
|
|
222
|
+
proposedAt: { var: '$ordinal' },
|
|
231
223
|
deadline: {
|
|
232
|
-
|
|
224
|
+
'+': [{ var: '$ordinal' }, { var: 'state.votingPeriodMs' }],
|
|
233
225
|
},
|
|
234
226
|
},
|
|
235
227
|
votes: {},
|
|
@@ -240,26 +232,25 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
240
232
|
},
|
|
241
233
|
// VOTING → VOTING: vote (member, no double-voting)
|
|
242
234
|
{
|
|
243
|
-
from:
|
|
244
|
-
to:
|
|
245
|
-
eventName:
|
|
235
|
+
from: 'VOTING',
|
|
236
|
+
to: 'VOTING',
|
|
237
|
+
eventName: 'vote',
|
|
238
|
+
// S1/A2 coupled fix: bind event.agent to a verified signer who is a member (actorHasEntry),
|
|
239
|
+
// and block a re-vote by that SAME bound actor — so the ballot is recorded under, and deduped
|
|
240
|
+
// on, the chain-verified voter. Without the binding, signerHasEntry only proves SOME signer is a
|
|
241
|
+
// member, letting one member stuff votes under arbitrary keys (set is the rc.5 map-write opcode).
|
|
246
242
|
guard: {
|
|
247
|
-
and: [
|
|
248
|
-
{ getKey: [{ var: "state.members" }, { var: "event.agent" }] },
|
|
249
|
-
{
|
|
250
|
-
"!": [{ getKey: [{ var: "state.votes" }, { var: "event.agent" }] }],
|
|
251
|
-
},
|
|
252
|
-
],
|
|
243
|
+
and: [(0, guards_js_1.actorHasEntry)('state.members'), { '!': [{ has: [{ var: 'state.votes' }, { var: 'event.agent' }] }] }],
|
|
253
244
|
},
|
|
254
245
|
effect: {
|
|
255
246
|
merge: [
|
|
256
|
-
{ var:
|
|
247
|
+
{ var: 'state' },
|
|
257
248
|
{
|
|
258
249
|
votes: {
|
|
259
|
-
|
|
260
|
-
{ var:
|
|
261
|
-
{ var:
|
|
262
|
-
{ vote: { var:
|
|
250
|
+
set: [
|
|
251
|
+
{ var: 'state.votes' },
|
|
252
|
+
{ var: 'event.agent' },
|
|
253
|
+
{ vote: { var: 'event.vote' }, votedAt: { var: '$ordinal' } },
|
|
263
254
|
],
|
|
264
255
|
},
|
|
265
256
|
},
|
|
@@ -269,39 +260,42 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
269
260
|
},
|
|
270
261
|
// VOTING → ACTIVE: finalize (passed)
|
|
271
262
|
{
|
|
272
|
-
from:
|
|
273
|
-
to:
|
|
274
|
-
eventName:
|
|
263
|
+
from: 'VOTING',
|
|
264
|
+
to: 'ACTIVE',
|
|
265
|
+
eventName: 'finalize',
|
|
266
|
+
// S2/A2 coupled fix: the for-count is DERIVED from recorded ballots in
|
|
267
|
+
// state.votes (length of the "for" entries), never read from the attacker's
|
|
268
|
+
// event.forCount. members is a Map so its count is length(keys(members)).
|
|
275
269
|
guard: {
|
|
276
|
-
|
|
277
|
-
{ var: "event.forCount" },
|
|
270
|
+
'>=': [
|
|
278
271
|
{
|
|
279
|
-
|
|
280
|
-
{
|
|
281
|
-
|
|
272
|
+
length: [
|
|
273
|
+
{
|
|
274
|
+
filter: [{ values: [{ var: 'state.votes' }] }, { '===': [{ var: 'vote' }, 'for'] }],
|
|
275
|
+
},
|
|
282
276
|
],
|
|
283
277
|
},
|
|
278
|
+
{
|
|
279
|
+
'*': [{ length: [{ keys: [{ var: 'state.members' }] }] }, { var: 'state.passingThreshold' }],
|
|
280
|
+
},
|
|
284
281
|
],
|
|
285
282
|
},
|
|
286
283
|
effect: {
|
|
287
284
|
merge: [
|
|
288
|
-
{ var:
|
|
285
|
+
{ var: 'state' },
|
|
289
286
|
{
|
|
290
287
|
rules: {
|
|
291
|
-
merge: [
|
|
292
|
-
{ var: "state.rules" },
|
|
293
|
-
{ var: "state.proposal.changes" },
|
|
294
|
-
],
|
|
288
|
+
merge: [{ var: 'state.rules' }, { var: 'state.proposal.changes' }],
|
|
295
289
|
},
|
|
296
290
|
history: {
|
|
297
291
|
cat: [
|
|
298
|
-
{ var:
|
|
292
|
+
{ var: 'state.history' },
|
|
299
293
|
[
|
|
300
294
|
{
|
|
301
|
-
type:
|
|
302
|
-
proposal: { var:
|
|
303
|
-
outcome:
|
|
304
|
-
finalizedAt: { var:
|
|
295
|
+
type: 'rule_change',
|
|
296
|
+
proposal: { var: 'state.proposal' },
|
|
297
|
+
outcome: 'passed',
|
|
298
|
+
finalizedAt: { var: '$ordinal' },
|
|
305
299
|
},
|
|
306
300
|
],
|
|
307
301
|
],
|
|
@@ -315,33 +309,38 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
315
309
|
},
|
|
316
310
|
// VOTING → ACTIVE: finalize (failed)
|
|
317
311
|
{
|
|
318
|
-
from:
|
|
319
|
-
to:
|
|
320
|
-
eventName:
|
|
312
|
+
from: 'VOTING',
|
|
313
|
+
to: 'ACTIVE',
|
|
314
|
+
eventName: 'finalize',
|
|
315
|
+
// S2/A2 coupled fix (failed arm): derive the for-count from recorded ballots in
|
|
316
|
+
// state.votes; never from event.forCount. members count = length(keys(members)).
|
|
321
317
|
guard: {
|
|
322
|
-
|
|
323
|
-
{ var: "event.forCount" },
|
|
318
|
+
'<': [
|
|
324
319
|
{
|
|
325
|
-
|
|
326
|
-
{
|
|
327
|
-
|
|
320
|
+
length: [
|
|
321
|
+
{
|
|
322
|
+
filter: [{ values: [{ var: 'state.votes' }] }, { '===': [{ var: 'vote' }, 'for'] }],
|
|
323
|
+
},
|
|
328
324
|
],
|
|
329
325
|
},
|
|
326
|
+
{
|
|
327
|
+
'*': [{ length: [{ keys: [{ var: 'state.members' }] }] }, { var: 'state.passingThreshold' }],
|
|
328
|
+
},
|
|
330
329
|
],
|
|
331
330
|
},
|
|
332
331
|
effect: {
|
|
333
332
|
merge: [
|
|
334
|
-
{ var:
|
|
333
|
+
{ var: 'state' },
|
|
335
334
|
{
|
|
336
335
|
history: {
|
|
337
336
|
cat: [
|
|
338
|
-
{ var:
|
|
337
|
+
{ var: 'state.history' },
|
|
339
338
|
[
|
|
340
339
|
{
|
|
341
|
-
type:
|
|
342
|
-
proposal: { var:
|
|
343
|
-
outcome:
|
|
344
|
-
finalizedAt: { var:
|
|
340
|
+
type: 'rule_change',
|
|
341
|
+
proposal: { var: 'state.proposal' },
|
|
342
|
+
outcome: 'failed',
|
|
343
|
+
finalizedAt: { var: '$ordinal' },
|
|
345
344
|
},
|
|
346
345
|
],
|
|
347
346
|
],
|
|
@@ -355,20 +354,22 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
355
354
|
},
|
|
356
355
|
// ACTIVE → DISPUTE: file_dispute
|
|
357
356
|
{
|
|
358
|
-
from:
|
|
359
|
-
to:
|
|
360
|
-
eventName:
|
|
361
|
-
|
|
357
|
+
from: 'ACTIVE',
|
|
358
|
+
to: 'DISPUTE',
|
|
359
|
+
eventName: 'file_dispute',
|
|
360
|
+
// S1/A2 coupled fix: only a CHAIN-VERIFIED member may file (getKey is not a JLVM
|
|
361
|
+
// opcode; signerHasEntry checks signer ∈ keys(state.members) via `has`).
|
|
362
|
+
guard: (0, guards_js_1.signerHasEntry)('state.members'),
|
|
362
363
|
effect: {
|
|
363
364
|
merge: [
|
|
364
|
-
{ var:
|
|
365
|
+
{ var: 'state' },
|
|
365
366
|
{
|
|
366
367
|
dispute: {
|
|
367
|
-
id: { var:
|
|
368
|
-
plaintiff: { var:
|
|
369
|
-
defendant: { var:
|
|
370
|
-
claim: { var:
|
|
371
|
-
filedAt: { var:
|
|
368
|
+
id: { var: 'event.disputeId' },
|
|
369
|
+
plaintiff: { var: 'event.agent' },
|
|
370
|
+
defendant: { var: 'event.defendant' },
|
|
371
|
+
claim: { var: 'event.claim' },
|
|
372
|
+
filedAt: { var: '$ordinal' },
|
|
372
373
|
evidence: [],
|
|
373
374
|
},
|
|
374
375
|
votes: {},
|
|
@@ -379,35 +380,26 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
379
380
|
},
|
|
380
381
|
// DISPUTE → DISPUTE: submit_evidence (plaintiff or defendant)
|
|
381
382
|
{
|
|
382
|
-
from:
|
|
383
|
-
to:
|
|
384
|
-
eventName:
|
|
385
|
-
guard:
|
|
386
|
-
or: [
|
|
387
|
-
{
|
|
388
|
-
"===": [{ var: "event.agent" }, { var: "state.dispute.plaintiff" }],
|
|
389
|
-
},
|
|
390
|
-
{
|
|
391
|
-
"===": [{ var: "event.agent" }, { var: "state.dispute.defendant" }],
|
|
392
|
-
},
|
|
393
|
-
],
|
|
394
|
-
},
|
|
383
|
+
from: 'DISPUTE',
|
|
384
|
+
to: 'DISPUTE',
|
|
385
|
+
eventName: 'submit_evidence',
|
|
386
|
+
guard: (0, guards_js_1.signerIsAnyParty)(['state.dispute.plaintiff', 'state.dispute.defendant']),
|
|
395
387
|
effect: {
|
|
396
388
|
merge: [
|
|
397
|
-
{ var:
|
|
389
|
+
{ var: 'state' },
|
|
398
390
|
{
|
|
399
391
|
dispute: {
|
|
400
392
|
merge: [
|
|
401
|
-
{ var:
|
|
393
|
+
{ var: 'state.dispute' },
|
|
402
394
|
{
|
|
403
395
|
evidence: {
|
|
404
396
|
cat: [
|
|
405
|
-
{ var:
|
|
397
|
+
{ var: 'state.dispute.evidence' },
|
|
406
398
|
[
|
|
407
399
|
{
|
|
408
|
-
from: { var:
|
|
409
|
-
content: { var:
|
|
410
|
-
at: { var:
|
|
400
|
+
from: { var: 'event.agent' },
|
|
401
|
+
content: { var: 'event.content' },
|
|
402
|
+
at: { var: '$ordinal' },
|
|
411
403
|
},
|
|
412
404
|
],
|
|
413
405
|
],
|
|
@@ -422,34 +414,32 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
422
414
|
},
|
|
423
415
|
// DISPUTE → DISPUTE: vote (member, not party, no double-vote)
|
|
424
416
|
{
|
|
425
|
-
from:
|
|
426
|
-
to:
|
|
427
|
-
eventName:
|
|
417
|
+
from: 'DISPUTE',
|
|
418
|
+
to: 'DISPUTE',
|
|
419
|
+
eventName: 'vote',
|
|
420
|
+
// S1/A2 coupled fix: bind event.agent to a verified member (actorHasEntry), exclude the parties,
|
|
421
|
+
// and block a re-vote by that SAME bound actor — so the dispute ballot is recorded under, and
|
|
422
|
+
// deduped on, the chain-verified voter (set is the rc.5 map-write opcode; signerIsNotParty still
|
|
423
|
+
// excludes any signer who is a party, which covers the bound actor).
|
|
428
424
|
guard: {
|
|
429
425
|
and: [
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
},
|
|
434
|
-
{
|
|
435
|
-
"!==": [{ var: "event.agent" }, { var: "state.dispute.defendant" }],
|
|
436
|
-
},
|
|
437
|
-
{
|
|
438
|
-
"!": [{ getKey: [{ var: "state.votes" }, { var: "event.agent" }] }],
|
|
439
|
-
},
|
|
426
|
+
(0, guards_js_1.actorHasEntry)('state.members'),
|
|
427
|
+
(0, guards_js_1.signerIsNotParty)('state.dispute.plaintiff'),
|
|
428
|
+
(0, guards_js_1.signerIsNotParty)('state.dispute.defendant'),
|
|
429
|
+
{ '!': [{ has: [{ var: 'state.votes' }, { var: 'event.agent' }] }] },
|
|
440
430
|
],
|
|
441
431
|
},
|
|
442
432
|
effect: {
|
|
443
433
|
merge: [
|
|
444
|
-
{ var:
|
|
434
|
+
{ var: 'state' },
|
|
445
435
|
{
|
|
446
436
|
votes: {
|
|
447
|
-
|
|
448
|
-
{ var:
|
|
449
|
-
{ var:
|
|
437
|
+
set: [
|
|
438
|
+
{ var: 'state.votes' },
|
|
439
|
+
{ var: 'event.agent' },
|
|
450
440
|
{
|
|
451
|
-
ruling: { var:
|
|
452
|
-
votedAt: { var:
|
|
441
|
+
ruling: { var: 'event.ruling' },
|
|
442
|
+
votedAt: { var: '$ordinal' },
|
|
453
443
|
},
|
|
454
444
|
],
|
|
455
445
|
},
|
|
@@ -460,29 +450,28 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
460
450
|
},
|
|
461
451
|
// DISPUTE → ACTIVE: resolve (quorum met)
|
|
462
452
|
{
|
|
463
|
-
from:
|
|
464
|
-
to:
|
|
465
|
-
eventName:
|
|
453
|
+
from: 'DISPUTE',
|
|
454
|
+
to: 'ACTIVE',
|
|
455
|
+
eventName: 'resolve',
|
|
456
|
+
// A2 fix: count recorded ballots. votes is a Map, and `length` rejects Maps, so
|
|
457
|
+
// count its keys: length(keys(state.votes)). (size is not a JLVM opcode.)
|
|
466
458
|
guard: {
|
|
467
|
-
|
|
468
|
-
{ size: { var: "state.votes" } },
|
|
469
|
-
{ var: "state.disputeQuorum" },
|
|
470
|
-
],
|
|
459
|
+
'>=': [{ length: [{ keys: [{ var: 'state.votes' }] }] }, { var: 'state.disputeQuorum' }],
|
|
471
460
|
},
|
|
472
461
|
effect: {
|
|
473
462
|
merge: [
|
|
474
|
-
{ var:
|
|
463
|
+
{ var: 'state' },
|
|
475
464
|
{
|
|
476
465
|
history: {
|
|
477
466
|
cat: [
|
|
478
|
-
{ var:
|
|
467
|
+
{ var: 'state.history' },
|
|
479
468
|
[
|
|
480
469
|
{
|
|
481
|
-
type:
|
|
482
|
-
dispute: { var:
|
|
483
|
-
ruling: { var:
|
|
484
|
-
remedy: { var:
|
|
485
|
-
resolvedAt: { var:
|
|
470
|
+
type: 'dispute',
|
|
471
|
+
dispute: { var: 'state.dispute' },
|
|
472
|
+
ruling: { var: 'event.ruling' },
|
|
473
|
+
remedy: { var: 'event.remedy' },
|
|
474
|
+
resolvedAt: { var: '$ordinal' },
|
|
486
475
|
},
|
|
487
476
|
],
|
|
488
477
|
],
|
|
@@ -496,17 +485,28 @@ exports.govSimpleDef = (0, fiber_app_js_1.defineFiberApp)({
|
|
|
496
485
|
},
|
|
497
486
|
// ACTIVE → DISSOLVED: dissolve (90% approval)
|
|
498
487
|
{
|
|
499
|
-
from:
|
|
500
|
-
to:
|
|
501
|
-
eventName:
|
|
488
|
+
from: 'ACTIVE',
|
|
489
|
+
to: 'DISSOLVED',
|
|
490
|
+
eventName: 'dissolve',
|
|
491
|
+
// S2/A2 coupled fix: dissolution must not trust an attacker-supplied
|
|
492
|
+
// approvalCount. Derive consent from the CHAIN-VERIFIED signers — every member
|
|
493
|
+
// (a key in state.members) must be among proofs[].address, with a non-empty
|
|
494
|
+
// belt. members is a Map, so iterate keys(members); size is not a JLVM opcode.
|
|
502
495
|
guard: {
|
|
503
|
-
|
|
504
|
-
{ var:
|
|
505
|
-
{
|
|
496
|
+
and: [
|
|
497
|
+
{ '>': [{ length: [{ keys: [{ var: 'state.members' }] }] }, 0] },
|
|
498
|
+
{
|
|
499
|
+
all: [
|
|
500
|
+
{ keys: [{ var: 'state.members' }] },
|
|
501
|
+
{
|
|
502
|
+
in: [{ var: '' }, { map: [{ var: 'proofs' }, { var: 'address' }] }],
|
|
503
|
+
},
|
|
504
|
+
],
|
|
505
|
+
},
|
|
506
506
|
],
|
|
507
507
|
},
|
|
508
508
|
effect: {
|
|
509
|
-
merge: [{ var:
|
|
509
|
+
merge: [{ var: 'state' }, { dissolvedAt: { var: '$ordinal' } }],
|
|
510
510
|
},
|
|
511
511
|
dependencies: [],
|
|
512
512
|
},
|