@hyperscale0/hsx 5.0.0 → 5.1.0

package/src/version.ts

@@ -1,2 +1,2 @@
-export const HSX_VERSION = "5.0.0";
+export const HSX_VERSION = "5.1.0";
 export const HSX_TARGET_UDL_VERSION = 4;

package/std/cards.hsx

@@ -28,11 +28,13 @@ instrument authorization(card: ref<cards.card>, merchant: party, issuer: party =
   lifecycle { states: [pending, approved, captured, declined, reversed, expired], initial: pending }
   action create {
     requires self.card in [active]
+    requires self.card.holder in [active]
     requires self.amount <= self.card.spendLimit
   }
   action approve {
     from: pending, to: approved, actor: { party: issuer }, deadline: { at: self.expiresAt }
     requires self.card in [active]
+    requires self.card.holder in [active]
     moves reserve self.amount from self.card.holder.holder to merchant capture "reservation"
   }
   action capture { from: approved, to: captured, actor: { party: merchant }, deadline: { at: self.expiresAt }, moves post self.reservation }

package/std/financing.hsx

@@ -525,7 +525,7 @@ instrument late_charge(on: ref<financing.installments>[], grace: duration = 3d,
       }
       lifecycle { states: [proposed, assessed, collected, waived, refunded], initial: proposed }
       action create { calculate: [{ target: overdueAt, op: shift, date: { field: self.assessment.overdueAt }, milliseconds: { literal: 0 }, direction: after }], requires unique "recovery_assessment" on [self.assessment]; requires self.plan == self.assessment.plan }
-      action assess {
+      action assess { allowZero: true,
         from: proposed, to: assessed, actor: clock, due: { at: self.assessment.overdueAt }
         requires self.assessment.slice.principalReceivable.balance > "0"
         moves self.amount from self.debt to self.receivable

package/std/lending.hsx

@@ -25,14 +25,15 @@ instrument round(borrower: party, plan: ref<financing.installments> = object(fin
 
 instrument commitment(round: ref<lending.round>, wallet: ref<wallet.balance>, investor: party = party(person)) {
   summary: "One investor's original-wallet contribution, capped cumulatively within the round."
-  fields { round: ref<round>, wallet: ref<wallet>, amount: money, loss: account(investor, claim, "loss") }
+  fields { round: ref<round>, wallet: ref<wallet>, investor: account of investor, amount: money, loss: account(investor, claim, "loss") }
   lifecycle { states: [committed, funded, withdrawn, refunded], initial: committed }
-  invariants sum "amount" of { instrument: all(lending.commitment), reference: "round", anchor: self.round, states: [committed, funded], limit: 366, where: { wallet: { field: self.wallet } } } <= self.round.maximumTicket
+  invariants sum "amount" of { instrument: all(lending.commitment), reference: "round", anchor: self.round, states: [committed, funded], limit: 366, where: { investor: { field: self.investor } } } <= self.round.maximumTicket
   invariants sum "amount" of { instrument: all(lending.commitment), reference: "round", anchor: self.round, states: [committed, funded], limit: 366 } <= self.round.price
   action create {
     actor: { party: investor }
     requires self.round in [open]
     requires self.wallet in [active]
+    requires self.wallet.holder == self.investor
     requires self.amount >= self.round.minimumTicket
     deadline: { at: self.round.closesAt }
     moves self.amount from self.wallet.held to self.round.held

package/std/money.hsx

@@ -97,6 +97,7 @@ instrument pool(payer: party, payee: party, target: money, closes: date) {
     contribution: {
       fields { pool: ref<parent>, payer: account of payer, amount: money, remaining: money? }
       lifecycle { states: [pending, paid, refunded], initial: pending }
+      invariants count of { instrument: current(), reference: "pool", anchor: self.pool, states: [paid], limit: 366 } <= 366
       action create { requires self.pool in [open] }
       action pay { from: pending, to: paid, actor: { party: payer }, deadline: { at: self.pool.closesAt }, requires self.pool in [open], calculate: [{ target: remaining, op: subtract, base: { field: self.pool.target }, subtract: [{ field: self.pool.held.balance }] }], requires self.amount <= self.remaining, moves self.amount from self.payer to self.pool.held }
       action refund { from: paid, to: refunded, actor: { parent: parent }, moves self.amount from self.pool.held to self.payer }

package/std/reporting.hsx

@@ -117,6 +117,12 @@ instrument portfolio(on: ref<financing.installments>[], default_days: integer(1,
               type: { kind: "money", currency: "SAR" },
               required: true
             },
+            {
+              name: "earnedProfit",
+              field: "profitEarned.balance",
+              type: { kind: "money", currency: "SAR" },
+              required: true
+            },
             {
               name: "scheduledPrincipal",
               field: "principal",
@@ -139,7 +145,8 @@ instrument portfolio(on: ref<financing.installments>[], default_days: integer(1,
             },
             { id: "observed", op: "parameter", name: "observationAt" },
             { id: "scheduledOutstanding", op: "sum", left: "principal", right: "profit" },
-            { id: "unpaid", op: "less", left: "zeroMoney", right: "scheduledOutstanding" },
+            { id: "totalOutstanding", op: "sum", left: "scheduledOutstanding", right: "earnedProfit" },
+            { id: "unpaid", op: "less", left: "zeroMoney", right: "totalOutstanding" },
             { id: "elapsed", op: "daysBetween", left: "due", right: "observed" },
             { id: "nonnegativeDays", op: "maximum", left: "elapsed", right: "zeroDays" },
             { id: "daysPastDue", op: "choose", condition: "unpaid", yes: "nonnegativeDays", no: "zeroDays" }
@@ -464,6 +471,12 @@ instrument portfolio(on: ref<financing.installments>[], default_days: integer(1,
               type: { kind: "money", currency: "SAR" },
               required: true
             },
+            {
+              name: "earnedProfit",
+              field: "profitEarned.balance",
+              type: { kind: "money", currency: "SAR" },
+              required: true
+            },
             {
               name: "scheduledPrincipal",
               field: "principal",
@@ -486,7 +499,8 @@ instrument portfolio(on: ref<financing.installments>[], default_days: integer(1,
             },
             { id: "observed", op: "parameter", name: "observationAt" },
             { id: "scheduledOutstanding", op: "sum", left: "principal", right: "profit" },
-            { id: "unpaid", op: "less", left: "zeroMoney", right: "scheduledOutstanding" },
+            { id: "totalOutstanding", op: "sum", left: "scheduledOutstanding", right: "earnedProfit" },
+            { id: "unpaid", op: "less", left: "zeroMoney", right: "totalOutstanding" },
             { id: "elapsed", op: "daysBetween", left: "due", right: "observed" },
             { id: "nonnegativeDays", op: "maximum", left: "elapsed", right: "zeroDays" },
             { id: "daysPastDue", op: "choose", condition: "unpaid", yes: "nonnegativeDays", no: "zeroDays" }
@@ -744,6 +758,12 @@ instrument portfolio(on: ref<financing.installments>[], default_days: integer(1,
               type: { kind: "money", currency: "SAR" },
               required: true
             },
+            {
+              name: "earnedProfit",
+              field: "profitEarned.balance",
+              type: { kind: "money", currency: "SAR" },
+              required: true
+            },
             {
               name: "scheduledPrincipal",
               field: "principal",
@@ -766,7 +786,8 @@ instrument portfolio(on: ref<financing.installments>[], default_days: integer(1,
             },
             { id: "observed", op: "parameter", name: "observationAt" },
             { id: "scheduledOutstanding", op: "sum", left: "principal", right: "profit" },
-            { id: "unpaid", op: "less", left: "zeroMoney", right: "scheduledOutstanding" },
+            { id: "totalOutstanding", op: "sum", left: "scheduledOutstanding", right: "earnedProfit" },
+            { id: "unpaid", op: "less", left: "zeroMoney", right: "totalOutstanding" },
             { id: "elapsed", op: "daysBetween", left: "due", right: "observed" },
             { id: "nonnegativeDays", op: "maximum", left: "elapsed", right: "zeroDays" },
             { id: "daysPastDue", op: "choose", condition: "unpaid", yes: "nonnegativeDays", no: "zeroDays" }
@@ -1113,6 +1134,12 @@ instrument portfolio(on: ref<financing.installments>[], default_days: integer(1,
               type: { kind: "money", currency: "SAR" },
               required: true
             },
+            {
+              name: "earnedProfit",
+              field: "profitEarned.balance",
+              type: { kind: "money", currency: "SAR" },
+              required: true
+            },
             {
               name: "scheduledPrincipal",
               field: "principal",
@@ -1135,7 +1162,8 @@ instrument portfolio(on: ref<financing.installments>[], default_days: integer(1,
             },
             { id: "observed", op: "parameter", name: "observationAt" },
             { id: "scheduledOutstanding", op: "sum", left: "principal", right: "profit" },
-            { id: "unpaid", op: "less", left: "zeroMoney", right: "scheduledOutstanding" },
+            { id: "totalOutstanding", op: "sum", left: "scheduledOutstanding", right: "earnedProfit" },
+            { id: "unpaid", op: "less", left: "zeroMoney", right: "totalOutstanding" },
             { id: "elapsed", op: "daysBetween", left: "due", right: "observed" },
             { id: "nonnegativeDays", op: "maximum", left: "elapsed", right: "zeroDays" },
             { id: "daysPastDue", op: "choose", condition: "unpaid", yes: "nonnegativeDays", no: "zeroDays" }