@ottochain/sdk 2.2.5 → 2.4.0

package/dist/esm/apps/markets/state-machines/market-crowdfund.js

@@ -1,4 +1,5 @@
 import { defineFiberApp } from "../../../schema/fiber-app.js";
+import { signerIsParty, signerIsNotParty } from "../../../schema/guards.js";
 /**
  * All-or-nothing crowdfunding with threshold, deadline, and stretch goals.
  */
@@ -78,27 +79,47 @@ export const marketCrowdfundDef = defineFiberApp({
         PROPOSED: {
             id: "PROPOSED",
             isFinal: false,
-            metadata: { description: "Campaign created but not yet open" },
+            metadata: {
+                label: "Proposed",
+                description: "Campaign created but not yet open",
+                category: "initial",
+            },
         },
         OPEN: {
             id: "OPEN",
             isFinal: false,
-            metadata: { description: "Accepting pledges" },
+            metadata: {
+                label: "Open",
+                description: "Accepting pledges",
+                category: "active",
+            },
         },
         FUNDED: {
             id: "FUNDED",
             isFinal: true,
-            metadata: { description: "Threshold met, funds released to creator" },
+            metadata: {
+                label: "Funded",
+                description: "Threshold met, funds released to creator",
+                category: "terminal",
+            },
         },
         REFUNDED: {
             id: "REFUNDED",
             isFinal: true,
-            metadata: { description: "Threshold not met, all pledges refunded" },
+            metadata: {
+                label: "Refunded",
+                description: "Threshold not met, all pledges refunded",
+                category: "terminal",
+            },
         },
         CANCELLED: {
             id: "CANCELLED",
             isFinal: true,
-            metadata: { description: "Campaign cancelled by creator" },
+            metadata: {
+                label: "Cancelled",
+                description: "Campaign cancelled by creator",
+                category: "terminal",
+            },
         },
     },
     initialState: "PROPOSED",
@@ -107,13 +128,13 @@ export const marketCrowdfundDef = defineFiberApp({
             from: "PROPOSED",
             to: "OPEN",
             eventName: "launch",
-            guard: { "===": [{ var: "event.agent" }, { var: "state.creator" }] },
+            guard: signerIsParty("state.creator"),
             effect: {
                 merge: [
                     { var: "state" },
                     {
                         status: "OPEN",
-                        launchedAt: { var: "$timestamp" },
+                        launchedAt: { var: "$ordinal" },
                         pledges: [],
                         totalPledged: 0,
                         backerCount: 0,
@@ -126,11 +147,11 @@ export const marketCrowdfundDef = defineFiberApp({
             from: "PROPOSED",
             to: "CANCELLED",
             eventName: "cancel",
-            guard: { "===": [{ var: "event.agent" }, { var: "state.creator" }] },
+            guard: signerIsParty("state.creator"),
             effect: {
                 merge: [
                     { var: "state" },
-                    { status: "CANCELLED", cancelledAt: { var: "$timestamp" } },
+                    { status: "CANCELLED", cancelledAt: { var: "$ordinal" } },
                 ],
             },
             dependencies: [],
@@ -142,14 +163,14 @@ export const marketCrowdfundDef = defineFiberApp({
             guard: {
                 and: [
                     { ">": [{ var: "event.amount" }, 0] },
-                    { "!==": [{ var: "event.agent" }, { var: "state.creator" }] },
+                    signerIsNotParty("state.creator"),
                     {
                         or: [
                             { "!": [{ var: "state.minPledge" }] },
                             { ">=": [{ var: "event.amount" }, { var: "state.minPledge" }] },
                         ],
                     },
-                    { "<=": [{ var: "$timestamp" }, { var: "state.deadline" }] },
+                    { "<=": [{ var: "$ordinal" }, { var: "state.deadline" }] },
                 ],
             },
             effect: {
@@ -164,7 +185,7 @@ export const marketCrowdfundDef = defineFiberApp({
                                         backer: { var: "event.agent" },
                                         amount: { var: "event.amount" },
                                         rewardTier: { var: "event.rewardTier" },
-                                        pledgedAt: { var: "$timestamp" },
+                                        pledgedAt: { var: "$ordinal" },
                                     },
                                 ],
                             ],
@@ -185,16 +206,18 @@ export const marketCrowdfundDef = defineFiberApp({
             guard: {
                 and: [
                     { ">": [{ var: "event.additionalAmount" }, 0] },
-                    { "<=": [{ var: "$timestamp" }, { var: "state.deadline" }] },
+                    { "<=": [{ var: "$ordinal" }, { var: "state.deadline" }] },
                     {
                         ">": [
                             {
-                                size: {
-                                    filter: [
-                                        { var: "state.pledges" },
-                                        { "===": [{ var: "backer" }, { var: "event.agent" }] },
-                                    ],
-                                },
+                                length: [
+                                    {
+                                        filter: [
+                                            { var: "state.pledges" },
+                                            { "===": [{ var: "backer" }, { var: "event.agent" }] },
+                                        ],
+                                    },
+                                ],
                             },
                             0,
                         ],
@@ -223,7 +246,7 @@ export const marketCrowdfundDef = defineFiberApp({
             guard: {
                 and: [
                     { ">=": [{ var: "state.totalPledged" }, { var: "state.threshold" }] },
-                    { ">=": [{ var: "$timestamp" }, { var: "state.deadline" }] },
+                    { ">=": [{ var: "$ordinal" }, { var: "state.deadline" }] },
                 ],
             },
             effect: {
@@ -231,7 +254,7 @@ export const marketCrowdfundDef = defineFiberApp({
                     { var: "state" },
                     {
                         status: "FUNDED",
-                        fundedAt: { var: "$timestamp" },
+                        fundedAt: { var: "$ordinal" },
                         stretchGoalsReached: {
                             filter: [
                                 { var: "state.stretchGoals" },
@@ -250,7 +273,7 @@ export const marketCrowdfundDef = defineFiberApp({
             guard: {
                 and: [
                     { "<": [{ var: "state.totalPledged" }, { var: "state.threshold" }] },
-                    { ">=": [{ var: "$timestamp" }, { var: "state.deadline" }] },
+                    { ">=": [{ var: "$ordinal" }, { var: "state.deadline" }] },
                 ],
             },
             effect: {
@@ -258,7 +281,7 @@ export const marketCrowdfundDef = defineFiberApp({
                     { var: "state" },
                     {
                         status: "REFUNDED",
-                        refundedAt: { var: "$timestamp" },
+                        refundedAt: { var: "$ordinal" },
                         reason: "threshold_not_met",
                     },
                 ],
@@ -274,12 +297,14 @@ export const marketCrowdfundDef = defineFiberApp({
                     {
                         ">": [
                             {
-                                size: {
-                                    filter: [
-                                        { var: "state.pledges" },
-                                        { "===": [{ var: "backer" }, { var: "event.agent" }] },
-                                    ],
-                                },
+                                length: [
+                                    {
+                                        filter: [
+                                            { var: "state.pledges" },
+                                            { "===": [{ var: "backer" }, { var: "event.agent" }] },
+                                        ],
+                                    },
+                                ],
                             },
                             0,
                         ],

package/dist/esm/apps/markets/state-machines/market-group-buy.js

@@ -1,4 +1,5 @@
 import { defineFiberApp } from "../../../schema/fiber-app.js";
+import { signerIsParty, signerIsAnyParty } from "../../../schema/guards.js";
 /**
  * Collective purchasing with quantity thresholds and tiered pricing.
  */
@@ -80,41 +81,65 @@ export const marketGroupBuyDef = defineFiberApp({
         PROPOSED: {
             id: "PROPOSED",
             isFinal: false,
-            metadata: { description: "Group buy created but not yet open" },
+            metadata: {
+                label: "Proposed",
+                description: "Group buy created but not yet open",
+                category: "initial",
+            },
         },
         OPEN: {
             id: "OPEN",
             isFinal: false,
-            metadata: { description: "Accepting orders" },
+            metadata: {
+                label: "Open",
+                description: "Accepting orders",
+                category: "active",
+            },
         },
         THRESHOLD_MET: {
             id: "THRESHOLD_MET",
             isFinal: false,
             metadata: {
+                label: "Threshold met",
                 description: "Minimum quantity reached, continuing for better tier",
+                category: "active",
             },
         },
         PROCESSING: {
             id: "PROCESSING",
             isFinal: false,
             metadata: {
+                label: "Processing",
                 description: "Order placed with vendor, awaiting fulfillment",
+                category: "pending",
             },
         },
         FULFILLED: {
             id: "FULFILLED",
             isFinal: true,
-            metadata: { description: "All items delivered to buyers" },
+            metadata: {
+                label: "Fulfilled",
+                description: "All items delivered to buyers",
+                category: "terminal",
+            },
         },
         REFUNDED: {
             id: "REFUNDED",
             isFinal: true,
-            metadata: { description: "Threshold not met, all orders refunded" },
+            metadata: {
+                label: "Refunded",
+                description: "Threshold not met, all orders refunded",
+                category: "terminal",
+            },
         },
         CANCELLED: {
             id: "CANCELLED",
             isFinal: true,
-            metadata: { description: "Group buy cancelled" },
+            metadata: {
+                label: "Cancelled",
+                description: "Group buy cancelled",
+                category: "terminal",
+            },
         },
     },
     initialState: "PROPOSED",
@@ -123,13 +148,13 @@ export const marketGroupBuyDef = defineFiberApp({
             from: "PROPOSED",
             to: "OPEN",
             eventName: "open",
-            guard: { "===": [{ var: "event.agent" }, { var: "state.organizer" }] },
+            guard: signerIsParty("state.organizer"),
             effect: {
                 merge: [
                     { var: "state" },
                     {
                         status: "OPEN",
-                        openedAt: { var: "$timestamp" },
+                        openedAt: { var: "$ordinal" },
                         orders: [],
                         totalQuantity: 0,
                         currentTier: 0,
@@ -142,11 +167,11 @@ export const marketGroupBuyDef = defineFiberApp({
             from: "PROPOSED",
             to: "CANCELLED",
             eventName: "cancel",
-            guard: { "===": [{ var: "event.agent" }, { var: "state.organizer" }] },
+            guard: signerIsParty("state.organizer"),
             effect: {
                 merge: [
                     { var: "state" },
-                    { status: "CANCELLED", cancelledAt: { var: "$timestamp" } },
+                    { status: "CANCELLED", cancelledAt: { var: "$ordinal" } },
                 ],
             },
             dependencies: [],
@@ -166,7 +191,7 @@ export const marketGroupBuyDef = defineFiberApp({
                             },
                         ],
                     },
-                    { "<=": [{ var: "$timestamp" }, { var: "state.deadline" }] },
+                    { "<=": [{ var: "$ordinal" }, { var: "state.deadline" }] },
                 ],
             },
             effect: {
@@ -181,7 +206,7 @@ export const marketGroupBuyDef = defineFiberApp({
                                         buyer: { var: "event.agent" },
                                         quantity: { var: "event.quantity" },
                                         shippingInfo: { var: "event.shippingInfo" },
-                                        orderedAt: { var: "$timestamp" },
+                                        orderedAt: { var: "$ordinal" },
                                     },
                                 ],
                             ],
@@ -206,7 +231,7 @@ export const marketGroupBuyDef = defineFiberApp({
                     { var: "state" },
                     {
                         status: "THRESHOLD_MET",
-                        thresholdMetAt: { var: "$timestamp" },
+                        thresholdMetAt: { var: "$ordinal" },
                         currentTier: {
                             reduce: [
                                 { var: "state.priceTiers" },
@@ -237,7 +262,7 @@ export const marketGroupBuyDef = defineFiberApp({
             guard: {
                 and: [
                     { ">": [{ var: "event.quantity" }, 0] },
-                    { "<=": [{ var: "$timestamp" }, { var: "state.deadline" }] },
+                    { "<=": [{ var: "$ordinal" }, { var: "state.deadline" }] },
                 ],
             },
             effect: {
@@ -252,7 +277,7 @@ export const marketGroupBuyDef = defineFiberApp({
                                         buyer: { var: "event.agent" },
                                         quantity: { var: "event.quantity" },
                                         shippingInfo: { var: "event.shippingInfo" },
-                                        orderedAt: { var: "$timestamp" },
+                                        orderedAt: { var: "$ordinal" },
                                     },
                                 ],
                             ],
@@ -292,13 +317,13 @@ export const marketGroupBuyDef = defineFiberApp({
             from: "THRESHOLD_MET",
             to: "PROCESSING",
             eventName: "finalize",
-            guard: { ">=": [{ var: "$timestamp" }, { var: "state.deadline" }] },
+            guard: { ">=": [{ var: "$ordinal" }, { var: "state.deadline" }] },
             effect: {
                 merge: [
                     { var: "state" },
                     {
                         status: "PROCESSING",
-                        finalizedAt: { var: "$timestamp" },
+                        finalizedAt: { var: "$ordinal" },
                         finalTier: { var: "state.currentTier" },
                         finalPricePerUnit: {
                             var: {
@@ -318,18 +343,13 @@ export const marketGroupBuyDef = defineFiberApp({
             from: "PROCESSING",
             to: "FULFILLED",
             eventName: "fulfill",
-            guard: {
-                or: [
-                    { "===": [{ var: "event.agent" }, { var: "state.vendor" }] },
-                    { "===": [{ var: "event.agent" }, { var: "state.organizer" }] },
-                ],
-            },
+            guard: signerIsAnyParty(["state.vendor", "state.organizer"]),
             effect: {
                 merge: [
                     { var: "state" },
                     {
                         status: "FULFILLED",
-                        fulfilledAt: { var: "$timestamp" },
+                        fulfilledAt: { var: "$ordinal" },
                         trackingInfo: { var: "event.trackingInfo" },
                     },
                 ],
@@ -345,7 +365,7 @@ export const marketGroupBuyDef = defineFiberApp({
                     {
                         "<": [{ var: "state.totalQuantity" }, { var: "state.minQuantity" }],
                     },
-                    { ">=": [{ var: "$timestamp" }, { var: "state.deadline" }] },
+                    { ">=": [{ var: "$ordinal" }, { var: "state.deadline" }] },
                 ],
             },
             effect: {
@@ -353,7 +373,7 @@ export const marketGroupBuyDef = defineFiberApp({
                     { var: "state" },
                     {
                         status: "REFUNDED",
-                        refundedAt: { var: "$timestamp" },
+                        refundedAt: { var: "$ordinal" },
                         reason: "threshold_not_met",
                     },
                 ],
@@ -369,12 +389,14 @@ export const marketGroupBuyDef = defineFiberApp({
                     {
                         ">": [
                             {
-                                size: {
-                                    filter: [
-                                        { var: "state.orders" },
-                                        { "===": [{ var: "buyer" }, { var: "event.agent" }] },
-                                    ],
-                                },
+                                length: [
+                                    {
+                                        filter: [
+                                            { var: "state.orders" },
+                                            { "===": [{ var: "buyer" }, { var: "event.agent" }] },
+                                        ],
+                                    },
+                                ],
                             },
                             0,
                         ],